update

src/components/CommodityMan/RecSettings.vue

@@ -196,12 +196,14 @@ export default {
             this.commonList.forEach(item=>{
                 item.Image=item.CoverImage;
             })
+            let commonList=JSON.parse(JSON.stringify(this.commonList)) 
             if(this.listType==1){
-                this.addMsg.OrderProductList=this.commonList
+                this.addMsg.OrderProductList=this.addMsg.OrderProductList.concat(commonList)
             }else{
-                this.addMsg.CommentProductList=this.commonList
+                this.addMsg.CommentProductList=this.addMsg.CommentProductList.concat(commonList)
             }
             this.ggmbDig=false;
+            console.log("this.addMsg.OrderProductList",this.addMsg.OrderProductList)
         },
         selectionChange(val){
             this.commonList=val;

src/components/CommodityMan/goodsList.vue

@@ -86,8 +86,11 @@
             label="分类">
                 <template slot-scope="scope">
                     <el-tag size="mini" v-if="scope.row.CategoryList && scope.row.CategoryList.length>0">{{scope.row.CategoryList[0].CategoryName}}</el-tag>
-                    <el-tooltip v-for="(item,index) in scope.row.CategoryList" :key="index" class="item" effect="dark" :content="item.CategoryName" placement="top">
-                        <span v-if="scope.row.CategoryList.length>1">...</span>               
+                    <el-tooltip  class="item" effect="dark" placement="top">
+                        <div slot="content">
+                            <span v-for="(item,index) in scope.row.CategoryList" :key="index">{{item.CategoryName}} </span>
+                        </div>
+                        <span v-if="scope.row.CategoryList.length>1 && index==0" v-for="(item,index) in scope.row.CategoryList" :key="index">...</span>               
                     </el-tooltip>
                 </template>
             </el-table-column>
@@ -157,7 +160,7 @@
             </el-table-column>
             <el-table-column
             prop="CreateDate"
-            width="150"
+            width="160"
             label="添加时间">
             </el-table-column>
             <el-table-column
@@ -273,13 +276,13 @@
                             <el-input :disabled="BuyGoodsNumState" v-model="plszMsg.LimitBuyGoodsNum" style="width:254px;margin-left:15px" type="number" min="1" size="small" placeholder="请输入内容" class="input-with-select">
                                 <el-button slot="append">件</el-button>
                             </el-input>
-                            <el-checkbox style="margin-left:10px" v-model="BuyGoodsNumState">不限制</el-checkbox>
+                            <el-checkbox @change="goodChange(BuyGoodsNumState,1)" style="margin-left:10px" v-model="BuyGoodsNumState">不限制</el-checkbox>
                         </el-form-item>
                         <el-form-item label-width="50px" label="订单">
                             <el-input :disabled="BuyOrderNumState" v-model="plszMsg.LimitBuyOrderNum" style="width:254px;margin-left:15px" type="number" min="1" size="small" placeholder="请输入内容" class="input-with-select">
                                 <el-button slot="append">单</el-button>
                             </el-input>
-                            <el-checkbox style="margin-left:10px" v-model="BuyOrderNumState">不限制</el-checkbox>
+                            <el-checkbox @change="goodChange(BuyOrderNumState,2)" style="margin-left:10px" v-model="BuyOrderNumState">不限制</el-checkbox>
                         </el-form-item>
                     </el-form-item>
                     <template v-if="plszMsg.Type==9">
@@ -439,6 +442,17 @@ export default {
         this.getRule();
     },
     methods:{
+        goodChange(val,num){
+            if(!val){
+                if(num==1){
+                    this.plszMsg.LimitBuyGoodsNum=0;
+                }
+                else if(num==2){
+                    this.plszMsg.LimitBuyOrderNum=0;
+                }
+                
+            }
+        },
         Export(){
             let msg = this.msg;
             msg = JSON.parse(JSON.stringify(msg));

src/components/CommodityMan/goodsServices.vue

@@ -65,7 +65,7 @@
                     <template v-else>
                         <el-input v-model="scope.row.SortNew" type="number" min="1" size="small" style="display:inline-block;width:150px"></el-input>
                         <span @click="scope.row.editState=false" class="el-icon-error" style="color: rgb(245, 108, 108);"></span>
-                        <span @click="Edit(scope.row,2)" class="el-icon-success" style="color:#67c23a"></span>
+                        <span @click="Edit(scope.row,2)" class="el-icon-success" style="color:#67c23a;margin-left:10px"></span>
                     </template>
                 </template>  
             </el-table-column>
@@ -79,8 +79,12 @@
             width="200"
             label="操作">
             <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                     <img @click="CommonJump('goodsServicesEdit',{ServiceId:scope.row.Id})" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <img @click="Delete(scope.row)" 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/CommodityMan/quickBuy.vue

@@ -8,7 +8,7 @@
         <div>
             <div class="searchInput" style="width:250px">
                 <el-input style="display:inline-block;width:225px;height:30px"
-                placeholder="请输入规格名搜索"
+                placeholder="请输入名称搜索"
                 v-model="msg.CategoryName"
                 @keyup.enter.native="getList()"
                 @clear="getList"

src/components/UserMan/baseSet.vue

@@ -81,7 +81,7 @@
               </el-input>
             </el-form-item>
             <el-form-item v-if="addMsg.DistributorTier==1 || addMsg.DistributorTier==2 || addMsg.DistributorTier==3"
-              label="佣金是否提完" prop="IsCommissionResidue">
+              label="允许用户多级返佣" prop="IsCommissionResidue">
               <el-radio v-model="addMsg.IsCommissionResidue" :label="1">是</el-radio>
               <el-radio v-model="addMsg.IsCommissionResidue" :label="2">否</el-radio>
             </el-form-item>