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

pages/mall/index.vue

@@ -135,15 +135,11 @@ export default {
     if (this.hasCompany) {
       this.storeInformation = {
         supplierId: this.$store.state.supplierInfo.supplierId,
-        name: this.$store.state.supplierInfo.name
       }
       this.queryData()
       this.getSupplier(this.$store.state.supplierInfo.supplierId)
     }
   },
-  onShow() {
-    this.downCallback()
-  },
   methods: {
     back,
     // 获取上新商品数量
@@ -154,6 +150,7 @@ export default {
             this.storeInfo = res
             this.$set(this.storeInformation, 'productNumber', res.productNumber)
             this.$set(this.storeInformation, 'currentProductNumber', res.currentProductNumber)
+            this.$set(this.storeInformation, 'name', res.name)
             if (res.logo === '') {
               this.logo = 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'
             } else {

pages/my-offer/index.vue

@@ -20,7 +20,7 @@
               <view class="list-info-title">{{ item.brandName }}{{ item.categoryName }}</view>
               <view class="list-info-text">
                 <text>{{ item.categoryName }}/{{ item.brandName }}/</text>
-                <text>{{ item.gramWeight }}g/{{ item.length }}*{{ item.width }}/{{ item.pieceQuantity }}张</text>
+                <text>{{ item.gramWeight }}g/{{ item.width }}*{{ item.length }}/{{ item.quantity }}张</text>
               </view>
             </view>
           </view>