no message

pages/agent/edit/index.js

@@ -68,8 +68,8 @@ Page({
             }
             if(!util.isEmpty(element.unitPrice)){
               var unitPrice = math.times(element.unitPrice, 1000)
-              if(element.uPrice && Number(element.uPrice) > 0){
-                unitPrice = math.times(math.plus(element.unitPrice, element.uPrice), 1000)
+              if(element.publicSubsidies && Number(element.publicSubsidies) > 0){
+                unitPrice = math.times(math.plus(element.unitPrice, element.publicSubsidies), 1000)
               }
               this.data.cateList.push({value: element.categoryId, text: element.categoryName + '(预估单价：' + unitPrice + '元/吨)'})
             }
@@ -210,16 +210,16 @@ Page({
         const element = this.data.factoryDetail.paperCategoryList[index]
         if(element.categoryId == detail.value){
           this.data.form.unitPrice = element.unitPrice
-          if(element.uPrice && Number(element.uPrice) > 0){
-            this.data.form.uPrice = element.uPrice
-            this.data.form.unitPrice = math.plus(element.unitPrice, element.uPrice)
+          if(element.publicSubsidies && Number(element.publicSubsidies) > 0){
+            this.data.form.publicSubsidies = element.publicSubsidies
+            this.data.form.unitPrice = math.plus(element.unitPrice, element.publicSubsidies)
           }
           this.data.cateName = element.categoryName
           break
         }
       }
       this.data.form.paperCategoryId = detail.value
-      this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.uPrice']: this.data.form.uPrice, cateName: this.data.cateName })
+      this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.publicSubsidies']: this.data.form.publicSubsidies, cateName: this.data.cateName })
     }
   },
   onEvent: function (message) {

pages/agent/edit/index.wxml

@@ -39,7 +39,7 @@
 		<view class="text-sg" style="min-width:170rpx">预估单价(元/吨)：</view>
 		<view class="text-sg text-black">
 			<text>{{formate.formatePrice(form.unitPrice)}}</text>
-			<text class="text-sm" wx:if="{{form.uPrice}}">(已含补贴{{formate.formatePrice2(form.uPrice, 0)}})</text>
+			<text class="text-sm" wx:if="{{form.publicSubsidies}}">(已含补贴{{formate.formatePrice2(form.publicSubsidies, 0)}})</text>
 		</view>
 	</view>
 	<view class="cu-item text-sg" style="text-align: right">

pages/agent/factory-fragment/index.js

@@ -79,13 +79,7 @@ Component({
       if (this.data.requesting) {
         return
       }
-      this.setData({
-        orderList: [],
-        tabIndex: this.data.tabIndex,
-        ['form.pageNum']: 1,
-        loading: true,
-        finished: false
-      })
+      this.setData({ orderList: [], tabIndex: this.data.tabIndex, ['form.pageNum']: 1, loading: true, finished: false })
       this.fetchPapersList()
     },
     // 获取特价列表

pages/agent/factory/index.wxml

@@ -59,7 +59,7 @@
 							<view class="text-sg text-black">{{item.categoryName}}</view>
 							<text class="text-sg text-black" wx:if="{{item.unitPrice}}">
 				        <text>{{priceItem(item, kg)}}</text>
-					      <text class="text-sm" wx:if="{{item.uPrice}}">(已含补贴{{formate.formatePrice2(item.uPrice, kg)}})</text>
+					      <text class="text-sm" wx:if="{{item.publicSubsidies}}">(已含补贴{{formate.formatePrice2(item.publicSubsidies, kg)}})</text>
 				      </text>
 							<text class="text-sg text-gray" wx:else>暂无报价</text>
 						</view>
@@ -181,14 +181,14 @@
 <wxs module="priceItem">
   function priceItem(item, kg) {
     if(kg){
-			if(item.uPrice && Number(item.uPrice) > 0){
-				let price = parseFloat(item.unitPrice) + parseFloat(item.uPrice)
+			if(item.publicSubsidies && Number(item.publicSubsidies) > 0){
+				let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies)
 				return (parseFloat(price)).toFixed(3) + '元/KG'
 			}
       return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG'
     } else {
-			if(item.uPrice && Number(item.uPrice) > 0){
-				let price = parseFloat(item.unitPrice) + parseFloat(item.uPrice)
+			if(item.publicSubsidies && Number(item.publicSubsidies) > 0){
+				let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies)
 				return (parseFloat(price) * 1000).toFixed(1) + '元/吨'
 			}
       return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨'

pages/withdrawal/vcheckout/index.wxml

@@ -3,9 +3,9 @@
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">申请提现</view>
 </cu-custom>
-<view class="bg-white" style="padding:24rpx;font-size:24rpx;">
+<view class="bg-white text-yellow" style="padding:24rpx;font-size:24rpx;">
+	<view>提现额度：对私100万/天，对公1000万/天</view>
 	<view>提现到账：对私预计两小时内到账，对公预计下一个工作日内到账</view>
-	<view>提现申请后T+1个工作日到账（周六、周日及节假日顺延到工作日），如有疑问请联系客服<text class="text-blue">400-6881-001</text></view>
 </view>
 
 <view style="height:24rpx"></view>
@@ -26,7 +26,9 @@
 		<text class="text-df text-blue" style="margin-left:30rpx" wx:if="{{orderList.length}}" bindtap="allExpend">全部提现</text>
 	</view>
 </view>
-<view style="height:16rpx"></view>
+<view style="padding:24rpx;font-size:24rpx;">
+	提现申请后T+1个工作日到账（周六、周日及节假日顺延到工作日），如有疑问请联系客服<text class="text-blue">400-6881-001</text>
+</view>
 <wux-cell-group>
 	<wux-cell hover-class="none" wx:for="{{orderList}}" wx:key="index" data-index="{{index}}" bind:click="checkList">
 		<view slot="header" style="padding: 8rpx 0rpx">