-----

app.js

@@ -1,7 +1,7 @@
 //app.js
 App({
   //----------------------------------------------globalData--------------------------------------
-  evn: 1,//0:开发环境，1：测试环境，2：生产环境
+  evn: 0,//0:开发环境，1：测试环境，2：生产环境
   tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
   agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
   version: 152,

pages/agent/detail/pound-info/pound-info.wxml

@@ -34,26 +34,11 @@
           </view>
           <view class="text-df text-gray" style="padding-right:16rpx;">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</view>
         </view>
-        <view class="flex flex-justify text-sg">
-          <text class="text-black">运费补贴</text>
-          <text class="text-gray">{{formate.formateAmount(item.freightSubsidies==null?0:item.freightSubsidies)}}元</text>
-        </view>
-        <view class="flex flex-justify text-sg" style="margin-top:20rpx">
-          <text class="text-black">其他补贴</text>
-          <text class="text-gray">{{formate.formateAmount(item.otherSubsidies==null?0:item.otherSubsidies)}}元</text>
-        </view>
-        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
-          <text class="text-black" style="min-width:200rpx">违禁物品扣款</text>
-          <text class="text-gray">{{formate.formateAmount(item.contrabandPenalty==null?0:item.contrabandPenalty)}}元</text>
-        </view>
-        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
-          <text class="text-black" style="min-width:200rpx">装车不规范扣款</text>
-          <text class="text-gray">{{formate.formateAmount(item.nonStandardPenalty==null?0:item.nonStandardPenalty)}}元</text>
-        </view>
-        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
-          <text class="text-black" style="min-width:200rpx">其他扣款</text>
-          <text class="text-gray">{{formate.formateAmount(item.otherPenalty==null?0:item.otherPenalty)}}元</text>
+        <view class="flex flex-justify text-sg" wx:for="{{ item.otherAmountDtoList }}" wx:for-item="cell" wx:for-index="cellIndex" wx:key="cellIndex" style="margin-top:{{cellIndex==0?0:20}}px;font-size:30rpx">
+          <text class="text-black">{{cell.title}}</text>
+          <text class="text-gray">{{formate.formateAmount(cell.amount==null?0:item.amount)}}元</text>
         </view>
+
         <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
           <text class="text-black" style="min-width:200rpx">总计</text>
           <text class="text-gray">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>

pages/mall/index/index.js

@@ -36,7 +36,7 @@ Component({
     loading: [true, true, true],
     requesting: [false, false, false],
     finished: [false, false, false],
-    form: [{ isOnlySupplyProduct: false, pageNum: 1 }, { pageNum: 1 }, { pageNum: 1, enableSalesAgent: 1 }],
+    form: [{ isOnlySupplyProduct: true, pageNum: 1 }, { pageNum: 1 }, { pageNum: 1, enableSalesAgent: 1 }],
     orderList: [],
     orderList1: [],
     orderList2: []

pages/mall/product-item/index.wxml

@@ -7,7 +7,7 @@
 	<view style="flex:1;padding-left:24rpx;height:100px">
 		<view class="flex" style="height:20px;align-items: center">
 			<image style="width:40px;height:20px;margin-right:12rpx" src="/assets/image/ico_tag{{item.bidType == 2 ? '2' : '1'}}.png"></image>
-			<view class="page-name">{{item.firstCategoryName || item.secondCategoryName}}</view>
+			<view class="page-name">{{item.secondCategoryName || item.firstCategoryName}}</view>
 		</view>
 		<view class="flex page-num" style="margin-top:8rpx;justify-content: space-between">
 			<view class="text-cut" style="font-size:24rpx;max-width: 240rpx">{{item.locProvinceName + item.locCityName}}