diff --git a/rc-busness/ajax/util.js b/rc-busness/ajax/util.js index 1d383876..469b9115 100644 --- a/rc-busness/ajax/util.js +++ b/rc-busness/ajax/util.js @@ -41,7 +41,7 @@ let util = { if((isWx || !isMobile) && $paytype == 1) { return {'result':true}; } - if(isMobile && $paytype == 3) { + if(isMobile && !isWx && $paytype == 3) { return {'result':true}; } if($paytype == 2) { @@ -50,13 +50,13 @@ let util = { let message=''; switch($paytype) { case "1": - message = '请返回电脑端继续当前订单的支付'; + message = '请返回电脑网页端继续当前订单的支付'; break; case "2": message = '请返回支付宝继续当前订单的支付'; break; case "3": - message = '请返回手机端继续当前订单的支付'; + message = '请返回手机网页端继续当前订单的支付'; break; default: message = '订单已过期,请重新下单'; diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index 5aacad61..b2b1a205 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -22,7 +22,7 @@ - + 数据加载中 + +
+
+ +
+
+

温馨提示

+ 请使用微信扫描小程序码 +
+
+
@@ -1056,6 +1067,7 @@ import { userque, searchchanpin, } from "../ajax/getData"; +import util from "@/ajax/util"; const settings = require("@/config"); export default { middleware: "metaTitle", @@ -1063,6 +1075,8 @@ export default { meta: { title: "首页" }, data() { return { + util, + showMiniShopQr:false, fixedHeader: false, dataLoaded: true, usermargin: { marginTop: "0" }, @@ -1427,6 +1441,15 @@ export default { diaoqi(){ this.$refs['fixRightComponent'].lianxi({title:'营养专家'}); }, + toMiniShop(){ + let isMobile = this.util.isMobile(); + if(isMobile) { + window.location.href="https://miniapp-product.royalcanin.com.cn/rcmini2020/admin/Voucher/urlRedirect.html"; + } else { + this.showMiniShopQr=true; + // /images/qrcode-minishop.png + } + }, playMobileVideo(item) { let videoPath = item.video; let player = this.$refs["mobile-video-player"]; diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index fd34793b..7d7c4572 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -34,7 +34,7 @@ ¥ - {{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }} + {{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }} {{ item.couponName }} @@ -43,7 +43,7 @@ {{ item.couponDesc }} -
+
有效期 {{item.validFrom}}至 {{item.validTo}} diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 88da1551..1288f863 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -167,7 +167,7 @@ ¥ - {{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }} + {{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
{{ item.couponName }} @@ -176,7 +176,7 @@ {{ item.couponName }} -
+
有效期 {{item.validFrom}}至 {{item.validTo}} @@ -291,8 +291,8 @@ export default { this.discountAmount = this.curCoupon.couponAmount; return this.sumPrice - this.curCoupon.couponAmount; } else if(this.curCoupon.discount && this.curCoupon.discount>0) { - this.discountAmount = this.sumPrice*this.curCoupon.discount; - return this.sumPrice * (1-this.curCoupon.discount); + this.discountAmount = this.sumPrice*(1-this.curCoupon.discount); + return this.sumPrice * this.curCoupon.discount; } } else { return this.sumPrice; @@ -330,8 +330,8 @@ export default { break; case 3: //Limited product % discount case 4: //% discount - total = total + (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount; - this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount); + total = total + (itemInCart.productPrice * itemInCart.buyCount) * (1-this.curCoupon.discount); + this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount; this.discountedProductCode = itemInCart.productCode; couponUsed=true; break; diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index a71708a2..bb126e16 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -52,7 +52,7 @@ >
- +