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 +