update

src/components/CommodityMan/addGoodsClass.vue

@@ -49,7 +49,7 @@
                     </el-tooltip>
                         <div class="app-gallery-item">
                             <el-button @click="userInfo.IconPath='',userInfo.Icon=''" v-if="userInfo.IconPath!=''" type="danger" icon="el-icon-close" circle></el-button>
-                            <img style="width:100px;height:100px" :src="getIconLink(userInfo.IconPath)" alt="">
+                            <img style="width:100%;height:100%" :src="getIconLink(userInfo.IconPath)" alt="">
                         </div>
                 </el-form-item>
                 <el-form-item class="commonLabel discount" label="分类大图">
@@ -61,7 +61,7 @@
                     </el-tooltip>
                     <div class="app-gallery-item">
                         <el-button @click="userInfo.BigIconPath='',userInfo.BigIcon=''" v-if="userInfo.BigIconPath!=''" type="danger" icon="el-icon-close" circle></el-button>
-                        <img style="width:100px;height:100px" :src="getIconLink(userInfo.BigIconPath)" alt="">
+                        <img style="width:100%;height:100%" :src="getIconLink(userInfo.BigIconPath)" alt="">
                     </div>
                     <p class="blue f12">
                         <span @click="czjfDig=true,imgDig=1" class="point">查看图例</span>
@@ -76,7 +76,7 @@
                     </el-tooltip>
                     <div class="app-gallery-item">
                         <el-button @click="userInfo.AdvertisingImagePath='',userInfo.AdvertisingImage=''" v-if="userInfo.AdvertisingImagePath!=''" size="mini" type="danger" icon="el-icon-close" circle></el-button>
-                        <img style="width:100px;height:100px" :src="getIconLink(userInfo.AdvertisingImagePath)" alt="">
+                        <img style="width:100%;height:100%" :src="getIconLink(userInfo.AdvertisingImagePath)" alt="">
                     </div>
                     <p class="blue f12">
                         <span @click="czjfDig=true,imgDig=2" class="point">查看图例</span>
