From db89348f2a25282c0348de684e0a349af43a934f Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 27 Jun 2024 17:39:25 +0800
Subject: [PATCH] add
---
components/goodPopup.vue | 6 +-
config/app.js | 9 +-
pageQuota/vipUser/index.vue | 119 +++++++++++-------
pages/cart/cart.vue | 2 +-
pages/index/index.vue | 18 +--
pagesOrder/setPayPassword/index.vue | 2 +-
pagesOrder/settle/settle.vue | 12 +-
.../zy-passwordboard/zy-passwordboard.vue | 2 +-
8 files changed, 110 insertions(+), 60 deletions(-)
diff --git a/components/goodPopup.vue b/components/goodPopup.vue
index f542595..02dcb50 100644
--- a/components/goodPopup.vue
+++ b/components/goodPopup.vue
@@ -43,7 +43,7 @@
购买数量*
-
+
@@ -80,6 +80,10 @@
},
})
+ const valChange = () => {
+ console.log(4545)
+ uni.vibrateShort();
+ }
let priceKey = ref({})
if (uni.getStorageSync('PRICE_KEY')) {
diff --git a/config/app.js b/config/app.js
index 02b82ad..a484fa4 100644
--- a/config/app.js
+++ b/config/app.js
@@ -4,17 +4,22 @@ import store from "@/store/user.js"
// 环境
let env = "dev"
// let env = "prod"
-// let env = "liu";
+// let env = "release";
+// let env = "local";
switch (env) {
case 'dev':
BASE_URL = 'https://test-multi-store.lihaink.cn';
WSS_URL = 'wss://test-multi-store.lihaink.cn/pull'
break;
- case 'liu':
+ case 'release':
BASE_URL = 'https://ceshi-multi-store.lihaink.cn';
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
break;
+ case 'local':
+ BASE_URL = 'http://192.168.1.201:8545';
+ WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
+ break;
default:
BASE_URL = 'https://multi-store.lihaink.cn';
WSS_URL = 'wss://multi-store.lihaink.cn/pull'
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 702ec73..f5baab2 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -1,15 +1,14 @@
-
+
-
-
+
@@ -27,6 +26,7 @@
{{ Role == 1 ? '行业会员' : '商户' }}开通报备
+
@@ -61,7 +61,7 @@
suffixIcon='arrow-down'>
-
+
@@ -83,16 +83,24 @@
{{ flag ? '获取验证码' : '重新获取' }}
-
-
-
报备人:{{ STORE_INFO.name }}
+
+
+
+
+
+ {{formData.label_name}}角色最低金额不能低于{{formData.label_limit}}元
+
+
+
+
- {{ index + 1 }}
+ {{index+1}}
{{ item.real_name }}
{{ item.price }}
{
+ formData.price = (+formData.price).toFixed(2)
+ }
+
const resetFormData = () => {
for (let key in formData) {
formData[key] = ''
@@ -354,8 +369,8 @@
const conformRole = (e) => {
formData.label_name = e.value[0].label_name
formData.label_id = e.value[0].label_id
- console.log(e)
-
+ formData.price = (+e.value[0].limit).toFixed(2)
+ formData.label_limit = e.value[0].limit
showPop1.value = false
}
@@ -480,13 +495,15 @@
if (!formData.mobile) return uni.$u.toast('请填写电话号码');
if (!formData.code) return uni.$u.toast('请输入短信验证码');
if (!formData.address) return uni.$u.toast('请选择地址');
+ if (!formData.label_id) return uni.$u.toast('请选择用户身份');
+ if (formData.price < formData.label_limit) return uni.$u.toast(
+ `${formData.label_name}角色最低金额不能低于${formData.label_limit}元`);
formData.store_id = STORE_INFO.id
if (Role.value == 1) {
// formData.recharge_type = 'INDUSTRYMEMBERS'
// formData.user_ship = 1
// vipRechargeApi(formData).then(res => {})
// return
- if (!formData.label_id) return uni.$u.toast('请选择用户身份');
uni.scanCode({
success: function(res) {
if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
@@ -505,17 +522,6 @@
}
});
- } else {
- delete formData.recharge_type
- delete formData.auth_code
- formData.user_ship = 4
- vipRechargeApi(formData).then(res => {
- uni.$u.toast('操作成功');
- currentTab.value = 2
- resetFormData()
- getLists()
- getCount()
- })
}
}
@@ -557,6 +563,12 @@
}
// 邀请用户数
+ let where = {
+ page_no: 1,
+ page_size: 25,
+ loadingOver: false
+
+ }
const count = ref(0)
const getCount = async () => {
if (Role.value == 4) return;
@@ -569,19 +581,16 @@
// 邀请列表
const lists = ref([])
const getLists = async () => {
- if (Role.value == 1) {
- let res = await rechargeListsApi({
- store_id: STORE_INFO.id,
- recharge_type: "INDUSTRYMEMBERS"
- })
- lists.value = res.data.lists
- } else {
- let res = await getCreateLists({
- store_id: STORE_INFO.id,
- })
- lists.value = res.data.lists
- count.value = res.data.count
- }
+ where.loadingOver = false
+ where.page_no = 1
+ where.page_size = 25
+ let res = await rechargeListsApi({
+ store_id: STORE_INFO.id,
+ recharge_type: "INDUSTRYMEMBERS",
+ page_no: 1,
+ page_size: 25
+ })
+ lists.value = res.data.lists
}
@@ -622,6 +631,32 @@
uni.stopPullDownRefresh()
}, 1000)
})
+
+
+ onReachBottom(async () => {
+ if (where.loadingOver) return;
+ where.page_no++;
+ if (Role.value == 1) {
+ let res = await rechargeListsApi({
+ store_id: STORE_INFO.id,
+ recharge_type: "INDUSTRYMEMBERS",
+ ...where
+ })
+ if (res.data.lists.length <= 0) {
+ return where.loadingOver = true
+ }
+ lists.value.push(...res.data.lists)
+ } else {
+ let res = await getCreateLists({
+ store_id: STORE_INFO.id,
+ ...where
+ })
+ if (res.data.lists.length <= 0) {
+ return where.loadingOver = true
+ }
+ lists.value.push(...res.data.lists)
+ }
+ })