update

src/components/CommodityMan/bulkImport.vue

@@ -63,7 +63,7 @@
                     </el-switch>
                 </el-form-item>
                 <el-form-item>
-                    <el-button @click="save('addMsg')" type="primary" style="margin:0 10px;" size="small">一键导入</el-button>
+                    <el-button :loading="loading" @click="save('addMsg')" type="primary" style="margin:0 10px;" size="small">一键导入</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -163,6 +163,7 @@ export default {
             importFileUrl: this.domainManager().UploadFileUrl,
 
             dataId:0,
+            loading:false,
         }
     },
     created(){
@@ -184,8 +185,9 @@ export default {
                 this.CategoryList.forEach(item=>{
                     this.addMsg.CategoryList.push(item.Id);
                 })
-                
+                this.loading=true;
                 this.apipost("/api/product/SetGoodsBatchImport", this.addMsg, res => {
+                this.loading=false;
                 if (res.data.resultCode == 1) {
                     this.Success(res.data.message)
                     this.addMsg={

src/components/CommodityMan/goodsListEdit.vue

@@ -90,7 +90,7 @@
                     <el-tooltip class="item" effect="dark" content="建议尺寸420*336" placement="top">
                       <el-button @click="openChangeDig(2)" size="small">选择图片</el-button>
                     </el-tooltip>
-                    <div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;">
+                    <div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;border:none">
                       <img v-if="!addMsg.CustomShareImage || addMsg.CustomShareImage==''"
                         src="../../assets/img/default.png" style="width:80px;height:80px" alt="">
                       <el-button @click="clearCustom" style="position: absolute;right: 6px;top: -10px;"
@@ -201,9 +201,8 @@
                           </div>
                           <div flex="dir:left" style="padding: 0px 10px;margin-top: 16px;">
                             <div class="box-grow-0">规格值：</div>
-                            <div v-for="(item2,index2) in item.SpecificationValueList" :key="index2" flex="dir:left"
-                              style="flex-wrap: wrap;">
-                              <div class="attr-list">
+                            <div flex="dir:left" style="flex-wrap: wrap;">
+                              <div v-for="(item2,index2) in item.SpecificationValueList" :key="index2" class="attr-list">
                                 <el-input @input="ggzChange" size="mini" v-model="item2.Name" width="152px"></el-input>
                                 <i @click="Deleteggz(item,index,index2)" class="el-icon-error close"></i>
                                 <div v-if="index==0 && item.EnabledImage==1" flex="cross:center main:center"
@@ -225,9 +224,9 @@
                                   </div>
                                 </div>
                               </div>
-                            </div>
-                            <div flex="dir:left" style="flex-wrap: wrap;">
-                              <span @click="addGgz(item,index)" class="blue f12">添加规格值</span>
+                              <div>
+                                <span @click="addGgz(item,index)" class="blue f12">添加规格值</span>
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -1642,6 +1641,7 @@
               }
               this.butorIntList.push(msg)
             }
+            console.log("butorIntList",this.butorIntList)
 
             this.GetDropdownList();
           }
@@ -1682,7 +1682,7 @@
             }
           })
           this.DropdownList = JSON.parse(JSON.stringify(this.DropdownList));
