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

rc-busness/pages/personal/integral.vue

@@ -2,6 +2,7 @@
 <div>
     <Myheader></Myheader>
       <div class="rc-top"></div>
+	  <tabs :crumbs="crumbs"></tabs>
          <div class="rc-max-width--xl rc-padding-y--md">
           <ul>
               <li v-for="(item,index) in userrecord" :key="index">
@@ -36,6 +37,14 @@ import Myheader from '~/components/header.vue'
 export default {
    data(){
        return{
+		   crumbs:[
+				{
+					path:'/personal/mypersonal',
+				},
+				{
+					path:'/personal/integral/',
+				}
+		   ],
            userrecord:[
                {
                    title:'日期',

rc-busness/pages/personal/mypersonal.vue

@@ -3,6 +3,7 @@
 <Myheader></Myheader>
  <!-- <tabs></tabs> -->
 <div class="rc-top"></div>
+	<tabs :crumbs="crumbs" :crumbStyle="`padding-left:0;`"></tabs>
   <div class="rc-layout-container rc-one-column rc-full-width ts-mypersonal">
     <div class="rc-column">
       <!-- <div class="rc-title">
@@ -152,16 +153,21 @@ export default {
 	meta: {title: '个人中心'},
   data() {
     return {
-      userlog:false,
-      islogin:false,
-      dialogInfo1:false,
-	userid:null,
-      usertitle:'',
-      rcvalue:5000,
-         usermessage:'关注皇家爱宠荟，修改个人资料',
-       userimage:require("../../assets/image/rc-new.png"),
-      userlogin:'登录注册',
-         userorder: "新手铲屎官",
+		crumbs:[
+			{
+				path:'/personal/mypersonal',
+			}
+		],
+		userlog:false,
+		islogin:false,
+		dialogInfo1:false,
+		userid:null,
+		usertitle:'',
+		rcvalue:5000,
+		usermessage:'关注皇家爱宠荟，修改个人资料',
+		userimage:require("../../assets/image/rc-new.png"),
+		userlogin:'登录注册',
+		userorder: "新手铲屎官",
       prefecture: [
         {
           title: "待付款",

rc-busness/pages/personal/settlement.less

@@ -10,7 +10,7 @@ ul li ol li em strong i {
 
 
 .settlement {
-    padding-top: 60px;
+    
 }
 
 
@@ -465,7 +465,9 @@ ul li ol li em strong i {
                     display: none;
                     border: none;
                     padding: 0;
-
+					&.show {
+						display:block;
+					}
                     &.active {
                         display: block;
                         border: none;

rc-busness/pages/personal/settlement.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="settlement">
     <Myheader></Myheader>
-    <div class="rc-main">
-    <tabs></tabs>
-    </div>
+	<div class="rc-top"></div>
     <div class="rc_contline"></div>
     <div class="rc-main">
       <div class="address-list">
@@ -28,7 +26,7 @@
             <span>{{ item.address }}</span>
           </div>
         </div>
-        <div class="mypersonal add">
+        <div class="mypersonal add" :class="useraddress.length>0?'':'show'">
           <div
             class="my-delivery"
             @click="addAddress"
@@ -67,10 +65,12 @@
             <span>配送方式:</span>
             <i>{{ shopprice.price }}</i>
           </li>
+		  <!--
           <li>
             <span> 活动促销:</span>
             <i>{{ shopprice.distribution }}</i>
           </li>
+		  -->
           <li>
             <span>商品总价:</span>
             <i class="red">{{ sumPrice }}</i>
@@ -97,7 +97,12 @@
         </div>
       </div>
     </div>
-    <el-dialog :visible.sync="dialogAdd" class="diallog_width" width="'100%" :title="dialogAddTitle">
+    <el-dialog
+      :visible.sync="dialogAdd"
+      class="diallog_width"
+      width="'100%"
+      :title="dialogAddTitle"
+    >
       <div class="tc dl_cont" v-if="dialogAdd">
         <myAddress
           @isClose="dialogCtrl"
@@ -109,9 +114,9 @@
       :visible.sync="dialogPopList"
       class="diallog_width"
       width="'100%"
-       title="选择收货地址"
+      title="选择收货地址"
     >
-      <div class="tc dl_cont" style="padding-bottom: 50px;position: relative;">
+      <div class="tc dl_cont" style="padding-bottom: 50px; position: relative">
         <div class="pop_list">
           <el-row
             class="mypersonal"
@@ -120,17 +125,20 @@
             :class="item.isDefault ? 'active' : ''"
           >
             <el-col :span="4"
-              ><input type="checkbox" v-model="item.checked" @click="selectPopAddress(item)"
+              ><input
+                type="checkbox"
+                v-model="item.checked"
+                @click="selectPopAddress(item)"
             /></el-col>
             <el-col :span="16" class="tl">
-              <div >
+              <div>
                 <p class="inline">{{ item.recipient }}</p>
                 <p class="inline">{{ item.recipientPhone }}</p>
               </div>
-              <p> {{ item.address }}</p>
+              <p>{{ item.address }}</p>
             </el-col>
             <el-col :span="4">
-              <i  @click="editAddress(item)" class="el-icon-edit"></i>
+              <i @click="editAddress(item)" class="el-icon-edit"></i>
             </el-col>
           </el-row>
           <div class="popnewaddr">
@@ -154,8 +162,16 @@ export default {
   meta: { title: "订单结算" },
   data() {
     return {
+	  crumbs:[
+		  {
+		  	path:'/productdetails/productlist/',
+		  },
+		  {
+			path:'/personal/settlement'
+		  }
+	  ],
       goldmedal: [],
-      dialogAddTitle:"",
+      dialogAddTitle: "",
       addressstype: null,
       orderstatus: "",
       userisdelivery: "待收货",
@@ -213,7 +229,7 @@ export default {
       this.useraddress = data;
     },
     editAddress(item) {
-      this.dialogAddTitle='修改收货地址'
+      this.dialogAddTitle = "修改收货地址";
       this.editAddressData = {
         memberId: item.memberId,
         name: item.recipient,
@@ -222,7 +238,7 @@ export default {
         id: item.id,
         cityId: item.cityId,
         districtId: item.districtId,
-        provinceId:item.provinceId,
+        provinceId: item.provinceId,
         provinceName: item.provinceName,
         cityName: item.cityName,
         districtName: item.districtName,
@@ -231,7 +247,7 @@ export default {
       this.dialogAdd = true;
     },
     addAddress() {
-      this.dialogAddTitle='新增收货地址'
+      this.dialogAddTitle = "新增收货地址";
       this.editAddressData = {};
       this.dialogAdd = true;
     },
@@ -239,9 +255,9 @@ export default {
       this.useraddress.forEach((item) => {
         if (item.id == cur.id) {
           item.isDefault = true;
-          item.checked=true
+          item.checked = true;
         } else {
-           item.checked=false
+          item.checked = false;
           item.isDefault = false;
         }
       });
@@ -250,9 +266,9 @@ export default {
       this.useraddress.forEach((item) => {
         if (item.id == cur.id) {
           item.isDefault = true;
-          item.checked=true
+          item.checked = true;
         } else {
-           item.checked=false
+          item.checked = false;
           item.isDefault = false;
         }
       });
@@ -268,7 +284,9 @@ export default {
       let orderAddress = this.useraddress.filter((item) => item.isDefault);
       let postData = [];
       this.goldmedal.forEach((item) => {
+		  let basePoint = (item.basePoint?item.basePoint:0);
         let oneProduct = {
+		  basePoint:basePoint,
           productName: item.productName,
           buyCount: item.buyCount,
           productId: item.productCode,
@@ -344,7 +362,9 @@ export default {
             postData[0].orderAddress.addressUserName +
             " " +
             postData[0].orderAddress.addressPhoneNumber,
-          wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
+          // wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
+          // wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
+          wxPay: res.msg,
         };
         this.$router.push({
           path: "/personal/userpay",
@@ -352,7 +372,7 @@ export default {
             userPayData: JSON.stringify(userPayData),
           },
         });
-      }else{
+      } else {
         this.$message({
           type: "warning",
           message: res.msg,
@@ -384,9 +404,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-
-@import url("../../assets/css/global.less");
+//@import url("../../assets/css/global.less");
 @import "./settlement.less";
 // @import url("../../assets/css/settlement.less");
-
 </style>

rc-busness/pages/personal/usermember.vue

@@ -2,7 +2,8 @@
    <div>
        <Myheader></Myheader>
 	   <div class="rc-top"></div>
-        <div class="rc-full-width rc-max-width--xl rc-padding-y--lg">
+	   	<tabs :crumbs="crumbs"></tabs>
+        <div class="rc-full-width rc-max-width--xl rc-padding-bottom--lg">
                  <div class="rc-main">
                     
                  <div class="rc-center" >
@@ -53,15 +54,24 @@
 <script>
 import Myheader from '~/components/header.vue'
 import Myfooter from '~/components/rc-footer.vue'
+import tabs from "~/components/tabs.vue";
 export default {
 data(){
   
     return{
-              banners:[
-                {src:require("../../assets/image/rc-new.png"),link:""},
-                {src:require("../../assets/image/rc-new1.png"),link:""},
-                {src:require("../../assets/image/rc-new2.png"),link:""},
-            ],
+			crumbs:[
+				{
+					path:'/personal/mypersonal',
+				},
+				{
+					path:'/personal/usermember/',
+				}
+			],
+			banners:[
+				{src:require("../../assets/image/rc-new.png"),link:""},
+				{src:require("../../assets/image/rc-new1.png"),link:""},
+				{src:require("../../assets/image/rc-new2.png"),link:""},
+			],
           userid:null,
           userimage:require("../../assets/image/rc-new.png"),
           userorder:'新手铲屎官',
@@ -251,7 +261,8 @@ methods:{
 },
 components:{
 Myheader,
-Myfooter
+Myfooter,
+tabs
 },
 mounted(){ 
       console.log(this.$refs.userblock);

rc-busness/pages/personal/userpay.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="page_modules">
     <Myheader></Myheader>
+	<div class="rc-top rc-md-up"></div>
     <div class="cont_modules">
-      <tabs></tabs>
       <el-row class="order_info">
         <el-col :span="6" class="ph_hidden">
           <ul class="li_inline">
@@ -19,7 +19,7 @@
         <el-col :span="6" class="ready_right">
           <div class="inline_right">
             <p>付款金额:</p>
-            <p class="price">{{ userPayData.userprice }}</p>
+            <p class="price">￥{{ userPayData.userprice }}</p>
           </div>
           <div class="inline_right">
             <p>收货信息:</p>
@@ -93,18 +93,20 @@ export default {
     return {
       activeIndex: 0,
       isSucess: false,
+	  dialogSuccess: false,
       paytype: "微信",
       userpaystype: [
         {
           paytype: "微信",
           payimage: require("../../assets/pay/wx.png"),
         },
+		/*
         {
           paytype: "支付宝",
           payimage: require("../../assets/pay/zfb.png"),
         },
+		*/
       ],
-      dialogSuccess: true,
       dialogFail: false,
       userPayData: {},
       qrtext:'',
@@ -163,15 +165,18 @@ export default {
       }
     },
     //支付监听
-    async updateOrderWX() {
-      let res = await updateOrderWX();
+
+    async payOrderWX() {
+      let res = await updateOrderWX(this.userPayData.orderId);
       if (res.success) {
         this.qrtext = '成功加入群的二维码';
         this.dialogSuccess = true;
-        clearInterval(this.time);
-      } else {
+
+      } else if (res.fail)  {
         this.dialogFail = true;
-        clearInterval(this.time);
+
+      }else{
+        this.payOrderWX()
       }
     },
   },
@@ -311,7 +316,7 @@ export default {
     }
   }
   .paycord {
-    display: none;
+    //display: none;
   }
 }
 </style>