diff --git a/package.json b/package.json
index c75949d..994491c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jdt-user",
- "version": "4.0.4",
+ "version": "4.0.5",
"private": true,
"description": "",
"templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass"
},
"taroConfig": {
- "version": "4.0.4"
+ "version": "4.0.5"
},
"scripts": {
"build:weapp": "taro build --type weapp",
diff --git a/src/components/Cart.vue b/src/components/Cart.vue
index 09edd6c..be9996e 100644
--- a/src/components/Cart.vue
+++ b/src/components/Cart.vue
@@ -235,7 +235,7 @@ defineExpose({
现金:{{ item.price }}
- 积分:{{ item.exchange }}
+ 积分:{{ item.discount_integral }}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5af4cce..926946b 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,14 +1,12 @@
-
+
{{ address }}
-
+
搜索
@@ -16,36 +14,18 @@
-
+
{{ item.name }}
-
+
@@ -54,8 +34,8 @@
diff --git a/src/pages/users/order_list/index.vue b/src/pages/users/order_list/index.vue
index 8459a6c..bc76121 100644
--- a/src/pages/users/order_list/index.vue
+++ b/src/pages/users/order_list/index.vue
@@ -65,6 +65,8 @@ interface GoodsItem {
Goods: {
name: string;
cover: string;
+ discount_price: number;
+ exchange: number;
};
ID: number;
gid: string;
@@ -275,8 +277,8 @@ const closed = () => {
{{ itm.Goods?.name }}
- {{ itm.pay_price }}元
- +{{ itm.pay_integral }}积分
+ {{ itm.Goods.discount_price }}元
+ +{{ itm.Goods.exchange }}积分
diff --git a/src/pages/users/order_list_detail/index.vue b/src/pages/users/order_list_detail/index.vue
index a737e06..8ba0f47 100644
--- a/src/pages/users/order_list_detail/index.vue
+++ b/src/pages/users/order_list_detail/index.vue
@@ -86,8 +86,8 @@
{{ item.Goods?.name }}
- {{ item.pay_price }}元
- +{{ item.pay_integral }}积分
+ {{ item.Goods.discount_price }}元
+ +{{ item.Goods.exchange }}积分
diff --git a/src/static/popTip.png b/src/static/popTip.png
index 0175e89..589bc82 100644
Binary files a/src/static/popTip.png and b/src/static/popTip.png differ
diff --git a/src/static/popTip2.png b/src/static/popTip2.png
deleted file mode 100644
index 2b13625..0000000
Binary files a/src/static/popTip2.png and /dev/null differ