Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/assets/css/common.css

@@ -112,8 +112,8 @@
 }
 .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .searchInput{
     line-height: normal;

src/components/CommodityMan/addGoodsClass.vue

@@ -360,8 +360,8 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
 }
 .addGoodsClass .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .addGoodsClass .searchInput{
     line-height: normal;

src/components/CommodityMan/goodsClassification.vue

@@ -874,8 +874,8 @@ export default {
 }
 .goodsClass .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .goodsClass .searchInput{
     line-height: normal;

src/components/CommodityMan/goodsListEdit.vue

-<template>
+<template>
   <div class="goodsListEdit">
     <div class="head-title">
       <span @click="CommonJump('goodsList')" class="blue point">商品列表</span>
@@ -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);
       });
@@ -2507,15 +2508,16 @@ export default {
       this.imgType = val;
     },
     SelectId(msg) {
+      let that=this;
       if (this.imgType == 1) {
         let obj = {
           Id: msg.selectId,
-          Path: this.domainManager().ImageUrl + msg.url
+          Path:that.getIconLink(msg.url),
         };
         this.addMsg.CarouselImageList.push(obj);
       }
       if (this.imgType == 2) {
-        this.addMsg.CustomShareImage = this.domainManager().ImageUrl + msg.url;
+        this.addMsg.CustomShareImage = that.getIconLink(msg.url);
       }
       if (this.imgType == 3) {
         let imgListIndex1 = this.imgListIndex1;
@@ -2605,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/goodsServices.vue

@@ -221,8 +221,8 @@ export default {
 }
 .quickBuy .content .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .quickBuy .content .searchInput{
     line-height: normal;

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/CommodityMan/quickBuy.vue

@@ -286,8 +286,8 @@ export default {
 }
 .quickBuy .content .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .quickBuy .content .searchInput{
     line-height: normal;

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)
         })
       },
       // 快递公司

src/router/index.js

@@ -332,6 +332,18 @@ export default new Router({
           name: 'BulkShipment',
           component: resolve => require(['@/components/orderMan/BulkShipment'], resolve),
         },
+        // 订单管理 批量发货
+        {
+          path: '/BulkShipment',
+          name: 'BulkShipment',
+          component: resolve => require(['@/components/orderMan/BulkShipment'], resolve),
+        },
+        // 订单管理 财务配置
+        {
+          path: '/financialAllocation',
+          name: 'financialAllocation',
+          component: resolve => require(['@/components/orderMan/financialAllocation'], resolve),
+        },
 
         //设置 基础设置
         {