1

src/components/CommodityMan/goodsClassification.vue

@@ -30,12 +30,10 @@
                     </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>
+                    
+                    <el-button type="primary" @click="SetProduct(1)" size="small">隐藏分类</el-button>
+                    <el-button type="primary" @click="SetProduct(2)" size="small">显示分类</el-button>
                   </div>
-
-
                 </div>
                 <div v-loading="loading" flex="dir:left box:mean" class="cat-list nopadding">
                     <el-card class="card-item-box" shadow="never">
@@ -854,15 +852,36 @@ export default {
             })
         },
       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);
+          let that = this;
+          let text
+          if(type==1){
+            text = '是否隐藏分类菜单！'
+          }
+          if(type==2){
+            text = '是否显示分类菜单！'
           }
+        that.$confirm(text, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.apipost("/api/product/SetProductCategoryShow", {IsShow:type}, res => {
+            this.loading=false;
+            if(res.data.resultCode==1){
+              this.Success(res.data.message)
+              this.getList1()
+              if(type==1){
+                this.tableData2=[]
+              }
+            }else {
+              this.Error(res.data.message);
+            }
+
+          })
+        }).catch(() => {
+
+        });
 
-        })
       }
     },
 };

src/components/UserMan/tinyMerchant/wdExamine.vue

@@ -109,7 +109,7 @@
         background
         @current-change="handleCurrentChange"
         :page-size="msg.pageSize"
-        layout="prev, pager, next"
+        layout="total,prev, pager, next"
         :current-page.sync="msg.pageIndex"
         :total="total">
         </el-pagination>

src/components/sallCenter/addCoupon.vue

@@ -13,7 +13,7 @@
         <el-tabs v-model="activeName"  style="padding: 15px 0">
           <el-tab-pane label="基础设置" name="first">
             <div class="form-body">
-              <el-form-item label="卡券名称" prop="Name" class="is-required">
+              <el-form-item label="优惠券名称" prop="Name" class="is-required">
                 <el-input v-model="msg.Name" />
               </el-form-item>
               <el-form-item label="微店铺">
@@ -24,6 +24,12 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="是否赞羊使用">
+                <el-radio-group v-model="msg.IsZanYangUse">
+                  <el-radio :label="0">否</el-radio>
+                  <el-radio :label="1">是</el-radio>
+                </el-radio-group>
+              </el-form-item>
               <el-form-item label="优惠券类型" class="is-required">
                 <el-radio-group v-model="msg.CouponType" @change="msg.DiscountsPrice = 0">
                   <el-radio :label="1">满减券</el-radio>
@@ -311,6 +317,7 @@
                 EndDate:'',
                 value:[],
                 SmallShopId:0,//微店id
+                IsZanYangUse:0,
               },
             checkedkeys:[],//默认选中的
             huiyuan:false,