diff --git a/Utils/Request.js b/Utils/Request.js index b74d33a..245c81d 100644 --- a/Utils/Request.js +++ b/Utils/Request.js @@ -26,19 +26,32 @@ function request(method, url, data) { data: '' }) // #ifdef H5 - uni.showToast({ - title: '当前登录信息失效,请前往登录', - icon: 'none', - duration: 2000, - success() { - setTimeout(() => { + uni.showModal({ + title: '前往登录', + content: '当前登录信息失效,请前往登录', + success: function(res) { + if (res.confirm) { uni.navigateTo({ url: '/pages/login/register' }) - - }, 1500); + } } }) + + // uni.showToast({ + // title: '当前登录信息失效,请前往登录', + // icon: 'none', + // duration: 2000, + // success() { + // setTimeout(() => { + // console.log('======'+window.location.href); + // uni.navigateTo({ + // url: '/pages/login/register' + // }) + + // }, 1500); + // } + // }) // #endif // #ifdef MP uni.showToast({ diff --git a/pages.json b/pages.json index a2b3e10..9b3812d 100644 --- a/pages.json +++ b/pages.json @@ -461,7 +461,6 @@ "navigationBarTextStyle": "white" } } - ], "subpackages": [{ "root": "subPages", @@ -808,6 +807,13 @@ "enablePullDownRefresh": false } + }, { + "path": "kfc-details/kfc-details", + "style": { + "navigationBarTitleText": "详情", + "enablePullDownRefresh": false + } + }] }], "globalStyle": { diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue index a57e57f..39c30ea 100644 --- a/pages/goods/goods-list/goods-list.vue +++ b/pages/goods/goods-list/goods-list.vue @@ -33,7 +33,7 @@ {{ row.discountPrice*100}} - + ￥ {{ row.discountPrice}} @@ -43,7 +43,7 @@ src="../../../static/img/jfh.png"> {{ row.salesPrice*100}} - ￥{{ row.salesPrice}} + ￥{{ row.salesPrice}} @@ -106,6 +106,13 @@ }); this.getCouponListArea(); this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); + } + if (option.id == 5) { + uni.setNavigationBarTitle({ + title: '工会卡列表' + }); + this.getCouponListArea(); + this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); } if (option.id == 3) { uni.setNavigationBarTitle({ diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue index 173edce..c8f1cec 100644 --- a/pages/goods/refuel-confirm/refuel-confirm.vue +++ b/pages/goods/refuel-confirm/refuel-confirm.vue @@ -87,7 +87,7 @@ - 支付方式 + 支付方式: + + + + + + + + {{item.couponName}} + + ￥{{item.discountPrice}} + + + + + @@ -137,6 +155,7 @@ imgadres: 'headzq.png', imgadres1: 'jbhed.png', imgadres2: 'jt.png', + imgadres5: 'unionarea.png', imgadres3: '', imgadres4: 'cusservice.png', webUrl: '', @@ -156,7 +175,9 @@ productList: [], productListleg: '', goldproductList: [], - goldproductListleg: '', + goldproductListleg: '', + unioncardproductList: [], + unioncardproductListleg: '', loadingText: '正在加载...', pageNum: 1, pageSize: 6, @@ -174,7 +195,8 @@ if (app.globalData.cityName != '') { this.city = app.globalData.cityName; this.getCouponListArea(); - this.getCouponListgold(); + this.getCouponListgold(); + this.getunioncardCouponListgold(); this.getCmsContent(); this.getCmsContentcmshome(); this.getCmsContentcmsContent(); @@ -261,6 +283,7 @@ app.globalData.cityId = '500000'; this.getCouponListArea(); this.getCouponListgold(); + this.getunioncardCouponListgold(); this.getCmsContent(); this.getCmsAactibity(); this.getCmsContentcmshome(); @@ -274,7 +297,8 @@ app.globalData.cityName = '重庆市'; app.globalData.cityId = '500000'; this.getCouponListArea(); - this.getCouponListgold(); + this.getCouponListgold(); + this.getunioncardCouponListgold(); this.getCmsContent(); this.getCmsAactibity(); this.getCmsContentcmshome(); @@ -504,7 +528,8 @@ // app.globalData.cityId = '500103'; if (res.return_data.result.addressComponent.adcode) { that.getCouponListArea(); - that.getCouponListgold(); + that.getCouponListgold(); + this.getunioncardCouponListgold(); that.getCmsContent(); that.getCmsAactibity(); that.getCmsContentcmshome(); @@ -605,6 +630,28 @@ this.productList = []; } }) + }, + //工会卡卡券列表 + getunioncardCouponListgold() { + let params = { + regionId: app.globalData.cityId, + pageNum: this.pageNum, + pageSize: this.pageSize, + displayArea: 5 + } + getCouponList(params).then(res => { + if (res.return_code == '000000' && res.return_data.list) { + this.unioncardproductList = res.return_data.list; + this.unioncardproductListleg = res.return_data.total; + if (res.return_data.total > 4) { + this.unioncardproductListleg = 4; + return; + } + this.unioncardproductListleg = res.return_data.total; + } else { + this.unioncardproductList = []; + } + }) }, //轮播图指示器 swiperChange(event) { @@ -1135,7 +1182,7 @@ background-color: #FFFFFF; border-bottom: solid 2upx #f6f6f6; display: flex; - justify-content: space-between; + justify-content: flex-start; flex-wrap: wrap; .category { diff --git a/pages/user/deposit/deposit.vue b/pages/user/deposit/deposit.vue index 979ac4c..942f9d8 100644 --- a/pages/user/deposit/deposit.vue +++ b/pages/user/deposit/deposit.vue @@ -16,12 +16,13 @@ - {{amount}}元 + {{amount}}元 + {{amount * 100}}分 - - 自定义充值金额 + + 自定义充值金额(兑:{{inputAmount * 100}}分) @@ -126,21 +127,21 @@ addOrder(goods).then(res => { uni.hideLoading(); if (res.return_code == '000000') { - //模板模拟支付，实际应用请调起微信/支付宝 - // #ifdef H5 - let params = { - "orderId": res.return_data.id, - "openId": app.globalData.openId, - "orderScene": "GOODS_ORDER", - "openIdType": 2 - } - // #endif + //模板模拟支付，实际应用请调起微信/支付宝 + // #ifdef H5 + let params = { + "orderId": res.return_data.id, + "openId": app.globalData.openId, + "orderScene": "GOODS_ORDER", + "openIdType": 2 + } + // #endif // #ifdef MP let params = { "orderId": res.return_data.id, "openId": app.globalData.openId, "orderScene": "GOODS_ORDER" - } + } // #endif orderToPay(params).then(res => { if (res.return_code == '000000') { @@ -269,33 +270,74 @@ .amount { width: 100%; + .list { + width: 94%; + margin-left: 3%; display: flow-root; justify-content: space-between; + align-items: center; padding: 20upx 0; .box { width: 30%; - height: 120rpx; + margin-left: 1%; + margin-right: 2%; + margin-top: 20upx; float: left; - margin-left: 3.333%; - margin-top: 20px; - display: flex; + height: 120upx; + // line-height: 120upx; + display: inline-grid; justify-content: center; align-items: center; - border-radius: 10rpx; - box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05); - font-size: 36rpx; + text-align: center; + box-shadow: 0upx 0upx 4upx #666666; + font-size: 36upx; + color: #089bf5; background-color: #f1f1f1; - color: 333; - &.on { - background-color: #0083f5; - color: #fff; + background-color: #089bf5; + color: #ffffff; } } + + .heTitle { + width: 100%; + font-size: 15px; + } } + // .list { + // display: flow-root; + // justify-content: space-between; + // padding: 20upx 0; + + // .box { + // width: 30%; + // height: 120rpx; + // float: left; + // margin-left: 3.333%; + // margin-top: 20px; + // display: flex; + // justify-content: center; + // align-items: center; + // border-radius: 10rpx; + // box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05); + // font-size: 36rpx; + // background-color: #f1f1f1; + // color: 333; + + // &.on { + // background-color: #0083f5; + // color: #fff; + // } + // } + // .heTitle { + // width: 100%; + // font-size: 15px; + // } + // } + .num { margin-top: 20upx; display: flex; @@ -304,7 +346,6 @@ .text { padding-right: 10upx; - font-size: 40upx; } .input { diff --git a/qianzhu-KFC/kfc-details/kfc-details.vue b/qianzhu-KFC/kfc-details/kfc-details.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/qianzhu-KFC/kfc-details/kfc-details.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/qianzhu-KFC/menu-list/menu-list.vue b/qianzhu-KFC/menu-list/menu-list.vue index b4022a1..26ec7ff 100644 --- a/qianzhu-KFC/menu-list/menu-list.vue +++ b/qianzhu-KFC/menu-list/menu-list.vue @@ -644,7 +644,7 @@ this.currentId = item.id; let index = this.slist.findIndex(sitem => sitem.pid == item.id); - this.tabScrollTop = this.slist[index].top; + this.tabScrollTop = this.slist[index].top; }, //右侧栏滚动 asideScroll(e) { @@ -682,6 +682,12 @@ // 清空购物车 delAll() { + }, + //跳转详情 + navToList(){ + uni.navigateTo({ + url:'../kfc-details/kfc-details' + }) } } } diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue index c3dc09f..d621c09 100644 --- a/qianzhu-KFC/order-details/order-details.vue +++ b/qianzhu-KFC/order-details/order-details.vue @@ -65,6 +65,9 @@ 联系客服 + 友情提示 + 1、如遇到商品售罄，将导致您无法取到所定食物，系统将自动为您安排退款，1个工作日内到账； + 2、如遇更多问题，请及时联系在线客服处理。 diff --git a/subPages/Phone-recharge-details/Phone-recharge-details.vue b/subPages/Phone-recharge-details/Phone-recharge-details.vue index 9e2fe99..49be2d7 100644 --- a/subPages/Phone-recharge-details/Phone-recharge-details.vue +++ b/subPages/Phone-recharge-details/Phone-recharge-details.vue @@ -28,7 +28,7 @@ - 话费充值 : {{phoneorderdes.userPhone}}｜{{phoneorderdes.operatorName}} + 话费充值 : {{phoneorderdes.rechargeContent}}｜{{phoneorderdes.operatorName}} 订单总额 diff --git a/subPages/coupon-comfirmation/coupon-comfirmation.vue b/subPages/coupon-comfirmation/coupon-comfirmation.vue index 557140c..97bc038 100644 --- a/subPages/coupon-comfirmation/coupon-comfirmation.vue +++ b/subPages/coupon-comfirmation/coupon-comfirmation.vue @@ -27,12 +27,12 @@ - 支付方式 + 支付方式: - + 积分支付可用积分: {{user.gold}} - + 微信支付 - + 汇联通工会卡可用余额: {{tongCardPrice}}元 - 支付方式 + 支付方式: - + 微信支付 - + 汇联通工会卡可用余额: {{tongCardPrice}}元