diff --git a/common/js/request.js b/common/js/request.js
index 79f7b92..2087aa6 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -10,9 +10,9 @@ export default {
title: '加载中'
})
// request 触发前拼接 url
- // args.url = 'https://www.opsoul.com' + args.url;
+ args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://10.45.137.214:80' + args.url;
- args.url = 'http://127.0.0.1:80' + args.url;
+ // args.url = 'http://127.0.0.1:80' + args.url;
if (args.data) {
args.data.deptId = globalData.deptId;
args.data.from = globalData.from;
diff --git a/pages/my/components/product-picked.vue b/pages/my/components/product-picked.vue
index 9a00835..b8eded3 100644
--- a/pages/my/components/product-picked.vue
+++ b/pages/my/components/product-picked.vue
@@ -6,10 +6,16 @@
{{product.goodsName}}
-
- {{product.standardName}}
- ×{{product.num}}
+
+ {{item.standardName}}
+ ×{{item.standardNum}}
+ ...
+
@@ -23,6 +29,10 @@
product: {
type: Object,
default: null
+ },
+ pickedList: {
+ type: Array,
+ default: []
}
}
}
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index 6ba8b55..89d1e0d 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -31,7 +31,7 @@
-
+
总价{{shopOrder.totalMoney}}