From 4854c04fb77492814317710607457bbff69fd7c5 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Fri, 15 Oct 2021 17:24:43 +0800 Subject: [PATCH] [...] --- apis/index.js | 8 +- .../coupon-template/coupon-template-1.vue | 2 +- .../coupon-template/coupon-template-2.vue | 2 +- pages.json | 11 +- pages/coupons/add.vue | 5 +- pages/property/coupon/confirmOrder.vue | 45 +- pages/property/coupon/couponMore.vue | 2 +- pages/property/coupon/payStatus.vue | 101 + pages/store/basics.vue | 3 + pages/vip/index.vue | 1 - static/images/payFail.png | Bin 0 -> 5225 bytes static/images/paySuccess.png | Bin 0 -> 4647 bytes .../build/.automator/app-plus/.automator.json | 0 .../build/app-plus/__uniappchooselocation.js | 1 - unpackage/dist/build/app-plus/__uniappes6.js | 1 - .../build/app-plus/__uniappopenlocation.js | 1 - .../dist/build/app-plus/__uniapppicker.js | 1 - .../dist/build/app-plus/__uniappquill.js | 8 - .../app-plus/__uniappquillimageresize.js | 1 - unpackage/dist/build/app-plus/__uniappscan.js | 1 - .../dist/build/app-plus/__uniappsuccess.png | Bin 2021 -> 0 bytes .../dist/build/app-plus/__uniappview.html | 25 - .../dist/build/app-plus/app-config-service.js | 8 - unpackage/dist/build/app-plus/app-config.js | 1 - unpackage/dist/build/app-plus/app-service.js | 7 - unpackage/dist/build/app-plus/app-view.js | 1 - unpackage/dist/build/app-plus/manifest.json | 1 - .../app-plus/static/dev/good_cover_00.jpg | Bin 177987 -> 0 bytes .../app-plus/static/dev/good_cover_01.png | Bin 328245 -> 0 bytes .../app-plus/static/dev/good_cover_02.jpg | Bin 190900 -> 0 bytes .../app-plus/static/dev/good_cover_03.jpg | Bin 465206 -> 0 bytes .../app-plus/static/dev/good_cover_04.jpg | Bin 92063 -> 0 bytes .../app-plus/static/dev/good_cover_05.jpg | Bin 198896 -> 0 bytes .../app-plus/static/dev/good_cover_06.jpg | Bin 241961 -> 0 bytes .../app-plus/static/dev/good_cover_07.jpg | Bin 752752 -> 0 bytes .../app-plus/static/dev/guide_cover_00.png | Bin 19476 -> 0 bytes .../app-plus/static/dev/guide_cover_01.png | Bin 16829 -> 0 bytes .../app-plus/static/dev/mall-logo-00.png | Bin 7824 -> 0 bytes .../app-plus/static/dev/mall-logo-01.png | Bin 3094 -> 0 bytes .../build/app-plus/static/icons/add-icon.png | Bin 1711 -> 0 bytes .../app-plus/static/icons/approve-icon.png | Bin 14410 -> 0 bytes .../app-plus/static/icons/audit-icon.png | Bin 14456 -> 0 bytes .../app-plus/static/icons/checked-icon.png | Bin 1992 -> 0 bytes .../app-plus/static/icons/e-logo-white.png | Bin 1657 -> 0 bytes .../build/app-plus/static/icons/e-logo.png | Bin 4152 -> 0 bytes .../app-plus/static/icons/listnull-icon.png | Bin 13032 -> 0 bytes .../app-plus/static/icons/login-icon.png | Bin 8930 -> 0 bytes .../static/icons/market_icon_high.png | Bin 1739 -> 0 bytes .../app-plus/static/icons/market_icon_low.png | Bin 1716 -> 0 bytes .../app-plus/static/icons/order_icon_00.png | Bin 2201 -> 0 bytes .../app-plus/static/icons/order_icon_01.png | Bin 1892 -> 0 bytes .../app-plus/static/icons/order_icon_02.png | Bin 1232 -> 0 bytes .../app-plus/static/icons/order_icon_03.png | Bin 2190 -> 0 bytes .../app-plus/static/icons/order_icon_04.png | Bin 1833 -> 0 bytes .../app-plus/static/icons/search-icon.png | Bin 3297 -> 0 bytes .../app-plus/static/icons/tool_icon_00.png | Bin 2793 -> 0 bytes .../app-plus/static/icons/tool_icon_01.png | Bin 3414 -> 0 bytes .../app-plus/static/icons/tool_icon_02.png | Bin 3554 -> 0 bytes .../app-plus/static/icons/tool_icon_03.png | Bin 3344 -> 0 bytes .../app-plus/static/icons/tool_icon_04.png | Bin 2846 -> 0 bytes .../app-plus/static/icons/tool_icon_05.png | Bin 2911 -> 0 bytes .../app-plus/static/icons/tool_icon_06.png | Bin 3198 -> 0 bytes .../app-plus/static/icons/tool_icon_07.png | Bin 3518 -> 0 bytes .../app-plus/static/icons/tool_icon_08.png | Bin 3225 -> 0 bytes .../app-plus/static/icons/unchecked-icon.png | Bin 944 -> 0 bytes .../build/app-plus/static/icons/wechat.png | Bin 4097 -> 0 bytes .../app-plus/static/imgs/vip-angle-back.png | Bin 1347 -> 0 bytes .../app-plus/static/tabBar/tabBar_icon_00.png | Bin 2282 -> 0 bytes .../app-plus/static/tabBar/tabBar_icon_01.png | Bin 2530 -> 0 bytes .../app-plus/static/tabBar/tabBar_icon_02.png | Bin 3253 -> 0 bytes .../app-plus/static/tabBar/tabBar_icon_03.png | Bin 2827 -> 0 bytes .../app-plus/static/tabBar/tabBar_show_00.png | Bin 2501 -> 0 bytes .../app-plus/static/tabBar/tabBar_show_01.png | Bin 2739 -> 0 bytes .../app-plus/static/tabBar/tabBar_show_02.png | Bin 3526 -> 0 bytes .../app-plus/static/tabBar/tabBar_show_03.png | Bin 3057 -> 0 bytes .../pyh-nv/components/pyh-nv/iconfont.ttf | Bin 2780 -> 0 bytes .../uni-icons/components/uni-icons/uni.ttf | Bin 26164 -> 0 bytes unpackage/dist/build/app-plus/view.css | 1 - unpackage/dist/build/app-plus/view.umd.min.js | 6 - .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 3129 ++++++------ unpackage/dist/dev/app-plus/app-view.js | 4194 +++++++++-------- 82 files changed, 3982 insertions(+), 3589 deletions(-) create mode 100644 pages/property/coupon/payStatus.vue create mode 100644 static/images/payFail.png create mode 100644 static/images/paySuccess.png delete mode 100644 unpackage/dist/build/.automator/app-plus/.automator.json delete mode 100644 unpackage/dist/build/app-plus/__uniappchooselocation.js delete mode 100644 unpackage/dist/build/app-plus/__uniappes6.js delete mode 100644 unpackage/dist/build/app-plus/__uniappopenlocation.js delete mode 100644 unpackage/dist/build/app-plus/__uniapppicker.js delete mode 100644 unpackage/dist/build/app-plus/__uniappquill.js delete mode 100644 unpackage/dist/build/app-plus/__uniappquillimageresize.js delete mode 100644 unpackage/dist/build/app-plus/__uniappscan.js delete mode 100644 unpackage/dist/build/app-plus/__uniappsuccess.png delete mode 100644 unpackage/dist/build/app-plus/__uniappview.html delete mode 100644 unpackage/dist/build/app-plus/app-config-service.js delete mode 100644 unpackage/dist/build/app-plus/app-config.js delete mode 100644 unpackage/dist/build/app-plus/app-service.js delete mode 100644 unpackage/dist/build/app-plus/app-view.js delete mode 100644 unpackage/dist/build/app-plus/manifest.json delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_00.jpg delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_01.png delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_02.jpg delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_03.jpg delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_04.jpg delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_05.jpg delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_06.jpg delete mode 100644 unpackage/dist/build/app-plus/static/dev/good_cover_07.jpg delete mode 100644 unpackage/dist/build/app-plus/static/dev/guide_cover_00.png delete mode 100644 unpackage/dist/build/app-plus/static/dev/guide_cover_01.png delete mode 100644 unpackage/dist/build/app-plus/static/dev/mall-logo-00.png delete mode 100644 unpackage/dist/build/app-plus/static/dev/mall-logo-01.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/add-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/approve-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/audit-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/checked-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/e-logo-white.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/e-logo.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/listnull-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/login-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/market_icon_high.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/market_icon_low.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/order_icon_00.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/order_icon_01.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/order_icon_02.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/order_icon_03.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/order_icon_04.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/search-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_00.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_01.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_02.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_03.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_04.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_05.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_06.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_07.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/tool_icon_08.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/unchecked-icon.png delete mode 100644 unpackage/dist/build/app-plus/static/icons/wechat.png delete mode 100644 unpackage/dist/build/app-plus/static/imgs/vip-angle-back.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_icon_00.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_icon_01.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_icon_02.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_icon_03.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_show_00.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_show_01.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_show_02.png delete mode 100644 unpackage/dist/build/app-plus/static/tabBar/tabBar_show_03.png delete mode 100644 unpackage/dist/build/app-plus/uni_modules/pyh-nv/components/pyh-nv/iconfont.ttf delete mode 100644 unpackage/dist/build/app-plus/uni_modules/uni-icons/components/uni-icons/uni.ttf delete mode 100644 unpackage/dist/build/app-plus/view.css delete mode 100644 unpackage/dist/build/app-plus/view.umd.min.js diff --git a/apis/index.js b/apis/index.js index bad3e74..aeec613 100644 --- a/apis/index.js +++ b/apis/index.js @@ -34,10 +34,10 @@ const request = (parameter) => { // console.log('parameterDbug', parameter) // 加载提示 - uni.showLoading({ - title: '加载中', - mask : true - }); + // uni.showLoading({ + // title: '加载中', + // mask : true + // }); // 请求实例 return new Promise((resolve, reject) => { uni.request({ diff --git a/components/coupon-template/coupon-template-1.vue b/components/coupon-template/coupon-template-1.vue index 26533e1..43b5ebc 100644 --- a/components/coupon-template/coupon-template-1.vue +++ b/components/coupon-template/coupon-template-1.vue @@ -152,7 +152,7 @@ box-sizing: border-box; .money { - font-size: 70rpx; + font-size: 50rpx; font-weight: bold; } } diff --git a/components/coupon-template/coupon-template-2.vue b/components/coupon-template/coupon-template-2.vue index 68b0f23..c18d4c9 100644 --- a/components/coupon-template/coupon-template-2.vue +++ b/components/coupon-template/coupon-template-2.vue @@ -127,7 +127,7 @@ box-sizing: border-box; .money { - font-size: 70rpx; + font-size: 50rpx; font-weight: bold; } } diff --git a/pages.json b/pages.json index c10b946..337e589 100644 --- a/pages.json +++ b/pages.json @@ -54,7 +54,8 @@ "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#e93340" } - }, { + }, + { "path": "pages/property/coupon/confirmOrder", "name": "ConfirmOrder", "style": { @@ -62,6 +63,14 @@ "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#e93340" } + },{ + "path": "pages/property/coupon/payStatus", + "name": "PayStatus", + "style": { + "navigationBarTitleText": "支付状态", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#e93340" + } }, { "path": "pages/property/order/numberWeight", "name": "NumberWeight", diff --git a/pages/coupons/add.vue b/pages/coupons/add.vue index d484881..b952ad1 100644 --- a/pages/coupons/add.vue +++ b/pages/coupons/add.vue @@ -92,6 +92,7 @@ @change="confirmDatePicker" > + @@ -138,8 +139,8 @@ ], timeIndex : 0, times : [ - { type: 2, text: '固定时间（区间范围）' }, - { type: 1, text: '延期券（用户领取后有效天数）' } + { type: 1, text: '固定时间（区间范围）' }, + { type: 2, text: '延期券（用户领取后有效天数）' } ], showDatePicker : false, // 活动弹出层时间 datePickerValue : [], // 活动时间 diff --git a/pages/property/coupon/confirmOrder.vue b/pages/property/coupon/confirmOrder.vue index c8c1b13..722a38f 100644 --- a/pages/property/coupon/confirmOrder.vue +++ b/pages/property/coupon/confirmOrder.vue @@ -17,8 +17,7 @@ 数量 - + @@ -57,8 +56,8 @@ 可用Eb总额：{{account.getEBBalance}} - - + + @@ -181,8 +180,7 @@ apiUrl = wxPay data = { order_no: this.order_no, - type: 'miniapp', - openid: uni.getStorageSync('openid') + type: 'app' } } else { apiUrl = ebPay @@ -191,16 +189,16 @@ } } apiUrl(data).then(res => { - let payInfo = res + let payInfo = JSON.parse(res) + console.log(payInfo, 'timeStamp...') if (this.selectTypeId === '2') { - if (payInfo.timeStamp) { + if (payInfo.timestamp) { + + + // app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。 uni.requestPayment({ - provider: 'wxpay', - timeStamp: payInfo.timeStamp, - nonceStr: payInfo.nonceStr, - package: payInfo.package, - signType: payInfo.signType, - paySign: payInfo.paySign, + provider: "wxpay", + orderInfo: JSON.stringify(payInfo), success: res => { this.$refs.uToast.show({ title: '支付成功', @@ -210,7 +208,7 @@ setTimeout(() => { this.canPay = true uni.reLaunch({ - url: '/pages/order/payStatus?success=true' + url: '/pages/property/coupon/payStatus?success=true' }) }, 3000); }, @@ -224,12 +222,16 @@ setTimeout(() => { this.canPay = true uni.reLaunch({ - url: '/pages/order/payStatus?success=false' + url: '/pages/property/coupon/payStatus?success=false' }) }, 3000); } - }); - + }) + + // app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。 + + + } else { this.$refs.uToast.show({ title: '创建订单成功', @@ -239,12 +241,10 @@ setTimeout(() => { this.canPay = true uni.reLaunch({ - url: '/pages/order/payStatus?success=true' + url: '/pages/property/coupon/payStatus?success=true' }) }, 3000); } - - } else { this.$refs.uToast.show({ title: res, @@ -254,11 +254,10 @@ setTimeout(() => { this.canPay = true uni.reLaunch({ - url: '/pages/order/payStatus?success=true' + url: '/pages/property/coupon/payStatus?success=true' }) }, 3000); } - }).catch(err => { this.$refs.uToast.show({ title: err.message, diff --git a/pages/property/coupon/couponMore.vue b/pages/property/coupon/couponMore.vue index 41ce3f1..1000bb0 100644 --- a/pages/property/coupon/couponMore.vue +++ b/pages/property/coupon/couponMore.vue @@ -2,7 +2,7 @@ - + diff --git a/pages/property/coupon/payStatus.vue b/pages/property/coupon/payStatus.vue new file mode 100644 index 0000000..fa01d9c --- /dev/null +++ b/pages/property/coupon/payStatus.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/pages/store/basics.vue b/pages/store/basics.vue index db402a1..4dbcd57 100644 --- a/pages/store/basics.vue +++ b/pages/store/basics.vue @@ -258,6 +258,7 @@ }, // 添加展示模块 addModule(){ + console.log('添加模板，，，，') let modulesList = this.modulesType.map(val => { return val.value }) @@ -407,6 +408,8 @@ color: $text-price; background: white; margin-top: $margin; + position: relative; + z-index: 10; .icon{ vertical-align: middle; margin-right: $margin/3; diff --git a/pages/vip/index.vue b/pages/vip/index.vue index c6aa457..98775e8 100644 --- a/pages/vip/index.vue +++ b/pages/vip/index.vue @@ -1,5 +1,4 @@