Compare commits

..

3 Commits

Author SHA1 Message Date
zmj d49221bcb4 add 2024-06-22 11:27:11 +08:00
zmj 94ba867c2b Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let into dev 2024-06-21 18:03:07 +08:00
weipengfei c020ba7513 修复bug 2024-06-21 16:03:17 +08:00
3 changed files with 153 additions and 143 deletions

View File

@ -14,8 +14,13 @@
</view>
<view class="row">
<view>商品价格</view>
<view>¥ {{datas.price}}</view>
<view>¥ {{datas.price}} / {{datas.unit_name }}</view>
</view>
<view class="row" v-if="datas.batch>0">
<view>起批量</view>
<view>{{datas.batch}}{{datas.unit_name }}起批 </view>
</view>
<view class="row">
<view>小计</view>
<view style="color: #F55726;" v-if="+datas.cart_num<+datas.batch">
@ -26,14 +31,14 @@
<view v-if="datas.is_bulk" class="row">
<view>购买重量<text style="color: #F55726;">*</text></view>
<view style="flex: 1;">
<up-input v-model="datas.cart_num" :cursorSpacing='120' type="number" border="none"
<up-input v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none"
placeholder="请输入购买重量" inputAlign="right"></up-input>
</view>
</view>
<view v-else class="row">
<view>购买数量<text style="color: #F55726;">*</text></view>
<view style="flex: 1;">
<up-input v-model="datas.cart_num" :cursorSpacing='120' type="number" border="none"
<up-input v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none"
placeholder="请输入购买数量" inputAlign="right">
<template #suffix>
<span style="color: #20b128;">{{datas.unit_name}}</span>
@ -73,10 +78,10 @@
cart_num: ''
});
const setData = (e) => {
console.log(e);
datas.value = e;
if (e.batch) datas.value.cart_num = e.batch;
if (Number(e.batch) > 0) datas.value.cart_num = e.batch;
else datas.value.cart_num = '';
}
const emit = defineEmits(['close', 'change']);

View File

@ -144,12 +144,17 @@
<text>{{item.spec}}</text>
</view>
</view>
<view style="display: flex;" v-if='userStore?.userInfo?.user_ship==1'>
<view class="price" style="margin-right: 10rpx;">{{item.vip_price}}</view>
<text class='price'>会员价</text>
<view style="display: flex;" v-if='item.batch>0'>
<view>{{item.batch}}{{item.unit_name }}起卖</view>
</view>
<view style="display: flex;align-items: center;" v-if='userStore?.userInfo?.user_ship==1'>
<text class='price' style="font-size: 24rpx;">会员价</text>
<text class="price" style="margin-right: 10rpx;">{{item.vip_price}}
</text>
<text class='price' style="font-size: 24rpx;">/{{item.unit_name}}</text>
</view>
<view class="price-btn">
<view class="price" style="font-size: 24rpx;">{{item.price}}</view>
<view class="price" style="font-size: 24rpx;">{{item.price}}/{{item.unit_name}}</view>
<view class="btn">
<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
</view>

View File

@ -67,7 +67,7 @@
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
<view>优惠减免</view>
<view>
<text>-¥</text>{{ c_price(orderInfo.preferential_amount, 0) }}<text>.{{ c_price(orderInfo.preferential_amount, 1) }}</text>
<text>-¥</text>{{ c_price(orderInfo.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 1) }}</text>
</view>
</view>
<view class="row" v-if="userInfo.user_ship==1 ">