diff --git a/App.vue b/App.vue index 30a77e7..91896dd 100644 --- a/App.vue +++ b/App.vue @@ -5,15 +5,15 @@ // brestUrl: 'http://192.168.3.4:9302/brest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - // url: 'https://hsg.dctpay.com/crest', - // imgUrl: 'https://hsg.dctpay.com/filesystem/', - // brestUrl : 'https://hsg.dctpay.com/brest', - // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', + url: 'https://hsg.dctpay.com/crest', + imgUrl: 'https://hsg.dctpay.com/filesystem/', + brestUrl : 'https://hsg.dctpay.com/brest', + imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', //测试 - url: 'https://hsgcs.dctpay.com/crest', - brestUrl : 'https://hsgcs.dctpay.com/brest', - imgUrl: 'https://hsgcs.dctpay.com/filesystem/', - imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', + // url: 'https://hsgcs.dctpay.com/crest', + // brestUrl : 'https://hsgcs.dctpay.com/brest', + // imgUrl: 'https://hsgcs.dctpay.com/filesystem/', + // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', userInfo: "", brestUserInfo : '', bresthighAgent:'', diff --git a/Utils/Api.js b/Utils/Api.js index 7dfb5fc..4ee1599 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -131,7 +131,12 @@ export const cancelOrder = params => { //订单查询详情 export const getOrderById = params => { return POST('GET', `${base}/highOrder/getOrderById`, params).then(res => res.data); -} +} +//已完成未查看 +export const orderCheck = params => { + return POST('GET', `${base}/highOrder/orderCheck`, params).then(res => res.data); +} + //获取商户列表 export const getMerchantList = params => { return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data); diff --git a/components/shopcart.vue b/components/shopcart.vue index fe89460..f8403ef 100644 --- a/components/shopcart.vue +++ b/components/shopcart.vue @@ -162,8 +162,12 @@ this.isShowList = !this.isShowList; } }, - buyList() { - if (this.goods.length == 0) { + buyList() { + let nums = 0; + this.goods.forEach((food) => { + nums += food.num + }) + if (nums == 0) { uni.showToast({ title: '请选择购买的商品', duration: 2000, diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue index 72099ee..1e2614e 100644 --- a/pages/goods/refuel-details/refuel-details.vue +++ b/pages/goods/refuel-details/refuel-details.vue @@ -219,6 +219,8 @@ if(app.globalData.gasKey){ this.store_key = app.globalData.gasKey; + }else{ + app.globalData.staffCode = ''; } // #ifdef H5 if (app.globalData.accountType && app.globalData.accountType == '000000#/') { @@ -370,11 +372,12 @@ //选择油号 changeValue(item) { this.gunnumber = []; - this.oilNo = item.oilNoName; + this.oilNo = item.oilNoName; + this.gunNo = ''; for (var i = 0; i < this.gasGunList.length; i++) { if (this.oilNo == this.gasGunList[i].oilNoName) { this.gunnumber.push(this.gasGunList[i]) - this.gunNo = this.gasGunList[i].gunNo; + // this.gunNo = this.gasGunList[i].gunNo; this.gasOilNo = this.gasGunList[i].oilNo; } } diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 48f3fcc..85ed232 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -213,7 +213,7 @@ uni.getStorage({ key: 'gasKey', success(e) { - if (e.data) { + if (e.data) { app.globalData.gasKey = e.data; } } @@ -221,7 +221,7 @@ uni.getStorage({ key: 'staffCode', success(e) { - if (e.data) { + if (e.data) { app.globalData.staffCode = e.data; } } diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index b28bdb9..120505c 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -52,6 +52,11 @@ + + + @@ -161,7 +166,9 @@ textnum: '', textSend: '', therrNum: '', - rechargeOrderNum: '', //话费待支付 + rechargeOrderNum: '', //话费待支付 + whetherCheckNum: '', //未查看数量 + orderPayNum:'', //支付订单数量 headerTop: null, statusTop: null, showHeader: true, @@ -364,7 +371,9 @@ this.user = res.return_data; this.textnum = res.return_data.unusedCouponNum; this.textSend = res.return_data.unusedDiscount; - this.therrNum = res.return_data.unpaid; + this.therrNum = res.return_data.unpaid; + this.whetherCheckNum = res.return_data.whetherCheckNum; + this.orderPayNum = res.return_data.orderPayNum; this.rechargeOrderNum = res.return_data.rechargeOrderNum; uni.setStorage({ key: "user", diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue index d3034b6..2fea62d 100644 --- a/pages/user/order_list/order_list.vue +++ b/pages/user/order_list/order_list.vue @@ -18,55 +18,55 @@ v-if="row.highChildOrderList[0].goodsType == 1"> - 卡券订单 + 卡券订单 - 积分充值 + 积分充值 - 优惠券包 + 优惠券包 - 团油订单 + 团油订单 - 电影票 + 电影票 - KFC + KFC - 星巴克 + 星巴克 - 会员充值 + 会员充值 - 工会卡充值 + 工会卡充值 {{row.createTime | formatDate('-')}} @@ -116,7 +116,8 @@ import { getUserOrderList, cancelOrder, - thirdCancelOrder + thirdCancelOrder, + orderCheck } from '../../../Utils/Api.js'; let app = getApp() export default { @@ -245,6 +246,7 @@ }, //跳转详情 jumpDetails(item, e) { + this.orderCheck(e); if (item == 4 || item == 9 || item == 10) { uni.navigateTo({ url: '/qianzhu-KFC/order-details/order-details?id=' + e @@ -254,6 +256,16 @@ uni.navigateTo({ url: '../order_details/order_details?id=' + e }) + + }, + //查看状态 + orderCheck(item) { + let datas = { + orderId: item + } + orderCheck(datas).then(res => { + + }); }, showType(tbIndex) { this.tabbarIndex = tbIndex; @@ -475,6 +487,14 @@ background-color: #fff; margin-bottom: 20upx; + .unread { + width: 10px; + height: 10px; + background-color: #e75e58; + border-radius: 50%; + margin-top: -20px; + } + .type { font-size: 26upx; color: #0083f5; diff --git a/qianzhu-KFC/buffet-order/buffet-order.vue b/qianzhu-KFC/buffet-order/buffet-order.vue index 858a97d..861cbe3 100644 --- a/qianzhu-KFC/buffet-order/buffet-order.vue +++ b/qianzhu-KFC/buffet-order/buffet-order.vue @@ -126,7 +126,9 @@ lon: app.globalData.longitude } getStarbucksStore(datas).then(res => { - uni.hideLoading(); + setTimeout(() => { + uni.hideLoading(); + }, 1000); if (res.return_code == '000000') { this.kcfShopList = res.return_data; } @@ -144,7 +146,9 @@ lon: app.globalData.longitude } getKfcStoresList(datas).then(res => { - uni.hideLoading(); + setTimeout(() => { + uni.hideLoading(); + }, 1000); if (res.return_code == '000000') { this.kcfShopList = res.return_data; } diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue index 00eef37..c6b1845 100644 --- a/qianzhu-KFC/confirmOrder/confirmOrder.vue +++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue @@ -45,7 +45,8 @@ ¥{{item.price}} - ¥{{item.oldprice}} + ¥{{item.oldprice}} @@ -57,7 +58,10 @@ - + + 选取: {{priceValue[1]}} 分 + + 积分抵扣 @@ -165,7 +169,7 @@ - 合计: ¥{{payPrice}} + 合计: ¥{{payPrice}} @@ -187,7 +191,7 @@ getThirdPartyByDetail, getHuiLianTongCardBalance, findUser, - qianzhuorderToPayByWx, + qianzhuorderToPayByWx, czhltUnionCardPay } from '../../Utils/Api.js'; // #ifdef H5 @@ -223,8 +227,8 @@ isDiscount: true, //刷新组件 showType: '', //支付方式 memDiscountId: '', //优惠券id - PaymentPassword: '', //支付密码 - orderId:'' //订单id + PaymentPassword: '', //支付密码 + orderId: '' //订单id } }, onLoad() { @@ -232,7 +236,7 @@ this.storeCode = app.globalData.qianzhulist[0].storeCode; this.customerMobile = app.globalData.userInfo.phone; this.getAllPrice(); - this.getAllCount(); + this.getAllCount(); this.findUser(); }, methods: { @@ -263,7 +267,7 @@ let zkprice = parseFloat(res.return_data.integralDiscount / 100).toFixed(2); let pprice = parseFloat(this.totalprice * 100).toFixed(0) let payprice = parseFloat(this.totalprice * 100 * zkprice).toFixed( - 0); + 0); if (payprice > this.user.gold) { this.availIntegal = this.user.gold; } else { @@ -278,7 +282,7 @@ if (res.return_code == '000000') { app.globalData.userInfo = res.return_data; this.user = res.return_data; - this.getHuiLianTongCardBalance(); + this.getHuiLianTongCardBalance(); this.getThirdPartyByDetail(); uni.setStorage({ key: "user", @@ -481,8 +485,8 @@ xbkaddOrder(datas).then(res => { uni.hideLoading(); - if (res.return_code == '000000') { - this.orderId = res.return_data.id; + if (res.return_code == '000000') { + this.orderId = res.return_data.id; let params = { "orderId": res.return_data.id, "openId": app.globalData.openId, @@ -515,7 +519,8 @@ title: '支付成功' }) uni.reLaunch({ - url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderId + url: '/qianzhu-KFC/order-details/order-details?id=' + + that.orderId }) }, fail: function(err) { @@ -717,7 +722,8 @@ title: '支付成功' }) uni.reLaunch({ - url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderId + url: '/qianzhu-KFC/order-details/order-details?id=' + that + .orderId }) }, cancel: function(r) { @@ -754,6 +760,17 @@ border-radius: 12px; } + .Bubble { + margin-left: 50%; + padding-top: 15px; + } + + .tests { + border-radius: 15px; + height: 22px; + line-height: 22px; + } + .jfrecharge { padding: 3px 20rpx; color: #fff; @@ -765,7 +782,7 @@ } .footbtn { - bottom: 0px; + bottom: 0px; z-index: 9999; position: fixed; } diff --git a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue index 1be3442..c683b54 100644 --- a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue +++ b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue @@ -89,7 +89,7 @@ {{item.productName}} - + @@ -191,7 +191,7 @@ this.currentId = item.name; let index = this.slist.findIndex(sitem => sitem.name == item.name); this.tabScrollTop = this.slist[index].top; - }, 500); + }, 1000); }, //右侧栏滚动 asideScroll(e) { @@ -276,7 +276,8 @@ if (good.num) { good.num = 0 } - }) + }) + app.globalData.qianzhulist = ''; }, //弹出弹窗 showPopups(item) { @@ -489,7 +490,7 @@ align-items: center; display: flex; height: 70upx; - padding-top: 8upx; + // padding-top: 8upx; font-size: 28upx; color: #333333; diff --git a/subPages/scancodeCoupons/scancodeCoupons.vue b/subPages/scancodeCoupons/scancodeCoupons.vue index dc67bdf..5e2b5e5 100644 --- a/subPages/scancodeCoupons/scancodeCoupons.vue +++ b/subPages/scancodeCoupons/scancodeCoupons.vue @@ -82,11 +82,16 @@ return `${year}${spe}${month}${spe}${day}`; } }, - onShow() { - }, + onShow() {}, onLoad() { this.getDiscountByCode(); }, + onUnload() { + uni.removeStorage({ + key: 'accountType' + }) + app.globalData.accountType = ''; + }, methods: { //获取卡券详情 getDiscountByCode() { @@ -136,7 +141,7 @@ icon: 'none', title: res.return_data, duration: 2000 - }) + }) this.getDiscountByCode(); } else { uni.hideLoading();