!82 2022-1-22 Jiamin

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

rc-busness/pages/personal/discount.vue

@@ -44,7 +44,7 @@
                 </div>
                    <nuxt-link :to="`/productdetails/productlist`">
                 <div  v-if="userload" class="ts-stand">
-                  <span @click="usertiao()" class="ts-standard-btn">立即使用</span>
+                        
                 </div>
                 </nuxt-link>
               </div>

rc-busness/pages/personal/useraddress.vue

@@ -287,6 +287,8 @@ export default {
       let data = await userindent(mobile);
       this.activeIndex = stype;
       this.goldmedal = data;
+      this.alllist=[];
+      this.useralllist=[];
       for (let i = 0; i < this.goldmedal.length; i++) {
         this.useralllist.push(this.goldmedal[i].orderDetailList[0]);
          this.alllist.push(this.goldmedal[i].orderDetailList[0])
@@ -294,7 +296,6 @@ export default {
         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]);
         }
@@ -383,6 +384,8 @@ export default {
         });
         setTimeout(() => {
             this.indet();
+            this.activeIndex=0;
+            this.useralllist=[];
         }, 500);
          
       }
@@ -391,6 +394,15 @@ export default {
     userpay(item, index) {
       if (item.status == 0) {
         this.canceldanhao(item.orderNumber);
+        setTimeout(() => {
+           this.indet(this.userdata);
+           this.useralllist=[];
+           this.alllist=[];
+           this.allmessage=[];
+           this.obligation=[];
+           this.receiving=[];
+           this.pending=[];
+        }, 500);
       }
       if (item.buttontitle == "立即支付") {
         this.$router.push({
@@ -411,13 +423,14 @@ export default {
     },
     selectGoods(item, index) {
       let list=[]
-  
       this.activeIndex = index;
+      console.log(this.obligation)
       if(item.title=='待付款'){
         list=this.obligation
       }
       else if(item.title=='待收货'){
        list=this.receiving
+       console.log(this.receiving);
 
       }else if(item.title=='待发货'){
         this.useralllist=this.pending
@@ -427,7 +440,8 @@ export default {
       else if(item.title=='全部'){
          list=this.alllist
       }
-      console.log(this.useralllist);
+     this.useralllist=[];
+     console.log(this.useralllist,list);
               for (var i = 0; i < this.useralllist.length; i++) {
         this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber;
         this.useralllist[i].status = this.goldmedal[i].status
@@ -437,7 +451,7 @@ export default {
         this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
       }
       this.useralllist=list
-
+   
     },
     userfind(item) {
       if(item.status==0){

rc-busness/pages/useraddress/openaddress.vue

@@ -155,6 +155,12 @@ export default {
     async userdelete(item) {
       console.log(item.memberId);
       let data = await editdelete(this.userid, item.id);
+      if(data){
+            this.$message({
+          type: 'warning',
+          message: '删除成功'
+        });
+      }
      this.editaddress();
       console.log(data);
     },