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 1/2] =?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>

From 37b229a6985c5a4857c3acbfc1486486853667f2 Mon Sep 17 00:00:00 2001
From: buffeyu <yeqingyu@dimine.net>
Date: Wed, 26 Jan 2022 11:57:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/client-detail/equipment-information.vue | 2 +-
 pages/follow-up-records/index.vue             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue
index 4971dd0..c0b8d8e 100644
--- a/pages/client-detail/equipment-information.vue
+++ b/pages/client-detail/equipment-information.vue
@@ -8,7 +8,7 @@
             <view class="bottom-btn" @tap="dropdownTap(index)">
               {{ dropdownName }}
               <!-- <uni-icons custom-prefix="iconfont" type="icon-required" size="16" color="#888888"></uni-icons> -->
-              <uni-icons size="16" custom-prefix="iconfont" type="m_dow_arrow" color="#888888"></uni-icons>
+              <uni-icons size="16" custom-prefix="iconfont" type="icon-m_dow_arrow" color="#888888"></uni-icons>
             </view>
             <view class="down-box" v-if="item.isShowSelect">
               <view class="row" v-for="(citem, cindex) in dropdownList" :key="cindex" @tap="dropdownItemTap(cindex)">
diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue
index acea003..3c4de64 100644
--- a/pages/follow-up-records/index.vue
+++ b/pages/follow-up-records/index.vue
@@ -72,7 +72,8 @@ export default {
         height: 0,
         emptyText: '暂无数据~',
         background: '#F7F8FA',
-        disabled: false
+        disabled: false,
+		emptyImage: '/static/imgs/order/order-empty.png'
       },
       params: {
         asc: '',