-          if (!this.$route.query.GoodsId) {
+          if (!this.$route.query.GoodsId || this.addMsg.DistributionCommissionTreeList.length==0) {
             this.GradeCommissionList = [];
             this.DropdownList.forEach(item => {
               let obj2 = {
@@ -1695,6 +1695,7 @@
               this.GradeCommissionList.push(obj2);
             })
             this.GradeCommissionList = JSON.parse(JSON.stringify(this.GradeCommissionList))
+            console.log("this.GradeCommissionList",this.GradeCommissionList)
             this.disList1 = [];
             let objNew = {
               SpecificationSort: '',
@@ -1843,7 +1844,7 @@
     position: absolute;
     right: -8px;
     top: -8px;
-    padding: 4px 4px;
+    padding: 4px 4px!important;
   }
 
   .goodsListEdit .add-image-btn {

src/components/UserMan/verificationMember.vue

@@ -16,11 +16,8 @@
                 </el-option>
             </el-select>
             <el-select class="w100" style="margin-right: 10px;" v-model="value" size="small" placeholder="请选择">
-                <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                <el-option label="全部平台" :value="0"></el-option>
+                <el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
                 </el-option>
             </el-select>
             <div class="searchInput">
@@ -140,12 +137,12 @@
                     { required: true, message: '新手机号', trigger: 'blur' }
                 ],
             },
-
+        platList:[],
         
       };
     },
     created() {
-
+        this.getplat();
     },
     methods: {
         handleCurrentChange(val) {
@@ -155,6 +152,11 @@
         getList(){
 
         },
+        getplat() {
+            this.apipost("/api/user/GetMemberUserSourceEnumList", {}, res => {
+                this.platList = res.data.data;
+            })
+        },
 
     },
     mounted() {

src/components/orderMan/orderDetails.vue

@@ -41,10 +41,10 @@
               </el-step>
             </template>
             <template>
-              <el-step v-if="activeStep>4" title="已结束" icon="el-icon-edit" description="2020-05-13 16:36:11">
+              <el-step v-if="activeStep>4" title="已结束" icon="el-icon-edit" :description="dataInfo.FinishTime">
                 <i :class="activeStep>4?'step05Active':'step05'" slot="icon"></i>
               </el-step>
-              <el-step v-else title="未结束" icon="el-icon-edit" description="2020-05-13 16:36:11">
+              <el-step v-else title="未结束" icon="el-icon-edit">
                 <i :class="activeStep==5?'step05Active':'step05'" slot="icon"></i>
               </el-step>
             </template>
@@ -193,7 +193,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-card shadow="never">
+      <el-card style="margin-top:15px" shadow="never">
         <el-table border :data="dataInfo.DetailList" style="width: 100%">
           <el-table-column prop="Id" label="商品标题">
             <template slot-scope="scope">
@@ -208,21 +208,29 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="规格" width="200">
+          <el-table-column prop="name" label="规格" width="200" align="center">
             <template slot-scope="scope">
               <el-tag :key="index2" v-for="(list,index2) in scope.row.SpecificationList" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
                   {{list}}
               </el-tag>
             </template>
-
           </el-table-column>
-          <el-table-column prop="Unit_Price" label="单价" width="120">
+          <el-table-column prop="Unit_Price" label="单价" width="120" align="center">
+            <template slot-scope="scope">
+             ￥{{scope.row.Unit_Price}}
+            </template>
           </el-table-column>
-          <el-table-column prop="Number" label="数量" width="80">
+          <el-table-column prop="Number" label="数量" width="80" align="center">
           </el-table-column>
-          <el-table-column prop="Original_Price" label="原价" width="120">
+          <el-table-column prop="Original_Price" label="原价" width="120" align="center">
+            <template slot-scope="scope">
+             ￥{{scope.row.Original_Price}}
+            </template>
           </el-table-column>
-          <el-table-column prop="Final_Price" label="折扣后" width="120">
+          <el-table-column prop="Final_Price" label="折扣后" width="120" align="center">
+            <template slot-scope="scope">
+             ￥{{scope.row.Final_Price}}
+            </template>
           </el-table-column>
         </el-table>
         <el-form label-width="200px" class="app-order-count-price">

src/components/orderMan/orderList.vue

@@ -9,9 +9,9 @@
           :multiple="true" 
           :on-success="successUpload"
           :show-file-list="false"
-          accept=".csv, .xlsx,.xls">
-          <el-button size="small" type="primary">
-          批量导入</el-button>
+          accept=".csv">
+          <el-button :loading="btnLoad" size="small" type="primary">
+          赞羊导入</el-button>
       </el-upload>
       <el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
       </el-button>
@@ -26,21 +26,21 @@
           value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
         <span style="margin-left:15px">所属平台：</span>
-        <el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderSource" size="small"
+        <el-select class="w120" @change="getList" v-model="msg.OrderSource" size="small"
           placeholder="请选择">
           <el-option label="全部平台" :value="0"></el-option>
           <el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
           </el-option>
         </el-select>
         <span style="margin-left:15px">订单类型：</span>
-        <el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderType" size="small"
+        <el-select class="w120" @change="getList"  v-model="msg.OrderType" size="small"
           placeholder="请选择">
           <el-option label="全部订单" :value="0"></el-option>
           <el-option v-for="item in orderTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
           </el-option>
         </el-select>
         <span style="margin-left:15px">配送方式：</span>
-        <el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.DeliveryMethod" size="small"
+        <el-select class="w120" @change="getList" v-model="msg.DeliveryMethod" size="small"
           placeholder="请选择">
           <el-option label="全部订单" :value="0"></el-option>
           <el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id">
@@ -156,8 +156,8 @@
                 <div flex="dir:top">
                   <div>
                     <span style="font-size: 16px;">￥{{item.Income}}</span>
-                    <el-popover placement="top-start" title="标题" width="200" trigger="hover"
-                      :content="'商品小计 '+ item.Income">
+                    <el-popover placement="bottom" width="200" trigger="hover"
+                      :content="'商品小计 '+  item.Income +'元'" >
                       <img slot="reference" src="../../assets/img/userman/price.png" alt="">
                     </el-popover>
                   </div>
@@ -235,7 +235,7 @@
                     class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
                 </div>
               </div>
-              <div v-if="item.Remark!=''" class="seller-remark">商家备注：{{item.Remark}}</div>
+              <div v-if="item.Remark && item.Remark!=''" class="seller-remark">商家备注：{{item.Remark}}</div>
             </div>
           </el-card>
           <el-card v-if="tableData.length==0" class="app-order-item" shadow="never">
@@ -582,6 +582,7 @@
         moresendtips: '',
         hszDig: false,
         hszMsg: {},
+        btnLoad:false,
       }
     },
     created() {
@@ -605,7 +606,9 @@
     methods: {
       successUpload(file){
         let path=file.data.Path;
+        this.btnLoad=true;
         this.apipost("/api/order/SetGoodsOrderBatchImport", {FilePath:path}, res => {
+          this.btnLoad=false;
           if (res.data.resultCode == 1) {
             this.Success(res.data.message)
           }else{

src/components/orderMan/salesOrderDetails.vue

@@ -93,7 +93,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-card shadow="never">
+      <el-card style="margin-top:15px" shadow="never">
         <el-table border :data="DetailList" style="width: 100%">
           <el-table-column prop="Id" label="商品标题">
             <template slot-scope="scope">
@@ -108,7 +108,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="规格" width="200">
+          <el-table-column prop="name" label="规格" width="200" align="center">
             <template slot-scope="scope">
               <el-tag :key="index2" v-for="(list,index2) in scope.row.SpecificationList" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
                   {{list}}
@@ -116,13 +116,22 @@
             </template>
 
           </el-table-column>
-          <el-table-column prop="Unit_Price" label="单价" width="120">
+          <el-table-column prop="Unit_Price" label="单价" width="120" align="center">
+            <template slot-scope="scope">
+             ￥{{scope.row.Unit_Price}}
+            </template>
           </el-table-column>
-          <el-table-column prop="Number" label="数量" width="80">
+          <el-table-column prop="Number" label="数量" width="80" align="center">
           </el-table-column>
-          <el-table-column prop="Original_Price" label="原价" width="120">
+          <el-table-column prop="Original_Price" label="原价" width="120" align="center">
+            <template slot-scope="scope">
+             ￥{{scope.row.Original_Price}}
+            </template>
           </el-table-column>
-          <el-table-column prop="Final_Price" label="折扣后" width="120">
+          <el-table-column prop="Final_Price" label="折扣后" width="120" align="center">
+            <template slot-scope="scope">
+             ￥{{scope.row.Final_Price}}
+            </template>
           </el-table-column>
         </el-table>
         <el-form label-width="200px" class="app-order-count-price">