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

优化

This commit is contained in:
weipengfei 2024-05-17 18:24:23 +08:00
parent 8f28955f44
commit aad2f02a5d
2 changed files with 135 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
components/goodPopup.vue
View File

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

6
pagesOrder/settle/settle.vue
View File

@ -13,7 +13,10 @@
<text style="margin: 0 10rpx;">自提点</text> <text style="margin: 0 10rpx;">自提点</text>
</view> </view>
<view v-if="shopInfo.mer_id"> <view v-if="shopInfo.mer_id">
<view>{{shopInfo.mer_name}}</view> <view>
{{shopInfo.mer_name}}
<span v-if="shopInfo.recommend" style="font-size: 10px;color: #fff;background-color: #20b128;padding: 2rpx 5rpx;border-radius: 4rpx;">推荐</span>
</view>
<view> <view>
<text>{{shopInfo.service_phone}}</text> <text>{{shopInfo.service_phone}}</text>
<text <text
@ -218,6 +221,7 @@
if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
.value.mer_id) { .value.mer_id) {
shopInfo.value = merchantList.value[0]; shopInfo.value = merchantList.value[0];
shopInfo.value.recommend = 1;
nextTick(() => { nextTick(() => {
shopRef.value.setCheck(shopInfo.value.mer_id); shopRef.value.setCheck(shopInfo.value.mer_id);
}) })