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

pages/client-detail/basic-information.vue

@@ -89,13 +89,15 @@
               <view class="left">
                 <view class="title"><text>产房面积：</text></view>
                 <view class="value">
-                  <text>{{ info.plantArea }}m²</text>
+                  <text>{{ info.plantArea }}</text>
+                  <text v-if="info.plantArea">m²</text>
                 </view>
               </view>
               <view class="right">
                 <view class="title"><text>年营业额：</text></view>
                 <view class="value">
-                  <text>{{ info.annualTurnover }}万</text>
+                  <text>{{ info.annualTurnover }}</text>
+                  <text v-if="info.annualTurnover">万</text>
                 </view>
               </view>
             </view>

pages/mall/index.vue

@@ -140,6 +140,9 @@ export default {
       this.getSupplier(this.$store.state.supplierInfo.supplierId)
     }
   },
+  onShow() {
+  	this.downCallback()
+  },
   methods: {
     back,
     // 获取上新商品数量
@@ -155,11 +158,11 @@ export default {
             } else {
               this.logo = res.logo
             }
-            if (res.backgroundImg === '') {
-              this.backgroundStyle = 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;'
-            } else {
-              this.backgroundStyle = 'background: url(' + res.backgroundImg + ') no-repeat;'
-            }
+            // if (res.backgroundImg === '') {
+            //   this.backgroundStyle = 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;'
+            // } else {
+            //   this.backgroundStyle = 'background: url(' + res.backgroundImg + ') no-repeat;'
+            // }
           }
         })
         .catch((err) => {
@@ -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,6 +442,7 @@ export default {
   .my-image {
     width: 100rpx;
     height: 100rpx;
+	
   }
 }
 </style>

pages/my-offer/index.vue

@@ -13,9 +13,9 @@
 					<text class="list-title">{{items.belongEnterpriseName}}</text>
 					<text class="list-title-Subtitle">{{ controlItems[items.orderStatus - 1] }}</text>
 				</view>
-				<view class="list-border list-info-line" v-for="(item, index) in items.orderItemList" :key="index">
-					<view class="list-info" :class="index === items.orderItemList.length ? 'list-border' : ''">
-						<view class=""><image class="list-image" src="../../static/logo.png"></image></view>
+				<view class="list-border list-info-line" v-for="(item, index) in items.itemList" :key="index">
+					<view class="list-info" :class="index === items.itemList.length ? 'list-border' : ''">
+						<view class=""><image class="list-image" :src="item.productImg || '../../static/logo.png' "></image></view>
 						<view class="list-info-contant">
 							<view class="list-info-title">{{ item.brandName }}{{ item.categoryName }}</view>
 							<view class="list-info-text">

pages/quotation-details/index.vue

@@ -192,7 +192,7 @@ export default {
 		// 修改报价按钮
 		editPrice() {
 			var params = {
-				title: '修改报价'
+				title: '修改报价',
 			}
 			go2('submit-quotation', params)
 		}