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

src/components/CommodityMan/goodsClassification.vue

@@ -8,24 +8,34 @@
         <div style="margin-top:10px;background:#fff;padding:20px">
             <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="商品分类" name="first">
-                <div style="margin-bottom:18px">
+                <div style="margin-bottom:18px;display: flex;flex-direction: row;align-items: center;justify-content: space-between">
+                  <div>
                     <template v-if="!dragState">
-                        <div class="searchInput" style="width:250px">
-                            <el-input style="display:inline-block;width:225px;height:30px"
-                            placeholder="请输入搜索内容"
-                            v-model="Name"
-                            size="small"
-                            clearable>
-                            </el-input>
-                            <span @click="getSearch" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
-                        </div>
-                        <el-button @click="dragState=true" style="margin-left:10x;" size="small" type="primary">编辑排序</el-button>
+                      <div class="searchInput" style="width:250px">
+                        <el-input style="display:inline-block;width:225px;height:30px"
+                                  placeholder="请输入搜索内容"
+                                  v-model="Name"
+                                  size="small"
+                                  clearable>
+                        </el-input>
+                        <span @click="getSearch" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
+                      </div>
+                      <el-button @click="dragState=true" style="margin-left:10x;" size="small" type="primary">编辑排序</el-button>
+
                     </template>
                     <template v-if="dragState">
-                        <el-button :loading="saveBtnLoad" @click="addSort" size="small" type="primary">保存排序</el-button>
-                        <el-button @click="dragState=false" style="margin:0 10x;" size="small" type="primary">取消编辑</el-button>
-                        <span>拖动分类名称排序</span>
-                    </template>   
+                      <el-button :loading="saveBtnLoad" @click="addSort" size="small" type="primary">保存排序</el-button>
+                      <el-button @click="dragState=false" style="margin:0 10x;" size="small" type="primary">取消编辑</el-button>
+                      <span>拖动分类名称排序</span>
+                    </template>
+                  </div>
+                  <div>
+                    分类的显示
+                    <el-radio v-model="SetPro" label="1" @change="SetProduct(1)">隐藏</el-radio>
+                    <el-radio v-model="SetPro" label="2" @change="SetProduct(2)">显示</el-radio>
+                  </div>
+
+
                 </div>
                 <div v-loading="loading" flex="dir:left box:mean" class="cat-list nopadding">
                     <el-card class="card-item-box" shadow="never">
@@ -39,7 +49,7 @@
                             :list="tableData1"
                             :options="{ animation:150}"
                             :no-transition-on-drag="false"
-                            draggable= ".draggable" 
+                            draggable= ".draggable"
                             >
                             <!-- @change="change"
                             @start="start"
@@ -88,7 +98,7 @@
                             :list="tableData2"
                             :options="{ animation:150}"
                             :no-transition-on-drag="false"
-                            draggable= ".draggable" 
+                            draggable= ".draggable"
                             >
                             <div @click="getChild2(index,item)" :class="{'draggable':dragState,'itemActive':activeIndex2==index}" v-for="(item,index) in tableData2" :key="item.Id">
                                 <el-row style="padding:7px 0;height:50px;box-sizing:border-box">
@@ -163,7 +173,7 @@
                             :list="tableData2"
                             :options="{ animation:150}"
                             :no-transition-on-drag="false"
-                            draggable= ".draggable" 
+                            draggable= ".draggable"
                             >
                             <div @click="getChild3(index)" :class="{'draggable':dragState,'itemActive':activeIndex3==index}" v-for="(item,index) in tableData3" :key="item.Id">
                                 <el-row style="padding:7px 0;height:50px;box-sizing:border-box">
@@ -262,7 +272,7 @@
                         </el-card>
                     </div>
                     <el-button :loading="saveBtnLoad" @click="transClass" style="margin-top:10px" size="mini" type="primary">开始转移</el-button>
-                    
+
                 </div>
             </el-tab-pane> -->
             <el-tab-pane label="商品批量转移" name="second">
@@ -327,7 +337,7 @@
                         </el-card>
                     </div>
                     <el-button :loading="saveBtnLoad" @click="transClass_t" style="margin-top:10px" size="mini" type="primary">开始转移</el-button>
-                    
+
                 </div>
             </el-tab-pane>
             <el-tab-pane label="分类样式" name="third">
@@ -352,7 +362,7 @@
                         </div>
                     </div>
                     <div>
-                        <div style="padding: 18px 20px;border-bottom: 1px solid #EBEEF5;box-sizing: border-box;"> 
+                        <div style="padding: 18px 20px;border-bottom: 1px solid #EBEEF5;box-sizing: border-box;">
                             显示设置
                         </div>
                         <el-form :model="changestyle" style="padding:0 30px;margin:20px 0" :rules="changestylerules" ref="changestyle" label-width="180px">
