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

pages/client-detail/base-paper-deals.vue

@@ -17,7 +17,7 @@
           <view class="left-title">{{ item.customerEnterpriseName }}</view>
           <view class="right-title">¥ {{ item.totalOfferPrice }}</view>
         </view>
-        <view class="content" v-for="(subItem, subIndex) in item.supplierOrderList[0].orderItmes" :key="subIndex">
+        <view class="content" v-for="(subItem, subIndex) in item.supplierOrderList[0].orderItems" :key="subIndex">
           <!-- <image class="image" :src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image> -->
           <image class="image" :src="subItem.productImg" mode=""></image>
           <view class="">
@@ -67,10 +67,10 @@ export default {
       params: {
         asc: '',
         desc: '',
-        // customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
-        // mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
-        customerEnterpriseId: '651107734133018624',
-        mallSupplierId: '670334117090562048', // 供应商id
+        customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
+        mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
+        // customerEnterpriseId: '651107734133018624', // 客户企业ID
+        // mallSupplierId: '670334117090562048', // 供应商id
         status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
         enterpriseIds: [] //企业ID集合网关获取
       },
@@ -80,8 +80,8 @@ export default {
       },
       orderParams: {
         beginDate: '',
-        currentSupplier: '670334117090562048',
-        // currentSupplier: this.$store.state.supplierInfo.supplierId || null,
+        // currentSupplier: '670334117090562048',
+        currentSupplier: this.$store.state.supplierInfo.supplierId || null,
         endDate: ''
       },
       list: [],

pages/client-detail/equipment-information.vue

@@ -176,12 +176,12 @@ export default {
       return new Promise((resolve, reject) => {
         getDeviceInfo({ ...this.params, ...this.pagination })
           .then((res) => {
-            res.records.forEach((el) => {
-              el.collapse = false
-              el.isShowSelect = false
-            })
             // console.log('设备信息', res.records)
             if (res) {
+				res.records.forEach((el) => {
+				  el.collapse = false
+				  el.isShowSelect = false
+				})
               if (this.pagination.pageNum == 1) {
                 this.list = res.records
               } else {

pages/login/index.vue

@@ -139,7 +139,7 @@ export default {
                     store.commit('setToken', token)
                     // 登录成功先查看是否有下一个页面
                     const nextPage = store.state.nextPage
-                    let page = null
+                    let page = undefined
                     if (nextPage.name) {
                       page = { url: nextPage.name, data: nextPage.data, isRedirect: true }
                     }