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

Compare commits

base: weipengfei:d03a1eecfcebc409ce1db1d406805b63d827ca04
Branches Tags
weipengfei:master
weipengfei:dev
weipengfei:product
weipengfei:release
...
compare: weipengfei:d49221bcb47d2a3fc2dfe5950b0c0b4bce0fb2af
Branches Tags
weipengfei:dev
weipengfei:product
weipengfei:master
weipengfei:release

3 Commits
d03a1eecfc ... d49221bcb4

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
Show Stats Expand all files Collapse all files

281
components/goodPopup.vue
View File

@ -1,160 +1,165 @@
<template>
<up-popup :show="show" closeable round="10" @close="close" :safeAreaInsetBottom="false">
<view class="good-popup">
<view class="head-title">
{{datas.is_bulk ? '称重商品' : '计件商品'}}
</view>
<view class="row">
<view>商品名称</view>
<view>{{datas.name || datas.goods_name || datas.store_name}}</view>
</view>
<view class="row">
<view>商品单位</view>
<view>{{datas.unit_name}}</view>
</view>
<view class="row">
<view>商品价格</view>
<view>¥ {{datas.price}}</view>
</view>
<view class="row">
<view>小计</view>
<view style="color: #F55726;" v-if="+datas.cart_num<+datas.batch">
{{`${datas.batch}${datas.unit_name}起批`}}
</view>
<view style="color: #F55726;" v-else>¥ {{subtotal}}</view>
</view>
<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"
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"
placeholder="请输入购买数量" inputAlign="right">
<template #suffix>
<span style="color: #20b128;">{{datas.unit_name}}</span>
</template>
</up-input>
</view>
</view>
<view class="row" style="padding-top: 30px;padding-bottom: 30rpx;">
<view style="width: 30%;margin-right: 30rpx;">
<up-button @click="close" color="#f7f7f7"><text style="color: #333;">取消</text></up-button>
</view>
<view style="flex: 1;">
<up-button @click="change" color="#20b128">确定</up-button>
</view>
</view>
</view>
</up-popup>
<up-popup :show="show" closeable round="10" @close="close" :safeAreaInsetBottom="false">
<view class="good-popup">
<view class="head-title">
{{datas.is_bulk ? '称重商品' : '计件商品'}}
</view>
<view class="row">
<view>商品名称</view>
<view>{{datas.name || datas.goods_name || datas.store_name}}</view>
</view>
<view class="row">
<view>商品单位</view>
<view>{{datas.unit_name}}</view>
</view>
<view class="row">
<view>商品价格</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">
{{`${datas.batch}${datas.unit_name}起批`}}
</view>
<view style="color: #F55726;" v-else>¥ {{subtotal}}</view>
</view>
<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="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="digit" border="none"
placeholder="请输入购买数量" inputAlign="right">
<template #suffix>
<span style="color: #20b128;">{{datas.unit_name}}</span>
</template>
</up-input>
</view>
</view>
<view class="row" style="padding-top: 30px;padding-bottom: 30rpx;">
<view style="width: 30%;margin-right: 30rpx;">
<up-button @click="close" color="#f7f7f7"><text style="color: #333;">取消</text></up-button>
</view>
<view style="flex: 1;">
<up-button @click="change" color="#20b128">确定</up-button>
</view>
</view>
</view>
</up-popup>
</template>
<script setup>
import {
computed,
ref
} from "vue"
import {
toast
} from "../uni_modules/uview-plus";
import {
computed,
ref
} from "vue"
import {
toast
} from "../uni_modules/uview-plus";
const props = defineProps({
show: {
type: Boolean,
default: false
},
})
const props = defineProps({
show: {
type: Boolean,
default: false
},
})
const datas = ref({
cart_num: ''
});
const setData = (e) => {
console.log(e);
datas.value = e;
if (e.batch) datas.value.cart_num = e.batch;
else datas.value.cart_num = '';
}
const datas = ref({
cart_num: ''
});
const setData = (e) => {
datas.value = e;
if (Number(e.batch) > 0) datas.value.cart_num = e.batch;
else datas.value.cart_num = '';
const emit = defineEmits(['close', 'change']);
const close = () => {
emit('close');
}
}
const change = () => {
if (+datas.value.cart_num < +datas.value.batch) return uni.$u.toast(
`购买数量不能小于${datas.value.batch}${datas.value.unit_name}`);
if (subtotal.value <= 0) {
uni.$u.toast('金额不可小于等于0');
datas.value.cart_num = '';
return;
}
emit('change', datas.value);
}
const emit = defineEmits(['close', 'change']);
const close = () => {
emit('close');
}
const subtotal = computed(() => {
let num = +datas.value.cart_num || 0;
let sell = +datas.value.sell || +datas.value.price;
return Number(num * sell * 100 / 100).toFixed(2)
})
const change = () => {
if (+datas.value.cart_num < +datas.value.batch) return uni.$u.toast(
`购买数量不能小于${datas.value.batch}${datas.value.unit_name}`);
if (subtotal.value <= 0) {
uni.$u.toast('金额不可小于等于0');
datas.value.cart_num = '';
return;
}
emit('change', datas.value);
}
defineExpose({
setData
})
const subtotal = computed(() => {
let num = +datas.value.cart_num || 0;
let sell = +datas.value.sell || +datas.value.price;
return Number(num * sell * 100 / 100).toFixed(2)
})
defineExpose({
setData
})
</script>
<style scoped lang="scss">
.good-popup {
padding: 30rpx;
.good-popup {
padding: 30rpx;
.head-title {
font-weight: bold;
text-align: center;
margin-bottom: 20rpx;
}
.head-title {
font-weight: bold;
text-align: center;
margin-bottom: 20rpx;
}
.row {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 20rpx;
border-bottom: 1rpx solid #f6f6f6;
margin-bottom: 20rpx;
.row {
display: flex;
align-items: center;
justify-content: space-between;
padding-bottom: 20rpx;
border-bottom: 1rpx solid #f6f6f6;
margin-bottom: 20rpx;
&:last-child {
border-bottom: none;
margin-bottom: 0;
}
&:last-child {
border-bottom: none;
margin-bottom: 0;
}
.content {
.top {
display: flex;
.content {
.top {
display: flex;
view {
margin-right: 20rpx;
}
}
view {
margin-right: 20rpx;
}
}
.bottom {}
}
.bottom {}
}
image {
width: 40rpx;
height: 40rpx;
flex-shrink: 0;
}
}
}
image {
width: 40rpx;
height: 40rpx;
flex-shrink: 0;
}
}
}
@keyframes disappear {
to {
opacity: 0;
/* 渐隐 */
transform: scale(0);
/* 缩小 */
}
}
@keyframes disappear {
to {
opacity: 0;
/* 渐隐 */
transform: scale(0);
/* 缩小 */
}
}
</style>

13
pages/index/index.vue
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>

2
pagesOrder/settle/settle.vue
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 ">