From 801d2cb4139c3d5fe10c896f6a73cb285fbc51db Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 6 Jul 2024 16:20:28 +0800
Subject: [PATCH] add
---
pageQuota/asset/index.vue | 48 +-
pageQuota/vipUser/index.vue | 1650 +++++++++++++++++-----------------
pages/my/my.vue | 4 +-
pagesOrder/settle/settle.vue | 6 +-
4 files changed, 855 insertions(+), 853 deletions(-)
diff --git a/pageQuota/asset/index.vue b/pageQuota/asset/index.vue
index dbc874f..618b3cf 100644
--- a/pageQuota/asset/index.vue
+++ b/pageQuota/asset/index.vue
@@ -1,27 +1,33 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.store_name }} x{{item.nums }}
+ ¥{{item.price}}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{item.store_name }} x{{item.nums }}
- ¥{{item.price}}
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index d83a407..4e212c7 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -10,8 +10,7 @@
-
+
@@ -22,9 +21,9 @@
-
-
+
@@ -52,15 +51,15 @@
-
-
+
-
-
- {{item.money}}元采购包
+
+
+ {{ item.money }}元采购包
- 送{{item.send}}{{item.send_string}}
+ 送{{ item.send }}{{ item.send_string }}
@@ -102,13 +101,13 @@
- {{Role==1?'完成并收款':"完成" }}
+ {{ Role == 1 ? '完成并收款' : "完成" }}
-
+
行业会员追加经营资金
@@ -126,12 +125,11 @@
+ :placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }">
-
@@ -150,14 +148,14 @@
-
+
+ v-if="formData2.label_limit && formData2.price < formData2.label_limit">
- {{formData2.label_name}}会员最低金额不能低于{{formData2.label_limit}}元
+ {{ formData2.label_name }}会员最低金额不能低于{{ formData2.label_limit }}元
-
+
当前已开通:
@@ -207,7 +205,7 @@
{{ item.real_name }}
-
+
查看号码
@@ -215,7 +213,7 @@
{{ item.create_time }}
{{ item.ship_name }}
- 已开通
+ 已开通
未开通,查询
@@ -232,7 +230,7 @@
-
+
当前已开通:
@@ -273,8 +271,8 @@
:activeStyle="{ color: '#20B128' }">
-
+
{{ item.city_name }}
@@ -297,13 +295,12 @@
{{ item.village_name }}
-
+
-
+
{{ item.brigade_name }}
@@ -313,476 +310,518 @@
+ confirmColor='#33B83A' @confirm='showModal = false' @close="showModal = false">
- {{popPhone}}
+ {{ popPhone }}
-
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 931788f..55cc8f0 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -116,8 +116,8 @@
-
+
+
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index b02dac6..388cef8 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -98,7 +98,7 @@
优惠减免
- -¥{{ c_price(orderInfo.activity_price, 0) }}.{{ c_price(orderInfo.activity_price, 1) }}
+ -¥{{ c_price(orderInfo.frozen_money, 0) }}.{{ c_price(orderInfo.frozen_money, 1) }}
@@ -110,13 +110,13 @@
订单备注
{{formData.remark.length}}/140