diff --git a/multipleShop/images/location.jpg b/multipleShop/images/location.jpg
new file mode 100644
index 0000000..eabb831
Binary files /dev/null and b/multipleShop/images/location.jpg differ
diff --git a/multipleShop/images/location.webp b/multipleShop/images/location.webp
deleted file mode 100644
index 0f6e146..0000000
Binary files a/multipleShop/images/location.webp and /dev/null differ
diff --git a/multipleShop/images/location_small.jpg b/multipleShop/images/location_small.jpg
new file mode 100644
index 0000000..8325e7b
Binary files /dev/null and b/multipleShop/images/location_small.jpg differ
diff --git a/multipleShop/images/location_small.webp b/multipleShop/images/location_small.webp
deleted file mode 100644
index d69b6c6..0000000
Binary files a/multipleShop/images/location_small.webp and /dev/null differ
diff --git a/multipleShop/images/phone.jpg b/multipleShop/images/phone.jpg
new file mode 100644
index 0000000..63f2ad3
Binary files /dev/null and b/multipleShop/images/phone.jpg differ
diff --git a/multipleShop/images/phone.webp b/multipleShop/images/phone.webp
deleted file mode 100644
index 0a3479e..0000000
Binary files a/multipleShop/images/phone.webp and /dev/null differ
diff --git a/multipleShop/images/time.jpg b/multipleShop/images/time.jpg
new file mode 100644
index 0000000..cc147c1
Binary files /dev/null and b/multipleShop/images/time.jpg differ
diff --git a/multipleShop/images/time.webp b/multipleShop/images/time.webp
deleted file mode 100644
index 914682a..0000000
Binary files a/multipleShop/images/time.webp and /dev/null differ
diff --git a/multipleShop/images/write_done.jpg b/multipleShop/images/write_done.jpg
new file mode 100644
index 0000000..78ee2cf
Binary files /dev/null and b/multipleShop/images/write_done.jpg differ
diff --git a/multipleShop/images/write_done.webp b/multipleShop/images/write_done.webp
deleted file mode 100644
index b760c6c..0000000
Binary files a/multipleShop/images/write_done.webp and /dev/null differ
diff --git a/multipleShop/index/index.vue b/multipleShop/index/index.vue
index 6deb7de..2bfcfa2 100644
--- a/multipleShop/index/index.vue
+++ b/multipleShop/index/index.vue
@@ -19,12 +19,12 @@
可配送
-
{{item.detailed_address || '-'}}
-
+
{{item.day_start + '-' + item.day_end}}
9:00-18:00
@@ -35,11 +35,11 @@
-
-
diff --git a/multipleShop/verificationOrder/index.vue b/multipleShop/verificationOrder/index.vue
index 0166912..0b29eeb 100644
--- a/multipleShop/verificationOrder/index.vue
+++ b/multipleShop/verificationOrder/index.vue
@@ -38,7 +38,7 @@
订单编号:{{item.order_id}}
-
+
diff --git a/pageQuota/Balance/index.vue b/pageQuota/Balance/index.vue
index 520f4ab..de27058 100644
--- a/pageQuota/Balance/index.vue
+++ b/pageQuota/Balance/index.vue
@@ -43,8 +43,10 @@
- 供销经营礼包
- +{{item.amount}}
+ {{item.title}}
+ +{{item.amount}}
+ -{{item.amount}}
+
{{item.create_time}}
diff --git a/pages/charge/charge_record.vue b/pages/charge/charge_record.vue
index 7c5a005..e763e9d 100644
--- a/pages/charge/charge_record.vue
+++ b/pages/charge/charge_record.vue
@@ -40,9 +40,9 @@
-
-
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f57c095..09c9242 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -127,10 +127,11 @@
- ¥{{item.price}}
+ ¥{{item.price}}
+
@@ -256,13 +257,13 @@
getGoodList();
}
- const addCart = (id, cart_num) => { //加入购物车
+ const addCart = (product_id, cart_num) => { //加入购物车
cartCreateApi({
cart_num: cart_num,
is_new: 0, // 是否直接购买0否1是
// goods_id: id,
store_id: where.value.store_id,
- product_id: id
+ product_id: product_id
}).then(res => {
getCartList();
}).catch(err => {
@@ -461,7 +462,7 @@
}
});
- addCart(data.id, data.cart_num);
+ addCart(data.product_id, data.cart_num);
}
// 结算
const settleAccounts = () => {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index d3082fa..24bcd4f 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -80,21 +80,21 @@
-
+
待核销
{{orderCount.waiting}}
-
+
已核销
{{orderCount.receiving}}
-
+
售后/退款
{{orderCount.applyRefund}}
diff --git a/pagesOrder/order/component/good.vue b/pagesOrder/order/component/good.vue
index 1d1eefc..5db7da1 100644
--- a/pagesOrder/order/component/good.vue
+++ b/pagesOrder/order/component/good.vue
@@ -27,7 +27,7 @@
- {{item.unit}}
+ {{item.unit_name}}
x{{item.cart_num}}
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 153196c..4c1ff20 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -34,13 +34,13 @@
color="#f6f6f6" :customStyle="{color:'#666666'}">修改
-->
-
+
+
+
{{addressInfo.real_name}}
@@ -56,7 +56,7 @@
@click='orderInfo.shipping_type=2' v-if='orderInfo.default_delivery==1'>
自提
-
配送
@@ -95,10 +95,10 @@
运费
¥0.00
-
- 活动折扣 9折
+
+ 活动折扣 {{orderInfo.activity}}
- -¥{{c_price(orderInfo.vip_price, 0)}}.{{c_price(orderInfo.vip_price, 1)}}
+ -¥{{orderInfo.activity_price}}
diff --git a/static/icon/back.jpg b/static/icon/back.jpg
new file mode 100644
index 0000000..d0a1da9
Binary files /dev/null and b/static/icon/back.jpg differ
diff --git a/static/icon/back.webp b/static/icon/back.webp
deleted file mode 100644
index 62e9dad..0000000
Binary files a/static/icon/back.webp and /dev/null differ
diff --git a/static/icon/diamond.jpg b/static/icon/diamond.jpg
new file mode 100644
index 0000000..b356c50
Binary files /dev/null and b/static/icon/diamond.jpg differ
diff --git a/static/icon/diamond.webp b/static/icon/diamond.webp
deleted file mode 100644
index ebab5c8..0000000
Binary files a/static/icon/diamond.webp and /dev/null differ
diff --git a/static/icon/done.jpg b/static/icon/done.jpg
new file mode 100644
index 0000000..791af1c
Binary files /dev/null and b/static/icon/done.jpg differ
diff --git a/static/icon/done.webp b/static/icon/done.webp
deleted file mode 100644
index c99802a..0000000
Binary files a/static/icon/done.webp and /dev/null differ
diff --git a/static/icon/order.jpg b/static/icon/order.jpg
new file mode 100644
index 0000000..aac0b6a
Binary files /dev/null and b/static/icon/order.jpg differ
diff --git a/static/icon/order.webp b/static/icon/order.webp
deleted file mode 100644
index 66e6e35..0000000
Binary files a/static/icon/order.webp and /dev/null differ
diff --git a/static/icon/silver.jpg b/static/icon/silver.jpg
new file mode 100644
index 0000000..6e6f9bb
Binary files /dev/null and b/static/icon/silver.jpg differ
diff --git a/static/icon/silver.webp b/static/icon/silver.webp
deleted file mode 100644
index d328fbd..0000000
Binary files a/static/icon/silver.webp and /dev/null differ
diff --git a/static/icon/wait.jpg b/static/icon/wait.jpg
new file mode 100644
index 0000000..d004ed2
Binary files /dev/null and b/static/icon/wait.jpg differ
diff --git a/static/icon/wait.webp b/static/icon/wait.webp
deleted file mode 100644
index a0aa7a4..0000000
Binary files a/static/icon/wait.webp and /dev/null differ