From 49ccd01bdfb4dc11c9a582505e5a766ab88c2eb5 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Tue, 1 Jul 2025 19:42:52 +0800 Subject: [PATCH] update --- pages/index/index.vue | 49 ++- pages/order/buyOrder/index.vue | 2 +- pages/order/orderFoodDetail/index.vue | 33 +- pages/order/orderdetail/index.vue | 34 +- pages/payfor/index.vue | 216 ++++++------ pages/register/index.vue | 3 +- pages/reservationOrder/index.vue | 4 +- pages/serviceDetail/index.vue | 6 +- pages/shopMallPage/shopType/index.vue | 19 +- .../settlement/components/commodityItem.vue | 49 ++- pages/shopPages/settlement/index.vue | 49 ++- pages/shopPages/shop/index.vue | 16 +- pages/shopPages/shopDetail/index.vue | 57 +++- pages/useConfig/balanceManage.vue | 7 +- pages/useConfig/userConfig.vue | 3 +- pages/useConfig/userInfo.vue | 30 +- pages/user/index.vue | 224 +++++++++++- static/images/home/registerIcon.png | Bin 103677 -> 0 bytes .../.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 +- .../dist/dev/mp-weixin/pages/index/index.js | 67 +++- .../dist/dev/mp-weixin/pages/index/index.wxml | 2 +- .../mp-weixin/pages/order/buyOrder/index.wxml | 2 +- .../pages/order/orderFoodDetail/index.wxml | 2 +- .../pages/order/orderFoodDetail/index.wxss | 7 +- .../pages/order/orderdetail/index.wxml | 2 +- .../pages/order/orderdetail/index.wxss | 7 +- .../dist/dev/mp-weixin/pages/payfor/index.js | 319 +++++++++++++++--- .../dev/mp-weixin/pages/payfor/index.wxml | 2 +- .../dev/mp-weixin/pages/register/index.wxml | 2 +- .../mp-weixin/pages/reservationOrder/index.js | 4 +- .../mp-weixin/pages/serviceDetail/index.js | 20 +- .../mp-weixin/pages/serviceDetail/index.wxml | 2 +- .../pages/shopMallPage/shopType/index.js | 10 + .../pages/shopMallPage/shopType/index.wxml | 2 +- .../settlement/components/commodityItem.js | 20 +- .../settlement/components/commodityItem.wxml | 2 +- .../pages/shopPages/settlement/index.js | 64 +++- .../pages/shopPages/settlement/index.wxml | 2 +- .../mp-weixin/pages/shopPages/shop/index.js | 13 +- .../mp-weixin/pages/shopPages/shop/index.wxml | 2 +- .../pages/shopPages/shopDetail/index.js | 47 ++- .../pages/shopPages/shopDetail/index.wxss | 2 + .../dist/dev/mp-weixin/pages/user/index.js | 197 +++++++++-- .../dist/dev/mp-weixin/pages/user/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/user/index.wxss | 23 ++ .../static/images/home/registerIcon.png | Bin 103677 -> 0 bytes 101 files changed, 1321 insertions(+), 416 deletions(-) delete mode 100644 static/images/home/registerIcon.png delete mode 100644 unpackage/dist/dev/mp-weixin/static/images/home/registerIcon.png diff --git a/pages/index/index.vue b/pages/index/index.vue index bbe395fb..104b7a83 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -157,7 +157,7 @@ - + 附近景区 @@ -751,7 +751,8 @@ export default { let req = { SearchParameter: { OWNERUNIT_ID: 911, - GOODSTYPE: 7000 + GOODSTYPE: 7000, + USERDEFINEDTYPE_STATE: 1 }, SortStr: "OPERATE_DATE desc", type: 'encryption' @@ -764,7 +765,8 @@ export default { let req2 = { SearchParameter: { OWNERUNIT_ID: 911, - GOODSTYPE: 7001 + GOODSTYPE: 7001, + USERDEFINEDTYPE_STATE: 1 }, SortStr: "OPERATE_DATE desc", type: 'encryption' @@ -778,8 +780,45 @@ export default { console.log('datadatadatadatadatadatadatadatadata', data2); let res1 = data1.Result_Data.List let res2 = data2.Result_Data.List - this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO) - this.poster = res2[0] + + // 修改一下 使用的是 当前时间在的范围内的第一个 + let firstObj1 = {} + if (res1 && res1.length > 0) { + for (let i = 0; i < res1.length; i++) { + const item = res1[i]; + if ( + new Date(item.PRESALE_STARTTIME).getTime() < new Date().getTime() && + new Date().getTime() < new Date(item.PRESALE_ENDTIME).getTime() + ) { + firstObj1 = item; + break; // 找到第一条后立即跳出循环 + } + } + } + + let firstObj2 = {} + if (res2 && res2.length > 0) { + for (let i = 0; i < res2.length; i++) { + const item = res2[i]; + if ( + new Date(item.PRESALE_STARTTIME).getTime() < new Date().getTime() && + new Date().getTime() < new Date(item.PRESALE_ENDTIME).getTime() + ) { + firstObj2 = item; + break; // 找到第一条后立即跳出循环 + } + } + } + + console.log('firstObj1', firstObj1); + console.log('firstObj2', firstObj2); + + + this.swiperList.unshift(firstObj1.USERDEFINEDTYPE_ICO) + this.poster = firstObj2 + + // this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO) + // this.poster = res2[0] }, // 测试加密的方法 diff --git a/pages/order/buyOrder/index.vue b/pages/order/buyOrder/index.vue index 8ce1c23a..8737768e 100644 --- a/pages/order/buyOrder/index.vue +++ b/pages/order/buyOrder/index.vue @@ -62,7 +62,7 @@ ¥{{ item.PAY_AMOUNT || "" }} - + 更多 diff --git a/pages/order/orderFoodDetail/index.vue b/pages/order/orderFoodDetail/index.vue index ffbc9e15..fcdf69a8 100644 --- a/pages/order/orderFoodDetail/index.vue +++ b/pages/order/orderFoodDetail/index.vue @@ -78,6 +78,9 @@

预约电话{{ orderInfo.ORDER_PERSONTEL }}

+

+ 订单备注{{ orderInfo.SALEBILL_DESC }} +

@@ -96,15 +99,20 @@
-
- {{ - item.COMMODITY_RULE - ? item.COMMODITY_NAME + "(" + item.COMMODITY_RULE + ")" - : item.COMMODITY_NAME - }} +
+
+ {{ + item.COMMODITY_RULE + ? item.COMMODITY_NAME + "(" + item.COMMODITY_RULE + ")" + : item.COMMODITY_NAME + }} +
+
x{{ item.ORDER_COUNT }}
+
￥{{ item.AVERAGE_PRICE }}
+
+
+ {{ item.SALEDETAIL_DESC || "" }}
-
x{{ item.ORDER_COUNT }}
-
￥{{ item.AVERAGE_PRICE }}
@@ -869,7 +877,6 @@ page { margin-bottom: 24rpx; } -.order-list, .coupon { padding: 20rpx 0; box-sizing: border-box; @@ -878,6 +885,14 @@ page { color: #000000; } +.order-list { + padding: 20rpx 0; + box-sizing: border-box; + background-color: #fff; + // display: flex; + color: #000000; +} + .order-name { font-size: 26rpx; flex: 0.7; diff --git a/pages/order/orderdetail/index.vue b/pages/order/orderdetail/index.vue index 169525a0..ba593403 100644 --- a/pages/order/orderdetail/index.vue +++ b/pages/order/orderdetail/index.vue @@ -111,6 +111,9 @@

微信支付￥{{ orderInfo.TOTAL_PAY }}

+

+ 订单备注{{ orderInfo.SALEBILL_DESC }} +

@@ -129,17 +132,23 @@
-
- {{ - item.COMMODITY_RULE - ? item.COMMODITY_NAME + "(" + item.COMMODITY_RULE + ")" - : item.COMMODITY_NAME - }} +
+
+ {{ + item.COMMODITY_RULE + ? item.COMMODITY_NAME + "(" + item.COMMODITY_RULE + ")" + : item.COMMODITY_NAME + }} +
+
x{{ item.ORDER_COUNT }}
+
￥{{ item.AVERAGE_PRICE }}
+
+
+ {{ item.SALEDETAIL_DESC || "" }}
-
x{{ item.ORDER_COUNT }}
-
￥{{ item.AVERAGE_PRICE }}
+
@@ -1016,7 +1025,6 @@ page { margin-bottom: 24rpx; } -.order-list, .coupon { padding: 20rpx 0; box-sizing: border-box; @@ -1025,6 +1033,14 @@ page { color: #000000; } +.order-list { + padding: 20rpx 0; + box-sizing: border-box; + background-color: #fff; + // display: flex; + color: #000000; +} + .order-name { font-size: 26rpx; flex: 0.7; diff --git a/pages/payfor/index.vue b/pages/payfor/index.vue index b98e26f2..eec49a06 100644 --- a/pages/payfor/index.vue +++ b/pages/payfor/index.vue @@ -11,8 +11,7 @@
-
- + "> +
- +
- +
{{ isShowAllCode ? allCode : showCode }} - {{ isShowAllCode ? "关闭查看" : "查看数字" }} + {{ isShowAllCode ? "关闭查看" : "查看数字" }} @@ -59,50 +46,27 @@
- +
- + 每分钟自动刷新
-
+
- + 优惠券
-
- 暂无可使用的优惠券 +
+ 暂无可使用的优惠券 {{ cid && choeseCouponIndex != null ? couponlist[choeseCouponIndex].CouponName : "选择要使用的优惠券" }} - +
@@ -110,8 +74,7 @@

支付成功

{{ payDoor }}

- {{ payPrice }}元 + {{ payPrice }}元
完成
@@ -127,10 +90,7 @@ - + @@ -144,35 +104,19 @@ - + 选择优惠券 - +
¥ {{ item.UseAmount }}
-
+
{{ item.CouponPoint }}积分兑换
@@ -187,12 +131,8 @@
{{ item.CouponName }}
- 有效期至{{ item.EndTime }} - 活动至{{ item.EndTime }} + 有效期至{{ item.EndTime }} + 活动至{{ item.EndTime }}
@@ -229,10 +169,13 @@ export default { loginType: "", barcodeImg: "", // 条码转的图片路径 qrcodeImg: "", // 二维码图片转的路径 + isLoading: false, + WXProfile: "", + user: {} }; }, computed: { - ...mapGetters(["user"]), + // ...mapGetters(["user"]), barcodeHeight() { return (120 / 750) * uni.getSystemInfoSync().windowWidth; @@ -248,6 +191,56 @@ export default { UniPopup, }, methods: { + // 拿用户最新的user信息 + async handleGetUserInfo() { + let _this = this; + let vuex = uni.getStorageSync('vuex') + let vuexObj = {} + if (vuex) { + vuexObj = JSON.parse(vuex) + console.log('vuexObjvuexObjvuexObj', JSON.parse(JSON.stringify(vuexObj))); + } + + const data = await _this.$api + .getCoop({ + action_type: "GetMembershipInfo", + // WechatUserId: _this.user.WechatUserId, + WechatUserId: vuexObj.user.WechatUserId, + }) + + // .then(function (data) { + if (data.ResultCode === "100") { + let _data = data; + _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || ""; + _this.user.WechatUserId = _data.Data.WechatUserId || ""; + _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || ""; + _this.user.MEMBERSHIP_LEVEL_TEXT = + _data.Data.MEMBERSHIP_LEVEL_TEXT || ""; + _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || ""; + _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || ""; + _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || ""; + _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || ""; + _this.user.ISPLUS = _data.Data.ISPLUS || ""; + _this.user.INDUSTRY_MEMBERSHIP_ID = + _data.Data.INDUSTRY_MEMBERSHIP_ID || ""; + _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || ""; + _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || ""; + _this.user.InviteCode = _data.Data.InviteCode || ""; + _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || ""; + _this.user.MEMBERSHIP_MOBILEPHONE = + _data.Data.MEMBERSHIP_MOBILEPHONE || ""; + _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL; + // _this.setUser(user); + _this.$store.commit("setUser", _this.user); + + _this.$forceUpdate() + _this.showAvatar = true + } else { + // _this.setUser({}); + // _this.$store.commit("setUser", user); + } + // }); + }, // 快捷支付 handleRealGoPay(payType) { if (this.loginType === "android") { @@ -317,29 +310,31 @@ export default { // _this.$utils.qrc('qrcode2', code, _this.qrcodeHeight2, _this.qrcodeHeight2, null, '../../../static/images/gsuyiw.png') _this.showCode = code.substring(0, 4) + " " + "*".repeat("6"); - wx.canvasToTempFilePath({ - canvasId: "barcode", - success: (res) => { - console.log("barcode", res); - // this.setData({ - // qrCodeImage: res.tempFilePath, // 保存图片路径 - // }); - _this.barcodeImg = res.tempFilePath; - _this.$forceUpdate(); - }, - }); - wx.canvasToTempFilePath({ - canvasId: "qrcode", - success: (res) => { - console.log("barcode", res); - // this.setData({ - // qrCodeImage: res.tempFilePath, // 保存图片路径 - // }); - _this.qrcodeImg = res.tempFilePath; - _this.$forceUpdate(); - }, - }); - + setTimeout(() => { + wx.canvasToTempFilePath({ + canvasId: "barcode", + success: (res) => { + console.log("barcode", res); + // this.setData({ + // qrCodeImage: res.tempFilePath, // 保存图片路径 + // }); + _this.barcodeImg = res.tempFilePath; + _this.$forceUpdate(); + }, + }); + wx.canvasToTempFilePath({ + canvasId: "qrcode", + success: (res) => { + console.log("barcode", res); + // this.setData({ + // qrCodeImage: res.tempFilePath, // 保存图片路径 + // }); + _this.qrcodeImg = res.tempFilePath; + _this.$forceUpdate(); + }, + }); + }, 300) + _this.$forceUpdate(); _this.timer = setInterval(function () { _this.getCode(); @@ -384,12 +379,19 @@ export default { // }, getCode() { let _this = this; + + this.isLoading = true; + if (!_this.user.MEMBERSHIP_ID) { + return; + } + this.barcodeImg = ""; this.qrcodeImg = ""; this.$api // .$get("/WeChat/GetMemberECode", { couponCode: this.cid || "" }) .$get("/WeChat/GetMemberECode", { membershipId: _this.user.MEMBERSHIP_ID || "", + couponCode: this.cid || "", }) .then((res) => { console.log("resdsadasd", res); @@ -397,6 +399,7 @@ export default { _this.allCode = res.Result_Data.Membership_ECode; _this.paintCode(res.Result_Data.Membership_ECode); } + _this.isLoading = false; }); }, getCouponLsit() { @@ -439,7 +442,7 @@ export default { // _this.payMent() // }, 5000) }, - onLoad(option) { + async onLoad(option) { let type = uni.getStorageSync("loginType"); this.loginType = type; console.log("option", option); @@ -449,6 +452,9 @@ export default { this.cid = ""; this.choeseCouponIndex = null; } + + await this.handleGetUserInfo() + this.getCouponLsit(); this.getCode(); this.$utils.addUserBehaviorNew(); diff --git a/pages/register/index.vue b/pages/register/index.vue index 40f1d746..abfb5c65 100644 --- a/pages/register/index.vue +++ b/pages/register/index.vue @@ -11,7 +11,8 @@ 您点击“立即授权”，即代表您已经阅读并同意更新后的《彩云驿出行隐私保护指引》条款。 - + +
diff --git a/pages/reservationOrder/index.vue b/pages/reservationOrder/index.vue index 4815823d..cc4dc923 100644 --- a/pages/reservationOrder/index.vue +++ b/pages/reservationOrder/index.vue @@ -312,12 +312,12 @@ export default { if (this.user.MEMBERSHIP_MOBILEPHONE) { let id = item.SERVERPARTSHOP_IDS.split(",")[0]; uni.navigateTo({ - url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`, + url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`, }); } else { let id = item.SERVERPARTSHOP_IDS.split(",")[0]; uni.navigateTo({ - url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`, + url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`, }); this.isLogin = true; } diff --git a/pages/serviceDetail/index.vue b/pages/serviceDetail/index.vue index f7228932..7438a7f0 100644 --- a/pages/serviceDetail/index.vue +++ b/pages/serviceDetail/index.vue @@ -567,7 +567,7 @@ - + 附近景点 @@ -936,12 +936,12 @@ export default { if (this.user.MEMBERSHIP_MOBILEPHONE) { let id = item.SERVERPARTSHOP_IDS.split(",")[0]; uni.navigateTo({ - url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`, + url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`, }); } else { let id = item.SERVERPARTSHOP_IDS.split(",")[0]; uni.navigateTo({ - url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`, + url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`, }); this.isLogin = true; } diff --git a/pages/shopMallPage/shopType/index.vue b/pages/shopMallPage/shopType/index.vue index a4a40efa..fe64b178 100644 --- a/pages/shopMallPage/shopType/index.vue +++ b/pages/shopMallPage/shopType/index.vue @@ -166,7 +166,8 @@
- +
{{ good.COMMODITY_NAME }} @@ -443,6 +444,9 @@ export default { this.searchText = ""; }, methods: { + handleDesc(e, item) { + this.good.SALEDETAIL_DESC = e.detail.value + }, // 节流函数 throttle(fn, delay) { let last = 0; @@ -485,6 +489,19 @@ export default { } console.log("good", this.good); + + + this.good.COMMODITY_GRADE = null + this.good.LIMIT_TOTALCOUNT = this.good.LIMIT_TOTALCOUNT ? this.good.LIMIT_TOTALCOUNT.toString() : "" + this.good.LIMIT_DAILYCOUNT = this.good.LIMIT_DAILYCOUNT ? this.good.LIMIT_DAILYCOUNT.toString() : "" + this.good.REMINDER_DAY = this.good.REMINDER_DAY ? this.good.REMINDER_DAY.toString() : "" + this.good.SEND_MODE = this.good.SEND_MODE ? this.good.SEND_MODE.toString() : "" + this.good.AFTERSALE_NATRUE = this.good.AFTERSALE_NATRUE ? this.good.AFTERSALE_NATRUE.toString() : "" + this.good.DUTY_PARAGRAPH = this.good.DUTY_PARAGRAPH ? this.good.DUTY_PARAGRAPH.toString() : "" + + + + if (this.good.RTCOMMODITY_MULTI_ID === "默认" || !this.good.RTCOMMODITY_MULTI_ID) { uni.showToast({ title: "请先选择规格！", diff --git a/pages/shopPages/settlement/components/commodityItem.vue b/pages/shopPages/settlement/components/commodityItem.vue index aa76f70f..5bb917c3 100644 --- a/pages/shopPages/settlement/components/commodityItem.vue +++ b/pages/shopPages/settlement/components/commodityItem.vue @@ -1,20 +1,17 @@