From 05d1486b4cf97384e8c712ba0b0e66e7638aa792 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 11:31:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mall/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 22b1488..ab1070e 100644
--- a/pages/mall/index.vue
+++ b/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>
@@ -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)

From f311c916f6382b7277f1d445abb43af74f910b9b Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 26 Jan 2022 11:38:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mall/index.vue | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 17253e0..60d485b 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -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>
@@ -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;

From e11f7e0a58cbdd2873f5c734e2c7f2d000699d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?=
 <yanggehui@chalco-steering.com>
Date: Wed, 26 Jan 2022 11:42:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=BF=E5=AE=BD?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/submit-quotation/index.vue | 2 +-
 pages/trade/orderList.vue        | 2 +-
 pages/trade/quotationList.vue    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue
index 9be9eef..50fc1f5 100644
--- a/pages/submit-quotation/index.vue
+++ b/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>
diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue
index 909fc87..ba1f789 100644
--- a/pages/trade/orderList.vue
+++ b/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>
diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue
index 26bb309..fd79733 100644
--- a/pages/trade/quotationList.vue
+++ b/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>