From 77d4938aeeebf6dc5dabd2894da79a4e4c0a1223 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Sat, 6 Jul 2024 13:55:06 +0800 Subject: [PATCH 1/4] 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 f1f7802..0d6283a 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 de2659b..fc96a69 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 3/4] 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 4/4] 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 @@