Skip to content

G
garden_merchant
提交 312ad261 authored 作者: 彭涛's avatar 彭涛
浏览文件
操作

对接接口

上级 29a418e6
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 253 行增加 和 51 行删除
pages.json
浏览文件 @ 312ad261
...@@ -24,7 +24,10 @@ ...@@ -24,7 +24,10 @@
"path": "pages/shopdetail/shopdetail", "path": "pages/shopdetail/shopdetail",
"style": { "style": {
"navigationBarTitleText": "商家", "navigationBarTitleText": "商家",
"navigationStyle":"custom" "navigationStyle":"custom",
"app-plus":{
"scrollIndicator":"none"
}
} }
} }
], ],
......
pages/changepassword/changepassword.vue
浏览文件 @ 312ad261
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<view class="login_head">修改登录密码</view> <view class="login_head">修改登录密码</view>
<view class="logo_input"> <view class="logo_input">
<view class="logo_input_list"> <view class="logo_input_list">
<input v-if="isoriginalpassword" type="password" v-model="originalpassword" <input v-if="isoriginalpassword" type="password" v-model="originalpassword" placeholder="请输入原密码"
placeholder="请输入原密码" placeholder-class="placeholder" /> placeholder-class="placeholder" />
<input v-else type="text" v-model="originalpassword" placeholder="请输入原密码" <input v-else type="text" v-model="originalpassword" placeholder="请输入原密码"
placeholder-class="placeholder" /> placeholder-class="placeholder" />
<image @click="originalpassword=''" v-if="originalpassword" src="../../static/images/close.png" <image @click="originalpassword=''" v-if="originalpassword" src="../../static/images/close.png"
mode="widthFix" class="close"></image> mode="widthFix" class="close"></image>
...@@ -15,10 +15,9 @@ ...@@ -15,10 +15,9 @@
mode="widthFix" class="hide_icon"></image> mode="widthFix" class="hide_icon"></image>
</view> </view>
<view class="logo_input_list"> <view class="logo_input_list">
<input v-if="isnewpassword" type="password" 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" /> 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" <image @click="newpassword=''" v-if="newpassword" src="../../static/images/close.png" mode="widthFix"
class="close"></image> class="close"></image>
<image @click="isnewpassword=false" v-if="isnewpassword" src="../../static/images/Invisible.png" <image @click="isnewpassword=false" v-if="isnewpassword" src="../../static/images/Invisible.png"
...@@ -27,9 +26,9 @@ ...@@ -27,9 +26,9 @@
mode="widthFix" class="hide_icon"></image> mode="widthFix" class="hide_icon"></image>
</view> </view>
<view class="logo_input_list"> <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" /> placeholder-class="placeholder" />
<input v-else type="text" v-model="affirmpassword" placeholder="再次输入新密码" <input v-else type="text" v-model="affirmpassword" placeholder="再次输入新密码"
placeholder-class="placeholder" /> placeholder-class="placeholder" />
<image @click="affirmpassword=''" v-if="affirmpassword" src="../../static/images/close.png" <image @click="affirmpassword=''" v-if="affirmpassword" src="../../static/images/close.png"
mode="widthFix" class="close"></image> mode="widthFix" class="close"></image>
...@@ -104,9 +103,11 @@ ...@@ -104,9 +103,11 @@
icon: 'success' icon: 'success'
}) })
let retime = setTimeout(function() { let retime = setTimeout(function() {
uni.navigateBack({ uni.setStorageSync('password', '')
delta: 1 uni.reLaunch({
url: '/pages/login/login'
}); });
clearTimeout(retime) clearTimeout(retime)
}, 2000) }, 2000)
} else { } else {
......
static/util/api.js
浏览文件 @ 312ad261
...@@ -3,6 +3,7 @@ const erp = erp || {}; ...@@ -3,6 +3,7 @@ const erp = erp || {};
const DOMAIN='https://faces.diaosaas.com/garden/'//正式 const DOMAIN='https://faces.diaosaas.com/garden/'//正式
// const DOMAIN = 'http://192.168.1.179:9101/'; // const DOMAIN = 'http://192.168.1.179:9101/';
//const DOMAIN = 'http://192.168.1.163:8089/'; //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 DOMAIN ='http://47.110.68.2/car/'
//const HOST = '/api' + 'api/'; //const HOST = '/api' + 'api/';
const HOST = DOMAIN + 'api/'; const HOST = DOMAIN + 'api/';
...@@ -11,5 +12,6 @@ erp.login = HOST + 'merchant/login' //登录 ...@@ -11,5 +12,6 @@ erp.login = HOST + 'merchant/login' //登录
erp.reSetPassword = HOST + 'merchant/reSetPassword' //修改密码 erp.reSetPassword = HOST + 'merchant/reSetPassword' //修改密码
erp.getIncomeDetail = HOST + 'merchant/getIncomeDetail' //获取收入明细 erp.getIncomeDetail = HOST + 'merchant/getIncomeDetail' //获取收入明细
erp.getIncomeStatistics = HOST + 'merchant/getIncomeStatistics' //获取收入统计 erp.getIncomeStatistics = HOST + 'merchant/getIncomeStatistics' //获取收入统计
erp.getTodayIncome = HOST + 'merchant/getTodayIncome' // 获取商家收入
export default erp; 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)')) <!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> 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 \ No newline at end of file
unpackage/dist/build/h5/static/util/api.js
浏览文件 @ 312ad261
...@@ -3,6 +3,7 @@ const erp = erp || {}; ...@@ -3,6 +3,7 @@ const erp = erp || {};
const DOMAIN='https://faces.diaosaas.com/garden/'//正式 const DOMAIN='https://faces.diaosaas.com/garden/'//正式
// const DOMAIN = 'http://192.168.1.179:9101/'; // const DOMAIN = 'http://192.168.1.179:9101/';
//const DOMAIN = 'http://192.168.1.163:8089/'; //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 DOMAIN ='http://47.110.68.2/car/'
//const HOST = '/api' + 'api/'; //const HOST = '/api' + 'api/';
const HOST = DOMAIN + 'api/'; const HOST = DOMAIN + 'api/';
...@@ -11,5 +12,6 @@ erp.login = HOST + 'merchant/login' //登录 ...@@ -11,5 +12,6 @@ erp.login = HOST + 'merchant/login' //登录
erp.reSetPassword = HOST + 'merchant/reSetPassword' //修改密码 erp.reSetPassword = HOST + 'merchant/reSetPassword' //修改密码
erp.getIncomeDetail = HOST + 'merchant/getIncomeDetail' //获取收入明细 erp.getIncomeDetail = HOST + 'merchant/getIncomeDetail' //获取收入明细
erp.getIncomeStatistics = HOST + 'merchant/getIncomeStatistics' //获取收入统计 erp.getIncomeStatistics = HOST + 'merchant/getIncomeStatistics' //获取收入统计
erp.getTodayIncome = HOST + 'merchant/getTodayIncome' // 获取商家收入
export default erp; export default erp;
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论