yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ 下单界面

pull/26/head^2
YunaiV 2023-12-11 22:21:21 +08:00
parent 7a15c9496c
commit 4ddf17e2df
7 changed files with 434 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

722
pages/order/confirm.vue
View File

@ -1,414 +1,388 @@
<template> <template>
<s-layout title="确认订单"> <s-layout title="确认订单">
<!-- v-if="state.orderInfo.need_address === 1" --> <!-- TODO：这个判断先删除 v-if="state.orderInfo.need_address === 1" -->
<!-- 这个判断先删除 --> <view class="bg-white address-box ss-m-b-14 ss-r-b-10" @tap="onSelectAddress">
<view class="bg-white address-box ss-m-b-14 ss-r-b-10" @tap="onSelectAddress"> <s-address-item :item="state.addressInfo" :hasBorderBottom="false">
<s-address-item :item="state.addressInfo" :hasBorderBottom="false"> <view class="ss-rest-button">
<view class="ss-rest-button"><text class="_icon-forward"></text></view> <text class="_icon-forward" />
</s-address-item> </view>
</view> </s-address-item>
<view class="order-card-box ss-m-b-14"> </view>
<s-goods-item v-for="item in state.orderInfo.goods_list" :key="item.goods_id"
:img="item.current_sku_price.image || item.goods.image" :title="item.goods.title"
:skuText="item.current_sku_price?.goods_sku_text" :price="item.current_sku_price.price"
:num="item.goods_num" marginBottom="10">
<template #top>
<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white">
<view class="item-title">配送方式</view>
<view class="ss-flex ss-col-center">
<text class="item-value">{{ item.dispatch_type_text }}</text>
</view>
</view>
</template>
</s-goods-item>
<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10"> <!-- 商品信息 -->
<view class="item-title">订单备注</view> <view class="order-card-box ss-m-b-14">
<view class="ss-flex ss-col-center"> <s-goods-item
<uni-easyinput maxlength="20" placeholder="建议留言前先与商家沟通" v-model="state.orderPayload.remark" v-for="item in state.orderInfo.items"
:inputBorder="false" :clearable="false"></uni-easyinput> :key="item.skuId"
</view> :img="item.picUrl"
</view> :title="item.spuName"
</view> :skuText="item.properties.map((property) => property.valueName).join(' ')"
<!-- 合计 --> :price="item.price"
<view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10"> :num="item.count"
<view class="total-box-content border-bottom"> marginBottom="10"
<view class="order-item ss-flex ss-col-center ss-row-between"> />
<view class="item-title">商品金额</view> <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
<view class="ss-flex ss-col-center"> <view class="item-title">订单备注</view>
<text class="item-value ss-m-r-24">￥{{ state.orderInfo.goods_amount }}</text> <view class="ss-flex ss-col-center">
</view> <uni-easyinput
</view> maxlength="20"
<view class="order-item ss-flex ss-col-center ss-row-between" placeholder="建议留言前先与商家沟通"
v-if="state.orderPayload.order_type === 'score'"> v-model="state.orderPayload.remark"
<view class="item-title">扣除积分</view> :inputBorder="false"
<view class="ss-flex ss-col-center"> :clearable="false"
<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img"></image> />
<text class="item-value ss-m-r-24">{{ state.orderInfo.score_amount }}</text> </view>
</view> </view>
</view> </view>
<view class="order-item ss-flex ss-col-center ss-row-between">
<view class="item-title">运费</view>
<view class="ss-flex ss-col-center">
<text class="item-value ss-m-r-24">+￥{{ state.orderInfo.dispatch_amount }}</text>
</view>
</view>
<view class="order-item ss-flex ss-col-center ss-row-between"
v-if="state.orderPayload.order_type != 'score'">
<!-- <view v-if="state.orderInfo.coupon_discount_fee > 0" class="order-item ss-flex ss-col-center ss-row-between"> -->
<view class="item-title">优惠券</view>
<view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
<text class="item-value text-red"
v-if="state.orderPayload.coupon_id">-￥{{ state.orderInfo.coupon_discount_fee }}</text>
<text class="item-value"
:class="state.couponInfo.can_use?.length > 0 ? 'text-red' : 'text-disabled'" v-else>{{
state.couponInfo.can_use?.length > 0
? state.couponInfo.can_use?.length + '张可用'
: '暂无可用优惠券'
}}</text>
<text class="_icon-forward item-icon"></text> <!-- 价格信息 -->
</view> <view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
</view> <view class="total-box-content border-bottom">
<view class="order-item ss-flex ss-col-center ss-row-between" <view class="order-item ss-flex ss-col-center ss-row-between">
v-if="state.orderInfo.promo_infos?.length"> <view class="item-title">商品金额</view>
<!-- <view v-if="state.orderInfo.promo_discount_fee > 0" class="order-item ss-flex ss-col-center ss-row-between"> --> <view class="ss-flex ss-col-center">
<view class="item-title">活动优惠</view> <text class="item-value ss-m-r-24">
<view class="ss-flex ss-col-center" @tap="state.showDiscount = true"> ￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
<text class="item-value text-red"> -￥{{ state.orderInfo.promo_discount_fee }} </text> </text>
<text class="_icon-forward item-icon"></text> </view>
</view> </view>
</view> <!-- TODO 芋艿：接入积分 -->
</view> <view
<view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28"> class="order-item ss-flex ss-col-center ss-row-between"
<view class="total-num ss-m-r-20">共{{ state.totalNumber }}件</view> v-if="state.orderPayload.order_type === 'score'"
<view>合计：</view> >
<view class="total-num text-red"> ￥{{ state.orderInfo.pay_fee }} </view> <view class="item-title">扣除积分</view>
<view class="ss-flex" v-if="state.orderPayload.order_type === 'score'"> <view class="ss-flex ss-col-center">
<view class="total-num ss-font-30 text-red ss-m-l-4"> + </view> <image
<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img"></image> :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
<view class="total-num ss-font-30 text-red">{{ state.orderInfo.score_amount }}</view> class="score-img"
</view> />
</view> <text class="item-value ss-m-r-24">{{ state.orderInfo.score_amount }}</text>
</view> </view>
<!-- 发票 --> </view>
<view class="bg-white ss-p-20 ss-r-20"> <view class="order-item ss-flex ss-col-center ss-row-between">
<view class="order-item ss-flex ss-col-center ss-row-between"> <view class="item-title">运费</view>
<view class="item-title">发票申请</view> <view class="ss-flex ss-col-center">
<view class="ss-flex ss-col-center" @tap="onSelectInvoice"> <text class="item-value ss-m-r-24">
<text class="item-value">{{ state.invoiceInfo.name || '无需开具发票' }}</text> +￥{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
<text class="_icon-forward item-icon"></text> </text>
</view> </view>
</view> </view>
</view> <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
<!-- 选择优惠券弹框 --> <view
<s-coupon-select v-model="state.couponInfo" :show="state.showCoupon" @confirm="onSelectCoupon" class="order-item ss-flex ss-col-center ss-row-between"
@close="state.showCoupon = false" /> v-if="state.orderInfo.type === 0"
<!-- 满额折扣弹框 --> >
<s-discount-list v-model="state.orderInfo" :show="state.showDiscount" @close="state.showDiscount = false" /> <view class="item-title">优惠券</view>
<!-- 底部 --> <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
<su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200"> <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
<view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center"> -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
<view class="total-box-footer ss-flex ss-col-center"> </text>
<view class="total-num ss-font-30 text-red"> ￥{{ state.orderInfo.pay_fee }} </view> <text
<view v-if="state.orderPayload.order_type === 'score'" class="ss-flex"> class="item-value"
<view class="total-num ss-font-30 text-red ss-m-l-4">+</view> :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img"></image> v-else
<view class="total-num ss-font-30 text-red">{{ state.orderInfo.score_amount }}</view> >
</view> {{
</view> state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
}}
</text>
<text class="_icon-forward item-icon" />
</view>
</view>
<view
class="order-item ss-flex ss-col-center ss-row-between"
v-if="state.orderInfo.price.discountPrice > 0"
>
<view class="item-title">活动优惠</view>
<view class="ss-flex ss-col-center">
<!-- @tap="state.showDiscount = true" TODO 芋艿：后续要把优惠信息打进去 -->
<text class="item-value text-red">
-￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
</text>
<text class="_icon-forward item-icon" />
</view>
</view>
</view>
<view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
<view class="total-num ss-m-r-20">
共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
</view>
<view>合计：</view>
<view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }} </view>
</view>
</view>
<button class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main" @tap="onConfirm"> <!-- 选择优惠券弹框 -->
{{ exchangeNow ? '立即兑换' : '提交订单' }} <s-coupon-select
</button> v-model="state.couponInfo"
</view> :show="state.showCoupon"
</su-fixed> @confirm="onSelectCoupon"
</s-layout> @close="state.showCoupon = false"
/>
<!-- 满额折扣弹框 TODO 芋艿：后续要把优惠信息打进去 -->
<s-discount-list
v-model="state.orderInfo"
:show="state.showDiscount"
@close="state.showDiscount = false"
/>
<!-- 底部 -->
<su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
<view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
<view class="total-box-footer ss-flex ss-col-center">
<view class="total-num ss-font-30 text-red">
￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
</view>
</view>
<button
class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
@tap="onConfirm"
>
提交订单
</button>
</view>
</su-fixed>
</s-layout>
</template> </template>
<script setup> <script setup>
import { import { reactive } from 'vue';
reactive, import { onLoad } from '@dcloudio/uni-app';
computed import sheep from '@/sheep';
} from 'vue'; import { isEmpty } from 'lodash';
import { import OrderApi from '@/sheep/api/trade/order';
onLoad, import CouponApi from '@/sheep/api/promotion/coupon';
onPageScroll, import { fen2yuan } from '@/sheep/hooks/useGoods';
onShow
} from '@dcloudio/uni-app';
import sheep from '@/sheep';
import {
isEmpty
} from 'lodash';
const state = reactive({ const state = reactive({
orderPayload: {}, orderPayload: {},
orderInfo: {}, orderInfo: {
addressInfo: {}, items: [], // 商品项列表
invoiceInfo: {}, price: {}, // 价格信息
totalNumber: 0, },
showCoupon: false, addressInfo: {}, // 选择的收货地址
couponInfo: [], showCoupon: false, // 是否展示优惠劵
showDiscount: false, couponInfo: [], // 优惠劵列表
}); showDiscount: false, // 是否展示营销活动
});
// 立即兑换(立即兑换无需跳转收银台) // 选择地址
const exchangeNow = computed( function onSelectAddress() {
() => state.orderPayload.order_type === 'score' && state.orderInfo.pay_fee == 0, uni.$once('SELECT_ADDRESS', (e) => {
); changeConsignee(e.addressInfo);
});
sheep.$router.go('/pages/user/address/list');
}
// 选择地址 // 更改收货人地址&计算订单信息
function onSelectAddress() { async function changeConsignee(addressInfo = {}) {
uni.$once('SELECT_ADDRESS', (e) => { if (!isEmpty(addressInfo)) {
changeConsignee(e.addressInfo); state.addressInfo = addressInfo;
}); }
sheep.$router.go('/pages/user/address/list'); await getOrderInfo();
} }
// 更改收货人地址&计算订单信息 // 选择优惠券
async function changeConsignee(addressInfo = {}) { async function onSelectCoupon(couponId) {
if (isEmpty(addressInfo)) { state.orderPayload.couponId = couponId || 0;
const { await getOrderInfo();
code, state.showCoupon = false;
data }
} = await sheep.$api.user.address.default();
console.log(data, '默认收货地址');
if (code === 0 && !isEmpty(data)) {
console.log('执行赋值')
addressInfo = data;
}
}
if (!isEmpty(addressInfo)) {
state.addressInfo = addressInfo;
state.orderPayload.address_id = state.addressInfo.id;
}
getOrderInfo();
}
// 选择优惠券 // 提交订单
async function onSelectCoupon(e) { function onConfirm() {
state.orderPayload.coupon_id = e || 0; if (!state.addressInfo.id) {
getOrderInfo(); sheep.$helper.toast('请选择收货地址');
state.showCoupon = false; return;
} }
submitOrder();
}
// 选择发票信息 // 创建订单&跳转
function onSelectInvoice() { async function submitOrder() {
uni.$once('SELECT_INVOICE', (e) => { const { code, data } = await OrderApi.createOrder({
state.invoiceInfo = e.invoiceInfo; items: state.orderPayload.items,
state.orderPayload.invoice_id = e.invoiceInfo.id || 0; couponId: state.orderPayload.couponId,
}); addressId: state.addressInfo.id,
sheep.$router.go('/pages/user/invoice/list'); deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
} pointStatus: false, // TODO 芋艿：需要支持【积分选择】
});
if (code !== 0) {
return;
}
// 更新购物车列表，如果来自购物车
if (state.orderPayload.items[0].cartId > 0) {
sheep.$store('cart').getList();
}
// 跳转到支付页面
sheep.$router.redirect('/pages/pay/index', {
orderSN: data.payOrderId,
});
}
// 提交订单/立即兑换 // 检查库存 & 计算订单价格
function onConfirm() { async function getOrderInfo() {
if (!state.orderPayload.address_id && state.orderInfo.need_address === 1) { // 计算价格
sheep.$helper.toast('请选择收货地址'); const { data, code } = await OrderApi.settlementOrder({
return; items: state.orderPayload.items,
} couponId: state.orderPayload.couponId,
addressId: state.addressInfo.id,
deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
pointStatus: false, // TODO 芋艿：需要支持【积分选择】
});
if (code !== 0) {
return;
}
state.orderInfo = data;
// 设置收货地址
if (state.orderInfo.address) {
state.addressInfo = state.orderInfo.address;
}
}
if (exchangeNow.value) { // 获取可用优惠券
uni.showModal({ async function getCoupons() {
title: '提示', const { code, data } = await CouponApi.getMatchCouponList(
content: '确定使用积分立即兑换?', state.orderInfo.price.payPrice,
cancelText: '再想想', state.orderInfo.items.map((item) => item.spuId),
success: async function(res) { state.orderPayload.items.map((item) => item.skuId),
if (res.confirm) { state.orderPayload.items.map((item) => item.categoryId),
submitOrder(); );
} if (code === 0) {
}, state.couponInfo = data;
}); }
} else { }
submitOrder();
}
}
// 创建订单&跳转 onLoad(async (options) => {
async function submitOrder() { if (!options.data) {
const { sheep.$helper.toast('参数不正确，请检查！');
error, return;
data }
} = await sheep.$api.order.create(state.orderPayload); state.orderPayload = JSON.parse(options.data);
if (error === 0) { await getOrderInfo();
// 更新购物车列表 await getCoupons();
if (state.orderPayload.from === 'cart') { });
sheep.$store('cart').getList();
}
if (exchangeNow.value) {
sheep.$router.redirect('/pages/pay/result', {
orderSN: data.order_sn,
});
} else {
sheep.$router.redirect('/pages/pay/index', {
orderSN: data.order_sn,
});
}
}
}
// 检查库存&计算订单价格
async function getOrderInfo() {
console.log(state.orderPayload, '计算价格传参')
// let {code, data} = await sheep.$api.order.calc(state.orderPayload);
// let data = await sheep.$api.order.calc(state.orderPayload);
console.log(state.orderPayload.items)
let data = await sheep.$api.order.calc({
deliveryType: 1,
pointStatus: false,
items: state.orderPayload.items
});
console.log(data, '修改后的获取订单详细数据')
return;
if (error === 0) {
state.totalNumber = 0;
state.orderInfo = data;
state.orderInfo.goods_list.forEach((item) => {
state.totalNumber += item.goods_num;
});
}
}
// 获取可用优惠券
async function getCoupons() {
const {
error,
data
} = await sheep.$api.order.coupons(state.orderPayload);
if (error === 0) {
state.couponInfo = data;
}
}
onLoad(async (options) => {
console.log(options)
if (options.data) {
state.orderPayload = JSON.parse(options.data);
changeConsignee();
if (state.orderPayload.order_type !== 'score') {
getCoupons();
}
}
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep() { :deep() {
.uni-input-wrapper { .uni-input-wrapper {
width: 320rpx; width: 320rpx;
} }
.uni-easyinput__content-input { .uni-easyinput__content-input {
font-size: 28rpx; font-size: 28rpx;
height: 72rpx; height: 72rpx;
text-align: right !important; text-align: right !important;
padding-right: 0 !important; padding-right: 0 !important;
.uni-input-input { .uni-input-input {
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
font-size: 26rpx; font-size: 26rpx;
height: 32rpx; height: 32rpx;
margin-top: 4rpx; margin-top: 4rpx;
} }
} }
.uni-easyinput__content { .uni-easyinput__content {
display: flex !important; display: flex !important;
align-items: center !important; align-items: center !important;
justify-content: right !important; justify-content: right !important;
} }
} }
.score-img { .score-img {
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
margin: 0 4rpx; margin: 0 4rpx;
} }
.order-item { .order-item {
height: 80rpx; height: 80rpx;
.item-title { .item-title {
font-size: 28rpx; font-size: 28rpx;
font-weight: 400; font-weight: 400;
} }
.item-value { .item-value {
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
font-family: OPPOSANS; font-family: OPPOSANS;
} }
.text-disabled { .text-disabled {
color: #bbbbbb; color: #bbbbbb;
} }
.item-icon { .item-icon {
color: $dark-9; color: $dark-9;
} }
.remark-input { .remark-input {
text-align: right; text-align: right;
} }
.item-placeholder { .item-placeholder {
color: $dark-9; color: $dark-9;
font-size: 26rpx; font-size: 26rpx;
text-align: right; text-align: right;
} }
} }
.total-box-footer { .total-box-footer {
height: 90rpx; height: 90rpx;
.total-num { .total-num {
color: #333333; color: #333333;
font-family: OPPOSANS; font-family: OPPOSANS;
} }
} }
.footer-box { .footer-box {
height: 100rpx; height: 100rpx;
.submit-btn { .submit-btn {
width: 240rpx; width: 240rpx;
height: 70rpx; height: 70rpx;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
.goto-pay-text { .goto-pay-text {
line-height: 28rpx; line-height: 28rpx;
} }
} }
.cancel-btn { .cancel-btn {
width: 240rpx; width: 240rpx;
height: 80rpx; height: 80rpx;
font-size: 26rpx; font-size: 26rpx;
background-color: #e5e5e5; background-color: #e5e5e5;
color: $dark-9; color: $dark-9;
} }
} }
.title { .title {
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.subtitle { .subtitle {
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
} }
.cicon-checkbox { .cicon-checkbox {
font-size: 36rpx; font-size: 36rpx;
color: var(--ui-BG-Main); color: var(--ui-BG-Main);
} }
.cicon-box { .cicon-box {
font-size: 36rpx; font-size: 36rpx;
color: #999999; color: #999999;
} }
</style> </style>

8
sheep/api/app.js
View File

@ -115,12 +115,14 @@ export default {
formData: { formData: {
group, group,
}, },
// TODO 芋艿：临时写死
header: { header: {
// Accept: 'text/json', // Accept: 'text/json',
// Authorization: token, // Authorization: token,
Accept : '*/*', Accept : '*/*',
'tenant-id' :'1', 'tenant-id' :'1',
Authorization: 'Bearer test247', 'terminal': 20,
Authorization: 'Bearer test247',
}, },
success: (uploadFileRes) => { success: (uploadFileRes) => {
let result = JSON.parse(uploadFileRes.data); let result = JSON.parse(uploadFileRes.data);

25
sheep/api/order.js
View File

@ -65,27 +65,18 @@ export default {
// 解决 SpringMVC 接受 List<Item> 参数的问题 // 解决 SpringMVC 接受 List<Item> 参数的问题
delete data2.items delete data2.items
for (let i = 0; i < data.items.length; i++) { for (let i = 0; i < data.items.length; i++) {
// data2['items[' + i + '' + '].skuId'] = data.items[i].skuId + ''; data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
// data2['items[' + i + '' + '].count'] = data.items[i].count + ''; data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
// data2['items[' + i + '' + '].cartId'] = data.items[i].cartId + ''; if (data.items[i].cartId) {
data2['items' + `%5B${i}%5D` + '.skuId'] = data.items[i].skuId + ''; data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
data2['items' + `%5B${i}%5D` + '.count'] = data.items[i].count + ''; }
data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
} }
console.log(data2, '对比数据') const queryString= Object.keys(data2).map(key => key + '=' + data2[key]).join('&')
return request2({ return request2({
url: 'trade/order/settlement', url: `trade/order/settlement?${queryString}`,
method: 'GET', method: 'GET'
// data,
params: data2
}) })
}, },
// calc: (data) =>
// request({
// url: 'order/order/calc',
// method: 'POST',
// data,
// }),
// 创建订单 // 创建订单
create: (data) => create: (data) =>
request({ request({

13
sheep/api/promotion/coupon.js
View File

@ -17,4 +17,17 @@ export default {
params: { spuId, productScope, count }, params: { spuId, productScope, count },
}); });
}, },
// 获得匹配指定商品的优惠劵列表
getMatchCouponList: (price, spuIds, skuIds, categoryIds) => {
return request({
url: '/app-api/promotion/coupon/match-list',
method: 'GET',
params: {
price,
spuIds: spuIds.join(','),
skuIds: skuIds.join(','),
categoryIds: categoryIds.join(','),
},
});
}
}; };

41
sheep/api/trade/order.js Normal file
View File

@ -0,0 +1,41 @@
import request2 from '@/sheep/request2';
const OrderApi = {
// 计算订单信息
settlementOrder: (data) => {
const data2 = {
...data,
}
// 移除多余字段
if (!(data.couponId > 0)) {
delete data2.couponId
}
if (!(data.addressId > 0)) {
delete data2.addressId
}
// 解决 SpringMVC 接受 List<Item> 参数的问题
delete data2.items
for (let i = 0; i < data.items.length; i++) {
data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
if (data.items[i].cartId) {
data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
}
}
const queryString= Object.keys(data2).map(key => key + '=' + data2[key]).join('&')
return request2({
url: `trade/order/settlement?${queryString}`,
method: 'GET'
})
},
// 创建订单
createOrder: (data) => {
return request2({
url: `trade/order/create`,
method: 'POST',
data
})
}
};
export default OrderApi;

24
sheep/components/s-coupon-select/s-coupon-select.vue
View File

@ -1,3 +1,4 @@
<!-- 订单确认的优惠劵选择弹窗 -->
<template> <template>
<su-popup <su-popup
:show="show" :show="show"
@ -16,20 +17,21 @@
:enable-back-to-top="true" :enable-back-to-top="true"
> >
<view class="subtitle ss-m-l-20">可使用优惠券</view> <view class="subtitle ss-m-l-20">可使用优惠券</view>
<view v-for="(item, index) in state.couponInfo.can_use" :key="index"> <view v-for="(item, index) in state.couponInfo" :key="index">
<s-coupon-list :data="item" type="user" :disabled="false"> <s-coupon-list :data="item" type="user" :disabled="false">
<template #default> <template #default>
<label class="ss-flex ss-col-center" @tap="radioChange(item.id)"> <label class="ss-flex ss-col-center" @tap="radioChange(item.id)">
<radio <radio
color="var(--ui-BG-Main)" color="var(--ui-BG-Main)"
style="transform: scale(0.8)" style="transform: scale(0.8)"
:checked="state.couponId == item.id" :checked="state.couponId === item.id"
@tap.stop="radioChange(item.id)" @tap.stop="radioChange(item.id)"
/> />
</label> </label>
</template> </template>
</s-coupon-list> </s-coupon-list>
</view> </view>
<!-- TODO 芋艿：未来接口需要支持下
<view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view> <view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view>
<view v-for="item in state.couponInfo.cannot_use" :key="item.id"> <view v-for="item in state.couponInfo.cannot_use" :key="item.id">
<s-coupon-list :data="item" type="user" :disabled="true"> <s-coupon-list :data="item" type="user" :disabled="true">
@ -41,6 +43,7 @@
</template> </template>
</s-coupon-list> </s-coupon-list>
</view> </view>
-->
</scroll-view> </scroll-view>
</view> </view>
<view class="modal-footer ss-flex"> <view class="modal-footer ss-flex">
@ -50,8 +53,9 @@
</template> </template>
<script setup> <script setup>
import { computed, reactive } from 'vue'; import { computed, reactive } from 'vue';
const props = defineProps({ const props = defineProps({
modelValue: { modelValue: { // 优惠劵列表
type: Object, type: Object,
default() {}, default() {},
}, },
@ -60,21 +64,27 @@
default: false, default: false,
}, },
}); });
const emits = defineEmits(['confirm', 'close']); const emits = defineEmits(['confirm', 'close']);
const state = reactive({ const state = reactive({
couponInfo: computed(() => props.modelValue), couponInfo: computed(() => props.modelValue), // 优惠劵列表
couponId: 0, couponId: 0, // 选中的优惠劵编号
}); });
// 选中优惠劵
function radioChange(couponId) { function radioChange(couponId) {
if (state.couponId == couponId) { if (state.couponId === couponId) {
state.couponId = 0; state.couponId = 0;
} else { } else {
state.couponId = couponId; state.couponId = couponId;
} }
} }
// 确认优惠劵
const onConfirm = () => { const onConfirm = () => {
emits('confirm', state.couponId); emits('confirm', state.couponId);
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep() { :deep() {

3
sheep/components/s-goods-item/s-goods-item.vue
View File

@ -26,7 +26,7 @@
:style="[{ color: priceColor }]" :style="[{ color: priceColor }]"
v-if="price && Number(price) > 0" v-if="price && Number(price) > 0"
> >
￥{{ price }} ￥{{ fen2yuan(price) }}
</view> </view>
<view v-if="score && Number(price) > 0">+</view> <view v-if="score && Number(price) > 0">+</view>
<view class="price-text ss-flex ss-col-center" v-if="score"> <view class="price-text ss-flex ss-col-center" v-if="score">
@ -54,6 +54,7 @@
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import { computed } from 'vue'; import { computed } from 'vue';
import { fen2yuan } from '../../hooks/useGoods';
/** /**
* 订单卡片 * 订单卡片
* *