!98 2022-1-24 Jiamin

Merge pull request !98 from Admin/sit-jiamin-v2

rc-busness/pages/myorder/usertion.vue

@@ -3,10 +3,11 @@
     <Myheader></Myheader>
     <div class="rc-top"></div>
       <div class="rc-main"  v-for="(item,index) in goldmedal" :key="item.id" >
-        <div class="rc-receiving"  >
+        <div class="rc-main rc-receiving"  >
           <em>{{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}}</em>
           <span>{{orderstatus}}</span>
         </div>
+        
         <div class="delivery" v-if="isshow" >
           <div class="to-delivery">
             <span>{{ trackingstates}}</span>
@@ -19,23 +20,17 @@
                 <img :src="leftico" alt="" /> 
            </div>
         </div>
-
         <div
           class="mypersonal"
-          v-for="(datddress, index) in useraddress"
-          :key="datddress.id"
         >
           <div class="my-delivery">
-            <span>{{ datddress.recipient }}</span>
-            <i>{{ datddress.recipientPhone }}</i>
+            <span>{{ item.addressUserName }}</span>
+            <i>{{ item.addressPhoneNumber }}</i>
           </div>
           <div class="per-delivery">
-            <span>{{ datddress.provinceName }}{{datddress.cityName}}{{datddress.districtName}}{{datddress.detailAddress}}</span>
+            <span>{{ item.addressProvinceName }}{{item.addressCityName}}{{item.addressCountyName}}</span>
           </div>
         </div>
-
-
-
         <div >
         <div class="rc-center">
           <div class="rc-usermain" v-for="(userlist,index) in item.orderDetailList" :key="index">
@@ -124,8 +119,8 @@
               <i>合计金额:</i>
                <em>￥{{usersalesAmount}}</em>
                </div>
-               <div style="padding-bottom:40px">
-               <span @click="onceagain()">再次购买</span>
+               <div style="padding-bottom:40px;cursor: pointer">
+               <span @click="onceagain(item)"> {{payorsucess}}</span>
                </div>
           </div>
 
@@ -159,6 +154,7 @@ export default {
       goldmedal:[],
       userproductId:'',
       logisticsDate:'',
+      addressPhoneNumber:'',
       userphone:'',
       logisticsNumber:'',
       customer:'',//联系客服或者取消订单
@@ -168,6 +164,7 @@ export default {
       logisticsCompany:'',//物流公司
       orderstatus: '',
       goldastates:'',
+      
       userisdelivery:'待收货',
       userdelivery: "派送中",
       isshow:true,
@@ -241,11 +238,11 @@ userpay(){
  }
 },
 //订单支付和再次购买
-   onceagain(){
+   onceagain(item){
      console.log(this.payorsucess);
      if(this.payorsucess=='立即支付'){
        console.log('----')
-      this.getwei();
+      this.getwei(item);
 
      }else{
        this.$router.push({
@@ -268,6 +265,7 @@ if(data){
   console.log(this.goldmedal);
   for(let i=0;i<this.goldmedal.length;i++){
     this.goldastates=this.goldmedal[i].status;
+
     this.userproductId=this.goldmedal[i].orderDetailList[0].productId;
     this.logisticsNumber=this.goldmedal[i].orderDetailList[0].logisticsNumber;  //物流单号
      this.trackingstates=this.goldmedal[i].orderDetailList[0].status//运输状态
@@ -285,7 +283,7 @@ if(data){
     this.orderNumber=this.goldmedal[i].orderNumber
     this.usersalesAmount=this.goldmedal[i].salesAmount;
     this.addressUserName=this.goldmedal[i].addressUserName;
-
+    this.addressPhoneNumber=this.goldmedal[i].addressPhoneNumber;
   }
   console.log(this.goldmedal,this.userproductId,this.usersalesAmount);
 }
@@ -296,10 +294,11 @@ if(data){
     async getwei(user) {
       console.log(user);
        let userPayData = {
+
           userprice: this.usersalesAmount,
            orderId:this.orderNumber,
-          userinformation:this.useraddress[0].recipient +
-            " "+this.userphone
+          userinformation:this.addressUserName +
+            " "+this.addressPhoneNumber
         };
           this.$router.push({
           path: "/personal/userpay",
@@ -310,12 +309,7 @@ if(data){
 
           },
         });
-        //      this.$router.push({
-        //   path: "/personal/userpay",
-        //   query: {
-           
-        //   },
-        // });
+        
     },
         async editaddress(user) {
     //  user.data.id=844350;

rc-busness/pages/personal/discount.vue

@@ -48,7 +48,7 @@
                   <span>{{item.validFrom}}至</span>
                   <em>{{item.validTo}}</em>
                 </div>
-                   <nuxt-link :to="`/productdetails/productlist`">
+                   <nuxt-link :to="`/productdetails/productlist`" v-if="activeIndex==0">
                 <div class="ts-standard-btn">
                         立即使用
                 </div>

rc-busness/pages/personal/useraddress.vue

@@ -320,7 +320,7 @@ export default {
         this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
         this.useralllist[i].status = this.goldmedal[i].status;
          this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName;
-           this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber;
+           this.useralllist[i].phoneNumber = this.goldmedal[i].addressPhoneNumber;
         this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
           //  this.useralllist[i].picFile = this.goldmedal[i].picFile; //图片路径
           //  this.useralllist[i].productName=this.goldmedal[i].productName;//商品名称

rc-busness/pages/userlogin/edit.vue

@@ -256,10 +256,14 @@ export default {
       else{
         //let user= JSON.parse(localStorage.getItem("userInfo"));
         let data = await this.vadmsg();
-        if(data.code=="1")
+        console.log(data.code)
+        if(data.code=1)
         {
+          console.log('---');
           data=await useredit(this.tel);
-          if(data.code=='1'){
+          console.log(this.tel);
+          console.log(data);
+          if(data.code=1){
             let couponId='0000000123';
             this.serdiscount(this.tel,couponId);
             setTimeout(() => {