From 2a14ce699b427e403de4a0691dc050c3a5ada946 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Fri, 28 Jun 2024 11:24:16 +0800 Subject: [PATCH 01/23] add --- api/api.js | 6 ++++++ config/app.js | 4 ++-- pageQuota/vipUser/index.vue | 21 +++++++++++++++------ pages/index/index.vue | 9 ++++++--- pages/login/login.vue | 8 ++++---- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/api/api.js b/api/api.js index 701edeb..73fb5d1 100644 --- a/api/api.js +++ b/api/api.js @@ -6,4 +6,10 @@ export const goodListApi = (data) => { export const goodClassListApi = (data) => { return request.get('/goods/goodsclass/lists', data); +} + + + +export const getPush = (data) => { + return request.get('/push', data); } \ No newline at end of file diff --git a/config/app.js b/config/app.js index 3500d16..a484fa4 100644 --- a/config/app.js +++ b/config/app.js @@ -2,8 +2,8 @@ let BASE_URL let WSS_URL import store from "@/store/user.js" // 环境 -// let env = "dev" -let env = "prod" +let env = "dev" +// let env = "prod" // let env = "release"; // let env = "local"; diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue index ef01bb8..5e39365 100644 --- a/pageQuota/vipUser/index.vue +++ b/pageQuota/vipUser/index.vue @@ -6,9 +6,6 @@ - @@ -347,7 +344,8 @@ // label_name: "", // label_id: "4", // user_ship: '1', - // code: '' + // price: 0.02, + // code: '12' }) const tofixedPrice = () => { @@ -481,7 +479,10 @@ const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`); user_channel.on('message', function(data) { try { + uni.hideLoading({}); + console.log(timerInvol) clearTimeout(timerInvol); + console.log("清除" + timerInvol) paySuccessToTabs2() } catch (error) {} }); @@ -501,7 +502,16 @@ if (Role.value == 1) { // formData.recharge_type = 'INDUSTRYMEMBERS' // formData.user_ship = 1 - // vipRechargeApi(formData).then(res => {}) + // vipRechargeApi(formData).then(res => { + // uni.showLoading({ + // title: '支付中...' + // }); + // timerInvol = setTimeout(() => { + // uni.hideLoading(); + // uni.$u.toast('支付超时'); + // console.log("支付超时") + // }, 10000) + // }) // return uni.scanCode({ success: function(res) { @@ -538,7 +548,6 @@ }).then(res => { timerInvol = setTimeout(() => { uni.hideLoading(); - if (currentTab.value == 2) return; uni.$u.toast('支付超时'); }, 30000) }) diff --git a/pages/index/index.vue b/pages/index/index.vue index ff84b16..cb5f161 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -24,9 +24,12 @@ {{ - (shareInfo.real_name || ( - userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }} + style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"> + + {{ (userStore.userInfo.real_name || userStore.userInfo.nickname) + '的供销个人门店' }} + + {{(shareInfo.real_name || (userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }} + {{ STORE_INFO.store_name }} diff --git a/pages/login/login.vue b/pages/login/login.vue index b0e743c..7beb209 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -13,13 +13,13 @@ - 微信快捷登录 + 微信快捷登录 - + @@ -190,7 +192,7 @@ config } from "@/config/app.js" - + let isFoucs = ref(false); const userStore = useUserStore(); const userInfo = ref({}); let token = uni.getStorageSync('token') || '' From 43612fe683ed0e087a1d10028e6c17d2fcfa09a8 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Fri, 28 Jun 2024 19:53:27 +0800 Subject: [PATCH 03/23] add --- api/user.js | 4 + config/app.js | 4 +- pageQuota/balanceDetail/index.vue | 6 +- pageQuota/vipUser/index.vue | 309 +++++++++++++++++++++++------- pages.json | 2 +- pages/login/login.vue | 6 +- pages/my/my.vue | 182 +++++++----------- pagesOrder/detail/detail.vue | 42 +++- 8 files changed, 364 insertions(+), 191 deletions(-) diff --git a/api/user.js b/api/user.js index 11f60ff..98fcf50 100644 --- a/api/user.js +++ b/api/user.js @@ -149,4 +149,8 @@ export const getReportingSms = (data) => { export const uploadImg = (data) => { return request.post('/Upload/image', data); +} + +export const getVipInfoByPhone = (data) => { + return request.get('/user/user/other_user_info', data); } \ No newline at end of file diff --git a/config/app.js b/config/app.js index a484fa4..3500d16 100644 --- a/config/app.js +++ b/config/app.js @@ -2,8 +2,8 @@ let BASE_URL let WSS_URL import store from "@/store/user.js" // 环境 -let env = "dev" -// let env = "prod" +// let env = "dev" +let env = "prod" // let env = "release"; // let env = "local"; diff --git a/pageQuota/balanceDetail/index.vue b/pageQuota/balanceDetail/index.vue index 8296aaa..4efc17d 100644 --- a/pageQuota/balanceDetail/index.vue +++ b/pageQuota/balanceDetail/index.vue @@ -13,7 +13,7 @@ {{item.create_time}} - 余额 {{item.before_balance}} + 余额 {{item.balance}} @@ -21,8 +21,8 @@ {{item.title}} - {{ !item.financial_pm?'+':'-' }}{{item.number}} + {{ item.financial_pm?'+':'-' }}{{item.number}} {{item.create_time}} diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue index 5e39365..e4ccde1 100644 --- a/pageQuota/vipUser/index.vue +++ b/pageQuota/vipUser/index.vue @@ -12,17 +12,22 @@ - + - + --> + + + + + + - {{ Role == 1 ? '行业会员' : '商户' }}开通报备 + 行业会员开通报备 @@ -48,7 +53,7 @@ suffixIcon='arrow-down'> - + - - - - --> @@ -85,15 +81,15 @@ 报备人:{{ STORE_INFO.name }} - + - - {{formData.label_name}}角色最低金额不能低于{{formData.label_limit}}元 + {{formData.label_name}}角色最低金额不能低于{{formData.label_limit}}元且最高金额不能超过10000.00元 @@ -102,14 +98,85 @@ - {{ Role == 1 ? '完成并收款' : '完成' }} + 完成并收款 + + + + 行业会员追加经营资金 + + + + + + + + + + + + + + + + + + 报备人:{{ STORE_INFO.name }} + + + + + + + + + {{formData2.label_name}}会员最低金额不能低于{{formData2.label_limit}}元 + + + 最高金额不能超过10000.00元 + + + 可单次多笔累计操作 + + + + + + + + + + 完成并收款 + + + + - + 当前已开通： @@ -120,25 +187,22 @@ - 序号 - 行业会员 - 经营资金 - 开通时间 - 商户 - 角色 + + 行业会员 + 经营资金 + 开通时间 + 角色 状态 - {{index+1}} - {{ item.real_name }} - {{ item.price }} - {{ item.create_time }} - {{ item.nickname }} - {{ item.label_name }} + + {{ item.real_name }} + {{ item.price }} + {{ item.create_time }} + {{ item.label_name }} - 已开通 + 已开通 未开通,查询 @@ -226,7 +290,8 @@ getUserLabel, getUserShip, getCreateLists, - getReportingSms + getReportingSms, + getVipInfoByPhone } from "@/api/user.js" import Push from "@/utils/push.js" import { @@ -244,6 +309,28 @@ const columns = ref([]) const showModa = ref(true) const storePhone = ref('') + const tabsLst = reactive([{ + name: '开通行业会员' + }, + { + name: '追加经营资金' + }, + { + name: '已开通列表' + }, + ]); + + + const tabsChange = (e) => { + currentTab.value = e.index + if (e.index == 2) { + getCount() + getLists() + } + // getLists() + } + + const confirmStore = () => { getStoreByPhone({ phone: storePhone.value @@ -291,7 +378,7 @@ const code = ref('') const checkPhone = (phone) => { const regex = /^1[3-9]\d{9}$/; - return regex.test(formData.mobile) ? true : false + return regex.test(phone) ? true : false } const getCode = async () => { @@ -312,7 +399,7 @@ // 验证码结束 - const currentTab = ref(1) + const currentTab = ref(0) const formData = reactive({ store_id: STORE_INFO.id, mobile: "", @@ -348,7 +435,61 @@ // code: '12' }) - const tofixedPrice = () => { + + const formData2 = reactive({ + store_id: STORE_INFO.id, + mobile: "", + province: 510000, + city: '', + area: "", + street: "", + village: "", + real_name: "", + auth_code: "", + address: "", + label_name: "", + label_id: "", + label_limit: "", + user_ship: '', + brigade: "", + price: "", + }) + + const phoneChnge = async () => { + if (formData2.mobile.length == 0) resetFormData(); + if (!checkPhone(formData2.mobile)) return + uni.showLoading({ + title: '查询用户中' + }) + let { + data + } = await getVipInfoByPhone({ + mobile: formData2.mobile + }) + uni.hideLoading() + formData2.city = data.address_info?.city + formData2.area = data.address_info?.area + formData2.province = data.address_info?.province + formData2.street = data.address_info?.street + formData2.village = data.address_info?.village + formData2.real_name = data.real_name + formData2.address = data.address_info?.address_like + formData2.label_id = data.label_id + // formData2.label_limit = data.label_id + formData2.user_ship = data.user_ship + formData2.brigade = data.address_info?.brigade + columns.value[0].forEach(item => { + if (item.label_id == data.label_id) { + formData2.label_name = item.label_name + formData2.label_limit = item.limit + } + }) + + } + + + const tofixedPrice = (type = 1) => { + if (type == 2) return formData2.price = (+formData2.price).toFixed(2) formData.price = (+formData.price).toFixed(2) } @@ -356,10 +497,16 @@ for (let key in formData) { formData[key] = '' } + for (let key in formData2) { + formData2[key] = '' + } + + tabsList.forEach(item => { item.name = '请选择' }) formData.province = 510000 + formData2.province = 510000 cutDown.value = 0 currentAddressIndex.value = 0 } @@ -490,39 +637,22 @@ // 提交 - const submit = async () => { - if (!formData.real_name) return uni.$u.toast('请填写真实姓名'); - 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 => { - // uni.showLoading({ - // title: '支付中...' - // }); - // timerInvol = setTimeout(() => { - // uni.hideLoading(); - // uni.$u.toast('支付超时'); - // console.log("支付超时") - // }, 10000) - // }) - // return + const submit = async (type = 1) => { + if (type == 2) { + if (!formData2.mobile) return uni.$u.toast('请填写电话号码'); + if (formData2.price < formData2.label_limit) return uni.$u.toast( + `${formData2.label_name}角色最低金额不能低于${formData2.label_limit}元`); + formData2.store_id = STORE_INFO.id uni.scanCode({ success: function(res) { if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整'); uni.showLoading({ title: '支付中...' }); - formData.auth_code = res.result - formData.recharge_type = 'INDUSTRYMEMBERS' - formData.user_ship = 1 - vipRechargeApi(formData).then(res => { + formData2.auth_code = res.result + formData2.recharge_type = 'INDUSTRYMEMBERS' + formData2.user_ship = 1 + vipRechargeApi(formData2).then(res => { timerInvol = setTimeout(() => { uni.hideLoading(); if (currentTab.value == 2) return; @@ -532,7 +662,52 @@ } }); + } else { + if (!formData.real_name) return uni.$u.toast('请填写真实姓名'); + 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 => { + // uni.showLoading({ + // title: '支付中...' + // }); + // timerInvol = setTimeout(() => { + // uni.hideLoading(); + // uni.$u.toast('支付超时'); + // console.log("支付超时") + // }, 10000) + // }) + // return + uni.scanCode({ + success: function(res) { + if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整'); + uni.showLoading({ + title: '支付中...' + }); + formData.auth_code = res.result + formData.recharge_type = 'INDUSTRYMEMBERS' + formData.user_ship = 1 + vipRechargeApi(formData).then(res => { + timerInvol = setTimeout(() => { + uni.hideLoading(); + if (currentTab.value == 2) return; + uni.$u.toast('支付超时'); + }, 30000) + }) + + } + }); + } + } + } const rePay = (item) => { @@ -604,8 +779,6 @@ } - getCount() - getLists() const upadtaStatus = (item) => { updataOrderApi({ diff --git a/pages.json b/pages.json index 0a14628..f3b81ad 100644 --- a/pages.json +++ b/pages.json @@ -53,7 +53,7 @@ "style": { "navigationBarTitleText": "个人中心", "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#D3FDCA" + "navigationBarBackgroundColor": "#CDFBBC" } }, { "path": "pages/charge/charge_record", diff --git a/pages/login/login.vue b/pages/login/login.vue index 7beb209..357ad27 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -14,12 +14,12 @@ 微信快捷登录 + size="28">手机号快捷登录 - + - - + 行业会员追加经营资金 @@ -176,7 +187,7 @@ - + 当前已开通： @@ -216,6 +227,56 @@ + + + + + + 当前已开通： + + 位{{ Role == 1 ? '行业会员' : '商户' }} + + + + + + + + 商户 + 开通时间 + 状态 + + + + + {{ item.nickname }} + {{ item.create_time }} + + 已开通 + + + + + + + + + + + + + + + + + + + + + + + + @@ -320,6 +381,15 @@ }, ]); + const tabsLst2 = reactive([{ + name: '开通商户' + }, + { + name: '已开通列表' + }, + ]); + + const tabsChange = (e) => { currentTab.value = e.index @@ -329,7 +399,10 @@ } // getLists() } - + const tabsChange1 = (e) => { + currentTab.value = (e.index) + getLists() + } const confirmStore = () => { getStoreByPhone({ @@ -638,6 +711,30 @@ // 提交 const submit = async (type = 1) => { + if (Role.value == 4) { + if (!formData.real_name) return uni.$u.toast('请填写真实姓名'); + if (!formData.mobile) return uni.$u.toast('请填写电话号码'); + if (!formData.code) return uni.$u.toast('请输入短信验证码'); + if (!formData.address) return uni.$u.toast('请选择地址'); + delete formData.recharge_type + delete formData.auth_code + formData.user_ship = 4 + vipRechargeApi(formData).then(res => { + resetFormData() + getLists() + currentTab.value = 1 + + }) + return + } + + + + + + + + if (type == 2) { if (!formData2.mobile) return uni.$u.toast('请填写电话号码'); if (formData2.price < formData2.label_limit) return uni.$u.toast( @@ -769,13 +866,21 @@ 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 + if (Role.value == 1) { + let res = await rechargeListsApi({ + store_id: STORE_INFO.id, + recharge_type: "INDUSTRYMEMBERS", + page_no: 1, + page_size: 25 + }) + 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 + } } diff --git a/pages.json b/pages.json index f3b81ad..1770fef 100644 --- a/pages.json +++ b/pages.json @@ -235,6 +235,15 @@ "enablePullDownRefresh": true } }, + + { + "path": "asset/index", + "style": { + "navigationBarTitleText": "会员资产", + "enablePullDownRefresh": true + } + }, + { "path": "balanceDetail/index", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index cb5f161..5527d90 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -401,6 +401,7 @@ const addCart = (product_id, cart_num) => { //加入购物车 cartCreateApi({ + type: 1, cart_num: cart_num, is_new: 0, // 是否直接购买0否1是 // goods_id: id, diff --git a/pages/login/login.vue b/pages/login/login.vue index 357ad27..0471e5a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -16,10 +16,10 @@ 手机号快捷登录 - + name="account-fill" color="#fff" size="28">真-手机号快捷登录 + @@ -266,7 +266,7 @@ const getDetails = () => { orderDetailApi({ order_id: datas.value.id, - ...location + // ...location }).then(res => { datas.value = res.data; options.code = datas.value.verify_code; // 生成条形码的值 @@ -493,19 +493,19 @@ } const getLocation = () => { - if (uni.getStorageSync('location')) { - location = uni.getStorageSync('location') - } else { - uni.getLocation({ - type: "gcj02", - success(res) { - location.lat = res.latitude; - location.long = res.longitude; - uni.setStorageSync('location', location) - return getDetails() - } - }) - } + // if (uni.getStorageSync('location')) { + // location = uni.getStorageSync('location') + // } else { + // uni.getLocation({ + // type: "gcj02", + // success(res) { + // location.lat = res.latitude; + // location.long = res.longitude; + // uni.setStorageSync('location', location) + // return getDetails() + // } + // }) + // } getDetails() } @@ -522,7 +522,6 @@ onBackPress(() => { clearInterval(timer); - console.log("清除"); }) const navgo = (url) => { diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue index b9adf37..8593c6e 100644 --- a/pagesOrder/order/order.vue +++ b/pagesOrder/order/order.vue @@ -107,7 +107,16 @@ - + + + + + + + + + + 核销码 {{orderData.verify_code}} diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue index ef089a1..476bbf2 100644 --- a/pagesOrder/settle/settle.vue +++ b/pagesOrder/settle/settle.vue @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue index 38645ee..d83a407 100644 --- a/pageQuota/vipUser/index.vue +++ b/pageQuota/vipUser/index.vue @@ -31,8 +31,10 @@ - 行业会员开通报备 - + 购买采购包 + + + 报备人：{{ STORE_INFO.name }} @@ -82,23 +84,20 @@ - - 报备人:{{ STORE_INFO.name }} + + 点击查看礼品包内容 - - - - + + + + {{item.money}}元采购包 + + + 送{{item.send}}{{item.send_string}} + - - {{formData.label_name}}角色最低金额不能低于{{formData.label_limit}}元且最高金额不能超过10000.00元 - - - {{formData2.label_name}}会员最低金额不能低于{{formData2.label_limit}}元 - + 可单次多笔累计操作 @@ -180,6 +179,8 @@ + + @@ -311,8 +312,6 @@ - - @@ -337,6 +336,7 @@ } from "@/api/address.js" import { vipRechargeApi, + getRechargeListApi, isUserShipApi, rechargeCountApi, reVipRechargeApi, @@ -443,6 +443,7 @@ // 手机保留一天结束 // 验证码 + const vipList = reactive([1, 2, 3, 5, 6, 7, 8]) const cutDown = ref(0) const flag = ref(true) const code = ref('') @@ -579,10 +580,10 @@ } = await getVipInfoByPhone({ mobile: formData2.mobile }) - // if (data.user_ship != 4) { - // uni.hideLoading() - // return uni.$u.toast('查询失败'); - // } + if (!vipList.includes(data.user_ship)) { + uni.hideLoading() + return uni.$u.toast('查询失败'); + } if (formData.mobile) { formData2.mobile = formData.mobile } @@ -597,14 +598,9 @@ } - const tofixedPrice = (type = 1) => { - if (type == 2) return formData2.price = (+formData2.price).toFixed(2) - formData.price = (+formData.price).toFixed(2) - } - const resetFormData = () => { for (let key in formData) { - formData[key] = '' + (key != 'price') && (formData[key] = '') } for (let key in formData2) { formData2[key] = '' @@ -621,8 +617,6 @@ const conformRole = (e) => { formData.label_name = e.value[0].title formData.label_id = e.value[0].id - formData.price = (+e.value[0].limit).toFixed(2) - formData.label_limit = e.value[0].limit showPop1.value = false } @@ -724,6 +718,7 @@ ]); let timerInvol = null + let paySuccess; // 开起一个scoket监听用户知否支付成功 const userInfo = useUserStore().userInfo; const connection = new Push({ @@ -733,13 +728,34 @@ const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`); user_channel.on('message', function(data) { try { - uni.hideLoading({}); + paySuccess = true + uni.hideLoading(); clearTimeout(timerInvol); paySuccessToTabs2() } catch (error) {} }); // 结束 + const navgo = (url) => { + uni.navigateTo({ + url + }) + } + + // 选择采购包 + const giftIndex = ref(0) + const rechargeList = ref([]) + const getRechargeList = async () => { + let res = await getRechargeListApi() + rechargeList.value = res.data + formData.price = rechargeList.value[0].money + } + + const choseGift = (index) => { + giftIndex.value = index + formData.price = rechargeList.value[index].money + } + // 提交 const submit = async (type = 1) => { @@ -787,10 +803,12 @@ formData2.recharge_type = 'INDUSTRYMEMBERS' formData2.user_ship = formData2.label_id vipRechargeApi(formData2).then(res => { + paySuccess = false; timerInvol = setTimeout(() => { uni.hideLoading(); - if (currentTab.value == 2) return; - uni.$u.toast('支付超时'); + if (!paySuccess) { + uni.$u.toast('支付超时'); + } }, 30000) }) } @@ -801,9 +819,9 @@ if (!formData.code) return uni.$u.toast('请输入短信验证码'); if (!formData.address) return uni.$u.toast('请选择地址'); if (!formData.label_id) return uni.$u.toast('请选择用户身份'); - if (Number(formData.price) < Number(formData.label_limit)) return uni.$u.toast( - `${formData.label_name}角色最低金额不能低于${formData.label_limit}元`); formData.store_id = STORE_INFO.id + formData.user_ship = formData.label_id + formData.recharge_type = 'INDUSTRYMEMBERS' if (Role.value == 1) { // formData.recharge_type = 'INDUSTRYMEMBERS' // formData.user_ship = formData.label_id @@ -830,14 +848,14 @@ uni.showLoading({ title: '支付中...' }); - formData.user_ship = formData.label_id formData.auth_code = res.result - formData.recharge_type = 'INDUSTRYMEMBERS' vipRechargeApi(formData).then(res => { + paySuccess = false; timerInvol = setTimeout(() => { uni.hideLoading(); - if (currentTab.value == 2) return; - uni.$u.toast('支付超时'); + if (!paySuccess) { + uni.$u.toast('支付超时'); + } }, 30000) }) } @@ -859,13 +877,19 @@ }).then(res => { timerInvol = setTimeout(() => { uni.hideLoading(); - uni.$u.toast('支付超时'); + if (!paySuccess) { + uni.$u.toast('支付超时'); + } }, 30000) }) } }); } + const tofixedPrice = (type = 1) => { + if (type == 2) return formData2.price = (+formData2.price).toFixed(2) + } + // 支付成功后清除formData并且切换tabs2 const paySuccessToTabs2 = () => { uni.hideLoading() @@ -936,19 +960,12 @@ } onLoad(() => { - // getUserShip().then(res => { - // range.value = res.data.lists.map(item => { - // return { - // value: item.id, - // text: item.title - // } - // })f - // }) getUserShip().then(res => { columns.value = [res.data.lists] }) getPhoneOneDay() getCityList() + getRechargeList() }) onPullDownRefresh(() => { @@ -1028,20 +1045,20 @@ } .card1 { - padding: 52rpx 30rpx; + padding: 30rpx; .card1-tit { font-size: 32rpx; color: #444444; text-align: center; - margin-bottom: 90rpx; + margin-bottom: 20rpx; } .store-info { font-size: 28rpx; color: #20B128; text-align: center; - margin-top: 30rpx; + margin-top: 20rpx; } } @@ -1087,7 +1104,7 @@ .address-content { padding: 20rpx; - height: 50vh; + height: 60vh; overflow-y: auto; .address-li { @@ -1123,5 +1140,65 @@ .btn-text { color: #20B128; + } + + .link { + padding-left: 20rpx; + color: #2F6BF2; + font-size: 28rpx; + margin-bottom: 30rpx; + position: relative; + text-decoration: underline; + text-underline-offset: 10rpx; + cursor: pointer; + } + + .link::after { + content: ''; + width: 12rpx; + height: 12rpx; + background-color: #2F6BF2; + position: absolute; + top: 50%; + transform: translateY(-50%); + border-radius: 12rpx; + left: 0; + } + + .gift-pack { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + + .gift-pack-li { + padding: 20rpx 40rpx; + border: #20B128 1px solid; + border-radius: 24rpx 24rpx 24rpx 24rpx; + background-color: #F6F6F6; + margin-bottom: 20rpx; + font-size: 26rpx; + color: #777777; + width: 310rpx; + box-sizing: border-box; + text-align: center; + + .gift-pack-li-top { + margin-bottom: 10rpx; + color: #20B128; + } + + .act-gift-top { + color: white; + } + } + + .act-gift { + background-color: #38BE41; + color: white; + } + + + + } \ No newline at end of file diff --git a/pages.json b/pages.json index 3ced8f0..cc70251 100644 --- a/pages.json +++ b/pages.json @@ -235,6 +235,13 @@ "enablePullDownRefresh": true } }, + { + "path": "vipUser/activePage", + "style": { + "navigationBarTitleText": "采购礼包", + "enablePullDownRefresh": false + } + }, { "path": "asset/index", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 2ac93bd..e0ccf7d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -162,8 +162,8 @@ {{ item.store_name }} - - 活动价 + + 售价 ￥{{item[priceKey.price]}}/{{ item.unit_name }} @@ -173,10 +173,10 @@ 赠10%品牌礼品券 - + 售价 From 8863dba81d8ed68d992e4c97a27147da431a4965 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Fri, 5 Jul 2024 19:37:27 +0800 Subject: [PATCH 18/23] add --- config/app.js | 4 ++-- pages/login/login.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/app.js b/config/app.js index 0d6283a..f1f7802 100644 --- a/config/app.js +++ b/config/app.js @@ -2,8 +2,8 @@ let BASE_URL let WSS_URL import store from "@/store/user.js" // 环境 -let env = "dev" -// let env = "prod" +// let env = "dev" +let env = "prod" // let env = "release"; // let env = "local"; diff --git a/pages/login/login.vue b/pages/login/login.vue index c666fa7..de2659b 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -16,10 +16,10 @@ 手机号快捷登录 - + + @@ -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 From 55e5572005adc3b465260628a9348f63acb916fd Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 10 Jul 2024 16:03:34 +0800 Subject: [PATCH 22/23] add --- api/order.js | 4 + components/goodPopup.vue | 24 +- pageQuota/asset/lists.vue | 137 +++ pageQuota/vipUser/index.vue | 1636 +++++++++++++++++------------------ pages.json | 9 +- pages/index/index.vue | 11 +- pages/my/my.vue | 1 + 7 files changed, 973 insertions(+), 849 deletions(-) create mode 100644 pageQuota/asset/lists.vue diff --git a/api/order.js b/api/order.js index 193cb14..7e04004 100644 --- a/api/order.js +++ b/api/order.js @@ -74,4 +74,8 @@ export const refundReasonListApi = (data) => { // 订单退款申请 export const applyRefundApi = (data) => { return request.post('/order/order/apply_refund', data); +} + +export const UserProductStorageLogApi = (data) => { + return request.get('/user_product_storage_log/UserProductStorageLog/lists', data); } \ No newline at end of file diff --git a/components/goodPopup.vue b/components/goodPopup.vue index 3b8aff1..1744c24 100644 --- a/components/goodPopup.vue +++ b/components/goodPopup.vue @@ -63,14 +63,7 @@ computed, nextTick, ref, - } from "vue" - import { - toast - } from "../uni_modules/uview-plus"; - import { - onShow - } from '@dcloudio/uni-app'; const foucs1 = ref(null) const props = defineProps({ @@ -78,20 +71,17 @@ type: Boolean, default: false }, + priceKey: { + type: Object, + default: () => ({}) + } + }) const valChange = () => { uni.vibrateShort(); } - let priceKey = ref({}) - if (uni.getStorageSync('PRICE_KEY')) { - priceKey.value = JSON.parse(uni.getStorageSync('PRICE_KEY')); - } else { - priceKey.value = {}; - } - - const datas = ref({ cart_num: '' }); @@ -121,7 +111,9 @@ const subtotal = computed(() => { let num = +datas.value.cart_num || 1; - let sell = +datas.value[priceKey.value.off_activity == 1 ? priceKey.value.price : priceKey.value.op_price]; + let sell = +datas.value[props.priceKey.off_activity == 1 ? props.priceKey.price : props + .priceKey + .op_price]; return Number(num * sell * 100 / 100).toFixed(2) }) diff --git a/pageQuota/asset/lists.vue b/pageQuota/asset/lists.vue new file mode 100644 index 0000000..a900e08 --- /dev/null +++ b/pageQuota/asset/lists.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue index 4e212c7..fb69d07 100644 --- a/pageQuota/vipUser/index.vue +++ b/pageQuota/vipUser/index.vue @@ -1,4 +1,5 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index cc70251..cec1e78 100644 --- a/pages.json +++ b/pages.json @@ -245,10 +245,17 @@ { "path": "asset/index", "style": { - "navigationBarTitleText": "会员资产", + "navigationBarTitleText": "用户资产", "enablePullDownRefresh": true } }, + { + "path": "asset/lists", + "style": { + "navigationBarTitleText": "预约记录", + "enablePullDownRefresh": false + } + }, { "path": "Gifts/index", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index e0ccf7d..2bd11bc 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -168,15 +168,15 @@ ￥{{item[priceKey.price]}}/{{ item.unit_name }} - + - 赠10%品牌礼品券 + {{item.tag}} - + 售价 @@ -231,7 +231,8 @@ - + diff --git a/pages/my/my.vue b/pages/my/my.vue index 55cc8f0..28b4bad 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -118,6 +118,7 @@ + From ae7660e239bd4c38b57ca2035f3e2b16b578f714 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Thu, 11 Jul 2024 16:46:19 +0800 Subject: [PATCH 23/23] add --- config/app.js | 4 ++-- pageQuota/vipUser/index.vue | 8 ++++---- pages/index/index.vue | 2 +- pages/my/my.vue | 11 +++++------ pagesOrder/settle/settle.vue | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/config/app.js b/config/app.js index 0d6283a..f1f7802 100644 --- a/config/app.js +++ b/config/app.js @@ -2,8 +2,8 @@ let BASE_URL let WSS_URL import store from "@/store/user.js" // 环境 -let env = "dev" -// let env = "prod" +// let env = "dev" +let env = "prod" // let env = "release"; // let env = "local"; diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue index fb69d07..d710b7e 100644 --- a/pageQuota/vipUser/index.vue +++ b/pageQuota/vipUser/index.vue @@ -8,7 +8,7 @@ - + @@ -382,7 +382,7 @@ name: '已开通列表' }, ]); - const vipList = reactive([1, 2, 3, 5, 6, 7, 8]) + const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8]) const tabsChange = (e) => { currentTab.value = e.index @@ -534,7 +534,7 @@ mobile: formData.mobile }) formData2.mobile = formData.mobile - if (data.user_ship == 4 || data.user_ship == 0) return; + if (data.user_ship == 0) return; if (Role.value == 1) { uni.$u.toast('该用户已是会员请使用追加经营资金进行收款') currentTab.value = 1 diff --git a/pages/index/index.vue b/pages/index/index.vue index 2bd11bc..c1d8a34 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -294,7 +294,7 @@ } from "@/api/multipleShop.js"; import useUserStore from "@/store/user"; - const vipList = reactive([1, 2, 3, 5, 6, 7, 8]) + const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8]) const userStore = useUserStore(); const STORE_INFO = reactive({ id: '', diff --git a/pages/my/my.vue b/pages/my/my.vue index 28b4bad..7024639 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -24,7 +24,7 @@