From 939d6656c8c660532a8aedb2b583871f757cf4d4 Mon Sep 17 00:00:00 2001 From: yangjie <812952667@qq.com> Date: Fri, 28 May 2021 17:27:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=202.=E5=A2=9E=E5=8A=A0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E8=AF=9D=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Authorize.vue | 8 +- pages copy.json | 2 +- pages.json | 29 ++- pages/goods/coupon-details/coupon-details.vue | 10 +- .../coupons-info-details.vue | 10 +- pages/goods/externalCoupon/externalCoupon.vue | 10 +- pages/goods/recording/recording.vue | 10 +- pages/login/register.vue | 8 +- pages/order/confirmation.vue | 10 +- pages/pay/success/success.vue | 10 +- pages/tabBar/user/user.vue | 7 +- pages/user/Charge/Charge.vue | 233 ++++++++++++++++++ pages/user/agentCoupons/agentCoupons.vue | 10 +- pages/user/coupon/coupon.vue | 10 +- .../mineCouponsDestails.vue | 10 +- pages/user/order_details/order_details.vue | 10 +- pages/user/runningWater/runningWater.vue | 10 +- 17 files changed, 322 insertions(+), 75 deletions(-) create mode 100644 pages/user/Charge/Charge.vue diff --git a/components/Authorize.vue b/components/Authorize.vue index 43be838..421d1ae 100644 --- a/components/Authorize.vue +++ b/components/Authorize.vue @@ -17,7 +17,7 @@ + withCredentials="true">去登录 @@ -127,8 +127,10 @@ that.isShowAuth = false }, getH5userinfo(){ - console.log('[=========]') - location.href='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_userinfo#wechat_redirect'; + uni.navigateTo({ + url:'/pages/login/register' + }) + // location.href='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_userinfo#wechat_redirect'; }, close() { uni.reLaunch({ diff --git a/pages copy.json b/pages copy.json index e781b33..3085e89 100644 --- a/pages copy.json +++ b/pages copy.json @@ -120,7 +120,7 @@ { "path": "pages/login/register", "style": { - "navigationBarTitleText": "注册账号", + "navigationBarTitleText": "手机号登录", "navigationBarBackgroundColor": "#f06c7a", "navigationBarTextStyle": "white", "app-plus": { diff --git a/pages.json b/pages.json index 415082a..e1aaa9c 100644 --- a/pages.json +++ b/pages.json @@ -118,7 +118,7 @@ { "path": "pages/login/register", "style": { - "navigationBarTitleText": "注册账号", + "navigationBarTitleText": "手机号登录", "navigationBarBackgroundColor": "#f06c7a", "navigationBarTextStyle": "white", "app-plus": { @@ -311,15 +311,14 @@ "enablePullDownRefresh": false } - } - , { + }, { "path": "pages/user/agentCoupons/agentCoupons", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false } - },{ + }, { "path": "pages/user/minePromotion/minePromotion", "style": { "navigationBarTitleText": "", @@ -330,19 +329,27 @@ } }, { - "path" : "pages/user/runningWater/runningWater", - "style" : - { - "enablePullDownRefresh": false, + "path": "pages/user/runningWater/runningWater", + "style": { + "enablePullDownRefresh": false, "navigationBarTitleText": "", "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#f06c7a", "backgroundColorTop": "#f06c7a", "navigationBarTextStyle": "white" - } - + } + + }, { + "path": "pages/user/Charge/Charge", + "style": { + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTitleText": "充值", + "backgroundColorTop": "#ffffff", + "backgroundColorBottom": "#ffffff" + } + } - ], + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue index b776ff8..c53155f 100644 --- a/pages/goods/coupon-details/coupon-details.vue +++ b/pages/goods/coupon-details/coupon-details.vue @@ -87,11 +87,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, diff --git a/pages/goods/coupons-info-details/coupons-info-details.vue b/pages/goods/coupons-info-details/coupons-info-details.vue index cdc2647..59b90d7 100644 --- a/pages/goods/coupons-info-details/coupons-info-details.vue +++ b/pages/goods/coupons-info-details/coupons-info-details.vue @@ -88,11 +88,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue index 68ae4a9..1d6e433 100644 --- a/pages/goods/externalCoupon/externalCoupon.vue +++ b/pages/goods/externalCoupon/externalCoupon.vue @@ -96,11 +96,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day}`; } }, diff --git a/pages/goods/recording/recording.vue b/pages/goods/recording/recording.vue index cc70972..79c68be 100644 --- a/pages/goods/recording/recording.vue +++ b/pages/goods/recording/recording.vue @@ -67,11 +67,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, diff --git a/pages/login/register.vue b/pages/login/register.vue index d815d15..647b265 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -13,13 +13,13 @@ - + 立即注册 - + diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 70d73da..c4c20bd 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -246,11 +246,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, diff --git a/pages/pay/success/success.vue b/pages/pay/success/success.vue index 84e1d26..2fa0229 100644 --- a/pages/pay/success/success.vue +++ b/pages/pay/success/success.vue @@ -85,11 +85,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index 6a36305..e6b4273 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -95,7 +95,7 @@ - + + + diff --git a/pages/user/agentCoupons/agentCoupons.vue b/pages/user/agentCoupons/agentCoupons.vue index 34fa32b..6b2676b 100644 --- a/pages/user/agentCoupons/agentCoupons.vue +++ b/pages/user/agentCoupons/agentCoupons.vue @@ -79,11 +79,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day}`; } }, diff --git a/pages/user/coupon/coupon.vue b/pages/user/coupon/coupon.vue index 09ff17b..05168bc 100644 --- a/pages/user/coupon/coupon.vue +++ b/pages/user/coupon/coupon.vue @@ -147,11 +147,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, diff --git a/pages/user/mineCouponsDestails/mineCouponsDestails.vue b/pages/user/mineCouponsDestails/mineCouponsDestails.vue index e9888f1..e45c715 100644 --- a/pages/user/mineCouponsDestails/mineCouponsDestails.vue +++ b/pages/user/mineCouponsDestails/mineCouponsDestails.vue @@ -80,11 +80,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day}`; } }, diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue index 519cccf..82b21a0 100644 --- a/pages/user/order_details/order_details.vue +++ b/pages/user/order_details/order_details.vue @@ -267,11 +267,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, diff --git a/pages/user/runningWater/runningWater.vue b/pages/user/runningWater/runningWater.vue index d3ca72a..3ebb374 100644 --- a/pages/user/runningWater/runningWater.vue +++ b/pages/user/runningWater/runningWater.vue @@ -72,11 +72,11 @@ let h = data.getHours(); let mm = data.getMinutes(); let s = data.getSeconds(); - month = month > 10 ? month : "0" + month; - day = day > 10 ? day : "0" + day; - h = h > 10 ? h : "0" + h; - mm = mm > 10 ? mm : "0" + mm; - s = s > 10 ? s : "0" + s; + month = month >= 10 ? month : "0" + month; + day = day >= 10 ? day : "0" + day; + h = h >= 10 ? h : "0" + h; + mm = mm >= 10 ? mm : "0" + mm; + s = s >= 10 ? s : "0" + s; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } },