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

pages/mall/index.vue

@@ -30,7 +30,7 @@
               ></image>
               <view class="" style="width: 100%">
                 <view class="title">
-                  <view class="">{{ item.brandName }}</view>
+                  <view class="">{{ item.name }}</view>
                   <view class="">
                     <image
                       class="icon"
@@ -39,10 +39,10 @@
                     ></image>
                   </view>
                 </view>
-                <view class="sub-title">{{ item.categoryName }}/{{ item.name }}/{{ item.manufacturerName }}</view>
-                <view class="desc">
+                <view class="sub-title">{{ item.manufacturerName }}/{{ item.categoryName }}/{{ item.brandName }}</view>
+                <view class="desc flex-row-center-start" style="flex-wrap: wrap">
                   克重(价格)：
-                  <text v-for="(sku, index) in item.skuList" :key="index">{{ sku.weight }}({{ sku.listPrice }})</text>
+                  <text style="margin-right: 8rpx" v-for="(sku, index) in item.skuList" :key="index">{{ sku.weight }}g({{ sku.listPrice }}元)</text>
                 </view>
               </view>
             </view>
@@ -58,7 +58,7 @@
         </scroll-list>
       </view>
       <view>
-        <view class="offer-prices" @click="nativeTo()"><image class="my-image" src="../../static/imgs/trade/camera.png" mode=""></image></view>
+        <view class="offer-prices" @click="nativeTo()"><image class="my-image" src="../../static/imgs/trade/camera.png"></image></view>
       </view>
       <no-data v-if="!pageShow"></no-data>
     </view>
@@ -134,7 +134,7 @@ export default {
   onShow() {
     if (this.hasCompany) {
       this.storeInformation = {
-        supplierId: this.$store.state.supplierInfo.supplierId,
+        supplierId: this.$store.state.supplierInfo.supplierId
       }
       this.queryData()
       this.getSupplier(this.$store.state.supplierInfo.supplierId)
@@ -424,18 +424,11 @@ export default {
     z-index: 9999;
     right: 32rpx;
     bottom: 122rpx;
-    background-color: #007aff;
     border-radius: 50%;
-    padding: 10rpx;
-    text-align: center;
-    width: 110rpx;
-    height: 110rpx;
-    border: 2rpx solid #f9f9f9;
+    width: 100rpx;
+    height: 100rpx;
+    overflow: hidden;
     box-shadow: 0rpx 4rpx 34rpx 0rpx rgba(0, 0, 0, 0.2);
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
   }
   .my-image {
     width: 100rpx;

pages/submit-quotation/index.vue

@@ -41,7 +41,7 @@
     <view class="submit-content" v-for="(items, index) in upDataObj.itemList" :key="index">
       <view class="submit-content-head">
         <view class="submit-content-title">
-          {{ items.paperName }} | {{ items.gramWeight }}g | {{ items.length }}*{{ items.width }} | {{ items.quantity }}张
+          {{ items.paperName }} | {{ items.gramWeight }}g | {{ items.width }}*{{ items.length }} | {{ items.quantity }}张
         </view>
         <view class="" v-if="upDataObj.replyStatus !== 30102" @click="commodityModify(items, index)">
           <image class="submit-image" src="../../static/imgs/mall/edit.png" mode=""></image>

pages/trade/orderList.vue

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

pages/trade/quotationList.vue

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