Merge remote-tracking branch 'origin/pro-Carl' into pro-Carl

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 = '订单已过期，请重新下单';

rc-busness/pages/index.vue

@@ -22,7 +22,7 @@
         </swiper-slide>
 
         <swiper-slide>
-				<a href="#" target="_blank">
+				<a @click="toMiniShop" target="_blank">
           <picture>
             <source
               media="(max-width: 768px)"
@@ -1038,6 +1038,17 @@
       <div class="userloding"></div>
       <span>数据加载中</span>
     </div>
+	<el-dialog :visible.sync="showMiniShopQr" :close-on-click-modal="false">
+	  <div class="rc-headera">
+	    <div class="rc-title">
+	      <img src="images/qrcode-wxgroup.jpg" alt="" style="margin:0 auto;"/>
+	    </div>
+	    <div class="rc-logmain rc-text--center">
+	      <h3>温馨提示</h3>
+	      <span>请使用微信扫描小程序码</span>
+	    </div>
+	  </div>
+	</el-dialog>
     <Myfooter></Myfooter>
   </div>
 </template>
@@ -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"];

rc-busness/pages/personal/discount.vue

@@ -34,7 +34,7 @@
 						￥
 					</i>
 					<span>
-						{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
+						{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
 					</span>
                 </div>
                 <strong>{{ item.couponName }}</strong>
@@ -43,7 +43,7 @@
                 <i  :style='usercolor'>
                   {{ item.couponDesc }}
                 </i>
-                <div class="rc-userfont">
+                <div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
                     <strong>有效期</strong>
                   <span>{{item.validFrom}}至</span>
                   <em>{{item.validTo}}</em>

rc-busness/pages/personal/settlement.vue

@@ -167,7 +167,7 @@
 						￥
 					</i>
 					<span>
-						{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
+						{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
 					</span>
 				</div>
 				<strong>{{ item.couponName }}</strong>
@@ -176,7 +176,7 @@
 				<i  :style='usercolor'>
 				  {{ item.couponName }}
 				</i>
-				<div class="rc-userfont">
+				<div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
 					<strong>有效期</strong>
 				  <span>{{item.validFrom}}至</span>
 				  <em>{{item.validTo}}</em>
@@ -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;
+				this.discountAmount = this.sumPrice*(1-this.curCoupon.discount);
-				return 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;
+							total = total + (itemInCart.productPrice * itemInCart.buyCount) * (1-this.curCoupon.discount);
-							this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount);
+							this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount;
 							this.discountedProductCode = itemInCart.productCode;
 							couponUsed=true;
 							break;

rc-busness/pages/productdetails/producted.vue

@@ -52,7 +52,7 @@
                 >
                   <div class="rc-img--square">
                     <img :src="item.attachmentPath" v-if="(item.attachmentPath.indexOf('mp4')<0)" />
-					<img src="/images/default.jpg" v-if="(item.attachmentPath.indexOf('mp4')>0)" />
+					<img src="/images/default.jpg" class="ts-video-btn" v-if="(item.attachmentPath.indexOf('mp4')>0)" />
                   </div>
                 </div>
                 <!-- <div class="rc-carousel__gallery-thumbnail">
@@ -237,7 +237,7 @@
 		  			￥
 		  		</i>
 		  		<span>
-		  			{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
+		  			{{ item.couponAmount?item.couponAmount:(parseInt((1-item.discount)*10)+'折') }}
 		  		</span>
 		  	</div>
 		  	<strong>{{ item.couponName }}</strong>
@@ -246,7 +246,7 @@
 		  	<i>
 		  	  {{ item.couponName }}
 		  	</i>
-		  	<div class="rc-userfont">
+		  	<div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
 		  		<strong>有效期</strong>
 		  	  <span>{{item.validFrom}}至</span>
 		  	  <em>{{item.validTo}}</em>
@@ -326,8 +326,6 @@ export default {
 			if (data) {
 				outputObj = data;
 				outputObj.productName = data.name;
-				outputObj.picture = outputObj.picture;
-				outputObj.showImgFile = outputObj.showImgFile;
 				newlist = [outputObj];
 				curItem = outputObj;
 			}
@@ -530,12 +528,8 @@ export default {
 	  let data = await oncequery(this.productCode);
 	  let outputObj = {};
 	  if (data) {
-      console.log(data);
-      debugger
 		outputObj = data;
 		outputObj.productName = data.name;
-		outputObj.picture = 'https://royalcanincn.escase.cn/jc/royalcanin/'+outputObj.picture;
-		outputObj.showImgFile = 'https://royalcanincn.escase.cn/jc/royalcanin/'+outputObj.showImgFile;
 	    this.newlist = [outputObj];
 	  }
 	  let picture = this.newlist[0].picture.split(",");