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/client-detail/base-paper-deals.vue

@@ -14,12 +14,12 @@
     <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
       <view class="card-box" v-for="(item, index) in list" :key="index">
         <view class="header">
-          <view class="left-title">{{ item.customerEnterpriseName }}</view>
+          <view class="left-title">{{ item.orderId }}</view>
           <view class="right-title">¥ {{ item.totalOfferPrice }}</view>
         </view>
         <view class="content" v-for="(subItem, subIndex) in item.supplierOrderList[0].orderItems" :key="subIndex">
           <!-- <image class="image" :src="/static/imgs/client/client-default.png" mode=""></image> -->
-          <image class="image" :src="subItem.productImg" mode=""></image>
+          <image class="image" :src="subItem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'" mode=""></image>
           <view class="">
             <view class="title">{{ subItem.productName }}</view>
             <view class="desc">
@@ -75,7 +75,7 @@ export default {
       params: {
         asc: '',
         desc: '',
-        customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
+        customerEnterpriseId: this.id, 
         mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
         // customerEnterpriseId: '651107734133018624', // 客户企业ID
         // mallSupplierId: '670334117090562048', // 供应商id

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,