From e683ef3a434805210017f96d470a2f5d289f88d8 Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Sat, 11 Mar 2023 17:31:35 +0800 Subject: [PATCH 1/3] upload --- app.json | 1 + assets/images/scan.png | Bin 0 -> 2718 bytes ext.json | 44 ++++----- index/user.wxml | 8 ++ pages/exchange/exchange.js | 97 +++++++++++------- pages/exchange/exchange.wxml | 8 +- pages/exchange/exchange.wxss | 37 +++++-- pages/exchangeCard/exchangeCard.js | 142 +++++++++++++++++++++++++++ pages/exchangeCard/exchangeCard.json | 5 + pages/exchangeCard/exchangeCard.wxml | 54 ++++++++++ pages/exchangeCard/exchangeCard.wxss | 121 +++++++++++++++++++++++ pages/getphoneInfo/index.js | 5 + pages/index/index.js | 16 +++ project.config.json | 2 +- project.private.config.json | 14 ++- 15 files changed, 478 insertions(+), 76 deletions(-) create mode 100644 assets/images/scan.png create mode 100644 pages/exchangeCard/exchangeCard.js create mode 100644 pages/exchangeCard/exchangeCard.json create mode 100644 pages/exchangeCard/exchangeCard.wxml create mode 100644 pages/exchangeCard/exchangeCard.wxss diff --git a/app.json b/app.json index b880fc1..5ac98a3 100644 --- a/app.json +++ b/app.json @@ -52,6 +52,7 @@ "pages/payrule/payrule", "pages/grade/grade", "pages/exchange/exchange", + "pages/exchangeCard/exchangeCard", "pages/game/index", "pages/canvas/index", "pages/specialcourtesy/specialcourtesy", diff --git a/assets/images/scan.png b/assets/images/scan.png new file mode 100644 index 0000000000000000000000000000000000000000..62f81b1cf6a6b204b09a03cc82fdfd1e9c0e7487 GIT binary patch literal 2718 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 literal 0 HcmV?d00001 diff --git a/ext.json b/ext.json index dcaba26..34dfe10 100644 --- a/ext.json +++ b/ext.json @@ -2,44 +2,35 @@ "ext": { "attr": { "car": { - "tjd": { - "payPath": "", - "tjdAppId": "wx6945d1bda68d7993" - }, "etcp": { - "payPath": "pages/pay/order-pay-open/main", - "etcpAppId": "wxc07f9d67923d676d", - "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" - }, - "bolink": { - "payPath": "pages/park/park", - "bolinkAppId": "wxbd08b4baa10fcc1d" - }, - "version": "release" + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } }, - "mchId": "1539123951", + "mchId": "1604439800", "imgProxy": [ { - "newUrl": "https://c.malls.iformall.com/img", + "newUrl": "https://ctest.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img1", + "newUrl": "https://ctest.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img2", + "newUrl": "https://ctest.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://c.malls.iformall.com/C/api", - "ifStoreApp": "0", + "configUrl": "https://ctest.malls.iformall.com/C/api", + "businessSwitch": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "欢乐城万象金街", - "weappId": "wxde54451891094c16", - "appVersion": "C.5.1.1" + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { @@ -75,7 +66,8 @@ "selectedIconPath": "assets/images/user-a.png" } ], - "custom": true + "color": "#abb1be", + "selectedColor": "#b2743d" }, "window": { "backgroundTextStyle": "dark", @@ -84,12 +76,16 @@ "navigationBarBackgroundColor": "#FFFFFF" }, "plugins": { + "auto-points-plugin": { + "version": "1.3.0", + "provider": "wxfab2bf944bfc4da6" + }, "live-player-plugin": { "version": "1.3.4", "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wxde54451891094c16", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/user.wxml b/index/user.wxml index 96a5973..8044f16 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -137,6 +137,14 @@ > + + + + 录入实体卡 + > + + + 问券调查 diff --git a/pages/exchange/exchange.js b/pages/exchange/exchange.js index 58673e1..62d22de 100644 --- a/pages/exchange/exchange.js +++ b/pages/exchange/exchange.js @@ -9,33 +9,54 @@ Page({ * 页面的初始数据 */ data: { - navigationBarHeight + navigationBarHeight, + code: "" }, // 兑换 - exchange(e){ + exchange(e) { + console.log(e, 'e'); let that = this; let code = e.detail.value.code; let formId = e.detail.formId; - if (!code || !code.replace(/\s*/g, "")){ + if (!code || !code.replace(/\s*/g, "")) { wx.showToast({ title: '请输入兑换码', - icon:"none", - duration:2500 + icon: "none", + duration: 2500 }) return; } - that.checkPhoneStatus(e.detail.value.code,formId = e.detail.formId); + that.checkPhoneStatus(code, formId); }, + + goScanCode() { + console.log('scan!!!'); + const that = this + wx.scanCode({ + success: (res) => { + console.log(res, 'res'); + const num = res.result + that.setData({ + code: num + }) + that.exchange({ detail: { value: num } }) + }, + fail: (res) => { + console.log(res, 'fail'); + } + }) + }, + checkPhoneStatus: function (password, formId) { let that = this; Http.get({ url: config.api.checkPhoneStatus, data: {} }) - .then(res => { - that.getCouponOrderByPassword(password, formId); - }) - .catch(err => { + .then(res => { + that.getCouponOrderByPassword(password, formId); + }) + .catch(err => { if (err.code == 11005) { /** * 手机号没有授权,将值传到用户手机号授权的页面 @@ -51,7 +72,7 @@ Page({ duration: 2500 }) } - }) + }) }, getCouponOrderByPassword(password, formId) { let that = this; @@ -62,34 +83,34 @@ Page({ formId: formId } }) - .then(res => { - wx.showModal({ - title: '兑换成功', - content: '消费卡已发放到"我的卡包"', - showCancel: true, - cancelText: "知道了", - cancelColor: '', - confirmText: "去查看", - confirmColor: '#FD832D', - success: function (res) { - if (res.cancel) { - //点击取消,默认隐藏弹框 - } else { - wx.redirectTo({ - url: '/pages/cardorder/index/index', - }) - } - }, - fail: function (res) { },//接口调用失败的回调函数 - complete: function (res) { },//接口调用结束的回调函数(调用成功、失败都会执行) + .then(res => { + wx.showModal({ + title: '兑换成功', + content: '消费卡已发放到"我的卡包"', + showCancel: true, + cancelText: "知道了", + cancelColor: '', + confirmText: "去查看", + confirmColor: '#FD832D', + success: function (res) { + if (res.cancel) { + //点击取消,默认隐藏弹框 + } else { + wx.redirectTo({ + url: '/pages/cardorder/index/index', + }) + } + }, + fail: function (res) { },//接口调用失败的回调函数 + complete: function (res) { },//接口调用结束的回调函数(调用成功、失败都会执行) + }) }) - }) - .catch(err => { - wx.showToast({ - title: err.message, - icon: 'none', - duration: 2000 + .catch(err => { + wx.showToast({ + title: err.message, + icon: 'none', + duration: 2000 + }) }) - }) } }) \ No newline at end of file diff --git a/pages/exchange/exchange.wxml b/pages/exchange/exchange.wxml index f8732eb..f652665 100644 --- a/pages/exchange/exchange.wxml +++ b/pages/exchange/exchange.wxml @@ -1,11 +1,13 @@
- - - + + + + + 如何获取兑换码? 1.实体卡卡密可刮开卡背面涂层查看; diff --git a/pages/exchange/exchange.wxss b/pages/exchange/exchange.wxss index ab3678f..ffe85b6 100644 --- a/pages/exchange/exchange.wxss +++ b/pages/exchange/exchange.wxss @@ -1,12 +1,15 @@ /* pages/exchange/exchange.wxss */ -.section{ +.section { padding: 20rpx 20rpx; } -.section{ + +.section { + position: relative; display: flex; flex: 5; } -.section input{ + +.section input { flex: 3; border: 1px solid #ccc; border-radius: 10rpx; @@ -16,29 +19,45 @@ padding-left: 20rpx; margin-right: 10rpx; } -.section button{ + +.section button { flex: 1; height: 74rpx; line-height: 74rpx; font-size: 30rpx; } -.comment{ + +.section .scan { + position: absolute; + right: 255rpx; + bottom: 37rpx; + width: 40rpx; + height: 40rpx; + z-index: 999; +} + +.comment { padding: 0 20rpx; margin-top: 60rpx; } -.comment text{ + +.comment text { display: block; } -.txt1{ + +.txt1 { margin-top: 30rpx; font-size: 34rpx; margin-bottom: 20rpx; } -.txt2,.txt3{ + +.txt2, +.txt3 { font-size: 30rpx; line-height: 40rpx; color: #999; } -.opcaity{ + +.opcaity { opacity: .6; } \ No newline at end of file diff --git a/pages/exchangeCard/exchangeCard.js b/pages/exchangeCard/exchangeCard.js new file mode 100644 index 0000000..cdef2ab --- /dev/null +++ b/pages/exchangeCard/exchangeCard.js @@ -0,0 +1,142 @@ +const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px' +const util = require("../../utils/util.js"); +const Http = require("../../utils/HttpBasics"); +const config = require("../../config/config"); +const imgurl = require("../../utils/imgurl"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + navigationBarHeight, + tabIndex: 0, + pdwSwitch: 0, + isChangePhone: false, + code: "", + name: "叶文沁", + phone: "1379****591", + tempPhone: '', + password: '', + }, + + // 兑换 + exchange(e) { + console.log(e, 'e'); + let that = this; + let code = e.detail.value.code; + console.log(code); + }, + + // 更改手机号 + changePhone() { + this.setData({ + isChangePhone: true, + tempPhone: this.data.phone + }) + }, + + // 输入手机号 + phoneInput(e) { + this.setData({ + phone: e.detail.value + }) + }, + + // 输入密码 + pwdInput(e) { + this.setData({ + password: e.detail.value + }) + }, + + // 确认手机号更改 + confirmPhone() { + const phoneReg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/ + const phoneValid = phoneReg.test(this.data.phone) + if (!phoneValid) { + wx.showToast({ + title: '请输入正确的手机号!', + icon: 'none' + }) + return + } + this.setData({ + isChangePhone: false, + }) + }, + + // 取消更改 + cancelChangePhone() { + this.setData({ + isChangePhone: false, + phone: this.data.tempPhone + }) + }, + + // 更改tab栏 + changeTabs(e) { + console.log(e, 'changeTabs'); + this.setData({ + tabIndex: e.target.id, + code: '', + password: '' + }) + }, + + // 支付安全设置 + securityChange(e) { + this.setData({ + pdwSwitch: e.detail.value * 1 + }) + }, + + // 扫描二维码 + goScanCode() { + console.log('scan!!!'); + const that = this + wx.scanCode({ + success: (res) => { + console.log(res, 'res'); + const num = res.result + that.setData({ + code: num + }) + that.exchange({ detail: { value: num } }) + }, + fail: (res) => { + console.log(res, 'fail'); + } + }) + }, + + // 检查用户登录状态 + checkPhoneStatus() { + let that = this; + Http.get({ + url: config.api.checkPhoneStatus, + }) + .then(res => { + + }) + .catch(err => { + if (err.code == 11005) { + // 手机号没有授权,将值传到用户手机号授权的页面 + wx.redirectTo({ + url: "/pages/getphoneInfo/index", + }) + } else { + wx.showToast({ + title: err.message, + icon: 'none', + duration: 2500 + }) + } + }) + }, + onLoad() { + setTimeout(() => { + this.checkPhoneStatus() + }, 2000); + } +}) diff --git a/pages/exchangeCard/exchangeCard.json b/pages/exchangeCard/exchangeCard.json new file mode 100644 index 0000000..88eeb8e --- /dev/null +++ b/pages/exchangeCard/exchangeCard.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } +} \ No newline at end of file diff --git a/pages/exchangeCard/exchangeCard.wxml b/pages/exchangeCard/exchangeCard.wxml new file mode 100644 index 0000000..cc00d00 --- /dev/null +++ b/pages/exchangeCard/exchangeCard.wxml @@ -0,0 +1,54 @@ + + + + + + 绑定 + 转增 + + +
+ + + + + +
+ + + 持卡人姓名:{{name}} + 持卡人手机号:{{phone}} 更改 + + 持卡人手机号: + + 确定 + 取消 + + + + 支付安全设置: + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/exchangeCard/exchangeCard.wxss b/pages/exchangeCard/exchangeCard.wxss new file mode 100644 index 0000000..f5f6f36 --- /dev/null +++ b/pages/exchangeCard/exchangeCard.wxss @@ -0,0 +1,121 @@ +/* pages/exchange/exchange.wxss */ +.section { + padding: 20rpx 20rpx; +} + +.section { + position: relative; + display: flex; + flex: 5; +} + +.section input { + flex: 3; + border: 1px solid #ccc; + border-radius: 10rpx; + height: 70rpx; + line-height: 70rpx; + font-size: 30rpx; + padding-left: 20rpx; + margin-right: 10rpx; +} + +.section button { + flex: 1; + height: 74rpx; + line-height: 74rpx; + font-size: 30rpx; +} + +.section .scan { + position: absolute; + right: 255rpx; + bottom: 37rpx; + width: 40rpx; + height: 40rpx; + z-index: 999; +} + +.comment { + padding: 0 20rpx; + margin-top: 60rpx; +} + +.comment text { + display: block; +} + +.opcaity { + opacity: .6; +} + +.tab { + display: flex; + justify-content: space-around; + margin-bottom: 25rpx; + z-index: 999; + height: 60rpx; +} + +.tab .tabItem { + width: 100rpx; + text-align: center; + padding-bottom: 15rpx; + transition: all .3s; +} + +.tabItem.active { + font-size: 35rpx; + color: #fd832d; + border-bottom: 5rpx solid #fd832d; +} + +.infoCard { + width: 90%; + text-align: left; + padding: 25rpx 25rpx 5rpx 25rpx; + font-size: 32rpx; + background-color: #fff; + margin: 10rpx auto; + border-radius: 15rpx; +} + +.infoCard view { + margin-bottom: 35rpx; +} + +.infoCard .phone .changePhone, +.infoCard .phone .confirmPhone { + color: #09bb07; +} + +.infoCard .phone .cancelChangePhone { + color: #fd832d; + margin-left: 15rpx; +} + +.infoCard .phone { + position: relative; +} + +.infoCard .phone .phoneInput { + position: relative; + top: 8rpx; + display: inline-block; + width: 240rpx; +} + +.infoCard .radioGroup { + display: inline-block; +} + +.infoCard .pwdBox { + border: 1px solid #5c5c5c; + padding: 15rpx; + border-radius: 15rpx; +} + +.btns { + margin-top: 50rpx; + padding: 0 40rpx; +} \ No newline at end of file diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index 61e8a15..48007df 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -249,6 +249,11 @@ Page({ } }); } + if (that.data.path == 'exchangeCard') { + wx.navigateTo({ + url: `/pages/exchangeCard/exchangeCard` + }) + } }).catch(err => { wx.showToast({ title: err.message, diff --git a/pages/index/index.js b/pages/index/index.js index 60ee758..1fb6e4b 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -77,6 +77,8 @@ Page({ options.id = this.data.newArr[2]; } else if (options.type == 'ts') { options.id = this.data.newArr[2]; + } else if (options.type == 'ts') { + options.id = this.data.newArr[2]; } } } @@ -344,6 +346,13 @@ Page({ url: '/pages/discountCardList/discountCardList' }) } + // 录入电子卡 + else if (app.globalData.type == 'se') { + // 录入电子卡 + wx.redirectTo({ + url: '/pages/exchangeCard/exchangeCard' + }) + } //直播 else if (app.globalData.type == 'zb') { wx.redirectTo({ @@ -533,6 +542,13 @@ Page({ url: '/pages/discountCardList/discountCardList' }) } + // 录入电子卡 + else if (app.globalData.type == 'se') { + // 录入电子卡 + wx.redirectTo({ + url: '/pages/exchangeCard/exchangeCard' + }) + } // 兑换 else if (app.globalData.type == 'ec') { wx.redirectTo({ diff --git a/project.config.json b/project.config.json index 9dda0a2..e4bfda1 100644 --- a/project.config.json +++ b/project.config.json @@ -35,7 +35,7 @@ }, "compileType": "miniprogram", "libVersion": "2.11.2", - "appid": "wx453ae0d37f3550d0", + "appid": "wxfa336cad86ed598d", "projectname": "C", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, diff --git a/project.private.config.json b/project.private.config.json index 92562bc..dfeade4 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -8,5 +8,17 @@ "useIsolateContext": true }, "libVersion": "2.11.2", - "condition": {} + "condition": { + "miniprogram": { + "list": [ + { + "name": "exchangeCard", + "pathName": "pages/exchangeCard/exchangeCard", + "query": "", + "launchMode": "default", + "scene": null + } + ] + } + } } \ No newline at end of file From f1e3802e2b858ef460256fecc8072ec3a8143575 Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Sat, 11 Mar 2023 17:32:30 +0800 Subject: [PATCH 2/3] upload --- project.private.config.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/project.private.config.json b/project.private.config.json index dfeade4..9a8b04a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -17,6 +17,13 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "pages/index/index", + "pathName": "pages/index/index", + "query": "type=se", + "launchMode": "default", + "scene": null } ] } From b6ca77c406b68c481ac5ed052b0254cc835006fa Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Sat, 11 Mar 2023 18:13:43 +0800 Subject: [PATCH 3/3] uploa --- .../{password.png => password-close.png} | Bin assets/images/password-show.png | Bin 0 -> 3038 bytes pages/exchangeCard/exchangeCard.js | 25 ++++++++++++++++-- pages/exchangeCard/exchangeCard.wxml | 17 +++++++++--- pages/exchangeCard/exchangeCard.wxss | 11 ++++++++ 5 files changed, 47 insertions(+), 6 deletions(-) rename assets/images/{password.png => password-close.png} (100%) create mode 100644 assets/images/password-show.png diff --git a/assets/images/password.png b/assets/images/password-close.png similarity index 100% rename from assets/images/password.png rename to assets/images/password-close.png diff --git a/assets/images/password-show.png b/assets/images/password-show.png new file mode 100644 index 0000000000000000000000000000000000000000..58a65cb98e73a1a5de6eb5cacc360b8be3664fdf GIT binary patch literal 3038 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 literal 0 HcmV?d00001 diff --git a/pages/exchangeCard/exchangeCard.js b/pages/exchangeCard/exchangeCard.js index cdef2ab..169e9b0 100644 --- a/pages/exchangeCard/exchangeCard.js +++ b/pages/exchangeCard/exchangeCard.js @@ -12,12 +12,13 @@ Page({ navigationBarHeight, tabIndex: 0, pdwSwitch: 0, + isShowPwd: false, isChangePhone: false, code: "", name: "叶文沁", phone: "1379****591", tempPhone: '', - password: '', + password: '' }, // 兑换 @@ -46,7 +47,7 @@ Page({ // 输入密码 pwdInput(e) { this.setData({ - password: e.detail.value + password: e.detail.value, }) }, @@ -110,6 +111,26 @@ Page({ }) }, + setPwdShow() { + const isShowPwd = this.data.isShowPwd + this.setData({ + isShowPwd: !isShowPwd + }) + }, + + submit() { + const thisData = this.data + const data = { + name: thisData.name, + phone: thisData.phone, + pdwSwitch: thisData.pdwSwitch, + password: thisData.password, + } + console.log(data, 'submitData'); + }, + + goGive() { }, + // 检查用户登录状态 checkPhoneStatus() { let that = this; diff --git a/pages/exchangeCard/exchangeCard.wxml b/pages/exchangeCard/exchangeCard.wxml index cc00d00..e93b54c 100644 --- a/pages/exchangeCard/exchangeCard.wxml +++ b/pages/exchangeCard/exchangeCard.wxml @@ -40,15 +40,24 @@ -
- + + + + + + + + +
- - + + + + \ No newline at end of file diff --git a/pages/exchangeCard/exchangeCard.wxss b/pages/exchangeCard/exchangeCard.wxss index f5f6f36..27293d1 100644 --- a/pages/exchangeCard/exchangeCard.wxss +++ b/pages/exchangeCard/exchangeCard.wxss @@ -110,9 +110,20 @@ } .infoCard .pwdBox { + position: relative; border: 1px solid #5c5c5c; padding: 15rpx; border-radius: 15rpx; + line-height: 100%; +} + +.infoCard .pwdBox .eye { + position: absolute; + right: 25rpx; + bottom: 5rpx; + width: 60rpx; + height: 60rpx; + z-index: 999; } .btns {