From f9e9d0607e3d1c86f2eee3361c2e45e3af4d2fdb Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 26 Jun 2024 18:55:10 +0800 Subject: [PATCH] add --- components/goodPopup.vue | 4 ++++ config/app.js | 9 ++++----- pageQuota/vipUser/index.vue | 26 ++++++++++++++++---------- pages/index/index.vue | 25 +++++++++++++++++-------- pagesOrder/order/order.vue | 2 +- pagesOrder/settle/settle.vue | 2 +- 6 files changed, 43 insertions(+), 25 deletions(-) diff --git a/components/goodPopup.vue b/components/goodPopup.vue index d35056a..f542595 100644 --- a/components/goodPopup.vue +++ b/components/goodPopup.vue @@ -8,6 +8,10 @@ 商品名称 {{ datas.name || datas.goods_name || datas.store_name }} + + 商品规格 + {{ datas.store_info}} + 商品单位 {{ datas.unit_name }} diff --git a/config/app.js b/config/app.js index 89477c3..4c70251 100644 --- a/config/app.js +++ b/config/app.js @@ -2,23 +2,22 @@ let BASE_URL let WSS_URL import store from "@/store/user.js" // 环境 -let env = "dev" +// let env = "dev" // let env = "prod" -// let env = "liu"; +let env = "liu"; switch (env) { case 'dev': BASE_URL = 'https://test-multi-store.lihaink.cn'; WSS_URL = 'wss://test-multi-store.lihaink.cn/pull' - // WSS_URL = 'ws://192.168.1.22:8787' break; case 'liu': BASE_URL = 'https:ceshi-multi-store.lihaink.cn'; - WSS_URL = 'wss://test-multi-store.lihaink.cn/pull' + WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; default: BASE_URL = 'https://multi-store.lihaink.cn'; - WSS_URL = 'wss://test-multi-store.lihaink.cn/pull' + WSS_URL = 'wss://multi-store.lihaink.cn/pull' } let HTTP_REQUEST_URL diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue index 6a8f541..831a1da 100644 --- a/pageQuota/vipUser/index.vue +++ b/pageQuota/vipUser/index.vue @@ -301,20 +301,21 @@ label_name: "", label_id: "", user_ship: '', - code: '' + code: '', + // store_id: STORE_INFO.id, // mobile: "19130550023", // province: 510000, - // city: '510600', - // area: "510626", - // street: "510626101", - // village: "", + // city: '510500', + // area: "510503", + // street: "510503102", + // village: "510503102201", // real_name: "赵明军", - // auth_code: "131527008529094084", + // auth_code: "131197337173621549", // address: "", // label_name: "", - // label_id: "", - // user_ship: '', + // label_id: "4", + // user_ship: '1', // code: '' }) @@ -443,12 +444,13 @@ if (!formData.real_name) return uni.$u.toast('请填写真实姓名'); if (!formData.mobile) return uni.$u.toast('请填写电话号码'); if (!formData.code) return uni.$u.toast('请输入短信验证码'); + if (!formData.label_id) return uni.$u.toast('请选择用户身份'); + if (!formData.address) return uni.$u.toast('请选择地址'); formData.store_id = STORE_INFO.id if (Role.value == 1) { // formData.recharge_type = 'INDUSTRYMEMBERS' // formData.user_ship = 1 - // vipRechargeApi(formData).then(res => { - // }) + // vipRechargeApi(formData).then(res => {}) // return uni.scanCode({ success: function(res) { @@ -485,7 +487,9 @@ formData.street = '' formData.village = '' formData.brigade = '' + formData.code = '' currentAddressIndex.value = 0 + count.value = 0 tabsList.forEach(item => { item.name = '请选择' }) @@ -532,7 +536,9 @@ formData.street = '' formData.village = '' formData.brigade = '' + formData.code = '' currentAddressIndex.value = 0 + count.value = 0 tabsList.forEach(item => { item.name = '请选择' }) diff --git a/pages/index/index.vue b/pages/index/index.vue index 6af51d2..d4a5bb4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -182,23 +182,25 @@ - + 规格 - {{ item.unit+item.unit_name }}/份 - - - + {{ item.store_info }} + 起批量 {{ item.batch }}{{ item.unit_name }}起卖 - + + + + @@ -1084,7 +1086,8 @@ width: 380rpx; display: flex; flex-direction: column; - justify-content: space-between; + justify-content: space-around; + position: relative; .shop-content-li { font-size: 22rpx; @@ -1117,6 +1120,12 @@ } + .shopconetent-btn { + position: absolute; + bottom: 0; + right: 0; + } + // .icon { // background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3b653202406260957228679.png'); // width: 17rpx; diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue index 80b7d2f..c4958dc 100644 --- a/pagesOrder/order/order.vue +++ b/pagesOrder/order/order.vue @@ -107,7 +107,7 @@ - + 核销码 {{orderData.verify_code}} diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue index bb2bba0..e87cf01 100644 --- a/pagesOrder/settle/settle.vue +++ b/pagesOrder/settle/settle.vue @@ -71,7 +71,7 @@ - 消费返利 + 优惠返还 ¥{{ c_price(orderInfo.activity_price, 0) }}.{{ c_price(orderInfo.activity_price, 1) }}