This commit is contained in:
zmj 2024-06-25 18:07:52 +08:00
parent f1430c9bc6
commit a0d5fef974
2 changed files with 21 additions and 7 deletions

View File

@ -289,20 +289,19 @@
const currentTab = ref(1) const currentTab = ref(1)
const formData = reactive({ const formData = reactive({
store_id: STORE_INFO.id, store_id: STORE_INFO.id,
mobile: "19130550023", mobile: "",
province: 510000, province: 510000,
city: '', city: '',
area: "", area: "",
street: "", street: "",
village: "", village: "",
brigade: "",
real_name: "赵明军", real_name: "赵明军",
auth_code: "", auth_code: "",
address: "", address: "",
label_name: "", label_name: "",
label_id: "", label_id: "",
user_ship: '', user_ship: '',
code: '8888' code: ''
}) })
const conformRole = (e) => { const conformRole = (e) => {
@ -438,6 +437,9 @@
if (Role.value == 1) { if (Role.value == 1) {
uni.scanCode({ uni.scanCode({
success: function(res) { success: function(res) {
if (res.result.length != 14) return uni.$u.toast('二维码未扫描完整');
formData.auth_code = res.result formData.auth_code = res.result
formData.recharge_type = 'INDUSTRYMEMBERS' formData.recharge_type = 'INDUSTRYMEMBERS'
formData.user_ship = 1 formData.user_ship = 1
@ -480,6 +482,7 @@
const rePay = (item) => { const rePay = (item) => {
uni.scanCode({ uni.scanCode({
success: function(res) { success: function(res) {
if (res.result.length != 14) return uni.$u.toast('二维码未扫描完整');
uni.showLoading({ uni.showLoading({
title: '支付中...' title: '支付中...'
}); });

View File

@ -39,7 +39,6 @@
:style="{ height: btns.height + 'px', top: btns.top + 'px', left: (btns.left - 40) + 'px' }"> :style="{ height: btns.height + 'px', top: btns.top + 'px', left: (btns.left - 40) + 'px' }">
<up-button icon="share-square" openType="share" plain size="large" loadingSize="100" /> <up-button icon="share-square" openType="share" plain size="large" loadingSize="100" />
</view> </view>
<view class="navbar"> <view class="navbar">
<view style="width: 400rpx;"> <view style="width: 400rpx;">
<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword" <up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
@ -159,10 +158,10 @@
<view class="goods-name" style="font-size: 28rpx;color: #060606;"> <view class="goods-name" style="font-size: 28rpx;color: #060606;">
{{ item.store_name }} {{ item.store_name }}
</view> </view>
<view class="shop-content-li"> <view class="shop-content-li" v-if="priceKey.off_activity==1">
<view class="shop-content-li-l" style="color: #FC452F;">活动价</view> <view class="shop-content-li-l" style="color: #FC452F;">活动价</view>
<view class="shop-content-li-r" style="color:#FC452F ;"><text <view class="shop-content-li-r" style="color:#FC452F ;"><text
style="font-size: 30rpx;">79.8</text>/ style="font-size: 30rpx;">{{item[priceKey.price]}}</text>/{{ item.unit_name }}
</view> </view>
<view class="tag"> <view class="tag">
10%品牌礼品 10%品牌礼品
@ -170,7 +169,7 @@
</view> </view>
<view class="shop-content-li" style="color: #999999;"> <view class="shop-content-li" style="color: #999999;">
<view class="shop-content-li-l">&nbsp;&nbsp;&nbsp;</view> <view class="shop-content-li-l">&nbsp;&nbsp;&nbsp;</view>
<view class="shop-content-li-r">32.52</view> <view class="shop-content-li-r">{{item[priceKey.op_price]}}</view>
</view> </view>
<view class="shop-content-li"> <view class="shop-content-li">
<view class="shop-content-li-l">&nbsp;&nbsp;&nbsp;</view> <view class="shop-content-li-l">&nbsp;&nbsp;&nbsp;</view>
@ -290,6 +289,14 @@
store_name: "" store_name: ""
}) })
const priceKey = reactive({
off_activity: "",
op_price: "",
price: ""
})
const getStoreInfoFn = () => { const getStoreInfoFn = () => {
if (uni.getStorageSync('STORE_INFO').length) { if (uni.getStorageSync('STORE_INFO').length) {
let data = JSON.parse(uni.getStorageSync('STORE_INFO')) let data = JSON.parse(uni.getStorageSync('STORE_INFO'))
@ -445,6 +452,10 @@
class: class_id, class: class_id,
cate_id: class_id, cate_id: class_id,
}).then(res => { }).then(res => {
for (let key in res.data.extend) {
priceKey[key] = res.data.extend[key]
}
console.log(priceKey)
if (loadmore) goodList.value.push(...res.data.lists); if (loadmore) goodList.value.push(...res.data.lists);
else goodList.value = res.data.lists; else goodList.value = res.data.lists;
}) })