diff --git a/Utils/js/date.js b/Utils/js/date.js
index bf346a8..e537735 100644
--- a/Utils/js/date.js
+++ b/Utils/js/date.js
@@ -5,7 +5,11 @@ const isNullOrEmpty = function(val) {
return false;
}
}
-
+
+const numFormat = (money) =>{
+ return parseFloat(money).toFixed(2)
+}
+
const timeFormat = (value, format) => {
let date = new Date(value);
let y = date.getFullYear();
@@ -54,5 +58,6 @@ const timeFormat = (value, format) => {
export {
isNullOrEmpty,
- timeFormat
+ timeFormat,
+ numFormat
}
diff --git a/pages/classify/cart-choose/cart-choose.vue b/components/cart-choose/cart-choose.vue
similarity index 95%
rename from pages/classify/cart-choose/cart-choose.vue
rename to components/cart-choose/cart-choose.vue
index 29a1a1a..0e11ea2 100644
--- a/pages/classify/cart-choose/cart-choose.vue
+++ b/components/cart-choose/cart-choose.vue
@@ -37,7 +37,7 @@
-->
-
+
选择规格
@@ -54,9 +54,9 @@
-
+
购买数量
-
+
@@ -212,7 +212,7 @@
obj = JSON.stringify(obj)
uni.navigateTo({
- url: '/pages/settleAccounts/settleAccounts?goodsList='+obj
+ url: '/physical-merchants/settleAccounts/settleAccounts?goodsList='+obj
})
// this.$emit("close")
@@ -225,7 +225,7 @@
// 去地址页
goAddress(){
uni.navigateTo({
- url:"/pages/address/address"
+ url:"/physical-merchants/address/address"
})
},
@@ -266,7 +266,7 @@
.choose-detail {
position: relative;
- padding: 20rpx;
+ padding: 20rpx 20rpx 80rpx 20rpx;
//选择
.choose-top {
display: flex;
diff --git a/pages/classify/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
similarity index 98%
rename from pages/classify/goods-list/goods-list.vue
rename to components/goods-list/goods-list.vue
index 875037a..a76f6e2 100644
--- a/pages/classify/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -142,9 +142,9 @@
-
-
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ad62b8d..65a2571 100644
--- a/pages.json
+++ b/pages.json
@@ -27,7 +27,8 @@
"softinputNavBar": "none"
}
}
- },{
+ },
+ {
"path": "pages/tabBar/classify/classify",
"style": {
"navigationBarTextStyle": "white",
@@ -40,97 +41,98 @@
"softinputNavBar": "none"
}
}
- },{
- "path": "pages/classify/goodsDetail/goodsDetail",
- "style": {
- "navigationBarTitleText": "商品详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/classify/goods-search/goods-search",
- "style": {
- "navigationBarTitleText": "搜索",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/classify/cart/cart",
- "style": {
- "navigationBarTitleText": "购物车",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/classify/goods-comment/goods-comment",
- "style": {
- "navigationBarTitleText": "查看评论",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/address/address",
- "style": {
- "navigationBarTitleText": "我的地址",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/address/addNewAddress/addNewAddress",
- "style": {
- "navigationBarTitleText": "新增地址",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/settleAccounts/settleAccounts",
- "style": {
- "navigationBarTitleText": "订单确认",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/classify/order/order",
- "style": {
- "navigationBarTitleText": "订单列表",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/classify/order/orderDetail",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/classify/order/editOrder",
- "style": {
- "navigationBarTitleText": "修改订单",
- "enablePullDownRefresh": false
- }
},
// {
- // "path": "pages/wuliu/wuliu",
+ // "path": "pages/classify/goodsDetail/goodsDetail",
// "style": {
- // "navigationBarTitleText": "物流信息",
+ // "navigationBarTitleText": "商品详情",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/classify/goods-search/goods-search",
+ // "style": {
+ // "navigationBarTitleText": "搜索",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/classify/cart/cart",
+ // "style": {
+ // "navigationBarTitleText": "购物车",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/classify/goods-comment/goods-comment",
+ // "style": {
+ // "navigationBarTitleText": "查看评论",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/address/address",
+ // "style": {
+ // "navigationBarTitleText": "我的地址",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/address/addNewAddress/addNewAddress",
+ // "style": {
+ // "navigationBarTitleText": "新增地址",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/settleAccounts/settleAccounts",
+ // "style": {
+ // "navigationBarTitleText": "订单确认",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/classify/order/order",
+ // "style": {
+ // "navigationBarTitleText": "订单列表",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/classify/order/orderDetail",
+ // "style": {
+ // "navigationBarTitleText": "订单详情",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/classify/order/editOrder",
+ // "style": {
+ // "navigationBarTitleText": "修改订单",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // // {
+ // // "path": "pages/wuliu/wuliu",
+ // // "style": {
+ // // "navigationBarTitleText": "物流信息",
+ // // "enablePullDownRefresh": false
+ // // }
+ // // },
+ // {
+ // "path": "pages/classify/order/pay",
+ // "style": {
+ // "navigationBarTitleText": "收银台页",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/classify/order/paymentResult",
+ // "style": {
+ // "navigationBarTitleText": "支付结果",
// "enablePullDownRefresh": false
// }
// },
- {
- "path": "pages/classify/order/pay",
- "style": {
- "navigationBarTitleText": "收银台页",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/classify/order/paymentResult",
- "style": {
- "navigationBarTitleText": "支付结果",
- "enablePullDownRefresh": false
- }
- },
{
"path": "pages/qianZhuPay/union-pay/union-pay",
"style": {
@@ -1077,7 +1079,104 @@
}
}]
- }],
+ },{
+ "root":"physical-merchants",
+ "pages":[
+ {
+ "path": "classify/goodsDetail/goodsDetail",
+ "style": {
+ "navigationBarTitleText": "商品详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/goods-search/goods-search",
+ "style": {
+ "navigationBarTitleText": "搜索",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/cart/cart",
+ "style": {
+ "navigationBarTitleText": "购物车",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/goods-comment/goods-comment",
+ "style": {
+ "navigationBarTitleText": "查看评论",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "address/address",
+ "style": {
+ "navigationBarTitleText": "我的地址",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "address/addNewAddress/addNewAddress",
+ "style": {
+ "navigationBarTitleText": "新增地址",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "settleAccounts/settleAccounts",
+ "style": {
+ "navigationBarTitleText": "订单确认",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/order/order",
+ "style": {
+ "navigationBarTitleText": "订单列表",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/order/orderDetail",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/order/editOrder",
+ "style": {
+ "navigationBarTitleText": "修改订单",
+ "enablePullDownRefresh": false
+ }
+ },
+ // {
+ // "path": "wuliu/wuliu",
+ // "style": {
+ // "navigationBarTitleText": "物流信息",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ {
+ "path": "classify/order/pay",
+ "style": {
+ "navigationBarTitleText": "收银台页",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/order/paymentResult",
+ "style": {
+ "navigationBarTitleText": "支付结果",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
+ }
+
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
diff --git a/pages/classify/order/orderDetail.vue b/pages/classify/order/orderDetail.vue
deleted file mode 100644
index f107c09..0000000
--- a/pages/classify/order/orderDetail.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-
-
-
-
-
- 已送达
-
-
- 感谢您的支持,如有问题可以联系我们
-
-
-
-
-
-
- 待支付
-
-
- {{countdownm}}:{{countdowns}}后订单自动取消
-
-
-
-
-
- 订单已取消
-
-
- 您的订单已取消
-
-
-
-
-
-
-
-
- 金科才能收到你看得出纳思达
- 利15652365478
-
-
- 修改
-
-
-
-
-
-
-
-
-
-
-
-
- 单只甜玉米 单只/250-300g
- 单价: ¥ 3.99/个
- 数量: 1个
-
-
- 实付: ¥ 3.42
- ¥ 3.99
-
-
-
-
-
-
- 还有{{3}}种商品
-
-
-
-
-
-
-
-
- 单只甜玉米 单只/250-300g
- 单价: ¥ 3.99/个
- 数量: 1个
-
-
- 实付: ¥ 3.42
- ¥ 3.99
-
-
-
-
-
- 共{{6}}种商品
-
-
-
-
- 商品金额
- ¥69.89
-
-
-
- 优惠券
- -¥10
-
-
-
-
- 运费
-
-
-
- ¥6
- ¥0
-
-
-
-
-
- 积分
- -¥2
-
-
-
- 支付优惠
- -¥0.01
-
-
-
- 已优惠¥ 12.01
- 实付¥58.88
-
-
-
-
-
-
- 订单编号
-
- 1209 2418 0001 0039
- 复制
-
-
-
-
- 下单时间
-
- 2023-03-04 17:05:27
-
-
-
-
-
-
-
-
-
-
-
-
- 收货信息
-
- 重庆市出厂时都曾经常吃的后面2楼
- 陈女士 175896546526
-
-
-
-
- 物流信息
-
- 查看物流信息
-
-
-
-
- 订单编号
-
- {{orderID}}
- 复制
-
-
-
-
- 下单时间
-
- 2023-03-04 17:05:27
-
-
-
-
- 支付方式
-
- 微信支付
-
-
-
-
-
-
-
- 取消订单
- 修改订单
- 立即支付{{countdownm}}:{{countdowns}}
-
-
-
- 再来一单
- 删除订单
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/tabBar/classify/classify.vue b/pages/tabBar/classify/classify.vue
index 2a5b4f5..3c9eb05 100644
--- a/pages/tabBar/classify/classify.vue
+++ b/pages/tabBar/classify/classify.vue
@@ -77,8 +77,8 @@
import uniBadge from '@/components/uni-badge/components/uni-badge/uni-badge.vue'
import componentSearch from "@/components/search/search.vue";
- import goodsList from '@/pages/classify/goods-list/goods-list.vue'
+ import goodsList from '@/components/goods-list/goods-list.vue'
import {getGoodsTypeTree,getListGoodsDetail,getShoppingCartList} from '@/Utils/physicalObject.js'
const app = getApp();
@@ -130,7 +130,7 @@
},
onShow(){
- console.log("121212")
+
this.hackReset = false;
this.$nextTick(() => {
this.hackReset = true;
@@ -184,7 +184,7 @@
//搜索事件
toSearch() {
uni.navigateTo({
- url:"/pages/classify/goods-search/goods-search"
+ url:"/physical-merchants/classify/goods-search/goods-search"
})
},
//导航点击
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 1385081..2117908 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -444,6 +444,15 @@
},
//跳转详情
jumpDetails(e, item) {
+ //实物类型
+ if(item == 12){
+ uni.navigateTo({
+ url:'/physical-merchants/classify/order/orderDetail?id='+e
+
+ })
+ return;
+ }
+
this.orderCheck(e);
if (item == 1 || item == 2 || item == 3) {
uni.navigateTo({
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index 866acc6..432b3b7 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -146,7 +146,12 @@
uni.navigateTo({
url: '/qianzhu-KFC/order-details/order-details?id=' + lists.orderNo
})
- } else {
+ }else if(lists.productType == 12){
+ uni.navigateTo({
+ url:'/physical-merchants/classify/order/orderDetail?id='+lists.orderNo
+ })
+ }
+ else {
uni.navigateTo({
url: '/pages/user/order_details/order_details?id=' + lists.orderNo
})
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 9890b46..cf2801b 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -43,7 +43,7 @@
-
+
-
+
{{row.title}}
-
+
x1
-
+
+
+
+
+
+
+ {{row.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{row.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
订单编号:{{row.orderNo}}
@@ -122,7 +170,7 @@
getDictionaryByCodeType
} from '../../../Utils/Api.js';
- import orderList from '@/pages/classify/order/orderList.vue'
+
let app = getApp()
export default {
@@ -165,7 +213,7 @@
}
},
components:{
- orderList
+
},
onLoad(option) {
// #ifdef H5
@@ -180,6 +228,10 @@
}
this.list = this.orderList[this.typeId];
this.tabbarIndex = tbIndex;
+ // this.getUserOrderList();
+ // this.getDictionaryByCodeType();
+ },
+ onShow(){
this.getUserOrderList();
this.getDictionaryByCodeType();
},
@@ -253,6 +305,16 @@
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
+
+ if(res.return_data.list.length>0){
+ res.return_data.list.map(item=>{
+ if(item.ext6){
+ item.ext6 = item.ext6.split(',')
+ }
+ })
+ }
+
+
this.orderList = this.orderList.concat(res.return_data.list);
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
@@ -276,21 +338,26 @@
},
//跳转详情
jumpDetails(e, item) {
- this.orderCheck(e);
- if (item == 1 || item == 2 || item == 3) {
+
+ //实物类型
+ if(item == 12){
uni.navigateTo({
- url: '/qianzhu-KFC/order-details/order-details?id=' + e
+ url:'/physical-merchants/classify/order/orderDetail?id='+e
+
})
return;
}
- //实物类型
- if(item == 12){
+
+ this.orderCheck(e);
+ if (item == 1 || item == 2 || item == 3) {
uni.navigateTo({
- url: '/pages/classify/order/orderDetail?id='+e
+ url: '/qianzhu-KFC/order-details/order-details?id=' + e
})
return;
}
+
+
uni.navigateTo({
url: '../order_details/order_details?id=' + e
})
@@ -376,6 +443,23 @@
},
//去支付
toPayment(row) {
+
+ //实物
+ if(row.productType == 12){
+ let obj = {
+ orderNo : row.orderNo,
+ createTime:row.createTime,
+ payPrice:row.payablePrice
+ }
+ obj = JSON.stringify(obj)
+ uni.navigateTo({
+ url: '/physical-merchants/classify/order/pay?obj=' + obj
+ })
+
+ return
+ }
+
+
let payTypes;
if (row.payType == 1 || row.payType == null) {
payTypes = 3;
@@ -394,6 +478,110 @@
diff --git a/pages/classify/order/orderList.vue b/physical-merchants/classify/order/orderList.vue
similarity index 100%
rename from pages/classify/order/orderList.vue
rename to physical-merchants/classify/order/orderList.vue
diff --git a/pages/classify/order/pay.vue b/physical-merchants/classify/order/pay.vue
similarity index 94%
rename from pages/classify/order/pay.vue
rename to physical-merchants/classify/order/pay.vue
index 100e4c2..4e5a2b0 100644
--- a/pages/classify/order/pay.vue
+++ b/physical-merchants/classify/order/pay.vue
@@ -14,7 +14,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -230,7 +230,9 @@
clearInterval(this.timers);
// this.getDetailByOrderNo();
this.countdownh = this.countdownm = this.countdowns = "00";
-
+ uni.reLaunch({
+ url:'/pages/user/order_list/order_list'
+ })
}
},
@@ -288,19 +290,22 @@
"signType": "MD5",
"timeStamp": res.return_data.timeStamp,
success: function(res) {
+
uni.hideLoading();
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
- url: "/pages/classify/order/paymentResult?id=" + that
+ url: "/physical-merchants/classify/order/paymentResult?id=" + that
.orderNo
// url: '../../user/order_details/order_details?id=' +that.orderNo
});
},
fail: function(err) {
uni.hideLoading();
- uni.navigateBack({})
+ uni.navigateBack({
+ delta:2
+ })
},
});
// #endif
@@ -386,7 +391,7 @@
title: '支付成功'
})
uni.reLaunch({
- url: "/pages/classify/order/paymentResult?id=" + that
+ url: "/physical-merchants/classify/order/paymentResult?id=" + that
.orderNo
// url: '../../user/order_details/order_details?id=' +that.orderNo
});
@@ -448,7 +453,7 @@
title: '支付成功'
})
uni.reLaunch({
- url: "/pages/classify/order/paymentResult?id=" + that.orderNo
+ url: "/physical-merchants/classify/order/paymentResult?id=" + that.orderNo
// url: '../../user/order_details/order_details?id=' +this.orderNo
})
return;
@@ -481,7 +486,7 @@
// pay(type) {
// uni.navigateTo({
- // url: "/pages/classify/order/paymentResult?type=" + type
+ // url: "/physical-merchants/classify/order/paymentResult?type=" + type
// })
// }
}
diff --git a/pages/classify/order/paymentResult.vue b/physical-merchants/classify/order/paymentResult.vue
similarity index 100%
rename from pages/classify/order/paymentResult.vue
rename to physical-merchants/classify/order/paymentResult.vue
diff --git a/components/trackNode/trackNode.vue b/physical-merchants/classify/order/trackNode/trackNode.vue
similarity index 89%
rename from components/trackNode/trackNode.vue
rename to physical-merchants/classify/order/trackNode/trackNode.vue
index f581df6..b772432 100644
--- a/components/trackNode/trackNode.vue
+++ b/physical-merchants/classify/order/trackNode/trackNode.vue
@@ -66,15 +66,15 @@ export default {
computed: {
nodeIconUrl () {
if (this.nodeData.logisticsStatus === 'WAIT_ACCEPT') { // 待揽收
- return this.isNewest ? '../../static/img/wuliu/ic-paied.png' : '../../static/img/wuliu/ic-paied-G.png'
+ return this.isNewest ? '../../../static/img/wuliu/ic-paied.png' : '../../../static/img/wuliu/ic-paied-G.png'
} else if (this.nodeData.logisticsStatus === 'ACCEPT') { // 已揽收
- return this.isNewest ? '../../static/img/wuliu/ic-pacakaging.png' : '../../static/img/wuliu/ic-pacakaging-G.png'
+ return this.isNewest ? '../../../static/img/wuliu/ic-pacakaging.png' : '../../../static/img/wuliu/ic-pacakaging-G.png'
} else if (this.nodeData.logisticsStatus === 'DELIVERING') { // 派件中
- return this.isNewest ? '../../static/img/wuliu/ic-sending.png' : '../../static/img/wuliu/ic-sending-G.png'
+ return this.isNewest ? '../../../static/img/wuliu/ic-sending.png' : '../../../static/img/wuliu/ic-sending-G.png'
} else if (this.nodeData.logisticsStatus === 'SIGN'|| this.nodeData.logisticsStatus === 'AGENT_SIGN') { // 已签收,已待签收
- return this.isNewest ? '../../static/img/wuliu/ic-delivering.png' : '../../static/img/wuliu/ic-delivering-G.png'
+ return this.isNewest ? '../../../static/img/wuliu/ic-delivering.png' : '../../../static/img/wuliu/ic-delivering-G.png'
}else if (this.nodeData.logisticsStatus === 'FAILED') { // 包裹异常
- return this.isNewest ? '../../static/img/wuliu/ic-package-failed.png' : '../../static/img/wuliu/ic-package-failed-G.png'
+ return this.isNewest ? '../../../static/img/wuliu/ic-package-failed.png' : '../../../static/img/wuliu/ic-package-failed-G.png'
}
},
acceptStationFixed () {
diff --git a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
new file mode 100644
index 0000000..eba84fb
--- /dev/null
+++ b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
@@ -0,0 +1,261 @@
+
+
+
+ 物流信息
+
+
+
+
+ {{tracesData.expressCompanyName}}
+ {{tracesData.number}}
+
+
+ 复制
+ |
+ 打电话
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/settleAccounts/detail-popup/detail-popup.vue b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue
similarity index 95%
rename from pages/settleAccounts/detail-popup/detail-popup.vue
rename to physical-merchants/settleAccounts/detail-popup/detail-popup.vue
index b861470..3422209 100644
--- a/pages/settleAccounts/detail-popup/detail-popup.vue
+++ b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue
@@ -24,7 +24,7 @@
{{item.title}}
-
+
¥{{item.price}}
@@ -32,6 +32,15 @@
¥{{item.originalPrice}}
+
+
+
+ ¥{{item.originalPrice}}
+
+
+
×{{item.num}}
@@ -197,7 +206,7 @@
discountList:[],//优惠券信息
totalPrice:0,//商品总金额
yhqType: 0,//选择的优惠券id
-
+ yhqId:0,
}
},
@@ -251,16 +260,18 @@
methods: {
// //goods货品, freight运费,integral积分,coupon优惠券
- show(str, data) {
+ show(str, data,yhqID) {
this.goodsList = [];
this.postPrice = null;
this.discountList = [];
this.totalPrice = 0;
-
+ this.yhqId = 0;
this.keywords = str;
if (str == 'goods') {
+ this.yhqId = yhqID;
+ console.log(this.yhqId,"this.yhqId")
this.goodsList = data;
} else if (str == 'freight') {
this.postPrice = data;
diff --git a/pages/settleAccounts/settleAccounts.vue b/physical-merchants/settleAccounts/settleAccounts.vue
similarity index 91%
rename from pages/settleAccounts/settleAccounts.vue
rename to physical-merchants/settleAccounts/settleAccounts.vue
index dc543e4..524b8d8 100644
--- a/pages/settleAccounts/settleAccounts.vue
+++ b/physical-merchants/settleAccounts/settleAccounts.vue
@@ -202,7 +202,7 @@