Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
G
garden_merchant
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
黄旭新
garden_merchant
Commits
312ad261
提交
312ad261
authored
9月 22, 2021
作者:
彭涛
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
对接接口
上级
29a418e6
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
253 行增加
和
51 行删除
+253
-51
pages.json
pages.json
+4
-1
changepassword.vue
pages/changepassword/changepassword.vue
+11
-10
shopdetail.vue
pages/shopdetail/shopdetail.vue
+230
-36
api.js
static/util/api.js
+2
-0
index.html
unpackage/dist/build/h5/index.html
+1
-1
index.1c28f4ce.js
unpackage/dist/build/h5/static/js/index.1c28f4ce.js
+1
-1
pages-changepassword-changepassword.2b3e2054.js
...static/js/pages-changepassword-changepassword.2b3e2054.js
+1
-0
pages-changepassword-changepassword.7d0ac4d1.js
...static/js/pages-changepassword-changepassword.7d0ac4d1.js
+0
-1
pages-shopdetail-shopdetail.63a61069.js
...uild/h5/static/js/pages-shopdetail-shopdetail.63a61069.js
+1
-0
pages-shopdetail-shopdetail.90cf6b6a.js
...uild/h5/static/js/pages-shopdetail-shopdetail.90cf6b6a.js
+0
-1
api.js
unpackage/dist/build/h5/static/util/api.js
+2
-0
没有找到文件。
pages.json
浏览文件 @
312ad261
...
...
@@ -24,7 +24,10 @@
"path"
:
"pages/shopdetail/shopdetail"
,
"style"
:
{
"navigationBarTitleText"
:
"商家"
,
"navigationStyle"
:
"custom"
"navigationStyle"
:
"custom"
,
"app-plus"
:{
"scrollIndicator"
:
"none"
}
}
}
],
...
...
pages/changepassword/changepassword.vue
浏览文件 @
312ad261
...
...
@@ -3,9 +3,9 @@
<view
class=
"login_head"
>
修改登录密码
</view>
<view
class=
"logo_input"
>
<view
class=
"logo_input_list"
>
<input
v-if=
"isoriginalpassword"
type=
"password"
v-model=
"originalpassword
"
placeholder
=
"请输入原密码"
placeholder
-class=
"placeholder"
/>
<input
v-else
type=
"text"
v-model=
"originalpassword"
placeholder=
"请输入原密码"
<input
v-if=
"isoriginalpassword"
type=
"password"
v-model=
"originalpassword"
placeholder=
"请输入原密码
"
placeholder-class=
"placeholder"
/>
<input
v-else
type=
"text"
v-model=
"originalpassword"
placeholder=
"请输入原密码"
placeholder-class=
"placeholder"
/>
<image
@
click=
"originalpassword=''"
v-if=
"originalpassword"
src=
"../../static/images/close.png"
mode=
"widthFix"
class=
"close"
></image>
...
...
@@ -15,10 +15,9 @@
mode=
"widthFix"
class=
"hide_icon"
></image>
</view>
<view
class=
"logo_input_list"
>
<input
v-if=
"isnewpassword"
type=
"password"
v-model=
"newpassword"
placeholder=
"请输入新密码"
placeholder-class=
"placeholder"
/>
<input
v-else
type=
"text"
v-model=
"newpassword"
placeholder=
"请输入新密码"
<input
v-if=
"isnewpassword"
type=
"password"
v-model=
"newpassword"
placeholder=
"请输入新密码"
placeholder-class=
"placeholder"
/>
<input
v-else
type=
"text"
v-model=
"newpassword"
placeholder=
"请输入新密码"
placeholder-class=
"placeholder"
/>
<image
@
click=
"newpassword=''"
v-if=
"newpassword"
src=
"../../static/images/close.png"
mode=
"widthFix"
class=
"close"
></image>
<image
@
click=
"isnewpassword=false"
v-if=
"isnewpassword"
src=
"../../static/images/Invisible.png"
...
...
@@ -27,9 +26,9 @@
mode=
"widthFix"
class=
"hide_icon"
></image>
</view>
<view
class=
"logo_input_list"
>
<input
v-if=
"isaffirmpassword"
type=
"password"
v-model=
"affirmpassword"
placeholder=
"再次输入新密码"
<input
v-if=
"isaffirmpassword"
type=
"password"
v-model=
"affirmpassword"
placeholder=
"再次输入新密码"
placeholder-class=
"placeholder"
/>
<input
v-else
type=
"text"
v-model=
"affirmpassword"
placeholder=
"再次输入新密码"
<input
v-else
type=
"text"
v-model=
"affirmpassword"
placeholder=
"再次输入新密码"
placeholder-class=
"placeholder"
/>
<image
@
click=
"affirmpassword=''"
v-if=
"affirmpassword"
src=
"../../static/images/close.png"
mode=
"widthFix"
class=
"close"
></image>
...
...
@@ -104,9 +103,11 @@
icon
:
'success'
})
let
retime
=
setTimeout
(
function
()
{
uni
.
navigateBack
({
delta
:
1
uni
.
setStorageSync
(
'password'
,
''
)
uni
.
reLaunch
({
url
:
'/pages/login/login'
});
clearTimeout
(
retime
)
},
2000
)
}
else
{
...
...
pages/shopdetail/shopdetail.vue
浏览文件 @
312ad261
差异被折叠。
点击展开。
static/util/api.js
浏览文件 @
312ad261
...
...
@@ -3,6 +3,7 @@ const erp = erp || {};
const
DOMAIN
=
'https://faces.diaosaas.com/garden/'
//正式
// const DOMAIN = 'http://192.168.1.179:9101/';
//const DOMAIN = 'http://192.168.1.163:8089/';
// const DOMAIN = 'http://192.168.1.117:9101/';
//const DOMAIN ='http://47.110.68.2/car/'
//const HOST = '/api' + 'api/';
const
HOST
=
DOMAIN
+
'api/'
;
...
...
@@ -11,5 +12,6 @@ erp.login = HOST + 'merchant/login' //登录
erp
.
reSetPassword
=
HOST
+
'merchant/reSetPassword'
//修改密码
erp
.
getIncomeDetail
=
HOST
+
'merchant/getIncomeDetail'
//获取收入明细
erp
.
getIncomeStatistics
=
HOST
+
'merchant/getIncomeStatistics'
//获取收入统计
erp
.
getTodayIncome
=
HOST
+
'merchant/getTodayIncome'
// 获取商家收入
export
default
erp
;
unpackage/dist/build/h5/index.html
浏览文件 @
312ad261
<!DOCTYPE html>
<html
lang=
zh-CN
><head><meta
charset=
utf-8
><meta
http-equiv=
X-UA-Compatible
content=
"IE=edge"
><title>
腾冲 · 花缘商家
</title><script>
var
coverSupport
=
'CSS'
in
window
&&
typeof
CSS
.
supports
===
'function'
&&
(
CSS
.
supports
(
'top: env(a)'
)
||
CSS
.
supports
(
'top: constant(a)'
))
document
.
write
(
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0'
+
(
coverSupport
?
', viewport-fit=cover'
:
''
)
+
'" />'
)
</script><link
rel=
stylesheet
href=
./static/index.f4fc78fe.css
></head><body><noscript><strong>
Please enable JavaScript to continue.
</strong></noscript><div
id=
app
></div><script
src=
./static/js/chunk-vendors.d2b2168a.js
></script><script
src=
./static/js/index.0eaea549.js
></script></body></html>
\ No newline at end of file
document
.
write
(
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0'
+
(
coverSupport
?
', viewport-fit=cover'
:
''
)
+
'" />'
)
</script><link
rel=
stylesheet
href=
./static/index.f4fc78fe.css
></head><body><noscript><strong>
Please enable JavaScript to continue.
</strong></noscript><div
id=
app
></div><script
src=
./static/js/chunk-vendors.d2b2168a.js
></script><script
src=
./static/js/index.1c28f4ce.js
></script></body></html>
\ No newline at end of file
unpackage/dist/build/h5/static/js/index.
0eaea549
.js
→
unpackage/dist/build/h5/static/js/index.
1c28f4ce
.js
浏览文件 @
312ad261
差异被折叠。
点击展开。
unpackage/dist/build/h5/static/js/pages-changepassword-changepassword.2b3e2054.js
0 → 100644
浏览文件 @
312ad261
差异被折叠。
点击展开。
unpackage/dist/build/h5/static/js/pages-changepassword-changepassword.7d0ac4d1.js
deleted
100644 → 0
浏览文件 @
29a418e6
差异被折叠。
点击展开。
unpackage/dist/build/h5/static/js/pages-shopdetail-shopdetail.63a61069.js
0 → 100644
浏览文件 @
312ad261
差异被折叠。
点击展开。
unpackage/dist/build/h5/static/js/pages-shopdetail-shopdetail.90cf6b6a.js
deleted
100644 → 0
浏览文件 @
29a418e6
差异被折叠。
点击展开。
unpackage/dist/build/h5/static/util/api.js
浏览文件 @
312ad261
...
...
@@ -3,6 +3,7 @@ const erp = erp || {};
const
DOMAIN
=
'https://faces.diaosaas.com/garden/'
//正式
// const DOMAIN = 'http://192.168.1.179:9101/';
//const DOMAIN = 'http://192.168.1.163:8089/';
// const DOMAIN = 'http://192.168.1.117:9101/';
//const DOMAIN ='http://47.110.68.2/car/'
//const HOST = '/api' + 'api/';
const
HOST
=
DOMAIN
+
'api/'
;
...
...
@@ -11,5 +12,6 @@ erp.login = HOST + 'merchant/login' //登录
erp
.
reSetPassword
=
HOST
+
'merchant/reSetPassword'
//修改密码
erp
.
getIncomeDetail
=
HOST
+
'merchant/getIncomeDetail'
//获取收入明细
erp
.
getIncomeStatistics
=
HOST
+
'merchant/getIncomeStatistics'
//获取收入统计
erp
.
getTodayIncome
=
HOST
+
'merchant/getTodayIncome'
// 获取商家收入
export
default
erp
;
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论