diff --git a/App.vue b/App.vue index f514d50..c7e2217 100644 --- a/App.vue +++ b/App.vue @@ -64,9 +64,18 @@ export default { // #endif }, - onShow() { + onShow() { // #ifndef H5 - this.getClipboard(); + // this.getClipboard(); + // #endif + // #ifdef APP-PLUS + console.log(storage.getShow()); + if (storage.getShow()) { + if(uni.getSystemInfoSync().platform == 'ios'){ + this.$u.route("/pages/tabbar/screen/fullScreen"); + // uni.reLaunch({ url: "/pages/tabbar/screen/fullScreen" }); + } + } // #endif }, methods: { diff --git a/androidPrivacy.json b/androidPrivacy.json new file mode 100644 index 0000000..5a57f2b --- /dev/null +++ b/androidPrivacy.json @@ -0,0 +1,17 @@ +{ + "version" : "1", + "prompt" : "template", + "title" : "服务协议和隐私政策", + "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "buttonAccept" : "同意并接受", + "buttonRefuse" : "暂不同意", + "second" : { + "title" : "确认提示", + "message" : "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", + "buttonAccept" : "同意并继续", + "buttonRefuse" : "退出应用" + }, + "styles" : { + "borderRadius" : "5px" + } +} diff --git a/config/config.js b/config/config.js index 48013e5..9624a59 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 + 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 1f7eaf5..33d1dd9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name" : "lili商城", - "appid" : "__UNI__C100675", + "appid" : "__UNI__83F0C3D", "description" : "", - "versionName" : "4.2.4", - "versionCode" : 4000240, + "versionName" : "4.2.5", + "versionCode" : 4000250, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/pages.json b/pages.json index 9b10a21..4d1a33f 100644 --- a/pages.json +++ b/pages.json @@ -14,7 +14,18 @@ "enablePullDownRefresh":true } }, - + { + "path":"pages/tabbar/screen/fullScreen", + "style": { + "navigationStyle": "custom", // 隐藏系统导航栏 + "app-plus":{ + "animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型 + "background": "transparent", // 背景透明 + "backgroundColor": "rgba(0,0,0,0)", // 背景透明 + "popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能 + } + } + }, { "path": "pages/tabbar/cart/cartList", "style": { 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/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: [], //足迹列表 diff --git a/pages/mine/point/myPoint.vue b/pages/mine/point/myPoint.vue index f6df627..4753686 100644 --- a/pages/mine/point/myPoint.vue +++ b/pages/mine/point/myPoint.vue @@ -11,11 +11,11 @@ 累计获得： - {{ pointData.point || 0 }} + {{ pointData.totalPoint || 0 }} - 未使用： - {{ pointData.variablePoint || 0 }} + 剩余积分： + {{ pointData.point || 0 }} 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/fillorder.vue b/pages/order/fillorder.vue index d66a640..e0c03a8 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -10,7 +10,10 @@
默认 -
+
-
-
-
- {{ item.storeName }} -
-
-
{{ item.promotionNotice || "" }}
-
-
- -
-
-
-

{{ val.goodsSku.goodsName }}

- x{{ val.num }} +
+
+
+
+ {{ item.storeName }}
-

- ￥ - {{ formatPrice(val.goodsSku.price)[0] }} - .{{ formatPrice(val.goodsSku.price)[1] }} -

-
- - 发票信息 - - {{ receiptList.receiptTitle }} - {{ receiptList.receiptContent }} - 不开发票 - - - - 配送 - - {{ item.promotionNotice || "" }}
+
- {{ - shippingMethod.find((e) => { - return e.value == shippingText; - }).label - }} - - - - 备注信息 - - - - +
+ +
+
+
+

{{ val.goodsSku.goodsName }}

+ x{{ val.num }} +
+

+ ￥ + {{ + formatPrice(val.goodsSku.price)[0] + }} + .{{ formatPrice(val.goodsSku.price)[1] }} +

+
+
+ + 发票信息 + + {{ receiptList.receiptTitle }} - + {{ receiptList.receiptContent }} + 不开发票 + + + + 配送 + + + {{ + shippingMethod.find((e) => { + return e.value == shippingText; + }).label + }} + + + + 备注信息 + + + + +
- +
@@ -190,22 +217,30 @@ 商品合计 - ￥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }} + ￥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }}
- 运费 + 运费 - 包邮 + 包邮 ￥{{ orderMessage.priceDetailDTO.freightPrice | unitPrice }}￥{{ + orderMessage.priceDetailDTO.freightPrice | unitPrice + }} @@ -215,7 +250,10 @@ @@ -249,7 +287,9 @@ 活动优惠 -￥{{ orderMessage.priceDetailDTO.discountPrice | unitPrice }}-￥{{ + orderMessage.priceDetailDTO.discountPrice | unitPrice + }} 0.00 @@ -277,7 +317,9 @@ {{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[0] }} - .{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} + .{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} +
{{ @@ -448,7 +490,9 @@ export default { this.navigateTo( `/pages/mine/address/address?from=cart&way=${ this.routerVal.way - }&parentOrder=${encodeURIComponent(JSON.stringify(this.routerVal.parentOrder))}` + }&parentOrder=${encodeURIComponent( + JSON.stringify(this.routerVal.parentOrder) + )}` ); }, @@ -483,9 +527,11 @@ export default { this.orderMessage.storeCoupons && Object.keys(this.orderMessage.storeCoupons)[0] ) { - let storeMemberCouponsId = Object.keys(this.orderMessage.storeCoupons)[0]; - let storeCouponId = this.orderMessage.storeCoupons[storeMemberCouponsId] - .memberCoupon.id; + let storeMemberCouponsId = Object.keys( + this.orderMessage.storeCoupons + )[0]; + let storeCouponId = + this.orderMessage.storeCoupons[storeMemberCouponsId].memberCoupon.id; selectedCoupon.push(storeCouponId); } this.orderMessage.cartList.forEach((item) => { @@ -608,9 +654,8 @@ export default { // 如果没有商品选择地址的话 则选择 默认地址 API_Address.getAddressDefault().then((res) => { if (res.data.result) { - res.data.result.consigneeAddressPath = res.data.result.consigneeAddressPath.split( - "," - ); + res.data.result.consigneeAddressPath = + res.data.result.consigneeAddressPath.split(","); this.address = res.data.result; } }); @@ -621,6 +666,14 @@ export default { this.notSupportFreight = []; // 获取结算参数 API_Trade.getCheckoutParams(this.routerVal.way).then((res) => { + if ( + !res.data.result.checkedSkuList || + res.data.result.checkedSkuList.length === 0 + ) { + uni.switchTab({ + url: "/pages/tabbar/cart/cartList", + }); + } if (res.data.result.skuList.length <= 0) { uni.redirectTo({ url: "/pages/order/myOrder?status=0", @@ -645,9 +698,8 @@ export default { this.getUserAddress(); } else { this.address = res.data.result.memberAddress; - res.data.result.memberAddress.consigneeAddressPath = res.data.result.memberAddress.consigneeAddressPath.split( - "," - ); + res.data.result.memberAddress.consigneeAddressPath = + res.data.result.memberAddress.consigneeAddressPath.split(","); } if ( diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index 103595a..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)" > 退款/售后 @@ -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: { 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/product/product/promotion/-promotion-coupon.vue b/pages/product/product/promotion/-promotion-coupon.vue index 4b1efae..0948a1e 100644 --- a/pages/product/product/promotion/-promotion-coupon.vue +++ b/pages/product/product/promotion/-promotion-coupon.vue @@ -1,184 +1,184 @@ - - - - - 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 }}元，立享 { if (item.roomGoodsList) { item.roomGoodsList = JSON.parse(item.roomGoodsList); diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js index 8b74eb0..e0d8f23 100644 --- a/pages/tabbar/home/template/tpl.js +++ b/pages/tabbar/home/template/tpl.js @@ -102,6 +102,14 @@ export function modelNavigateTo(item) { url: `/pages/product/shopList`, }); break; + case "外部链接": + // #ifdef H5 + window.location.href = val.url; + // #endif + // #ifdef APP-PLUS + plus.runtime.openURL(val.url) //不需要拼接\ + // #endif + break; } break; diff --git a/pages/tabbar/home/template/tpl_menu.vue b/pages/tabbar/home/template/tpl_menu.vue index 29f6b6e..d57f44d 100644 --- a/pages/tabbar/home/template/tpl_menu.vue +++ b/pages/tabbar/home/template/tpl_menu.vue @@ -1,7 +1,12 @@ 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..ac4f57c 100644 --- a/pages/tabbar/home/template/tpl_title.vue +++ b/pages/tabbar/home/template/tpl_title.vue @@ -1,24 +1,34 @@ + diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue index 9fb5739..56f7683 100644 --- a/pages/tabbar/home/views.vue +++ b/pages/tabbar/home/views.vue @@ -1,10 +1,15 @@ @@ -29,4 +38,4 @@ export default { margin: 0; } } - \ No newline at end of file + diff --git a/pages/tabbar/screen/fullScreen.vue b/pages/tabbar/screen/fullScreen.vue new file mode 100644 index 0000000..f089fa2 --- /dev/null +++ b/pages/tabbar/screen/fullScreen.vue @@ -0,0 +1,95 @@ + + + + + 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; } 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);