Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2

rc-busness/pages/personal/discount.vue

@@ -4,6 +4,7 @@
   <Myheader></Myheader>
      <!-- <tabs></tabs> -->
      <div class="rc-top"></div>
+	 <tabs :crumbs="crumbs"></tabs>
       <div class="rc-usermain">
     
         <div class="rc rc-column">
@@ -17,7 +18,7 @@
           </span>
           <!-- <span @click="tanchu()">弹出</span> -->
         </div>
-         <div class="online bold"></div>
+		<div class="online bold"></div>
 
         <div class="rs-dis">
           <div
@@ -29,7 +30,12 @@
             <div class="rc-contair">
               <div class="rc-left" ref="userleft" id="userleft" :style='usercolor'>
                 <div>
-                  <i>￥</i><span>{{item.couponTypeId=='4'?parseInt(((item.discount) *10))+ '折':item.couponAmount}}</span>
+					<i v-if="(item.couponTypeId!='4' && item.couponAmount>0)">
+						￥
+					</i>
+					<span>
+						{{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}}
+					</span>
                 </div>
                 <strong>{{ item.couponName }}</strong>
               </div>
@@ -59,14 +65,22 @@
 
 
 <script>
- import {allConfig,getdraw} from "../../ajax/getData";
-//  import tabs from "@/components/tabs.vue";
+import {allConfig,getdraw} from "../../ajax/getData";
+import tabs from "@/components/tabs.vue";
 export default {
   //    middleware: 'metaTitle',
   //   // middleware: 'metaTitle',
   // meta: {title: '优惠券'},
   data() {
     return {
+		crumbs:[
+				{
+					path:'/personal/mypersonal/',
+				},
+				{
+					path:'/personal/discount/',
+				}
+		],
       userload: true,
       pastdue: false,
       unused: false,
@@ -209,6 +223,7 @@ export default {
   },
   components: {
     Myheader,
+	tabs
   },
 };
 import Myheader from "~/components/header.vue";

rc-busness/pages/personal/integral.vue

@@ -3,7 +3,7 @@
     <Myheader></Myheader>
       <div class="rc-top"></div>
 	  <tabs :crumbs="crumbs"></tabs>
-         <div class="rc-max-width--xl rc-padding-y--md">
+         <div class="rc-max-width--xl rc-padding-bottom--md">
           <ul>
               <li v-for="(item,index) in userrecord" :key="index">
                      {{item.title}}

rc-busness/pages/personal/settlement.less

@@ -183,12 +183,13 @@ ul li ol li em strong i {
             border: 1px solid #d8d8d8;
             margin-right: 20px;
             width: 96px;
-                height: 96px;
+			height: 96px;
 
             img {
                 width: 96px;
                 height: 96px;
                 display: block;
+				object-fit:contain;
             }
         }
 

rc-busness/pages/personal/settlement.vue

@@ -92,7 +92,7 @@
             <em>{{ sumPrice }}</em>
           </div>
           <div style="font-weight: bold">
-            <span @click="jiesuan()">提交订单</span>
+            <span @click="preJiesuan()">提交订单</span>
           </div>
         </div>
       </div>
@@ -280,6 +280,19 @@ export default {
       this.dialogAdd = parm;
       this.getAddressList();
     },
+	preJiesuan(){
+		let checkResult=true;
+		if(this.useraddress.length<=0) {
+			this.$message({
+			  type: "error",
+			  message: '请先添加收件信息',
+			});
+			checkResult=false;
+		}
+		
+		if(checkResult)
+			this.jiesuan();
+	},
     async jiesuan() {
       let orderAddress = this.useraddress.filter((item) => item.isDefault);
       let postData = [];

rc-busness/pages/personal/useraddress.vue

@@ -2,6 +2,7 @@
   <div>
     <Myheader></Myheader>
     <div class="rc-top"></div>
+    <tabs :crumbs="crumbs"></tabs>
     <div class="online bold"></div>
     <div class="usercontshow rc-max-width--xl">
       <div class="rc-headera">
@@ -137,11 +138,20 @@
 
 <script>
 import Myheader from "~/components/header.vue";
-import MyFooter from '~/components/rc-footer.vue'
+import MyFooter from '~/components/rc-footer.vue';
+import tabs from "~/components/tabs.vue";
 import { customerorders, userindent, canceldanhao,generateOrderWX } from "../../ajax/getData";
 export default {
   data() {
     return {
+	  crumbs:[
+		{
+			path:'/personal/mypersonal/',
+		},
+		{
+			path:'/personal/useraddress/',
+		}
+	  ],
       activeIndex: 0,
       userstype:'',
       alllist:[],
@@ -280,7 +290,8 @@ export default {
   },
   components: {
     Myheader,
-    MyFooter
+    MyFooter,
+	tabs
   },
   methods: {
     async indet(mobile, stype) {
@@ -297,7 +308,6 @@ export default {
          this.alllist.push(this.goldmedal[i].orderDetailList[0])
         this.allmessage.push(this.goldmedal[i].orderDetailList[0])
         if(this.goldmedal[i].status==0){
-          console.log("+++++++++++++");
           this.obligation.push(this.goldmedal[i].orderDetailList[0]);
         }else if(this.goldmedal[i].status==1){
           this.receiving.push(this.goldmedal[i].orderDetailList[0]);
@@ -389,7 +399,10 @@ export default {
            this.receiving=[];
            this.pending=[];
         }, 500);
-      }
+      } else if(item.status == 1) { //确认收货
+		  
+	  }
+	  
       if (item.buttontitle == "立即支付") {
         this.$router.push({
           path: "/personal/userpay",

rc-busness/pages/personal/userpay.vue

@@ -87,11 +87,12 @@ import Myheader from "~/components/header.vue";
 import tabs from "@/components/tabs.vue";
 import vueQr from 'vue-qr'
 
-import { generateOrderAlipay, updateOrderWX,repayOrde } from "../../ajax/getData";
+import { generateOrderAlipay, updateOrderWX, monitorOrderNotify } from "../../ajax/getData";
 export default {
   data() {
     return {
       activeIndex: 0,
+	  paymentTimer:undefined,
       isSucess: false,
 	  dialogSuccess: false,
       paytype: "微信",
@@ -131,10 +132,14 @@ export default {
   },
   methods: {
     closeDialogSuccess() {
-      this.qrtext = '';
-      // this.$router.push({
-      //   path: "/index",
-      // });
+		this.qrtext = '';
+		this.$router.push({
+			path: "/myorder/usertion",
+			query:{
+				stype:1,
+				orderNumber:this.userPayData.orderId
+			}
+		});
     },
     closeDialogFail() {
       this.qrtext = '';
@@ -169,16 +174,18 @@ export default {
     //支付监听
 
     async payOrderWX() {
-      let res = await updateOrderWX(this.userPayData.orderId);
+      let res = await monitorOrderNotify(this.userPayData.orderId);
       if (res.success) {
         this.qrtext = '成功加入群的二维码';
         this.dialogSuccess = true;
 
       } else if (res.fail)  {
         this.dialogFail = true;
-
       }else{
-        this.payOrderWX()
+		  let _self = this;
+		  this.paymentTimer = setTimeout(function(){
+			  _self.payOrderWX()
+		  },5000);
       }
     },
   },