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

components/scroll-list/scroll-list.vue

@@ -25,7 +25,7 @@
         </view>
         <view class="empty-wrap" v-if="showEmpty">
           <slot name="empty" v-if="$slots.empty"></slot>
-          <view class="empty-view" v-else>
+          <view class="empty-view flex-col-center-center" v-else>
             <image class="empty-image" :src="defaultOption.emptyImage || images.empty" mode="aspectFit"></image>
             <text class="empty-text" :style="[emptyTextStyle]">{{ emptyText }}</text>
           </view>

pages/add-paper/index.vue

@@ -503,7 +503,7 @@ export default {
       for (let i = 0; i < validateFields.length; i++) {
         if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') {
           uni.showToast({
-            title: '请完善信息',
+            title: '请完善纸品基础信息',
             icon: 'none'
           })
           return
@@ -513,7 +513,7 @@ export default {
         for (let z = 0; z < this.skuList.length; z++) {
           if (this.skuList[z][validatePriceFields[j]] === null || this.skuList[z][validatePriceFields[j]] === '') {
             uni.showToast({
-              title: '请完善信息',
+              title: '请完善纸品售价信息',
               icon: 'none'
             })
             return
@@ -758,13 +758,13 @@ export default {
     height: 88rpx;
     border-radius: 10rpx;
     line-height: 80rpx;
-    width: 150px;
+    width: 270rpx;
   }
   .btn-class-upload {
     height: 88rpx;
     border-radius: 10rpx;
     line-height: 80rpx;
-    width: 200px;
+    width: 400rpx;
   }
   .uploud-btn {
     display: flex;

pages/mall/index.vue

@@ -136,7 +136,7 @@ export default {
       this.storeInformation = {
         supplierId: this.$store.state.supplierInfo.supplierId
       }
-      this.queryData()
+      this.downCallback()
       this.getSupplier(this.$store.state.supplierInfo.supplierId)
     }
   },
@@ -251,7 +251,7 @@ export default {
           })
           setTimeout(() => {
             this.orderPagination.pageNum = 1
-            this.queryData()
+            this.downCallback()
           }, 500)
         }
       })

pages/trade/orderList.vue

@@ -25,7 +25,10 @@
         <view class="list-border list-info-line" v-for="(subItem, subIndex) in item.orderItems" :key="subIndex">
           <view class="list-info">
             <view>
-              <image class="list-image" :src="subItem.productImg"></image>
+              <image
+                class="list-image"
+                :src="subItem.productImg || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
+              ></image>
             </view>
             <view class="list-info-content">
               <view class="list-info-title">{{ subItem.productName }}</view>
@@ -214,13 +217,13 @@ export default {
   }
   .list-info-line {
     padding-left: 32rpx;
-    line-height: 70rpx;
+    // line-height: 70rpx;
     // width: 750rpx;
     // height: 88rpx;
     background: #ffffff;
   }
   .list-info-content {
-    margin-left: 48rpx;
+    margin-left: 20rpx;
   }
   .list-info-title {
     font-family: PingFangSC-Medium;
@@ -229,6 +232,7 @@ export default {
     letter-spacing: 0;
     text-align: left;
     font-weight: 550;
+    margin-top: 8rpx;
   }
   .list-info-text {
     font-family: PingFangSC-Regular;
@@ -236,16 +240,16 @@ export default {
     color: #888888;
     letter-spacing: 0;
     text-align: left;
-    line-height: 64rpx;
+    margin-top: 26rpx;
     font-weight: 400;
   }
   .list-image {
     width: 100rpx;
     height: 100rpx;
-    margin-top: 20rpx;
   }
   .list-info {
     display: flex;
+    padding: 24rpx 0;
   }
   .list-bottom-content {
     // line-height: 70rpx;

utils/http/index.js

@@ -92,7 +92,7 @@ const resInterceptor = (response, options) => {
   if (statusCode >= 200 && statusCode < 300) {
     if (res.code == 0) {
       // 将成功的null置位1
-      return res.data || 1
+      return res.data === null ? 1 : res.data
     } else {
       uni.showToast({
         title: res.message,