Merge branch 'feature/act-code' into dev

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

@@ -166,7 +166,7 @@ export default {
         startTime,
         endTime,
         // addChannel: 1,
-        addChannel: linkId ? 1 : hmId ? 2 : 0, // 不具备传0
+        addChannel: linkId ? 1 : hmId ? this.$route.query.addChannel : 0, // 不具备传0
         createTimeOrder: that.sortType || ''
       };
       postJsonRequest('/haoban-manage3-web/hm/qrcode/wxUserAddLog/list', para)
@@ -195,6 +195,7 @@ export default {
   mounted() {
     let that = this;
     that.getTableList();
+    console.log(this.$route.query);
   }
 };
 </script>

src/views/salesleads/components/dataDetail.vue

@@ -58,6 +58,7 @@
 import { detailClerkList } from '@/api/actCode.js';
 import { _debounce } from '@/common/js/public';
 import mixin from '../actCodeManage/components/mixin';
+import { getRequest } from '@/api/api';
 export default {
   name: 'DateDetail',
   props: {
@@ -126,7 +127,8 @@ export default {
             return time.getTime() <= start || time.getTime() >= end;
           }
         };
-      }
+      },
+      hmTypeLook: null
     };
   },
   created() {
@@ -230,8 +232,6 @@ export default {
         delete paras.inFields.storeSelect;
         delete paras.inFields.clerkSelect;
       }
-
-      console.log(this.api, 'api');
       await this.api(paras).then(res => {
         if (res.data.code == 0) {
           this.tableData = res.data.result.result || [];
@@ -252,7 +252,13 @@ export default {
       if (linkId) {
         this.$router.push({ path: '/attLinkRecord', query: query });
       } else {
-        this.$router.push({ path: '/actCodeRecord', query: query });
+        if (this.id) {
+          getRequest('/haoban-manage3-web/hm/qrcode/detail', { hmId: this.id }).then(res => {
+            this.hmTypeLook = res.data.result.hmType;
+            query.addChannel = this.hmTypeLook;
+            this.$router.push({ path: '/actCodeRecord', query: query });
+          });
+        }
       }
     }
   }