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

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

@@ -63,7 +63,7 @@
       <el-table-column label="活码状态" width="130">
         <template slot-scope="{ row }">
           <p><span class="dot normal" v-if="row.statusFlag == 1">正常</span><span class="dot voided" v-if="row.statusFlag == 2">作废</span><span class="dot needSure" v-if="row.statusFlag == 3">待生效</span></p>
-          <p class="toTopTip" v-if="row.statusFlag == 1">(今日已达上限)</p>
+          <p class="toTopTip" v-if="row.overFlag == 1">(今日已达上限)</p>
         </template>
       </el-table-column>
       <el-table-column label="添加好友人数" prop="addNum" sortable="custom" width="150">
@@ -132,7 +132,7 @@
       </el-table-column>
     </el-table>
     <div class="block common-wrap__page text-right m-t-24" v-if="tableData.length">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-size.sync="pageParam.pageSize" :current-page.sync="pageParam.pageNum" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[20, 40, 60, 80]" :total="totalCount"> </el-pagination>
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-size.sync="pageParam.pageSize" :current-page.sync="pageParam.pageNo" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[20, 40, 60, 80]" :total="totalCount"> </el-pagination>
     </div>
     <el-dialog title="选择分组" :visible.sync="dialogGroupFormVisible" width="25%">
       <el-form :model="formGroup">
@@ -284,7 +284,7 @@ export default {
       // 分页参数
       pageParam: {
         pageSize: 20,
-        pageNum: 1
+        pageNo: 1
       },
       sortColumn: '',
       sortType: '',
@@ -428,12 +428,12 @@ export default {
     },
     // 当前页变化
     handleCurrentChange(val) {
-      this.pageParam.pageNum = val;
+      this.pageParam.pageNo = val;
       this.getTableList();
     },
     // 页码
     handleSizeChange(val) {
-      this.pageParam.pageNum = 1;
+      this.pageParam.pageNo = 1;
       this.pageParam.pageSize = val;
       this.getTableList();
     },
@@ -445,7 +445,7 @@ export default {
       this.getTableList();
     },
     searchList() {
-      this.pageNum = 1;
+      this.pageParam.pageNo = 1;
       this.getTableList();
     },
     getTableList() {
@@ -491,10 +491,9 @@ export default {
   watch: {
     currentGroupId: {
       handler: function(val) {
-        console.log('val', val, 'val');
         // if (val != null) {
         this.currentGroupId = val;
-        this.pageParam.pageNum = 1;
+        this.pageParam.pageNo = 1;
         this.getTableList();
         // }
       },

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

@@ -47,6 +47,7 @@ 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

@@ -140,6 +140,7 @@ export default {
     },
     // 保存按钮
     save() {
+      console.log(this.form, 'this.form');
       if (!this.$refs.welcomeItem.submit()) {
         return;
       }