From 49dd0615c23be8288b193535ff59596155ba9967 Mon Sep 17 00:00:00 2001
From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com>
Date: Thu, 13 May 2021 10:30:33 +0800
Subject: [PATCH] -----
---
app.js | 2 +-
pages/agent/detail/pound-info/pound-info.wxml | 23 ++++---------------
pages/mall/index/index.js | 2 +-
pages/mall/product-item/index.wxml | 2 +-
4 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/app.js b/app.js
index 6b9d64e..6bb01c5 100644
--- a/app.js
+++ b/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,
diff --git a/pages/agent/detail/pound-info/pound-info.wxml b/pages/agent/detail/pound-info/pound-info.wxml
index f6aee11..e36d968 100644
--- a/pages/agent/detail/pound-info/pound-info.wxml
+++ b/pages/agent/detail/pound-info/pound-info.wxml
@@ -34,26 +34,11 @@
{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元
-
- 运费补贴
- {{formate.formateAmount(item.freightSubsidies==null?0:item.freightSubsidies)}}元
-
-
- 其他补贴
- {{formate.formateAmount(item.otherSubsidies==null?0:item.otherSubsidies)}}元
-
-
- 违禁物品扣款
- {{formate.formateAmount(item.contrabandPenalty==null?0:item.contrabandPenalty)}}元
-
-
- 装车不规范扣款
- {{formate.formateAmount(item.nonStandardPenalty==null?0:item.nonStandardPenalty)}}元
-
-
- 其他扣款
- {{formate.formateAmount(item.otherPenalty==null?0:item.otherPenalty)}}元
+
+ {{cell.title}}
+ {{formate.formateAmount(cell.amount==null?0:item.amount)}}元
+
总计
{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元
diff --git a/pages/mall/index/index.js b/pages/mall/index/index.js
index 6a7641e..5fca57b 100644
--- a/pages/mall/index/index.js
+++ b/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: []
diff --git a/pages/mall/product-item/index.wxml b/pages/mall/product-item/index.wxml
index 44967de..ec01ad8 100644
--- a/pages/mall/product-item/index.wxml
+++ b/pages/mall/product-item/index.wxml
@@ -7,7 +7,7 @@
- {{item.firstCategoryName || item.secondCategoryName}}
+ {{item.secondCategoryName || item.firstCategoryName}}
{{item.locProvinceName + item.locCityName}}