Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

pages/add-record/index.vue

@@ -79,6 +79,7 @@ export default {
         address: '',
         content: '',
         customerEnterpriseId: this.$store.state.supplierInfo.id || null,
+		mallSupplierId: this.$store.state.supplierInfo.supplierId || null,
         remark: '',
         respondent: ''
       }

pages/follow-up-records/index.vue

@@ -78,7 +78,7 @@ export default {
       params: {
         asc: '',
         desc: '',
-        customerEnterpriseId: null,
+        customerEnterpriseId: this.$store.state.supplierInfo.id || null,
         mallSupplierId: this.$store.state.supplierInfo.supplierId || null
         // enterpriseIds : ['651107734133018624'],
         // mallSupplierId : '670334117090562048',
@@ -103,9 +103,9 @@ export default {
     this.downCallback()
   },
   onLoad(option) {
-    if (option.customerEnterpriseId) {
-      this.params.customerEnterpriseId = option.customerEnterpriseId
-    }
+    // if (option.customerEnterpriseId) {
+    //   this.params.customerEnterpriseId = option.customerEnterpriseId
+    // }
   },
   methods: {
     back,