From 8e66c24ff9c1ceed65435a3c932afd6ac2fd1390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Tue, 26 Apr 2022 15:17:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AD=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=A4=E6=96=AD=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=83=A8=E5=88=86=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +- pages/order/afterSales/afterSales.vue | 145 +++++++++++++++----------- pages/order/myOrder.vue | 2 +- pages/promotion/lives.vue | 8 +- 4 files changed, 90 insertions(+), 69 deletions(-) diff --git a/manifest.json b/manifest.json index 8bc9ebd..6973972 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__C100675", "description" : "", - "versionName" : "4.2.4.1", - "versionCode" : 4000241, + "versionName" : "4.2.5", + "versionCode" : 4000250, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue index f7e71ca..15b41c4 100644 --- a/pages/order/afterSales/afterSales.vue +++ b/pages/order/afterSales/afterSales.vue @@ -17,7 +17,8 @@ @clear="submitSearchOrderList(current)" @custom="submitSearchOrderList(current)" v-model="orderSn" - > + > + x{{ sku.num }} - - - + + + 该商品已申请售后服务 + + 该商品无法申请售后 - -
- - - 退货处理-{{ order.serviceStatus | serviceStatusList }} - - 补发商品-{{ order.serviceStatus | serviceStatusList }} - - 退款-{{ order.serviceStatus | serviceStatusList }} - - 换货-{{ order.serviceStatus | serviceStatusList }} - - 取消订单-{{ order.serviceStatus | serviceStatusList }} -
- - - -
- 申请售后 + +
+ + + 退货处理-{{ order.serviceStatus | serviceStatusList }} + + 补发商品-{{ order.serviceStatus | serviceStatusList }} + + 退款-{{ order.serviceStatus | serviceStatusList }} + + 换货-{{ order.serviceStatus | serviceStatusList }} + + 取消订单-{{ order.serviceStatus | serviceStatusList }} +
+ + + + + + +
+
+ 申请售后 +
@@ -229,7 +229,7 @@ export default { pageNumber: 1, pageSize: 10, sort: "createTime", - flowPrice: 1, + flowPrice: 0, order: "desc", }, @@ -404,6 +404,10 @@ export default { */ onExpress(order, sku) { sku.storeName = order.storeName; + let data = { + ...order, + ...sku, + }; storage.setAfterSaleData(data); uni.navigateTo({ @@ -458,31 +462,38 @@ page, overflow-y: auto; height: calc(100vh - 44px - 80rpx - 104rpx); } + .u-tabs-search { padding: 20rpx; background: #fff; } + .countMoney { margin-left: 7rpx; color: $main-color; font-size: 28rpx; } + .seller-view { background-color: #fff; margin: 20rpx 0rpx; padding: 0rpx 20rpx; border-radius: 20rpx; + .seller-info { height: 70rpx; + .seller-name { font-size: 28rpx; display: flex; flex-direction: row; + .name { margin-left: 15rpx; margin-top: -2rpx; } } + .order-sn { font-size: 22rpx; color: #909399; @@ -526,6 +537,7 @@ page, color: $main-color; } } + .btn-view { padding: 16rpx 0; @@ -535,10 +547,12 @@ page, } } } + .description { color: #909399; size: 25rpx; } + .cannot_apply { text-align: center; font-size: 22rpx; @@ -547,6 +561,10 @@ page, height: 70rpx; line-height: 70rpx; } +.not_center { + text-align: left; +} + .icon { margin-right: 10rpx; } @@ -556,6 +574,7 @@ page, display: flex; justify-content: flex-end; } + .default-btn { background-color: #ffffff; margin-left: 15rpx; @@ -566,9 +585,11 @@ page, padding: 0 24rpx; border-radius: 200px; } + .close { color: $light-color; } + .border { border: 2rpx solid $light-color; color: $light-color; diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index fccdc14..88cae7e 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -139,7 +139,7 @@ shape="circle" class="cancel-btn" size="mini" - v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" + v-if="order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyService(order)" > 退款/售后 diff --git a/pages/promotion/lives.vue b/pages/promotion/lives.vue index bda1fa3..bd0a728 100644 --- a/pages/promotion/lives.vue +++ b/pages/promotion/lives.vue @@ -159,7 +159,7 @@ export default { let recommendLives = await getLiveList(this.recommendParams); if (recommendLives.data.success) { // 推荐直播间 - if (recommendLives.data.result.records.length != 0) { + if (recommendLives.data.result.records.length ) { this.status = "loadmore"; this.recommendLives = recommendLives.data.result.records; } else { @@ -172,7 +172,7 @@ export default { * 2.如果没有直播间设置一个默认图片 */ - if (this.recommendLives.length == 0) { + if (!this.recommendLives.length) { if (this.liveList[0].shareImg) { this.$set(this, "swiperImg", [ { @@ -199,7 +199,7 @@ export default { let res = await getLiveList(this.params[this.current]); // 直播间 if (res.data.success) { - if (res.data.result.records.length != 0) { + if (res.data.result.records.length ) { this.status = "loadmore"; this.liveList.push(...res.data.result.records); } else { @@ -211,7 +211,7 @@ export default { ? (this.status = "loadmore") : (this.status = "noMore"); - console.log(this.status); + this.liveList.forEach((item) => { if (item.roomGoodsList) { item.roomGoodsList = JSON.parse(item.roomGoodsList); From b1cfdef41c48a230e865e3c582c552f7b92dc903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Tue, 26 Apr 2022 17:21:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?app=E6=9B=B4=E6=96=B0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/APPUpdate/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/APPUpdate/index.js b/plugins/APPUpdate/index.js index 7a15aa4..595514a 100644 --- a/plugins/APPUpdate/index.js +++ b/plugins/APPUpdate/index.js @@ -854,7 +854,7 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) { export default function (isPrompt = false) { getCurrentNo((version) => { getServerNo((res) => { - if (res.versionCode.replace(/\./g, "") <= version.versionCode) { + if (res.versionCode.replace(/\./g, "") <= version.version) { return false; } From dc04b4220f89ffa7e559ef9b1037275121223d9f Mon Sep 17 00:00:00 2001 From: ran <17633066053@163.com> Date: Fri, 29 Apr 2022 12:07:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E6=B7=BB=E5=8A=A0=E4=BF=83=E9=94=80=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MP_verify_qSyvBPhDsPdxvOhC.txt | 1 - manifest.json | 4 ---- pages/tabbar/cart/cartList.vue | 13 ++++++++----- 3 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 MP_verify_qSyvBPhDsPdxvOhC.txt diff --git a/MP_verify_qSyvBPhDsPdxvOhC.txt b/MP_verify_qSyvBPhDsPdxvOhC.txt deleted file mode 100644 index 767ab3e..0000000 --- a/MP_verify_qSyvBPhDsPdxvOhC.txt +++ /dev/null @@ -1 +0,0 @@ -qSyvBPhDsPdxvOhC \ No newline at end of file diff --git a/manifest.json b/manifest.json index 871e564..1f7eaf5 100644 --- a/manifest.json +++ b/manifest.json @@ -195,10 +195,6 @@ } }, "plugins" : { - "myPlugin" : { - "version" : "1.1.0", - "provider" : "wx738958e0f4c894f9" - }, "live-player-plugin" : { "version" : "1.3.0", "provider" : "wx2b03c6e691cd7370" diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue index 2233360..afc0000 100644 --- a/pages/tabbar/cart/cartList.vue +++ b/pages/tabbar/cart/cartList.vue @@ -236,12 +236,15 @@ export default { }, methods: { /** - * 倒数计时 - */ + * 倒数计时 + */ getCountDownTime(val) { - let date = new Date(val.replace(/-/g, "/")); - let timeSimple = new Date(date).getTime() / 1000; - return timeSimple - new Date().getTime() / 1000; + if (val.promotionMap) { + let key = Object.keys(val.promotionMap).find((child, index) => { + return child.split("-")[0] == 'SECKILL' + }); + return val.promotionMap[key].endTime / 1000 - (new Date().getTime() / 1000) + } }, /** From 6f60cc6afbcaa3d7d6fe841cfec545626513d959 Mon Sep 17 00:00:00 2001 From: ran <17633066053@163.com> Date: Fri, 29 Apr 2022 12:10:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/tabbar/cart/cartList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue index afc0000..0b3949f 100644 --- a/pages/tabbar/cart/cartList.vue +++ b/pages/tabbar/cart/cartList.vue @@ -99,7 +99,7 @@ >
距秒杀结束: + font-size="24" :timestamp="getCountDownTime(skuItem)">
From a9046aded4756d3024f7a68216d82c0dc8fea8e3 Mon Sep 17 00:00:00 2001 From: ran <17633066053@163.com> Date: Tue, 3 May 2022 10:12:01 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=B6=B3=E8=BF=B9=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/myTracks.vue | 557 +++++++++++++++++----------------------- 1 file changed, 242 insertions(+), 315 deletions(-) diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue index f8dcc27..a7da248 100644 --- a/pages/mine/myTracks.vue +++ b/pages/mine/myTracks.vue @@ -1,342 +1,269 @@ + .myTracks-action-check { + align-items: center; + display: -webkit-box; + display: -webkit-flex; + display: flex; + } + From a6a8a5d583d03f6b6db4881d6c70bb4334506250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 5 May 2022 15:11:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/tabbar/cart/cartList.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue index 0b3949f..0623bfa 100644 --- a/pages/tabbar/cart/cartList.vue +++ b/pages/tabbar/cart/cartList.vue @@ -51,7 +51,7 @@ - + @@ -110,7 +110,9 @@ 预估到手价 ￥{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[0]}} .{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} - +
+ {{skuItem.errorMessage}} +
@@ -192,8 +194,8 @@ export default { }, ], isInvalid(val) { - //是否无效商品 - if (val.invalid == 1) { + //是否无效商品/没库存商品 + if (val.invalid == 1 || (!val.checked && val.errorMessage)) { return true; } else { return false;