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

components/bussiness-components/packingStationItem.vue

@@ -4,7 +4,7 @@
       <image class="image" :src="info.enterpriseLogo || '/static/imgs/client/client-default.png'"></image>
       <view class="content">
         <view class="title">
-          <text class="text" style="width: 410rpx">{{ info.enterpriseName }}</text>
+          <text class="text" style="max-width: 410rpx">{{ info.enterpriseName }}</text>
           <image
             class="icon"
             :src="info.whetherCooperation ? '/static/imgs/general/cooperation-icon.png' : '/static/imgs/general/no-cooperation-icon.png'"
@@ -154,8 +154,7 @@ export default {
         justify-content: flex-start;
         flex-wrap: nowrap;
         .text {
-          lines: 1;
-          text-overflow: ellipsis;
+          word-break: break-all;
           font-size: 32rpx;
           color: #000000;
           font-weight: 600;

pages/mall/index.vue

@@ -19,12 +19,15 @@
           <view class="set" @click="setting">设置</view>
         </view>
       </view>
-      <uGap></uGap>
       <view class="" v-if="pageShow">
         <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
           <view v-for="(item, index) in listData" :key="index">
             <view class="content" @click="detailInfo(item)">
-              <image class="image" :src="item.litPicUrl" mode=""></image>
+              <image
+                class="image"
+                :src="item.litPicUrl || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
+                mode=""
+              ></image>
               <view class="" style="width: 100%">
                 <view class="title">
                   <view class="">{{ item.brandName }}</view>
@@ -117,7 +120,7 @@ export default {
         pageSize: 10,
         storeId: null,
         name: null,
-        supplierId: this.$store.state.supplierInfo.supplierId,
+        supplierId: this.$store.state.supplierInfo.supplierId
       },
       listData: [],
       logo: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif',
@@ -423,7 +426,7 @@ export default {
     z-index: 9999;
     right: 32rpx;
     bottom: 122rpx;
-    background-color: #007AFF;
+    background-color: #007aff;
     border-radius: 50%;
     padding: 10rpx;
     text-align: center;
@@ -439,7 +442,6 @@ export default {
   .my-image {
     width: 100rpx;
     height: 100rpx;
-	
   }
 }
 </style>

pages/trade/orderList.vue

@@ -11,7 +11,7 @@
       >
     </uni-segmented-control>
     <scroll-list style="touch-action: none" ref="orderRef" :option="orderOption" @load="orderUp" @refresh="orderDown">
-      <view v-for="(item, index) in list" :key="index" @click="go2('order-detail', { orderId: item.orderId })">
+      <view v-for="(item, index) in list" :key="index" @click="go2('order-detail', { orderId: item.orderId })" style="margin-bottom: 20rpx">
         <view class="list-border list-title-line">
           <view>
             <view class="list-title">{{ item.customerEnterpriseName }}</view>
@@ -44,7 +44,6 @@
             <text class="list-title-Subtitle subTitle-right">¥{{ item.totalOfferPrice }}</text>
           </view>
         </view>
-        <!-- <uGap></uGap> -->
       </view>
     </scroll-list>
   </view>

pages/trade/quotationList.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="quotation-list">
     <scroll-list ref="quotationRef" :option="option" @load="quotationUp" @refresh="quotationDown">
-      <view v-for="(item, index) in list" :key="index">
+      <view v-for="(item, index) in list" :key="index" style="margin-bottom: 20rpx">
         <view class="list-border list-title-line">
           <text class="list-title">{{ item.belongEnterpriseName }}</text>
           <text class="list-title-Subtitle">{{ item.replyStatus | replyStatusName }}</text>
@@ -47,8 +47,6 @@
             </view>
           </view>
         </view>
-
-        <uGap></uGap>
       </view>
     </scroll-list>
     <view>
@@ -86,7 +84,6 @@ export default {
         size: 10,
         auto: true,
         emptyText: '暂无报价信息~',
-        background: '#F7F8FA',
         fontSize: '40rpx',
         emptyImage: '/static/imgs/client-detail/no-data-icon.png'
       },