weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add

This commit is contained in:
zmj 2024-06-26 18:55:10 +08:00
parent d1a2593c86
commit f9e9d0607e
6 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/goodPopup.vue
View File

@ -8,6 +8,10 @@
<view>商品名称</view>
<view>{{ datas.name || datas.goods_name || datas.store_name }}</view>
</view>
<view class="row" v-if="datas.store_info">
<view>商品规格</view>
<view>{{ datas.store_info}}</view>
</view>
<view class="row">
<view>商品单位</view>
<view>{{ datas.unit_name }}</view>

9
config/app.js
View File

@ -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

26
pageQuota/vipUser/index.vue
View File

@ -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 = '请选择'
})

23
pages/index/index.vue
View File

@ -182,23 +182,25 @@
</view>
</view>
<view class="shop-content-li" style="justify-content: space-between;">
<view class="shop-content-li" style="justify-content: space-between;"
v-if="item.store_info">
<view style="display: flex;">
<view class="shop-content-li-l">规格</view>
<view class="shop-content-li-r">{{ item.unit+item.unit_name }}/份</view>
</view>
<view class="btn" v-if="!item.batch">
<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
<view class="shop-content-li-r">{{ item.store_info }}</view>
</view>
</view>
<view class="shop-content-li" style="justify-content: space-between;" v-if="item.batch">
<view style="display: flex;">
<view class="shop-content-li-l">起批量</view>
<view class="shop-content-li-r">{{ item.batch }}{{ item.unit_name }}起卖</view>
</view>
<view class="btn">
<!-- <view class="btn">
<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
</view> -->
</view>
<view class="shopconetent-btn">
<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
</view>
</view>
</view>
@ -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;

2
pagesOrder/order/order.vue
View File

@ -107,7 +107,7 @@
<view class="mask" v-if='showVerifyPop' @click="showVerifyPop=false">
<view
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);background-color: white;padding: 20rpx;">
<up-image :src="orderData.verify_img" width="550rpx" height="100rpx"></up-image>
<up-image :src="orderData.verify_img" width="404rpx" height="60rpx"></up-image>
<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
核销码 {{orderData.verify_code}}
</view>

2
pagesOrder/settle/settle.vue
View File

@ -71,7 +71,7 @@
</view>
</view>
<view class="row" v-if="userInfo.user_ship==1 ">
<view>消费返利</view>
<view>优惠返还</view>
<view>
<text>¥</text>{{ c_price(orderInfo.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 1) }}</text>
</view>