补贴

pages/agent/agent-item/index.js

@@ -12,7 +12,8 @@ Component({
     item: { type: Object, value: null }
   },
   data: {
-    kg: app.globalData.kg
+    kg: app.globalData.kg,
+    cateIndex: 0
   },
   lifetimes: {
     // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
@@ -36,15 +37,15 @@ Component({
     unflodItem: function(){
       this.setData({ ['item.fold']: !this.data.item.fold })
     },
-    checkTag: function(event){
+    checkTag: function(e){
       var cateIndex = -1
-      if(util.isEmpty(this.data.item.cateIndex)){
-        cateIndex = event.currentTarget.dataset.ck
-      } else if(this.data.item.cateIndex != event.currentTarget.dataset.ck){
-        cateIndex = event.currentTarget.dataset.ck
+      if(util.isEmpty(this.data.cateIndex)){
+        cateIndex = e.currentTarget.dataset.ck
+      } else if(this.data.cateIndex != e.currentTarget.dataset.ck){
+        cateIndex = e.currentTarget.dataset.ck
       }
       if(cateIndex >= 0){
-        this.setData({ ['item.cateIndex']: cateIndex })
+        this.setData({ cateIndex })
       }
     },
     saleGood: function(e){
@@ -52,15 +53,15 @@ Component({
         wx.navigateTo({ url: '/pages/login/index' })
         return
       }
-      if(util.isEmpty(this.data.item.cateIndex)){
+      if(util.isEmpty(this.data.cateIndex)){
         util.showToast('请选择一个纸品')
         return
       }
-      if(util.isEmpty(this.data.item.paperCategoryList[this.data.item.cateIndex].unitPrice)){
+      if(util.isEmpty(this.data.item.paperCategoryList[this.data.cateIndex].unitPrice)){
         util.showToast('该纸品暂无报价，无法卖货')
         return
       }
-      var categoryId = this.data.item.paperCategoryList[this.data.item.cateIndex].categoryId
+      var categoryId = this.data.item.paperCategoryList[this.data.cateIndex].categoryId
       wx.navigateTo({ url: '/pages/agent/edit/index?id=' + this.data.item.paperMillId + '&categoryId=' + categoryId })
     }
   }

pages/agent/agent-item/index.wxml

@@ -31,10 +31,13 @@
 </view>
 <view class="bg-white" style="padding:0rpx 32rpx 10rpx 32rpx">
 	<view class="flex" wx:for-item="cateItem" wx:for-index="ck" wx:for="{{item.paperCategoryList}}" wx:key="ck" wx:if="{{item.fold || ck < 3}}" style="margin-bottom: 20rpx">
-		<view class="item-cate {{item.cateIndex == ck ? 'cate-tag' : ''}}" data-page="{{pageIndex}}" data-index="{{index}}" data-ck="{{ck}}" catchtap="checkTag">
+		<view class="item-cate {{cateIndex == ck ? 'cate-tag' : ''}}" data-page="{{pageIndex}}" data-index="{{index}}" data-ck="{{ck}}" catchtap="checkTag">
 			<view class="flex flex-justify">
 				<view class="text-sg text-black">{{cateItem.categoryName}}</view>
-				<text class="text-sg text-black" wx:if="{{cateItem.unitPrice}}">{{formate.formatePrice2(cateItem.unitPrice, kg)}}</text>
+				<text class="text-sg text-black" wx:if="{{cateItem.unitPrice}}">
+				  <text>{{priceItem(cateItem, kg)}}</text>
+					<text class="text-sm">(已含补贴{{formate.formatePrice2(cateItem.unitPrice, kg)}})</text>
+				</text>
 				<text class="text-sg text-gray" wx:else>暂无报价</text>
 			</view>
 			<view class="flex flex-justify text-xs text-gray" style="margin-top:4rpx">
@@ -70,4 +73,23 @@
 			</view>
 		</view>
 	</view>
-</view>
+</view>
+
+<wxs module="priceItem">
+  function priceItem(item, kg) {
+    if(kg){
+			if(item.uprice && Number(item.uprice) > 0){
+				let price = parseFloat(item.unitPrice) + parseFloat(item.uprice)
+				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)
+				return (parseFloat(price) * 1000).toFixed(1) + '元/吨'
+			}
+      return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨'
+    }
+  }
+  module.exports = priceItem;
+</wxs>

pages/agent/factory-fragment/index.js

@@ -120,20 +120,11 @@ Component({
             })
           }
         } else {
-          this.setData({
-            finished: true,
-            requesting: false,
-            loading: false,
-            pageNum: 1
-          })
+          this.setData({ requesting: false, finished: true, loading: false, })
         }
       }).catch(err => {
         //异常回调
-        this.setData({
-          requesting: false,
-          finished: true,
-          loading: false,
-        })
+        this.setData({ requesting: false, finished: true, loading: false, })
       })
     },
     goattentionIndex: function () {