@@ -376,7 +386,7 @@
                                     <el-option label="3" :value="3"> </el-option>
                                 </el-select>
                             </el-form-item>
-                        </el-form> 
+                        </el-form>
                         <el-button :loading="saveBtnLoad" @click="SaveStyle('changestyle')" style="margin-left: 10px;" size="small" type="primary">保存</el-button>
 
                     </div>
@@ -416,7 +426,7 @@
                 </el-table-column>
                 <el-table-column
                 prop="Tier"
-                
+
                 label="操作">
                     <template slot-scope="scope">
                         <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -450,6 +460,7 @@ export default {
             val:'',
             activeName:'first',
             dragState:false,
+            SetPro:'0',
             msg1:{
                 Id:0,
                 Name:'',
@@ -551,7 +562,7 @@ export default {
             changestylerules:{
 
             },
-            
+
         }
     },
     created(){
@@ -627,7 +638,7 @@ export default {
                         this.styleList=this.typeList3;
                     }
                 }
-                
+
             })
         },
         getnoChangeData(num){
@@ -733,7 +744,7 @@ export default {
                     null
                 );
             }).catch(() => {
-                
+
             });
         },
         getSearch(){
@@ -745,7 +756,7 @@ export default {
                 this.getList2();
                 this.searchDig=true
             }
-            
+
         },
         addSort(){
             this.sortList=[];
@@ -790,7 +801,7 @@ export default {
             if(this.tableData2.length==0){
                 this.tableData3=[];
             }
-            
+
 
         },
         handleClick(val){
@@ -821,14 +832,14 @@ export default {
                     }
                     if(num && num==1){
                         this.transData1=pageData;
-                    }  
+                    }
                     if(num && num==2){
                         this.transData2=pageData;
-                    } 
-                    
-                    
+                    }
+
+
                 }
-                
+
             })
         },
         getList2(){
@@ -837,11 +848,22 @@ export default {
                 this.loading=false;
                 if(res.data.resultCode==1){
                     let pageData=res.data.data.pageData;
-                    this.searchList=pageData; 
+                    this.searchList=pageData;
                 }
-                
+
             })
         },
+      SetProduct(type){//分类的显示/隐藏
+        this.apipost("/api/product/SetProductCategoryShow", {IsShow:type}, res => {
+          this.loading=false;
+          if(res.data.resultCode==1){
+            this.Success(res.data.message)
+          }else {
+            this.Error(res.data.message);
+          }
+
+        })
+      }
     },
 };
 </script>
@@ -867,10 +889,10 @@ export default {
 }
 .goodsClass .app-style .style-img{
     background-image: url('../../assets/img/userman/select.png');
-     background-size: cover; 
-     background-position: center center; 
-     width: 80px; 
-     height: 80px; 
+     background-size: cover;
+     background-position: center center;
+     width: 80px;
+     height: 80px;
      border-radius: 0%;
 }
 .goodsClass .app-style .image-box .active {

src/components/UserMan/tinyMerchant/tinyMerchantSet.vue

@@ -13,7 +13,7 @@
 
             <el-form-item label="是否开启">
               <el-radio v-model="addMsg.IsOpen" :label="2">开启</el-radio>
-              <el-radio v-model="addMsg.IsOpen" :label="1"  @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.CustomMinFixedPrice = 0,addMsg.CustomMaxFixedPrice = 0">不开启</el-radio>
+              <el-radio v-model="addMsg.IsOpen" :label="1" >不开启</el-radio>
             </el-form-item>
             <el-form-item label="是否需要审核" >
               <el-radio v-model="addMsg.IsExamine" :label="2">开启</el-radio>
@@ -254,11 +254,11 @@
       Save(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            if(this.addMsg.PriceType==1 && this.addMsg.CustomMinPriceRate>=this.addMsg.CustomMaxPriceRate){
+            if(this.addMsg.IsOpen==2 &&  this.addMsg.CustomMinPriceRate>=this.addMsg.CustomMaxPriceRate){
                 this.Error('区间比例从低到高')
                 return
             }
-            if(this.addMsg.PriceType==2 && this.addMsg.CustomMinFixedPrice>=this.addMsg.CustomMaxFixedPrice){
+            if(this.addMsg.IsOpen==2&& this.addMsg.CustomMinFixedPrice>=this.addMsg.CustomMaxFixedPrice){
                 this.Error('区间价格从低到高')
                 return
             }