From db541a5c44c4b741c9b89c30fcf91ddb1de40056 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Wed, 2 Jul 2025 19:30:30 +0800 Subject: [PATCH] update --- pages.json | 3 +- pages/homeFn/myCoupon/index.vue | 890 +++++++----------- pages/index/index.vue | 23 +- pages/order/buyOrder/index.vue | 201 +++- pages/shopPages/settlement/index.vue | 11 +- pages/shopPages/shopDetail/index.vue | 163 +++- pages/useConfig/FavoriteStore.vue | 531 ++++++----- pages/user/index.vue | 52 +- .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../mp-weixin/components/card.js.map | 2 +- .../components/currentService.js.map | 2 +- .../mp-weixin/components/keyboard.js.map | 2 +- .../mp-weixin/components/noData.js.map | 2 +- .../mp-weixin/components/shopTabbar.js.map | 2 +- .../mp-weixin/components/tabbar.js.map | 2 +- .../mp-weixin/pages/allFunPage/index.js.map | 2 +- .../mp-weixin/pages/bindCar/index.js.map | 2 +- .../pages/evaluateList/addEvaluate.js.map | 2 +- .../evaluateList/components/orderItem.js.map | 2 +- .../mp-weixin/pages/evaluateList/index.js.map | 2 +- .../pages/highwayHeadlines/detail.js.map | 2 +- .../pages/highwayHeadlines/index.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../pages/myAddress/address/index.js.map | 2 +- .../pages/myAddress/newAdd/index.js.map | 2 +- .../mp-weixin/pages/newEvaluate/index.js.map | 2 +- .../mp-weixin/pages/newMap/index/index.js.map | 2 +- .../mp-weixin/pages/noDataPage/index.js.map | 2 +- .../buyOrder/components/orderItem.js.map | 2 +- .../pages/order/buyOrder/index.js.map | 2 +- .../foodOrder/components/orderItem.js.map | 2 +- .../pages/order/foodOrder/index.js.map | 2 +- .../pages/order/orderFoodDetail/index.js.map | 2 +- .../pages/order/orderdetail/index.js.map | 2 +- .../pages/otherFunPage/finance/index.js.map | 2 +- .../otherFunPage/goPublicPage/index.js.map | 2 +- .../pages/otherFunPage/insurance/index.js.map | 2 +- .../mp-weixin/pages/payfor/index.js.map | 2 +- .../mp-weixin/pages/register/index.js.map | 2 +- .../pages/reservationOrder/index.js.map | 2 +- .../pages/serviceDetail/index.js.map | 2 +- .../mp-weixin/pages/serviceList/index.js.map | 2 +- .../pages/shopMallPage/index/index.js.map | 2 +- .../pages/shopMallPage/shopCar/index.js.map | 2 +- .../pages/shopMallPage/shopType/index.js.map | 2 +- .../pages/shopMallPage/user/index.js.map | 2 +- .../components/commodityItem.js.map | 2 +- .../components/loading/index.js.map | 2 +- .../settlement/components/orderInfo.js.map | 2 +- .../settlement/components/orderStatus.js.map | 2 +- .../settlement/components/receiveGoods.js.map | 2 +- .../pages/shopPages/settlement/index.js.map | 2 +- .../shopPages/settlementFood/index.js.map | 2 +- .../shop/components/merchantEvaluation.js.map | 2 +- .../pages/shopPages/shop/index.js.map | 2 +- .../pages/shopPages/shopDetail/index.js.map | 2 +- .../pages/shopPages/shopList/index.js.map | 2 +- .../components/merchantEvaluation.js.map | 2 +- .../mp-weixin/pages/storeDetail/index.js.map | 2 +- .../mp-weixin/pages/user/index.js.map | 2 +- .../components/l-dragSort/l-dragSort.js.map | 2 +- .../components/uni-icons/uni-icons.js.map | 2 +- .../components/uni-popup/uni-popup.js.map | 2 +- .../components/uni-rate/uni-rate.js.map | 2 +- .../mp-weixin/components/currentService.json | 4 +- .../dist/dev/mp-weixin/pages/index/index.js | 8 +- .../dist/dev/mp-weixin/pages/index/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/index/index.wxss | 14 + .../mp-weixin/pages/order/buyOrder/index.js | 246 +++-- .../mp-weixin/pages/order/buyOrder/index.wxml | 2 +- .../mp-weixin/pages/order/buyOrder/index.wxss | 54 +- .../pages/shopPages/settlement/index.js | 2 +- .../pages/shopPages/settlement/index.wxml | 2 +- .../pages/shopPages/shopDetail/index.js | 138 ++- .../pages/shopPages/shopDetail/index.wxml | 2 +- .../pages/shopPages/shopDetail/index.wxss | 4 + .../dist/dev/mp-weixin/pages/user/index.js | 57 +- .../dist/dev/mp-weixin/pages/user/index.wxml | 2 +- 78 files changed, 1444 insertions(+), 1079 deletions(-) diff --git a/pages.json b/pages.json index ffbacaab..fac0f28a 100644 --- a/pages.json +++ b/pages.json @@ -148,7 +148,8 @@ { "path": "index", "style": { - "navigationBarTitleText": "优惠券" + "navigationBarTitleText": "优惠券", + "navigationBarBackgroundColor": "#ffffff" } } ] diff --git a/pages/homeFn/myCoupon/index.vue b/pages/homeFn/myCoupon/index.vue index 4b1dbb19..30ce7fe2 100644 --- a/pages/homeFn/myCoupon/index.vue +++ b/pages/homeFn/myCoupon/index.vue @@ -1,144 +1,58 @@ @@ -162,6 +76,10 @@ export default { specialCards: [], // 专享券 novalid: [], isCustomLoading: false, + tabList: [{ label: "未使用", value: 1 }, { label: "已使用", value: 2 }, { label: "已过期", value: 3 }],// tab的列表 + selectTab: 1, + allCouponList: [],// 全部类型的 列表 + showCouponList: [],// 当前显示的列表 }; }, computed: { @@ -173,10 +91,58 @@ export default { components: { NoData, }, + onUnload() { + this.novalid = []; + this.couponList = []; + this.pageMsg.isLoading = true; + this.pageMsg.activeTabs = 0; + }, + // onHide () { + // this.couponOrder = {} + // this.couponList = [] + // this.novalid = [] + // }, + onShow() { + // this.getList(); + }, + async onLoad(option) { + await this.handleGetData() + // this.setIsLoading(true) + // this.getUnList(); + // this.$utils.addUserBehaviorNew(); + }, + // onReachBottom() { + // if (this.pageMsg.isLoadMore) { + // this.pageMsg.pageIndex += 1; + // this.getList(); + // } + // }, + // onPullDownRefresh() { + // this.pageMsg.pageIndex = 1; + // this.getList(); + // this.getUnList(); + // setTimeout(function () { + // uni.stopPullDownRefresh(); + // }, 1000); + // }, methods: { ...mapMutations({ setIsLoading: "setIsLoading", }), + // 修改 是否显示规则 + handleShowRule(item) { + item.showRule = !item.showRule + this.$forceUpdate(); + }, + // 修改顶部的tab选择 + handleChangeTab(value) { + this.selectTab = value + this.showCouponList = this.allCouponList[this.selectTab - 1] + + console.log('this.showCouponList', this.showCouponList.length); + + this.$forceUpdate(); + }, handleGoCouponsList(obj) { console.log('obj', obj); // uni.navigateTo({ @@ -205,10 +171,41 @@ export default { }); }, + async handleGetData() { + const req = { + CouponStatus: "0,1,2" + } + const data = await this.$api.$get("/WeChat/GetMemberCouponList", req) + console.log('data', data); + + let list = data.Result_Data.List + + // 待使用 + let toBeUsed = [] + // 已使用 + let usedAlready = [] + // 已失效 + let expired = [] + if (list && list.length > 0) { + list.forEach((item) => { + item.showRule = false + if (item.CouponState === 0) { + toBeUsed.push(item) + } else if (item.CouponState === 1) { + usedAlready.push(item) + } else if (item.CouponState === 2) { + expired.push(item) + } + }) + } + + this.allCouponList = [toBeUsed, usedAlready, expired] + this.showCouponList = this.allCouponList[this.selectTab - 1] + }, getList() { let _this = this; this.$api - .$get("/WeChat/GetMemberCouponList", { CouponStatus: 0 }) + .$get("/WeChat/GetMemberCouponList", { CouponStatus: 0 }) // 未使用 .then((rs) => { _this.pageMsg.isLoading = false; if (rs.Result_Code === 100) { @@ -229,494 +226,239 @@ export default { this.isCustomLoading = true; let _this = this; _this.$api - .$get("/WeChat/GetMemberCouponList", { CouponStatus: "1,2" }) + .$get("/WeChat/GetMemberCouponList", { CouponStatus: "1,2" }) // 已使用、已过期 .then((rs) => { if (rs.Result_Code === 100) { + console.log('rsrsrsrsrsrsrs', rs); + _this.novalid = rs.Result_Data.List; } _this.isCustomLoading = false; }); }, }, - onUnload() { - this.novalid = []; - this.couponList = []; - this.pageMsg.isLoading = true; - this.pageMsg.activeTabs = 0; - }, - // onHide () { - // this.couponOrder = {} - // this.couponList = [] - // this.novalid = [] - // }, - onShow() { - this.getList(); - }, - onLoad(option) { - // this.setIsLoading(true) - this.getUnList(); - this.$utils.addUserBehaviorNew(); - }, - onReachBottom() { - if (this.pageMsg.isLoadMore) { - this.pageMsg.pageIndex += 1; - this.getList(); - } - }, - onPullDownRefresh() { - this.pageMsg.pageIndex = 1; - this.getList(); - this.getUnList(); - setTimeout(function () { - uni.stopPullDownRefresh(); - }, 1000); - }, }; - diff --git a/pages/index/index.vue b/pages/index/index.vue index 104b7a83..7ddb1523 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -72,6 +72,7 @@ }} 营业中 + 爆满 @@ -560,7 +561,11 @@ export default { // this.getLocalServer(); if (currentService) { - this.serviceDetail = this.handleMergeDetail(currentService); + let res = this.handleMergeDetail(currentService); + this.serviceDetail = { + ...this.serviceDetail, + ...res + } console.log('onLoad', this.serviceDetail); } else { @@ -1430,6 +1435,7 @@ export default { this.serverPartList = data.Result_Data.List; let nearService = this.serverPartList[0]; + console.log('nearServicenearServicenearService', nearService); nearService.sumDetail = this.handleMergeDetail(nearService); this.serviceDetail = nearService; @@ -1871,6 +1877,21 @@ export default { border-radius: 4rpx; display: inline-block; } + + .bePacked { + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 22rpx; + color: #FF5959; + line-height: 32rpx; + text-align: justify; + font-style: normal; + padding: 2rpx 6rpx; + background: #fbdada; + border-radius: 4rpx; + display: inline-block; + margin-left: 16rpx; + } } } diff --git a/pages/order/buyOrder/index.vue b/pages/order/buyOrder/index.vue index 8737768e..c664b353 100644 --- a/pages/order/buyOrder/index.vue +++ b/pages/order/buyOrder/index.vue @@ -18,31 +18,35 @@ - {{ item.label }} - + + :style="{ height: `calc(100vh - ${menu.bottom}px - 42px - 35px - 35px)` }" @scrolltolower="handleScrollTolower"> - {{ item.SUPPLIER_NAME || "" }} + {{ item.SHOPNAME || "" }} {{ item.SALEBILL_STATE_TEXT || "" }} - + + :src="subItem.IMAGE_URL ? subItem.IMAGE_URL.split(',')[0] : 'https://eshangtech.com/ShopICO/no-picture.png'" /> @@ -50,30 +54,46 @@ - ¥180.88 - x1 + ¥{{ subItem.AVERAGE_PRICE || '-' }} + x{{ subItem.ORDER_COUNT || '-' }} +
+ + 共{{ item.GOODSList.length }}个品项 +
+ 实付款： ¥{{ item.PAY_AMOUNT || "" }} - + - 更多 + 更多 评价 - 再次购买 + + 去付款 + 确认收货 + + + 我是有底线的 + @@ -191,6 +211,60 @@ export default { this.$utils.addUserBehaviorNew(); }, methods: { + // 确认收获 + handleConfirmReceipt(obj) { + console.log('obj', obj); + + let _this = this + uni.showModal({ + title: '提示', + content: '确认已收货？', + success: async function (res) { + if (res.confirm) { + const req = { + action_type: "UpdateOrderState", + action_data: obj.SALEBILL_ID, + saleBillChildId: obj.SALEBILL_CHILD_ID || "", + SALEBILL_STATE: 3000, + } + const data = await _this.$api.getCoop(req) + console.log('data', data); + if (data.error !== 1) { + uni.showToast({ + title: data.msg, + icon: 'none' + }) + } else { + uni.showToast({ + title: "收货成功！", + icon: 'none' + }) + let type = + _this.currentTab === 1 + ? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" + : _this.currentTab === 2 + ? "1005" + : _this.currentTab === 3 + ? "1010,2000" + : _this.currentTab === 4 + ? "2010" + : _this.currentTab === 5 + ? "" + : ""; + _this.handleGetOrderList(type); + } + + } else if (res.cancel) { + } + } + }); + }, + // 点击展开更多商品 + handleClickShowMoreShop(obj) { + console.log('obj', obj); + obj.isShowMore = !obj.isShowMore + this.$forceUpdate() + }, // 点击再次跳转 工会商城 或 彩云驿商城 handleGoStore() { @@ -204,6 +278,11 @@ export default { // 大tab切换 handleBigTab(val) { this.selectBigTab = val + console.log('this.currentTab', this.currentTab); + + if (val === 3 && this.currentTab === 7) { + this.currentTab = 2 + } console.log('this.selectBigTab', this.selectBigTab); this.orderList = [] @@ -225,6 +304,7 @@ export default { ? "" : ""; this.handleGetOrderList(type); + this.$forceUpdate() }, // 滚动到底部 加载更多 handleScrollTolower() { @@ -244,24 +324,34 @@ export default { this.handleGetOrderList(type); }, handleTab(val) { + if (this.selectBigTab === 3 && val === 7) { + this.currentTab = 2 + } + + this.pageMsg = { pageIndex: 1, pageSize: 10, isOver: false, }; - this.currentTab = val; + if (this.currentTab === val) { + this.currentTab = "" + } else { + this.currentTab = val; + } + this.orderList = []; let type = - val === 1 + this.currentTab === 1 ? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" - : val === 2 + : this.currentTab === 2 ? "1005" - : val === 3 + : this.currentTab === 3 ? "1010,2000" - : val === 4 + : this.currentTab === 4 ? "2010" - : val === 5 + : this.currentTab === 5 ? "" : ""; this.handleGetOrderList(type); @@ -317,7 +407,7 @@ export default { mask: true, }); const req = { - action_type: "GetMallOrderList", + action_type: "GetOrderList", salebillType: this.searchType === "6" ? this.selectBigTab === 1 ? '3001,3999' : this.selectBigTab === 2 ? '3999' : @@ -325,7 +415,7 @@ export default { : this.selectBigTab === 1 ? '3000,3001,3002,3999' : this.selectBigTab === 2 ? '3000,3002,3999' : - this.selectBigTab === 3 ? '3001,3999' : '', + this.selectBigTab === 3 ? '3001' : '', salebillState: this.searchType === "6" ? "" : status || "", // salebillType: // this.searchType === "6" @@ -391,6 +481,14 @@ export default { item.SUPPLIER_NAME, }); }, + handleGoShopDetail(item, index) { + console.log('itemitemitemitem', item); + console.log('indexindexindexindex', index); + let obj = item.GOODSList[index] + uni.navigateTo({ + url: `/pages/shopPages/shopDetail/index?id=${obj.COMMODITY_ID}`, + }); + } }, }; @@ -663,6 +761,24 @@ export default { } } + .is_more { + width: 400rpx; + height: 40rpx; + margin: auto; + text-align: center; + //display: flex; + //flex-direction: row; + //align-items: center; + color: #9fa3a8; + font-size: 28rpx; + + .arrow_icon { + width: 26rpx; + height: 16rpx; + margin-right: 16rpx; + } + } + .orderItemMoneyBox { width: 100%; display: flex; @@ -697,7 +813,7 @@ export default { display: flex; align-items: center; justify-content: space-between; - margin-top: 16rpx; + margin-top: 32rpx; .orderItemBottomLeft { .orderItemBottomLeftMore { @@ -725,7 +841,7 @@ export default { text-align: left; font-style: normal; text-transform: none; - padding: 2rpx 26rpx; + padding: 4rpx 26rpx; background: #F2F5F6; border-radius: 4rpx; margin-right: 34rpx; @@ -740,13 +856,52 @@ export default { text-align: left; font-style: normal; text-transform: none; - padding: 2rpx 26rpx; + padding: 4rpx 26rpx; background: #F2F5F6; border-radius: 4rpx; } } } } + + .inBottom { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + + .bottomText { + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 26rpx; + color: #d0d0d0; + line-height: 40rpx; + text-align: justify; + font-style: normal; + position: relative; + padding: 6rpx 0; + } + + .bottomText::after { + content: ""; + width: 30vw; + height: 2rpx; + background: #e0e0e0; + position: absolute; + left: -32vw; + top: 50%; + } + + .bottomText::before { + content: ""; + width: 30vw; + height: 2rpx; + background: #e0e0e0; + position: absolute; + right: -32vw; + top: 50%; + } + } } diff --git a/pages/shopPages/settlement/index.vue b/pages/shopPages/settlement/index.vue index e2c06d9c..ed6046d6 100644 --- a/pages/shopPages/settlement/index.vue +++ b/pages/shopPages/settlement/index.vue @@ -47,12 +47,13 @@
-
共{{ shopOrder.length }}个品项，{{ shopCount }}件商品
@@ -146,10 +147,10 @@ {{ item.USER_NAME || "" - }} + }} {{ item.USER_SEX_TEXT || "" - }} + }} {{ item.MOBILEPHONE || "" }} diff --git a/pages/shopPages/shopDetail/index.vue b/pages/shopPages/shopDetail/index.vue index ac563962..b0c5819e 100644 --- a/pages/shopPages/shopDetail/index.vue +++ b/pages/shopPages/shopDetail/index.vue @@ -75,34 +75,38 @@
-
-
- ¥ - - {{ good.bigNumber || "" }}.{{ good.smallNumber || "00" }} - - -
+ +
+
+ ¥ + + {{ good.bigNumber || "" }}.{{ good.smallNumber || "00" }} + + +
- -
+
-
- 市场价：¥{{ good.COMMODITY_RETAILPRICE }} -
+
+ 市场价：¥{{ good.COMMODITY_RETAILPRICE }} +
+
+ 销量：{{ good.COMMODITY_EN || "0" }}
+ + + +
{{ good.COMMODITY_NAME || "-" }}
@@ -121,7 +129,7 @@ }} --> 库存：{{ good.COMMODITY_STOCK || "0" }} - 销量：{{ good.COMMODITY_EN || "0" }} + 规格：{{ good.COMMODITY_RULE || "" }} {{'平均'+good.REMINDER_DAY+'天内发货'}}{{"预售时间："+(good.UPPER_DATE&&good.OFF_DATE?(good.UPPER_DATE||"-")+'-'+(good.OFF_DATE||"-"):good.UPPER_DATE&&!good.OFF_DATE?(good.UPPER_DATE||"-")+'起':"")}}{{good.SEND_MODE===1000?"发货模式：自提":good.SEND_MODE===2000?"发货模式：邮寄":good.SEND_MODE===3000?"发货模式：免发货":""}}{{good.DELIVER_AREA?'配送区域：'+(good.DELIVER_AREA||"仅限云南省即江浙沪包邮区购买"):""}}{{good.LIMIT_TOTALCOUNT?'限购数量：每人限购'+good.LIMIT_TOTALCOUNT+'件':""}}{{good.LIMIT_TOTALCOUNT?'每日限购：每人每日限购'+good.LIMIT_TOTALCOUNT+'件':""}}{{good.AFTERSALE_NATRUE?''+(good.AFTERSALE_NATRUE===1000?"仅支持退货":good.AFTERSALE_NATRUE===2000?"仅支持换货":good.AFTERSALE_NATRUE===3000?"支持退货和换货":""):""}}商品备注{{''+(good.COMMODITY_DESC||"暂无")+''}}商品简介{{good.COMMODITY_NAME}}￥{{good.COMMODITY_MEMBERPRICE}}{{"/"+good.COMMODITY_UNIT}}详细信息下单信息购买数量规格{{''+item.COMMODITY_NAME+''}}加入购物车立即购买首页收藏购物车加入购物车预售中立即购买已售罄已结束{{'此商品为'+(panicBuying?'热销':'预售')+"商品，"+(panicBuying?'抢购':'起售')+"倒计时 "+(countdown||"")+''}} \ No newline at end of file +商品详情{{item.$orig.label}}{{"销量："+(good.COMMODITY_EN||"0")}}{{''+(good.COMMODITY_NAME||"-")+''}}{{"库存："+(good.COMMODITY_STOCK||"0")}}{{"规格："+(good.COMMODITY_RULE||"")}}{{'平均'+good.REMINDER_DAY+'天内发货'}}{{"预售时间："+(good.UPPER_DATE&&good.OFF_DATE?(good.UPPER_DATE||"-")+'-'+(good.OFF_DATE||"-"):good.UPPER_DATE&&!good.OFF_DATE?(good.UPPER_DATE||"-")+'起':"")}}{{good.SEND_MODE===1000?"发货模式：自提":good.SEND_MODE===2000?"发货模式：邮寄":good.SEND_MODE===3000?"发货模式：免发货":""}}{{good.DELIVER_AREA?'配送区域：'+(good.DELIVER_AREA||"仅限云南省即江浙沪包邮区购买"):""}}{{good.LIMIT_TOTALCOUNT?'限购数量：每人限购'+good.LIMIT_TOTALCOUNT+'件':""}}{{good.LIMIT_TOTALCOUNT?'每日限购：每人每日限购'+good.LIMIT_TOTALCOUNT+'件':""}}{{good.AFTERSALE_NATRUE?''+(good.AFTERSALE_NATRUE===1000?"仅支持退货":good.AFTERSALE_NATRUE===2000?"仅支持换货":good.AFTERSALE_NATRUE===3000?"支持退货和换货":""):""}}商品备注{{''+(good.COMMODITY_DESC||"暂无")+''}}商品简介{{good.COMMODITY_NAME}}￥{{good.COMMODITY_MEMBERPRICE}}{{"/"+good.COMMODITY_UNIT}}详细信息下单信息购买数量规格{{''+item.COMMODITY_NAME+''}}加入购物车立即购买首页收藏购物车加入购物车预售中立即购买已售罄已结束{{'此商品为'+(panicBuying?'热销':'预售')+"商品，"+(panicBuying?'抢购':'起售')+"倒计时 "+(countdown||"")+''}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/shopPages/shopDetail/index.wxss b/unpackage/dist/dev/mp-weixin/pages/shopPages/shopDetail/index.wxss index fc65cb53..937593ab 100644 --- a/unpackage/dist/dev/mp-weixin/pages/shopPages/shopDetail/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/shopPages/shopDetail/index.wxss @@ -187,6 +187,10 @@ color: #333; padding-right: 32rpx; } +.inventory.data-v-0dc4ca38 { + color: #999999; + font-size: 24rpx; +} .vip-price.data-v-0dc4ca38 { font-size: 42rpx; color: #ea3323; diff --git a/unpackage/dist/dev/mp-weixin/pages/user/index.js b/unpackage/dist/dev/mp-weixin/pages/user/index.js index 6913f942..27126f3e 100644 --- a/unpackage/dist/dev/mp-weixin/pages/user/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/user/index.js @@ -104,7 +104,9 @@ var render = function () { var _c = _vm._self._c || _h var g0 = _vm.$utils.handleFormatNumber(_vm.userInfo.MEMBERSHIP_POINT || 0) var g1 = _vm.$utils.handleFormatNumber(_vm.userInfo.ACCOUNT_BALANCE || 0) - var g2 = _vm.serviceDetail.ImageLits && _vm.serviceDetail.ImageLits.length > 0 + var g2 = false + ? undefined + : null _vm.$mp.data = Object.assign( {}, { @@ -265,7 +267,7 @@ var _default = { onShow: function onShow() { var _this2 = this; return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() { - var inShop, seatInfo, currentService, obj, newObj, shopCarList, count; + var inShop, shopCarList, count; return _regenerator.default.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { @@ -288,31 +290,30 @@ var _default = { _context.next = 10; return _this2.handleGetCarCode(); case 10: - seatInfo = uni.getStorageSync("seatInfo"); - if (seatInfo) { - _this2.seat = JSON.parse(seatInfo); - } - currentService = uni.getStorageSync("currentService"); - if (!currentService) { - _context.next = 20; - break; - } - _context.next = 16; - return _this2.handleGetServiceDetail(currentService.SERVERPART_ID); - case 16: - obj = _this2.handleMergeDetail(currentService); - newObj = _objectSpread(_objectSpread({}, currentService), {}, { - sumDetail: obj, - haveREFUELINGGUN: obj.haveREFUELINGGUN, - HASCHARGE: obj.HASCHARGE, - havePARKING: obj.havePARKING, - haveWC: obj.haveWC, - HASMOTHER: obj.HASMOTHER, - HASPILOTLOUNGE: obj.HASPILOTLOUNGE - }); - _this2.serviceDetail = newObj; - _this2.handleGetChargingStation(_this2.serviceDetail); - case 20: + // let seatInfo = uni.getStorageSync("seatInfo"); + // if (seatInfo) { + // this.seat = JSON.parse(seatInfo); + // } + + // let currentService = uni.getStorageSync("currentService"); + // if (currentService) { + // await this.handleGetServiceDetail(currentService.SERVERPART_ID); + + // let obj = this.handleMergeDetail(currentService) + // let newObj = { + // ...currentService, + // sumDetail: obj, + // haveREFUELINGGUN: obj.haveREFUELINGGUN, + // HASCHARGE: obj.HASCHARGE, + // havePARKING: obj.havePARKING, + // haveWC: obj.haveWC, + // HASMOTHER: obj.HASMOTHER, + // HASPILOTLOUNGE: obj.HASPILOTLOUNGE, + // } + // this.serviceDetail = newObj + // this.handleGetChargingStation(this.serviceDetail); + // } + if (_this2.inShop === 2 || _this2.inShop === 1) { // 判断当前的购物车里面是否有东西 shopCarList = []; @@ -330,7 +331,7 @@ var _default = { } _this2.shopCarListCount = count; } - case 21: + case 11: case "end": return _context.stop(); } diff --git a/unpackage/dist/dev/mp-weixin/pages/user/index.wxml b/unpackage/dist/dev/mp-weixin/pages/user/index.wxml index f30788ec..339afe46 100644 --- a/unpackage/dist/dev/mp-weixin/pages/user/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/user/index.wxml @@ -1 +1 @@ -{{inShop===2?userInfo.MEMBERSHIP_NAME||user.MEMBERSHIP_NAME||"微信用户":userInfo.NICK_NAME||userInfo.MEMBERSHIP_NAME||"未填写名称"}}{{user.MEMBERSHIP_LEVEL_TEXT||""}}{{cards?cards:"未绑定爱车"}}我的收藏会员码{{userInfo.COUPON_COUNT||0}}优惠券{{$root.g0}}积分{{$root.g1}}余额我的订单未付款{{mallOrderCountList[0]}}待发货{{mallOrderCountList[1]}}待收货{{mallOrderCountList[2]}}待评价退换货商城订单{{item.label}}退换/售后工会订单{{item.label}}我的点餐{{item.label}}{{item.orderCount}}常用功能会员权益我的爱车建议反馈客服帮助客服帮助伴您行程无忧服务热线伴您行程无忧{{serviceDetail.SERVERPART_NAME||"-"}}交投新能源快充空{{chargingObj.use||"0"}}{{"/"+(chargingObj.have||"0")}}{{"/"+(serviceDetail.sumDetail.STATEGRIDCHARGE||"0")}} \ No newline at end of file +{{inShop===2?userInfo.MEMBERSHIP_NAME||user.MEMBERSHIP_NAME||"微信用户":userInfo.NICK_NAME||userInfo.MEMBERSHIP_NAME||"未填写名称"}}{{user.MEMBERSHIP_LEVEL_TEXT||""}}{{cards?cards:"未绑定爱车"}}我的收藏会员码{{userInfo.COUPON_COUNT||0}}优惠券{{$root.g0}}积分{{$root.g1}}余额我的订单未付款{{mallOrderCountList[0]}}待发货{{mallOrderCountList[1]}}待收货{{mallOrderCountList[2]}}待评价退换货商城订单{{item.label}}退换/售后工会订单{{item.label}}我的点餐{{item.label}}{{item.orderCount}}常用功能会员权益我的爱车建议反馈客服帮助客服帮助伴您行程无忧服务热线伴您行程无忧{{serviceDetail.SERVERPART_NAME||"-"}}交投新能源快充空{{chargingObj.use||"0"}}{{"/"+(chargingObj.have||"0")}}{{"/"+(serviceDetail.sumDetail.STATEGRIDCHARGE||"0")}} \ No newline at end of file