@@ -400,8 +400,8 @@ li{
     padding: 4px 4px!important;
 }
 .addGoodsClass .app-gallery-item{
-    width: 100px;
-    height: 100px;
+    width: 80px;
+    height: 80px;
     border: 1px solid #e3e3e3;
     border-radius: 2px;
     margin-right: 10px;

src/components/CommodityMan/goodsClassification.vue

@@ -688,6 +688,9 @@ export default {
             if(this.tableData2.length>0){
                 this.tableData3=this.tableData2[0].ChildList;
             }
+            if(this.tableData2.length==0){
+                this.tableData3=[];
+            }
             
 
         },

src/components/CommodityMan/goodsList.vue

@@ -31,7 +31,7 @@
             end-placeholder="结束日期">
             </el-date-picker>
             <div class="searchInput" style="width:250px">
-                <el-input style="display:inline-block;width:225px;height:30px"
+                <el-input @keyup.enter.native="getList()" style="display:inline-block;width:225px;height:30px"
                 placeholder="请输入名称搜索"
                 v-model="msg.Name"
                 @clear="getList"
@@ -130,6 +130,10 @@
             width="100"
             sortable
             label="库存">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.InventoryNum==0" style="color:red">售罄</span>
+                    <span v-else>{{scope.row.InventoryNum}}</span>
+                </template> 
             </el-table-column>
             <el-table-column
             prop="SalesNum"
@@ -410,7 +414,7 @@ export default {
             GoodsIds:[],
             plszMsg:{
                 GoodsIds:'',
-                Type:10,
+                Type:7,
                 FreightId:0,
                 LimitBuyGoodsNum:-1,
                 LimitBuyOrderNum:-1,

src/components/CommodityMan/materialMan.vue

@@ -52,14 +52,14 @@
                                 <span>全部</span>
                                 <div style="display:inline-block;float:right">
                                     <div style="margin-left: 20px;display:inline-block;" class="appendInput">
-                                        <el-input size="small" style="width:250px" placeholder="请输入内容" v-model="PageMsg.Name">
+                                        <el-input @keyup.enter.native="GetPageList()" size="small" style="width:250px" placeholder="请输入内容" v-model="PageMsg.Name">
                                             <el-button @click="GetPageList" slot="append" icon="el-icon-search"></el-button>
                                         </el-input>
                                     </div>
                                     <el-checkbox style="margin-left:12px" :indeterminate="isIndeterminate" v-model="checkAll" @change="CheckAllChange">全选</el-checkbox>
                                     <el-button v-if="PageMsg.Recycled==1" @click="HsPage" style="margin:0 12px" size="small">删除</el-button>
                                     <el-button v-if="PageMsg.Recycled==2" @click="HYPage" style="margin-left:12px" size="small">还原</el-button>
-                                    <el-button v-if="PageMsg.Recycled==2" @click="DeletePage" size="small">删除11</el-button>
+                                    <el-button v-if="PageMsg.Recycled==2" @click="DeletePage" size="small">删除</el-button>
                                     <el-dropdown v-if="scgroupMsg.Recycled==1" size="small" split-button>
                                         移动至
                                         <el-dropdown-menu slot="dropdown">
@@ -414,6 +414,7 @@ export default {
     
     SelectGroup(id){
         this.PageMsg.GroupId=id;
+        this.addpageMsg.GroupId=id;
         this.GetPageList();
     },
     EditPage(item){

src/components/UserMan/MembersBuy.vue

@@ -82,7 +82,7 @@
             <div style="margin: 15px 0;"></div>
             <div style="padding: 10px 25px 20px;">
                 <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-                    <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Id">{{city.Name}}</el-checkbox>
+                    <el-checkbox style="margin-bottom:10px;;width:135px" v-for="city in cities" :label="city.Id" :key="city.Id">{{city.Name}}</el-checkbox>
                 </el-checkbox-group>
             </div>
             

src/components/UserMan/disWithdrawal.vue

@@ -18,6 +18,7 @@
                 style="width: 100%;margin:0 0 20px 0">
                 <el-table-column
                 prop="address"
+                width="227"
                 label="基本信息">
                     <template slot-scope="scope">
                         <div class="app-image" :style="{backgroundImage:'url(' + scope.row.Photo + ')',backgroundSize:'cover'}"></div> 
@@ -76,7 +77,7 @@
                         <img v-if="scope.row.AuditStatus==1" @click="openReason(1,scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/pass.png" alt="">
                     </el-tooltip>
                     <el-tooltip class="item" effect="dark" content="拒绝" placement="top-start">
-                        <img v-if="scope.row.AuditStatus==1" @click="openReason(3,scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/nopass.png" alt="">
+                        <img v-if="scope.row.AuditStatus==1 || scope.row.AuditStatus==2" @click="openReason(3,scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/nopass.png" alt="">
                     </el-tooltip>
                 </template>    
                 </el-table-column>
@@ -103,7 +104,7 @@
             <div style="margin: 15px 0;"></div>
             <div style="padding: 10px 25px 20px;">
                 <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-                    <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
+                    <el-checkbox style="margin-bottom:10px;;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
                 </el-checkbox-group>
             </div>
             

src/components/UserMan/distributionOrder.vue

@@ -37,7 +37,7 @@
                     :value="item.Id">
                     </el-option>
                 </el-select>
-                <el-input @clear="getList" clearable style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal" size="small">
+                <el-input @clear="getList"  @keyup.enter.native="getList()" clearable style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal" size="small">
                     <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
                         <el-option
                         v-for="item in option"
@@ -133,8 +133,8 @@
                                     <div>
                                         <span style="font-size: 16px;">￥{{item.Income}}</span>
                                         <el-popover
-                                            placement="top-start"
-                                            title="标题"
+                                            placement="bottom"
+                                            title=""
                                             width="200"
                                             trigger="hover"
                                             :content="'商品小计 '+ item.Income">
@@ -151,9 +151,9 @@
                             <div flex="main:center cross:center" class="app-box-info" style="width: 10%;border-right: 1px solid #EBEEF5;">
                                 <div>待结算</div>
                             </div>
-                            <div flex="main:center cross:center" class="app-order-info" style="border-right: 0px; width: 15%;">
-                                <div>
-                                    <div v-for="(list,index2) in item.OrderCommissionList" :key="index2" shadow="never" style="margin: 10px;">
+                            <div flex="main:center cross:center" class="app-order-info" style="border-right: 0px; width: 20%;">
+                                <div style="margin:0 auto;width:90%;margin-left:17%">
+                                    <div v-for="(list,index2) in item.OrderCommissionList" :key="index2" style="margin: 10px;text-align:left">
                                         <div>
                                             <span v-if="list.Grade==0">自购返利</span>
                                             <span v-if="list.Grade==1">一级佣金</span>
@@ -174,7 +174,7 @@
                                     <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 地址：{{item.ShoppingAddress}}</div>
                                 </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">
@@ -204,7 +204,7 @@
                 <div style="margin: 15px 0;"></div>
                 <div style="padding: 10px 25px 20px;">
                     <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-                        <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
+                        <el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
                     </el-checkbox-group>
                 </div>
                 
@@ -308,7 +308,6 @@ export default {
                 this.msg.UserId='';
                 this.msg.GoodsName=msgVal;
             }
-            this.getList();
         },
      
         Export(){
@@ -342,11 +341,12 @@ export default {
         },
         handleClick(val){
             let dataId=val.$attrs.dataId;
-            this.msg.OrderStatus=dataId;
+            this.msg.OrderType=dataId;
             this.getList();
         },
         
         getList(){
+            this.ChangeId(this.msgId);
             if(!this.msgVal || this.msgVal==''){
                 this.msg.OrderNo='';
                 this.msg.UserName='';

src/components/UserMan/distributorLevel.vue

@@ -105,8 +105,12 @@
             width="150"
             label="操作">
             <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                     <img @click="EditgoUrl(scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/edit.png" alt="">
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
                     <img v-if="scope.row.Enabled==2" @click="Delete(scope.row,1)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
+                </el-tooltip>
             </template>    
             </el-table-column>
         </el-table>

src/components/UserMan/distributors.vue

@@ -21,14 +21,14 @@
           </el-option>
         </el-select>
         <div class="searchInput" style="width:150px">
-          <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入ID" v-model="msg.Id"
+          <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入ID" v-model="msg.UserId"
             size="small" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <div class="searchInput" style="width:150px">
-          <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入昵称" v-model="msg.Name"
+          <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入昵称" v-model="msg.NickName"
             size="small" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
@@ -170,7 +170,7 @@
         <div style="margin: 15px 0;"></div>
         <div style="padding: 10px 25px 20px;">
           <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-            <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Name">
+            <el-checkbox style="margin-bottom:10px;;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">
               {{city.Name}}</el-checkbox>
           </el-checkbox-group>
         </div>
@@ -306,7 +306,7 @@
         msg: {
           pageIndex: 1,
           pageSize: 15,
-          UserId: 0,
+          UserId: '',
           AuditStatus: 0,
           GradeId: -1,
           Name: '',
@@ -394,7 +394,7 @@
         this.apipost("/api/user/GetDistributorInfoReferralsList", this.referMsg, res => {
           this.loading1 = false;
           if (res.data.resultCode == 1) {
-            let pageData = res.data.data.pageData;
+            let pageData = res.data.data;
             this.tableData1 = pageData;
           }
 
@@ -556,6 +556,9 @@
       Export() {
         this.msg.ExcelEnumIds = this.checkedCities;
         let msg = JSON.parse(JSON.stringify(this.msg));
+        if(!msg.UserId && msg.UserId==''){
+          msg.UserId=0;
+        }
         this.JavaGetLocalFile(
           "/api/user/GetDistributorListToExcel",
           msg,
@@ -566,8 +569,12 @@
         this.tableData[index].OpenIdState = !this.tableData[index].OpenIdState;
       },
       getList() {
+        let msg = JSON.parse(JSON.stringify(this.msg));
+        if(!msg.UserId && msg.UserId==''){
+          msg.UserId=0;
+        }
         this.loading = true;
-        this.apipost("/api/user/GetDistributorInfoPageList", this.msg, res => {
+        this.apipost("/api/user/GetDistributorInfoPageList",msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;

src/components/UserMan/setMember.vue

@@ -314,7 +314,6 @@
                 }
               })
             })
-            console.log("this.numList",this.numList)
             
           }
 

src/components/orderMan/afterSalesOrder.vue

@@ -204,7 +204,7 @@
                 <div style="margin: 15px 0;"></div>
                 <div style="padding: 10px 25px 20px;">
                     <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-                        <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
+                        <el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
                     </el-checkbox-group>
                 </div>
                 

src/components/orderMan/evaluationMan.vue

@@ -110,12 +110,12 @@
                             <span>{{scope.row.Content}}</span>
                         </el-tooltip>
                         <div>
-                            <div @click="OpenImg(scope.row)" style="margin: 10px; display: inline-block; cursor: pointer;">
-                                <div class="backImg" style="background-image: url(https://cdnimg.iotweixin.com/uploads/mall1285/20200316/586d61c616082de7c3a7d1d778104785.jpg); background-size: cover;"></div>
+                            <div v-for="(item,index) in scope.row.CommentImgList" :key="index" @click="OpenImg(scope.row)" style="margin: 10px; display: inline-block; cursor: pointer;">
+                                <div class="backImg" :style="{backgroundImage:'url(' + domainManager().ImageUrl+item + ')',backgroundSize:'cover'}"></div>
                             </div>
-                            <div style="margin: 10px; display: inline-block; cursor: pointer;">
+                            <!-- <div style="margin: 10px; display: inline-block; cursor: pointer;">
                                 <div class="backImg" style="background-image: url(https://cdnimg.iotweixin.com/uploads/mall1285/20200316/586d61c616082de7c3a7d1d778104785.jpg); background-size: cover;"></div>
-                            </div>
+                            </div> -->
                         </div>
                     </template>  
                 </el-table-column>
@@ -538,6 +538,9 @@ export default {
 </script>
 
 <style>
+.evaluationMan .el-input.is-active .el-input__inner, .el-input__inner:focus {
+    border-color: #dcdfe6;
+}
 .plDig .table-item .el-radio__label{
     display: none;
 }

src/components/orderMan/orderList.vue

@@ -34,7 +34,7 @@
           <el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id">
           </el-option>
         </el-select>
-        <el-input @clear="getList" clearable style="margin-left:15px;width:300px" class="input-with-select"
+        <el-input @clear="getList"  @keyup.enter.native="getList()" clearable style="margin-left:15px;width:300px" class="input-with-select"
           placeholder="请输入内容" v-model="msgVal" size="small">
           <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
             <el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
@@ -367,7 +367,7 @@
         <div style="margin: 15px 0;"></div>
         <div style="padding: 10px 25px 20px;">
           <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-            <el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Name">
+            <el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">
               {{city.Name}}</el-checkbox>
           </el-checkbox-group>
         </div>
@@ -647,7 +647,7 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = '';
         }
-        if (val == 2) {
+        else if (val == 2) {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = msgVal;
           this.msg.UserName = '';
@@ -657,7 +657,7 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = '';
         }
-        if (val == 3) {
+        else if (val == 3) {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = '';
           this.msg.UserName = msgVal;
@@ -667,7 +667,7 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = '';
         }
-        if (val == 4) {
+        else if (val == 4) {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = '';
           this.msg.UserName = '';
@@ -677,7 +677,7 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = '';
         }
-        if (val == 5) {
+        else if (val == 5) {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = '';
           this.msg.UserName = '';
@@ -687,7 +687,7 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = '';
         }
-        if (val == 6) {
+        else if (val == 6) {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = '';
           this.msg.UserName = '';
@@ -697,7 +697,7 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = '';
         }
-        if (val == 7) {
+        else if (val == 7) {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = '';
           this.msg.UserName = '';
@@ -707,7 +707,7 @@
           this.msg.Mobile = msgVal;
           this.msg.ProductCode = '';
         }
-        if (val == 8) {
+        else if (val == 8) {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = '';
           this.msg.UserName = '';
@@ -717,7 +717,6 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = msgVal;
         }
-        this.getList();
       },
       hszOk() {
         this.apipost('/api/order/SetOrderOperation', this.hszMsg,
@@ -1065,6 +1064,8 @@
       },
 
       getList() {
+        let that=this;
+        that.ChangeId(that.msgId);
         if (!this.msgVal || this.msgVal == '') {
           this.msg.OrderNo = '';
           this.msg.MerchantsNo = '';