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

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)">

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: '',

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>