diff --git a/pages.json b/pages.json index 1d25607..e3f5b99 100644 --- a/pages.json +++ b/pages.json @@ -7,14 +7,14 @@ "enablePullDownRefresh": false } - },{ - "path": "pages/user/news/news", - "style": { - "navigationBarTitleText": "消息", - "enablePullDownRefresh": false - } - - },{ + }, { + "path": "pages/user/news/news", + "style": { + "navigationBarTitleText": "消息", + "enablePullDownRefresh": false + } + + }, { "path": "pages/tabBar/home/home", "style": { "navigationBarTextStyle": "white", @@ -27,17 +27,17 @@ "softinputNavBar": "none" } } - }, { - "path": "pages/qianZhuPay/union-pay/union-pay", - "style": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "选择方式", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "enablePullDownRefresh": false - } - - }, { + }, { + "path": "pages/qianZhuPay/union-pay/union-pay", + "style": { + "navigationBarTextStyle": "white", + "navigationBarTitleText": "选择方式", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "enablePullDownRefresh": false + } + + }, { "path": "pages/user/bindingCardList/bindingCardList", "style": { "navigationBarTitleText": "卡列表", @@ -234,8 +234,8 @@ "path": "pages/user/coupon/coupon", "style": { "navigationBarTitleText": "优惠券", - "navigationBarBackgroundColor": "#ffffff", - "backgroundColorTop": "#f3f3f3", + "navigationBarBackgroundColor": "#ffffff", + "backgroundColorTop": "#f3f3f3", "backgroundColorBottom": "#ffffff", "app-plus": { "bounce": "none" @@ -505,16 +505,16 @@ } - ,{ - "path" : "components/postion/postion", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ], + , { + "path": "components/postion/postion", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + + ], "subpackages": [{ "root": "subPages", "pages": [{ @@ -819,7 +819,14 @@ } } + }, { + "path": "shareCounpon/shareCounpon", + "style": { + "navigationBarTitleText": "分享领取优惠券", + "enablePullDownRefresh": false } + + } ] }, { "root": "qianzhu-KFC", @@ -877,13 +884,13 @@ "path": "order-details/order-details", "style": { "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#3da7e7", - "backgroundColorTop": "#3da7e7", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3da7e7", + "backgroundColorTop": "#3da7e7", "navigationBarTextStyle": "white" } - },{ + }, { "path": "kfc-menu-list/kfc-menu-list", "style": { "navigationBarTitleText": "菜单", diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue index 545efda..441adcf 100644 --- a/pages/goods/externalCoupon/externalCoupon.vue +++ b/pages/goods/externalCoupon/externalCoupon.vue @@ -92,7 +92,7 @@ font-size: 16px; } - + @@ -176,8 +176,10 @@ }, onLoad() { var arr1 = window.location.href; - var arr2 = arr1.split('='); - this.getH5AccessToken(arr2[1]); + var arr2 = arr1.split('='); + if(!app.globalData.openId){ + this.getH5AccessToken(arr2[1]); + } this.getDiscountByQrCode(); }, @@ -214,7 +216,7 @@ getDiscountByQrCode() { let that = this; uni.getStorage({ - key: 'h5code', + key: 'staffCode', success: (res) => { let params = { code: res.data diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 5165257..a5b67e4 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -288,7 +288,7 @@ radioStatus: true, memDiscountId: '', user: '', - paytype: 'weixin', + paytype: '2', PaymentPassword: '', orderId: '', jumpType: '', diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index d1303ce..9dea445 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -516,7 +516,9 @@ // 007 在线加油 // 008 工会卡卡券 // 009 分销推广优选商品 - // 0010 只跳首页 + // 0010 只跳首页 + // 0011 扫码领取优惠券 + if (e.data == '000000#/' && app.globalData.h5code) { uni.navigateTo({ url: '../../goods/refuel-details/refuel-details' @@ -573,6 +575,11 @@ url: '/subPages/selectEntry/selectEntry' }) } + if (e.data == '0000011&key' && app.globalData.h5code) { + uni.navigateTo({ + url: '../../goods/externalCoupon/externalCoupon' + }) + } } } }) diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue index ef8084f..e56c7cd 100644 --- a/pages/welcome/welcome.vue +++ b/pages/welcome/welcome.vue @@ -23,13 +23,16 @@ app.globalData.accountId = options.accountId; uni.switchTab({ url: '../tabBar/home/home' - }) + }) + // uni.navigateTo({ + // url:'/subPages/shareCounpon/shareCounpon' + // }) // #endif // #ifdef H5 var arr1 = window.location.href; var arr2 = arr1.split('='); if (arr2[1] != undefined && arr2[2] == '1#/') { - app.globalData.h5code = arr2[1]; + app.globalData.h5code = arr2[1]; uni.setStorage({ key: "h5code", data: arr2[1] @@ -58,7 +61,7 @@ that.loginBySilence(arr3[0]); } if (arr2[3] != undefined && arr2[3]) { - let arr4 = arr2[3].split('#'); + let arr4 = arr2[3].split('#'); uni.setStorage({ key: "staffCode", data: arr4[0] diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue index ed9f35d..5cb4d9c 100644 --- a/subPages/recharge-centre/recharge-centre.vue +++ b/subPages/recharge-centre/recharge-centre.vue @@ -131,7 +131,7 @@ notice: '', //警告 textcont: '', // 富文本 explainReceiptTime: '', //时间到账 - time: 0, + time: 20, //导航 scrollIntoView: 0, //设置哪个方向可滚动，则在哪个方向滚动到该元素 @@ -160,17 +160,18 @@ this.findSecConfigByTypewap(); }, mounted() { - let scroll_width = 0; - const query = uni.createSelectorQuery().in(this); - query.select('.right-left-scroll').boundingClientRect(data => { - scroll_width = (data.width).toFixed(2); - }).exec(); - - query.select('.right-left-scroll .content').boundingClientRect(data => { - if (data.width - scroll_width > 0) { - this.time = (9 * data.width / scroll_width).toFixed(2); - } - }).exec(); + // let scroll_width = 0; + // const query = uni.createSelectorQuery().in(this); + // query.select('.right-left-scroll').boundingClientRect(data => { + // scroll_width = (data.width).toFixed(2); + // }).exec(); + + // query.select('.right-left-scroll .content').boundingClientRect(data => { + // if (data.width - scroll_width > 0) { + // this.time = (9 * data.width / scroll_width).toFixed(2); + // console.log('=====' + this.time); + // } + // }).exec(); }, methods: { //查询弹窗 diff --git a/subPages/shareCounpon/shareCounpon.vue b/subPages/shareCounpon/shareCounpon.vue new file mode 100644 index 0000000..2d6c9f7 --- /dev/null +++ b/subPages/shareCounpon/shareCounpon.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/uni.scss b/uni.scss index 3e9061d..386a60b 100644 --- a/uni.scss +++ b/uni.scss @@ -75,7 +75,10 @@ $uni-font-size-subtitle:36upx; $uni-color-paragraph: #3F536E; // 文章段落颜色 $uni-font-size-paragraph:30upx; -/* 字体大小 */ +/* 字体大小 */ +.font10 { + font-size: 10px; +} .font11 { font-size: 11px; } @@ -659,7 +662,10 @@ $uni-font-size-paragraph:30upx; .mart5 { margin-top: 5px; } - + +.mart3 { + margin-top: 3px; +} .mart1 { margin-top: 1px; } @@ -842,10 +848,6 @@ $uni-font-size-paragraph:30upx; justify-content: flex-end; display: flex; } - -.font12{ - font-size: 12px; -} .aliitem{