update

src/components/CommodityMan/goodsListEdit.vue

@@ -874,7 +874,7 @@
                             type="info"
                             style="margin:5px"
                           >
-                            {{ item.Name }}</el-tag
+                            {{ item.AreaName }}</el-tag
                           >
                         </div>
                       </div>
@@ -2450,7 +2450,8 @@ export default {
       this.AreaList.forEach(item => {
         let obj = {
           Id: item.RegionId,
-          Name: item.RegionName
+          AreaId:item.RegionId,
+          AreaName: item.RegionName
         };
         this.addMsg.AreaList.push(obj);
       });
@@ -2606,6 +2607,7 @@ export default {
         },
         res => {
           this.addMsg = res.data.data;
+          console.log("this.addMsg",this.addMsg)
           this.initShareSettings();
           this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
           this.SpecificationList = this.addMsg.SpecificationList;

src/components/CommodityMan/materialMan.vue

@@ -240,7 +240,7 @@ export default {
             Type:1,
             Recycled:1,
             pageIndex:1,
-            pageSize:15,
+            pageSize:20,
             GroupId:0,
         },
         PageList:[],

src/components/UserMan/usersListEdit.vue

@@ -152,6 +152,8 @@
           UserId: this.UserId
         }, res => {
           this.userInfo = res.data.data;
+          this.msg.Name = this.userInfo.SuperiorName;
+          this.getList();
         })
       },
     },

src/components/orderMan/salesOrderDetails.vue

@@ -541,24 +541,27 @@
         this.apipost("/api/order/GetOrderAfterSaleInfo", {
           ReOrderId: this.ReOrderId
         }, res => {
-          this.dataInfo = res.data.data;
-          let data = res.data.data;
-          // 未付款
-          if (data.CreateDate != '' && data.AuditTime=='') {
-            this.activeStep = 1;
-          }
-          if (data.CreateDate != '' && data.AuditTime!='' && data.FinishTime=='') {
-            this.activeStep = 2;
-          }
-          if (data.FinishTime!='') {
-            this.activeStep = 3;
+          if(res.data.resultCode==1){
+            this.dataInfo = res.data.data;
+            let data = res.data.data;
+            // 未付款
+            if (data.CreateDate != '' && data.AuditTime=='') {
+              this.activeStep = 1;
+            }
+            if (data.CreateDate != '' && data.AuditTime!='' && data.FinishTime=='') {
+              this.activeStep = 2;
+            }
+            if (data.FinishTime!='') {
+              this.activeStep = 3;
+            }
+            
+            if (data.OrderInfo) {
+              this.OrderInfo = data.OrderInfo;
+            }
+            this.DetailList=[];
+            this.DetailList.push(data.OrderInfo)
           }
           
-          if (data.OrderInfo) {
-            this.OrderInfo = data.OrderInfo;
-          }
-          this.DetailList=[];
-          this.DetailList.push(data.OrderInfo)
         })
       },
       // 快递公司