Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue

@@ -84,8 +84,8 @@ export default {
         { value: '正常-今日已达上限', style: 'warning' }
       ],
       statusIndex: 1,
-      scrollTop: 0,
-      scrollStyle: 'position:fixed;top:80px;z-index:1;padding-bottom:0;height:40px;background:yellow;'
+      scrollTop: 0
+      // scrollStyle: 'position:fixed;top:110px;z-index:1;padding-bottom:0;height:40px;background:yellow;'
     };
   },
   methods: {
@@ -159,7 +159,7 @@ export default {
     scrollMethod: _throttle(function() {
       // 节流会不自然 左右不滑动
       this.scrollTop = document.getElementById('hb-layout-pager-one').scrollTop;
-      console.log(this.scrollTop);
+      // console.log(this.scrollTop);
     }, 100)
   },
   mounted() {
@@ -197,7 +197,7 @@ export default {
 }
 .fixed-tab {
   position: absolute;
-  top: 80px;
+  top: 110px;
   z-index: 1;
   padding-bottom: 0;
   height: 40px;

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -12,10 +12,10 @@
           <el-option label="使用成员" :value="2"></el-option>
         </el-select>
         <el-select v-model="inFields.storeSelect" v-if="storeSelect == 1" filterable remote placeholder="请输入门店名称/code" :remote-method="remoteMethods" :loading="selectLoading" v-loadmore="onLoadmoreStore" @change="searchList" style="margin-left: -4px; width:196px;">
-          <el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeCode"> </el-option>
+          <el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeId"> </el-option>
         </el-select>
         <el-select v-model="inFields.clerkSelect" v-if="storeSelect == 2" filterable remote placeholder="请输入成员名称/code" :loading="selectLoading" @change="searchList" style="margin-left: -4px; width:196px;">
-          <el-option v-for="item in memberList" :key="item.clerkId" :label="item.clerkName" :value="item.clerkCode"> </el-option>
+          <el-option v-for="item in memberList" :key="item.clerkId" :label="item.clerkName" :value="item.clerkId"> </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -217,7 +217,7 @@ export default {
           text: '数据',
           visible: true,
           handler: row => {
-            this.$router.push(`/actCodeDetail?id=${row.hmId}&activeName=second`);
+            this.$router.push(`/actCodeDetail?hmId=${row.hmId}&activeName=second`);
           }
         },
         {

src/views/salesleads/actCodeManage/staffActCode/views/setActCode.vue

@@ -47,7 +47,6 @@ export default {
     };
   },
   created() {
-    console.log(this.$route.query.hmId, 'this.$route.query.hmId');
     if (this.$route.query.hmId) {
       this.getActCodeInfo();
     }

src/views/salesleads/components/act-code-set.vue

@@ -62,8 +62,8 @@ export default {
         // name: '', // 名称
         hmGroupId: '', //活码分组id
         passFlag: true, // 1自动通过 0否
-        memberLabelId: 'fd6b44967aa647bcadfad10706244c56', //会员活动标签id
-        memberLabelName: '测试121212-木瑾0630测试标签值50',
+        memberLabelId: '', //会员活动标签id
+        memberLabelName: '',
         welcomeId: '' // 欢迎语id
         // clerkIdList: '', // 选择导购id
         // storeId: '' //门店id
@@ -86,6 +86,7 @@ export default {
   },
   created() {
     this.searchGroup();
+    console.log(this.form, 400);
   },
   methods: {
     handleTagCloseTag() {
@@ -140,7 +141,6 @@ export default {
     },
     // 保存按钮
     save() {
-      console.log(this.form, 'this.form');
       if (!this.$refs.welcomeItem.submit()) {
         return;
       }
@@ -157,7 +157,7 @@ export default {
       handler: function(val) {
         if (val) {
           this.form.hmGroupId = val.hmGroupId;
-          this.form.passFlag = val.passFlag == 1 ? true : false;
+          // this.form.passFlag = val.passFlag == 1 ? true : false;
           this.form.memberLabelId = val.memberLabelId ? val.memberLabelId : '';
           this.form.memberLabelName = val.memberLabelName ? val.memberLabelName : '';
           this.form.welcomeId = val.welcomeId;