From 201ee840d58eb39957b3e5b8074f4890b9051fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Sat, 2 Apr 2022 18:32:01 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4im=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?app=20=E4=B8=AD=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 4 +- manifest.json | 4 +- pages/cart/payment/payOrder.vue | 65 +++++++++++++++----------- pages/product/goods.vue | 81 ++++++++++++++++++--------------- pages/tabbar/home/web-view.vue | 13 +++++- 5 files changed, 98 insertions(+), 69 deletions(-) diff --git a/config/config.js b/config/config.js index 48013e5..11113ba 100644 --- a/config/config.js +++ b/config/config.js @@ -6,11 +6,11 @@ export default { downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址 shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址 appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态） - appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看 aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转 iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看 logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址 customerServiceMobile:"13161366885", //客服电话 - customerServiceEmail:"lili@lili.com" //客服邮箱 + customerServiceEmail:"lili@lili.com", //客服邮箱 + imWebSrc:"https://im.pickmall.cn" //IM地址 }; diff --git a/manifest.json b/manifest.json index 871e564..05cd6a4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__C100675", "description" : "", - "versionName" : "4.2.4", - "versionCode" : 4000240, + "versionName" : "4.2.4.1", + "versionCode" : 4000241, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index 0f8da5e..a898921 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -226,13 +226,18 @@ const paymentMethod = payment; // 客户端类型 APP/NATIVE/JSAPI/H5 const paymentClient = this.paymentClient; - + + uni.showLoading({ + title: "正在唤起支付...", + mask:true + }); + // #ifdef APP-PLUS //APP pay // 初始化支付签名 await API_Trade.initiatePay(paymentMethod, paymentClient, params).then( (signXml) => { - + uni.hideLoading(); //如果支付异常 if (!signXml.data.success) { uni.showToast({ @@ -241,33 +246,39 @@ }); return; } - + let payForm = signXml.data.result; - + let paymentType = paymentMethod === "WECHAT" ? "wxpay" : "alipay"; - uni.requestPayment({ - provider: paymentType, - orderInfo: payForm, - success: (e) => { - console.log(e); - uni.showToast({ - icon: "none", - title: "支付成功!", - }); - - this.callback(paymentMethod) - - - }, - fail: (e) => { - console.log(this); - this.exception = e; - uni.showModal({ - content: "支付失败,如果您已支付，请勿反复支付", - showCancel: false, - }); - }, - }); + + if(paymentMethod === "WALLET"){ + uni.showToast({ + icon: "none", + title: "支付成功!", + }); + this.callback(paymentMethod) + } + else{ + uni.requestPayment({ + provider: paymentType, + orderInfo: payForm || '', + success: (e) => { + uni.showToast({ + icon: "none", + title: "支付成功!", + }); + this.callback(paymentMethod) + }, + fail: (e) => { + console.log(this); + this.exception = e; + uni.showModal({ + content: "支付失败,如果您已支付，请勿反复支付", + showCancel: false, + }); + }, + }); + } } ); //APP pay diff --git a/pages/product/goods.vue b/pages/product/goods.vue index b512e57..5125e34 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -382,7 +382,6 @@ import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块 import popupAddress from "./product/popup/address"; //地址选择模块 import shares from "@/components/m-share/index"; //分享 import popups from "@/components/popups/popups"; //气泡框 - import setup from "./product/popup/popup"; export default { components: { @@ -527,7 +526,8 @@ export default { }; }, - computed: { + computed: { + // udesk IM IM() { return this.IMLink + this.storeDetail.merchantEuid; }, @@ -708,40 +708,49 @@ export default { }, linkMsgDetail() { - if (this.storeDetail.merchantEuid) { - uni.navigateTo({ - url: `/pages/tabbar/home/web-view?src=${this.IM}`, - }); - } else { - // 客服 - // #ifdef MP-WEIXIN - const params = { - storeName: this.storeDetail.storeName, - goodsName: this.goodsDetail.goodsName, - goodsId: this.goodsDetail.goodsId, - goodsImg: this.goodsDetail.thumbnail, - price: this.goodsDetail.promotionPrice || this.goodsDetail.price, - // originalPrice: this.goodsDetail.original || this.goodsDetail.price, - uuid: storage.getUuid(), - token: storage.getAccessToken(), - sign: this.storeDetail.yzfSign, - mpSign: this.storeDetail.yzfMpSign, - }; - uni.navigateTo({ - url: - "/pages/product/customerservice/index?params=" + - encodeURIComponent(JSON.stringify(params)), - }); - // #endif - // #ifndef MP-WEIXIN - const sign = this.storeDetail.yzfSign; - uni.navigateTo({ - url: - "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" + - sign, - }); - // #endif - } + // lili 基础客服 + + uni.navigateTo({ + url: `/pages/tabbar/home/web-view?IM=${this.storeDetail.storeId}`, + }); + + // udesk 代码 + // if (this.storeDetail.merchantEuid) { + // uni.navigateTo({ + // url: `/pages/tabbar/home/web-view?src=${this.IM}`, + // }); + // } + + + // 客服 云智服代码 + // // #ifdef MP-WEIXIN + // const params = { + // storeName: this.storeDetail.storeName, + // goodsName: this.goodsDetail.goodsName, + // goodsId: this.goodsDetail.goodsId, + // goodsImg: this.goodsDetail.thumbnail, + // price: this.goodsDetail.promotionPrice || this.goodsDetail.price, + // // originalPrice: this.goodsDetail.original || this.goodsDetail.price, + // uuid: storage.getUuid(), + // token: storage.getAccessToken(), + // sign: this.storeDetail.yzfSign, + // mpSign: this.storeDetail.yzfMpSign, + // }; + // uni.navigateTo({ + // url: + // "/pages/product/customerservice/index?params=" + + // encodeURIComponent(JSON.stringify(params)), + // }); + // // #endif + // // #ifndef MP-WEIXIN + // const sign = this.storeDetail.yzfSign; + // uni.navigateTo({ + // url: + // "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" + + // sign, + // }); + // // #endif + }, // 格式化金钱 1999 --> [1999,00] formatPrice(val) { diff --git a/pages/tabbar/home/web-view.vue b/pages/tabbar/home/web-view.vue index 4fef3f1..5cd9a9c 100644 --- a/pages/tabbar/home/web-view.vue +++ b/pages/tabbar/home/web-view.vue @@ -5,9 +5,13 @@ @@ -29,4 +38,4 @@ export default { margin: 0; } } - \ No newline at end of file + From 4ed3832a5fc55a0afeebdb8eb2660db528c8df00 Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 8 Apr 2022 16:28:14 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E8=B6=B3?= =?UTF-8?q?=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/myTracks.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue index a0fa2cd..f8dcc27 100644 --- a/pages/mine/myTracks.vue +++ b/pages/mine/myTracks.vue @@ -68,6 +68,8 @@ export default { params: { pageNumber: 1, pageSize: 10, + order: "desc", + sort: "updateTime", }, trackList: [], //足迹列表 From 14d12d90e3b0f77632319e91fb6d67834ce96357 Mon Sep 17 00:00:00 2001 From: paulGao Date: Mon, 18 Apr 2022 09:51:00 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/tabbar/home/template/tpl_notice.vue | 49 ++++ .../home/template/tpl_promotions_detail.vue | 271 ++++++++++++++++++ pages/tabbar/home/template/tpl_title.vue | 11 +- pages/tabbar/home/views.vue | 49 ++-- 4 files changed, 359 insertions(+), 21 deletions(-) create mode 100644 pages/tabbar/home/template/tpl_notice.vue create mode 100644 pages/tabbar/home/template/tpl_promotions_detail.vue diff --git a/pages/tabbar/home/template/tpl_notice.vue b/pages/tabbar/home/template/tpl_notice.vue new file mode 100644 index 0000000..c0e36b2 --- /dev/null +++ b/pages/tabbar/home/template/tpl_notice.vue @@ -0,0 +1,49 @@ + + + + diff --git a/pages/tabbar/home/template/tpl_promotions_detail.vue b/pages/tabbar/home/template/tpl_promotions_detail.vue new file mode 100644 index 0000000..0939658 --- /dev/null +++ b/pages/tabbar/home/template/tpl_promotions_detail.vue @@ -0,0 +1,271 @@ + + + diff --git a/pages/tabbar/home/template/tpl_title.vue b/pages/tabbar/home/template/tpl_title.vue index 6286074..2825837 100644 --- a/pages/tabbar/home/template/tpl_title.vue +++ b/pages/tabbar/home/template/tpl_title.vue @@ -1,13 +1,17 @@ + - - From 64686e165ff46e6822b535915940d41560c75e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 21 Apr 2022 11:50:13 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=9A=E6=AC=A1=E8=AF=B7=E6=B1=82bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/myOrder.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index 103595a..fccdc14 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -323,7 +323,7 @@ export default { } else { this.initData(0); } - this.loadData(this.status); + // this.loadData(this.status); }, onShow() { if (this.tabCurrentIndex) { @@ -331,7 +331,7 @@ export default { } else { this.initData(0); } - this.loadData(this.status); + // this.loadData(this.status); }, onLoad(options) { @@ -342,9 +342,9 @@ export default { let status = Number(options.status); this.status = status; this.tabCurrentIndex = status; - if (status == 0) { - this.loadData(status); - } + // if (status == 0) { + // this.loadData(status); + // } }, watch: { From f87ec1866927d013c43a68a3e2defad6054f50e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 21 Apr 2022 11:58:34 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=91=E6=99=BA?= =?UTF-8?q?=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/manifest.json b/manifest.json index 05cd6a4..8bc9ebd 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" From b22ad88f37a822e04e8b4472598adb15516080d6 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 21 Apr 2022 14:58:18 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/promotion/-promotion-details.vue | 2 +- pages/tabbar/home/template/tpl.js | 8 ++++++++ pages/tabbar/home/template/tpl_menu.vue | 20 ++++++++++++------- pages/tabbar/home/template/tpl_title.vue | 8 +++++++- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/pages/product/product/promotion/-promotion-details.vue b/pages/product/product/promotion/-promotion-details.vue index 4ff0e08..d9a52e1 100644 --- a/pages/product/product/promotion/-promotion-details.vue +++ b/pages/product/product/promotion/-promotion-details.vue @@ -15,7 +15,7 @@ 赠送包邮服务 -
+
满{{ res[prom].fullMoney }}元，立享
-
+
- +
{{ item.title }}
@@ -18,15 +23,15 @@
diff --git a/utils/storage.js b/utils/storage.js index 9fefeb3..f7befdd 100644 --- a/utils/storage.js +++ b/utils/storage.js @@ -18,7 +18,16 @@ export default { getHotWords() { return uni.getStorageSync(`hotWords`); }, - + //写入 展示还是不展示 + setShow(val) { + uni.setStorageSync("show", val); + }, + getShow() { + if (uni.getStorageSync(`show`) === "" || uni.getStorageSync(`show`) === undefined) { + return true; + } + return uni.getStorageSync(`show`); + }, // 获取face id登录 getFaceLogin() { return uni.getStorageSync(FACE_LOGIN); 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 13/14] =?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 14/14] =?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; }