From 37dfc1e4ddef406bdc63a73fdd15e4fefd7b8121 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Mon, 22 May 2023 10:12:43 +0800 Subject: [PATCH 1/2] nothing --- ext.json | 8 +-- pages/forgetpwd/forgetpwd.ttml | 34 ++++++----- pages/user/user.ttml | 107 +++++++++++++++++---------------- 3 files changed, 76 insertions(+), 73 deletions(-) diff --git a/ext.json b/ext.json index 8157f83..e8c2509 100644 --- a/ext.json +++ b/ext.json @@ -4,9 +4,9 @@ "configUrl": "https://b.malls.iformall.com", "datatowerurl": "https://mobile.malls.iformall.com" }, - "name": "滨江购物广场商家版", - "weappId": "tt61cc1771fef34a7701", - "appVersion": "B.5.1.0" + "name": "家帮汇商户端", + "weappId": "tt883bfe86170711f401", + "appVersion": "Btest.5.1.0" }, "debug": false, "tabBar": { @@ -29,7 +29,7 @@ "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#52A0FD" }, - "extAppid": "tt61cc1771fef34a7701", + "extAppid": "tt883bfe86170711f401", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/forgetpwd/forgetpwd.ttml b/pages/forgetpwd/forgetpwd.ttml index 0b82612..474fa2a 100644 --- a/pages/forgetpwd/forgetpwd.ttml +++ b/pages/forgetpwd/forgetpwd.ttml @@ -1,18 +1,20 @@ -
- - 修改密码 - 找回密码 - 请填写你的手机号,我们会发送验证码验证身份 - - - - - - - - + + + 修改密码 + 找回密码 + 请填写你的手机号,我们会发送验证码验证身份 + + + + - - - \ No newline at end of file + + + +
+ + +
\ No newline at end of file diff --git a/pages/user/user.ttml b/pages/user/user.ttml index 95fbdc6..a723f59 100644 --- a/pages/user/user.ttml +++ b/pages/user/user.ttml @@ -1,18 +1,18 @@ - - - - - - - - - {{userInfo.mall_name}}({{userInfo.merchant_name}}) - {{userInfo.phone}} - - + + + + + + + + + {{userInfo.mall_name}}({{userInfo.merchant_name}}) + {{userInfo.phone}} - + + - + - - - 修改密码 - - - + + + 修改密码 + + + - - - 导出核销记录 - - - - - - 开通收款账户 - 点击复制链接 - + + 开通收款账户 + 点击复制链接 + - - 账户余额 - 点击复制链接 - + + 账户余额 + 点击复制链接 + - - - - 积分操作记录 - - - - + + + 积分操作记录 + + + - - 客服电话 - {{userInfo.service_phone}} - - - - - + + + 客服电话 + {{userInfo.service_phone}} - - \ No newline at end of file + + + + + + + \ No newline at end of file From 691ac68122a9dca382fbcb29388831b80262caed Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Fri, 2 Jun 2023 18:00:24 +0800 Subject: [PATCH 2/2] upload --- pages/index/index.js | 2 ++ pages/user/user.ttml | 4 ---- project.config.json | 23 ++++++++++++++++++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/pages/index/index.js b/pages/index/index.js index 7037686..d003a57 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -167,6 +167,7 @@ Page({ } }) } else { + tt.showToast({ image: './../../assets/images/fail.png', title: res.message, @@ -182,6 +183,7 @@ Page({ merchantList: res.data.merchantList }) } else { + console.log(res, 'res'); tt.showToast({ image: './../../assets/images/fail.png', title: res.message, diff --git a/pages/user/user.ttml b/pages/user/user.ttml index a723f59..b33f243 100644 --- a/pages/user/user.ttml +++ b/pages/user/user.ttml @@ -59,10 +59,6 @@ 点击复制链接 - - - -