feat: 选品广场/会员优选添加自提模块
This commit is contained in:
+118
-20
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<s-pages title="确认订单" :pink_bg="true">
|
<s-pages title="确认订单" :pink_bg="true">
|
||||||
<view class="p-b-132">
|
<view class="p-b-132">
|
||||||
<AddressSelection v-model="addressState" theme="2" @getSettlementInfo="getSettlementInfo" />
|
<AddressSelection v-model="addressState" theme="2" />
|
||||||
<view class="p-x-32 m-t-24">
|
<view class="p-x-32 m-t-24">
|
||||||
<view class="bg24 p-x-20 p-t-20 radius16">
|
<view class="bg24 p-x-20 p-t-20 radius16">
|
||||||
<view v-if="settlementInfo.items && settlementInfo.items.length">
|
<view v-if="settlementInfo.items && settlementInfo.items.length">
|
||||||
@@ -14,10 +14,41 @@
|
|||||||
<view class="c25 size28">商品金额</view>
|
<view class="c25 size28">商品金额</view>
|
||||||
<view>¥{{ $fen2yuan(settlementInfo?.price?.totalPrice || 0) }}</view>
|
<view>¥{{ $fen2yuan(settlementInfo?.price?.totalPrice || 0) }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="flex-row ju-between m-b-36">
|
<view
|
||||||
|
class="flex-row ju-between m-b-36"
|
||||||
|
v-if="addressState.deliveryType === DeliveryTypeEnum.EXPRESS.type"
|
||||||
|
>
|
||||||
<view class="c25 size28">运费</view>
|
<view class="c25 size28">运费</view>
|
||||||
<view>¥{{ $fen2yuan(settlementInfo?.price?.deliveryPrice || 0) }}</view>
|
<view>¥{{ $fen2yuan(settlementInfo?.price?.deliveryPrice || 0) }}</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view
|
||||||
|
class="flex-row ju-between m-b-36"
|
||||||
|
v-if="addressState.deliveryType === DeliveryTypeEnum.PICK_UP.type"
|
||||||
|
>
|
||||||
|
<view class="c25 size28">联系人</view>
|
||||||
|
<uni-easyinput
|
||||||
|
class="order-input"
|
||||||
|
maxlength="20"
|
||||||
|
placeholder="请填写您的联系姓名"
|
||||||
|
v-model="addressState.receiverName"
|
||||||
|
:inputBorder="false"
|
||||||
|
:clearable="false"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
<view
|
||||||
|
class="flex-row ju-between m-b-36"
|
||||||
|
v-if="addressState.deliveryType === DeliveryTypeEnum.PICK_UP.type"
|
||||||
|
>
|
||||||
|
<view class="c25 size28">联系电话</view>
|
||||||
|
<uni-easyinput
|
||||||
|
class="order-input"
|
||||||
|
maxlength="20"
|
||||||
|
placeholder="请填写您的联系电话"
|
||||||
|
v-model="addressState.receiverMobile"
|
||||||
|
:inputBorder="false"
|
||||||
|
:clearable="false"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
<view class="flex-center ju-flex-end borderTop">
|
<view class="flex-center ju-flex-end borderTop">
|
||||||
<span class="size26 line96">合计: </span>
|
<span class="size26 line96">合计: </span>
|
||||||
<span class="c13 size28 m-l-12 line96 weight900"
|
<span class="c13 size28 m-l-12 line96 weight900"
|
||||||
@@ -35,38 +66,51 @@
|
|||||||
</s-pages>
|
</s-pages>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, getCurrentInstance } from 'vue';
|
import { ref, getCurrentInstance, watch } from 'vue';
|
||||||
import AddressSelection from '@/pages/order/addressSelection.vue';
|
import AddressSelection from '@/pages/order/addressSelection.vue';
|
||||||
import { onLoad, onShow } from '@dcloudio/uni-app';
|
import { onLoad, onShow } from '@dcloudio/uni-app';
|
||||||
import aiOrder from '@/components/ai_order/ai_order';
|
import aiOrder from '@/components/ai_order/ai_order';
|
||||||
let { proxy } = getCurrentInstance();
|
let { proxy } = getCurrentInstance();
|
||||||
import api from '@/sheep/api/member/address';
|
import api from '@/sheep/api/member/address';
|
||||||
import * as SpuApi from '@/sheep/api/ai/index';
|
import * as SpuApi from '@/sheep/api/ai/index';
|
||||||
|
import { DeliveryTypeEnum } from '@/sheep/helper/const';
|
||||||
|
|
||||||
const addressState = ref({
|
const addressState = ref({
|
||||||
addressInfo: {},
|
addressInfo: {},
|
||||||
deliveryType: 1,
|
deliveryType: DeliveryTypeEnum.EXPRESS.type,
|
||||||
isPickUp: false,
|
isPickUp: true,
|
||||||
pickUpInfo: {},
|
pickUpInfo: {},
|
||||||
receiverName: '',
|
receiverName: '',
|
||||||
receiverMobile: '',
|
receiverMobile: '',
|
||||||
});
|
});
|
||||||
let remark_value = ref();
|
let remark_value = ref();
|
||||||
let spuId = ref();
|
let spuId = ref();
|
||||||
let spuPrice = ref();
|
|
||||||
const isSubmitting = ref(false);
|
const isSubmitting = ref(false);
|
||||||
|
|
||||||
const settlementInfo = ref<any>({});
|
const settlementInfo = ref<any>({});
|
||||||
let addressId = ref('');
|
const lastSettlementQuery = ref('');
|
||||||
const getSettlementInfo = (id = '') => {
|
const getSettlementRequestId = () => String(addressState.value.addressInfo?.id || '');
|
||||||
addressId.value = id;
|
const getSettlementInfo = () => {
|
||||||
SpuApi.getGiftSettlementInfo({
|
const query = {
|
||||||
id: id,
|
id: getSettlementRequestId(),
|
||||||
spuId: spuId.value,
|
spuId: spuId.value,
|
||||||
|
deliveryType: addressState.value.deliveryType,
|
||||||
|
pickUpStoreId:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? String(addressState.value.pickUpInfo?.id || '')
|
||||||
|
: undefined,
|
||||||
|
};
|
||||||
|
const queryKey = JSON.stringify(query);
|
||||||
|
if (queryKey === lastSettlementQuery.value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastSettlementQuery.value = queryKey;
|
||||||
|
SpuApi.getGiftSettlementInfo({
|
||||||
|
...query,
|
||||||
}).then((res: any) => {
|
}).then((res: any) => {
|
||||||
settlementInfo.value = res.data || {};
|
settlementInfo.value = res.data || {};
|
||||||
// 设置收货地址
|
// 设置收货地址
|
||||||
if (res.data.address) {
|
if (!addressState.value.addressInfo?.id && res.data.address) {
|
||||||
addressState.value.addressInfo = res.data.address;
|
addressState.value.addressInfo = res.data.address;
|
||||||
}
|
}
|
||||||
// if (settlementInfo.value?.items?.length) {
|
// if (settlementInfo.value?.items?.length) {
|
||||||
@@ -88,12 +132,44 @@
|
|||||||
if (isSubmitting.value) {
|
if (isSubmitting.value) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!addressId.value) return proxy.utils.toast('请选择地址');
|
if (
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.EXPRESS.type &&
|
||||||
|
!addressState.value.addressInfo?.id
|
||||||
|
) {
|
||||||
|
return proxy.utils.toast('请选择收货地址');
|
||||||
|
}
|
||||||
|
if (addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type) {
|
||||||
|
if (!addressState.value.pickUpInfo?.id) {
|
||||||
|
return proxy.utils.toast('请选择自提门店');
|
||||||
|
}
|
||||||
|
if (addressState.value.receiverName === '' || addressState.value.receiverMobile === '') {
|
||||||
|
return proxy.utils.toast('请填写联系人或联系人电话');
|
||||||
|
}
|
||||||
|
if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(addressState.value.receiverName)) {
|
||||||
|
return proxy.utils.toast('请填写您的真实姓名');
|
||||||
|
}
|
||||||
|
if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(addressState.value.receiverMobile)) {
|
||||||
|
return proxy.utils.toast('请填写正确的手机号');
|
||||||
|
}
|
||||||
|
}
|
||||||
isSubmitting.value = true;
|
isSubmitting.value = true;
|
||||||
try {
|
try {
|
||||||
let res: any = await SpuApi.createOrderOpen({
|
let res: any = await SpuApi.createOrderOpen({
|
||||||
id: addressId.value,
|
id: getSettlementRequestId(),
|
||||||
spuId: spuId.value,
|
spuId: spuId.value,
|
||||||
|
deliveryType: addressState.value.deliveryType,
|
||||||
|
pickUpStoreId:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.pickUpInfo?.id
|
||||||
|
: undefined,
|
||||||
|
receiverName:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.receiverName
|
||||||
|
: undefined,
|
||||||
|
receiverPhone:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.receiverMobile
|
||||||
|
: undefined,
|
||||||
userRemark: remark_value.value,
|
userRemark: remark_value.value,
|
||||||
});
|
});
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
@@ -115,12 +191,10 @@
|
|||||||
const getAddress = () => {
|
const getAddress = () => {
|
||||||
api.getAddressList().then((res: any) => {
|
api.getAddressList().then((res: any) => {
|
||||||
if (res.code === 0 && res.data?.length) {
|
if (res.code === 0 && res.data?.length) {
|
||||||
// addressState.value.addressInfo = res.data[0];
|
let index = res.data.findIndex((e: any) => e.defaultStatus);
|
||||||
// getSettlementInfo(res.data[0].id);
|
|
||||||
let index = res.data.findIndex((e) => e.defaultStatus);
|
|
||||||
if (index !== -1) {
|
if (index !== -1) {
|
||||||
addressState.value.addressInfo = res.data[index];
|
addressState.value.addressInfo = res.data[index];
|
||||||
getSettlementInfo(res.data[index].id);
|
getSettlementInfo();
|
||||||
} else {
|
} else {
|
||||||
getSettlementInfo();
|
getSettlementInfo();
|
||||||
}
|
}
|
||||||
@@ -134,15 +208,27 @@
|
|||||||
// spuId.value = options.id;
|
// spuId.value = options.id;
|
||||||
// }
|
// }
|
||||||
// if (options.price) {
|
// if (options.price) {
|
||||||
// spuPrice.value = options.price;
|
|
||||||
// }
|
// }
|
||||||
// getSettlementInfo();
|
// getSettlementInfo();
|
||||||
// });
|
// });
|
||||||
onLoad((e) => {
|
onLoad((e: any) => {
|
||||||
// getCartList();
|
// getCartList();
|
||||||
spuId.value = e.id;
|
spuId.value = e.id;
|
||||||
// console.log(e.id);
|
// console.log(e.id);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => [
|
||||||
|
addressState.value.deliveryType,
|
||||||
|
addressState.value.addressInfo?.id,
|
||||||
|
addressState.value.pickUpInfo?.id,
|
||||||
|
spuId.value,
|
||||||
|
],
|
||||||
|
() => {
|
||||||
|
getSettlementInfo();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
onShow(() => {
|
onShow(() => {
|
||||||
getAddress();
|
getAddress();
|
||||||
});
|
});
|
||||||
@@ -171,6 +257,18 @@
|
|||||||
border-top: 1rpx solid #dfdfdf;
|
border-top: 1rpx solid #dfdfdf;
|
||||||
padding: 12rpx 0;
|
padding: 12rpx 0;
|
||||||
}
|
}
|
||||||
|
:deep(.order-input) {
|
||||||
|
width: 320rpx;
|
||||||
|
}
|
||||||
|
:deep(.order-input .uni-easyinput__content) {
|
||||||
|
background: transparent !important;
|
||||||
|
}
|
||||||
|
:deep(.order-input .uni-easyinput__content-input) {
|
||||||
|
text-align: right !important;
|
||||||
|
font-size: 26rpx;
|
||||||
|
height: 56rpx;
|
||||||
|
padding-right: 0 !important;
|
||||||
|
}
|
||||||
.ai-button2--disabled {
|
.ai-button2--disabled {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|||||||
+14
-1
@@ -45,6 +45,13 @@
|
|||||||
@getOrderDetail="getOrderDetail"
|
@getOrderDetail="getOrderDetail"
|
||||||
></card_order>
|
></card_order>
|
||||||
|
|
||||||
|
<PickUpVerify
|
||||||
|
v-if="Number(state.orderInfo.deliveryType) === 2"
|
||||||
|
ref="pickUpVerifyRef"
|
||||||
|
:orderInfo="state.orderInfo"
|
||||||
|
:systemStore="systemStore"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- 价格信息 -->
|
<!-- 价格信息 -->
|
||||||
<view class="order-price-box bg24">
|
<view class="order-price-box bg24">
|
||||||
<view class="notice-item ss-flex ss-row-between" v-for="(v, i) in priceArr" :key="i">
|
<view class="notice-item ss-flex ss-row-between" v-for="(v, i) in priceArr" :key="i">
|
||||||
@@ -130,7 +137,7 @@
|
|||||||
handleOrderButtons,
|
handleOrderButtons,
|
||||||
} from '@/sheep/hooks/useGoods';
|
} from '@/sheep/hooks/useGoods';
|
||||||
import * as OrderApi from '@/sheep/api/ai/index';
|
import * as OrderApi from '@/sheep/api/ai/index';
|
||||||
import DeliveryApi from '@/sheep/api/trade/delivery';
|
import StoreApi from '@/sheep/api/trade/store';
|
||||||
import PickUpVerify from '@/pages/order/pickUpVerify.vue';
|
import PickUpVerify from '@/pages/order/pickUpVerify.vue';
|
||||||
import card_order from '@/components/orderItem/card_order.vue';
|
import card_order from '@/components/orderItem/card_order.vue';
|
||||||
|
|
||||||
@@ -190,6 +197,12 @@
|
|||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
state.orderInfo = res.data;
|
state.orderInfo = res.data;
|
||||||
handleOrderButtons(state.orderInfo);
|
handleOrderButtons(state.orderInfo);
|
||||||
|
if (res.data.pickUpStoreId) {
|
||||||
|
const { data } = await StoreApi.getStoreById(res.data.pickUpStoreId);
|
||||||
|
systemStore.value = data || {};
|
||||||
|
} else {
|
||||||
|
systemStore.value = {};
|
||||||
|
}
|
||||||
if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
|
if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
|
||||||
pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
|
pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
|
||||||
}
|
}
|
||||||
|
|||||||
+129
-42
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<s-pages title="确认订单" :pink_bg="true">
|
<s-pages title="确认订单" :pink_bg="true">
|
||||||
<view class="p-b-132">
|
<view class="p-b-132">
|
||||||
<AddressSelection v-model="addressState" theme="2" @getSettlementInfo="getSettlementInfo" />
|
<AddressSelection v-model="addressState" theme="2" />
|
||||||
<view class="p-x-32 m-t-24">
|
<view class="p-x-32 m-t-24">
|
||||||
<view class="bg24 p-x-20 p-t-20 radius16">
|
<view class="bg24 p-x-20 p-t-20 radius16">
|
||||||
<view v-if="settlementInfo.items && settlementInfo.items.length">
|
<view v-if="settlementInfo.items && settlementInfo.items.length">
|
||||||
@@ -11,12 +11,34 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="flex-row ju-between m-b-36">
|
<view class="flex-row ju-between m-b-36">
|
||||||
<view class="c25 size28">商品金额</view>
|
<view class="c25 size28">商品金额</view>
|
||||||
<view>¥{{ $fen2yuan(settlementInfo?.price?.payPrice || 0) }}</view>
|
<view>¥{{ $fen2yuan(settlementInfo?.price?.totalPrice || 0) }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="flex-row ju-between m-b-36">
|
<view class="flex-row ju-between m-b-36" v-if="addressState.deliveryType === DeliveryTypeEnum.EXPRESS.type">
|
||||||
<view class="c25 size28">运费</view>
|
<view class="c25 size28">运费</view>
|
||||||
<view>¥{{ $fen2yuan(settlementInfo?.price?.deliveryPrice || 0) }}</view>
|
<view>¥{{ $fen2yuan(settlementInfo?.price?.deliveryPrice || 0) }}</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="flex-row ju-between m-b-36" v-if="addressState.deliveryType === DeliveryTypeEnum.PICK_UP.type">
|
||||||
|
<view class="c25 size28">联系人</view>
|
||||||
|
<uni-easyinput
|
||||||
|
class="order-input"
|
||||||
|
maxlength="20"
|
||||||
|
placeholder="请填写您的联系姓名"
|
||||||
|
v-model="addressState.receiverName"
|
||||||
|
:inputBorder="false"
|
||||||
|
:clearable="false"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
<view class="flex-row ju-between m-b-36" v-if="addressState.deliveryType === DeliveryTypeEnum.PICK_UP.type">
|
||||||
|
<view class="c25 size28">联系电话</view>
|
||||||
|
<uni-easyinput
|
||||||
|
class="order-input"
|
||||||
|
maxlength="20"
|
||||||
|
placeholder="请填写您的联系电话"
|
||||||
|
v-model="addressState.receiverMobile"
|
||||||
|
:inputBorder="false"
|
||||||
|
:clearable="false"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
<view class="flex-center ju-flex-end borderTop">
|
<view class="flex-center ju-flex-end borderTop">
|
||||||
<span class="size26 line96">合计: </span>
|
<span class="size26 line96">合计: </span>
|
||||||
<span class="c13 size28 m-l-12 line96 weight900"
|
<span class="c13 size28 m-l-12 line96 weight900"
|
||||||
@@ -32,54 +54,69 @@
|
|||||||
</s-pages>
|
</s-pages>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, reactive, onMounted, onUnmounted, getCurrentInstance, watch, nextTick } from 'vue';
|
import { ref, getCurrentInstance, watch } from 'vue';
|
||||||
import AddressSelection from '@/pages/order/addressSelection.vue';
|
import AddressSelection from '@/pages/order/addressSelection.vue';
|
||||||
import { onLoad } from '@dcloudio/uni-app';
|
import { onLoad } from '@dcloudio/uni-app';
|
||||||
import aiOrder from '@/components/ai_order/ai_order';
|
import aiOrder from '@/components/ai_order/ai_order';
|
||||||
import api from '@/sheep/api/member/address';
|
import api from '@/sheep/api/member/address';
|
||||||
let { proxy } = getCurrentInstance();
|
let { proxy } = getCurrentInstance();
|
||||||
import * as SpuApi from '@/sheep/api/ai/index';
|
import * as SpuApi from '@/sheep/api/ai/index';
|
||||||
|
import { DeliveryTypeEnum } from '@/sheep/helper/const';
|
||||||
|
|
||||||
const addressState = ref({
|
const addressState = ref({
|
||||||
addressInfo: {}, // 选择的收货地址
|
addressInfo: {}, // 选择的收货地址
|
||||||
deliveryType: 1, // 收货方式:1-快递配送,2-门店自提
|
deliveryType: DeliveryTypeEnum.EXPRESS.type, // 收货方式:1-快递配送,2-门店自提
|
||||||
isPickUp: false, // 门店自提是否开启
|
isPickUp: true, // 门店自提是否开启
|
||||||
pickUpInfo: {}, // 选择的自提门店信息
|
pickUpInfo: {}, // 选择的自提门店信息
|
||||||
receiverName: '', // 收件人名称
|
receiverName: '', // 收件人名称
|
||||||
receiverMobile: '', // 收件人手机
|
receiverMobile: '', // 收件人手机
|
||||||
});
|
});
|
||||||
|
|
||||||
const cartList = ref([]);
|
|
||||||
const getCartList = () => {
|
|
||||||
SpuApi.getShopCartList({}).then((res) => {
|
|
||||||
let list = res.data || [];
|
|
||||||
if (list.length) {
|
|
||||||
list.forEach((e) => {
|
|
||||||
e.skuArr = JSON.parse(e.specification);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
cartList.value = list;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
// 获取订单结算信息
|
// 获取订单结算信息
|
||||||
const settlementInfo = ref({});
|
const settlementInfo = ref<any>({});
|
||||||
let addressId = ref('');
|
const lastSettlementQuery = ref('');
|
||||||
const getSettlementInfo = (id = '') => {
|
const getSettlementRequestId = () => String(addressState.value.addressInfo?.id || '');
|
||||||
addressId.value = id;
|
const getSettlementInfo = () => {
|
||||||
SpuApi.getSettlementInfo({
|
const query = {
|
||||||
id: id,
|
id: getSettlementRequestId(),
|
||||||
}).then((res) => {
|
deliveryType: addressState.value.deliveryType,
|
||||||
|
pickUpStoreId:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? String(addressState.value.pickUpInfo?.id || '')
|
||||||
|
: undefined,
|
||||||
|
receiverName:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.receiverName
|
||||||
|
: undefined,
|
||||||
|
receiverPhone:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.receiverMobile
|
||||||
|
: undefined,
|
||||||
|
};
|
||||||
|
const queryKey = JSON.stringify(query);
|
||||||
|
if (queryKey === lastSettlementQuery.value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastSettlementQuery.value = queryKey;
|
||||||
|
SpuApi.getSettlementInfo(query).then((res: any) => {
|
||||||
settlementInfo.value = res.data || {};
|
settlementInfo.value = res.data || {};
|
||||||
|
if (
|
||||||
|
!addressState.value.addressInfo?.id &&
|
||||||
|
res.data?.address &&
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.EXPRESS.type
|
||||||
|
) {
|
||||||
|
addressState.value.addressInfo = res.data.address;
|
||||||
|
}
|
||||||
|
|
||||||
// if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
|
// if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
|
||||||
// proxy.utils.toast('订单金额不能超过5000元');
|
// proxy.utils.toast('订单金额不能超过5000元');
|
||||||
// }
|
// }
|
||||||
if (settlementInfo.value?.items?.length) {
|
if (settlementInfo.value?.items?.length) {
|
||||||
settlementInfo.value.items.forEach((e) => {
|
settlementInfo.value.items.forEach((e: any) => {
|
||||||
e.skuArr = e.items;
|
e.skuArr = e.items;
|
||||||
e.skuArr.forEach((item) => {
|
e.skuArr.forEach((item: any) => {
|
||||||
item.propertyText = '';
|
item.propertyText = '';
|
||||||
item.properties.forEach((e1) => {
|
item.properties.forEach((e1: any) => {
|
||||||
item.propertyText += e1.valueName + ' ';
|
item.propertyText += e1.valueName + ' ';
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -87,13 +124,45 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const sub = async () => {
|
const sub = async () => {
|
||||||
// if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
|
// if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
|
||||||
// proxy.utils.toast('订单金额不能超过5000元, 请重新选择商品');
|
// proxy.utils.toast('订单金额不能超过5000元, 请重新选择商品');
|
||||||
// return;
|
// return;
|
||||||
// }
|
// }
|
||||||
if (!addressId.value) return proxy.utils.toast('请选择地址');
|
if (addressState.value.deliveryType === DeliveryTypeEnum.EXPRESS.type && !addressState.value.addressInfo?.id) {
|
||||||
let res: any = await SpuApi.createOrder({ id: addressId.value });
|
return proxy.utils.toast('请选择收货地址');
|
||||||
|
}
|
||||||
|
if (addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type) {
|
||||||
|
if (!addressState.value.pickUpInfo?.id) {
|
||||||
|
return proxy.utils.toast('请选择自提门店');
|
||||||
|
}
|
||||||
|
if (addressState.value.receiverName === '' || addressState.value.receiverMobile === '') {
|
||||||
|
return proxy.utils.toast('请填写联系人或联系人电话');
|
||||||
|
}
|
||||||
|
if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(addressState.value.receiverName)) {
|
||||||
|
return proxy.utils.toast('请填写您的真实姓名');
|
||||||
|
}
|
||||||
|
if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(addressState.value.receiverMobile)) {
|
||||||
|
return proxy.utils.toast('请填写正确的手机号');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let res: any = await SpuApi.createOrder({
|
||||||
|
id: getSettlementRequestId(),
|
||||||
|
deliveryType: addressState.value.deliveryType,
|
||||||
|
pickUpStoreId:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.pickUpInfo?.id
|
||||||
|
: undefined,
|
||||||
|
receiverName:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.receiverName
|
||||||
|
: undefined,
|
||||||
|
receiverPhone:
|
||||||
|
addressState.value.deliveryType === DeliveryTypeEnum.PICK_UP.type
|
||||||
|
? addressState.value.receiverMobile
|
||||||
|
: undefined,
|
||||||
|
});
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
// proxy.utils.toast('下单成功');
|
// proxy.utils.toast('下单成功');
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@@ -114,14 +183,12 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
const getAddress = () => {
|
const getAddress = () => {
|
||||||
api.getAddressList().then((res) => {
|
api.getAddressList().then((res: any) => {
|
||||||
if (res.code === 0 && res.data?.length) {
|
if (res.code === 0 && res.data?.length) {
|
||||||
// addressState.value.addressInfo = res.data[0];
|
let index = res.data.findIndex((e: any) => e.defaultStatus);
|
||||||
// getSettlementInfo(res.data[0].id);
|
|
||||||
let index = res.data.findIndex((e) => e.defaultStatus);
|
|
||||||
if (index !== -1) {
|
if (index !== -1) {
|
||||||
addressState.value.addressInfo = res.data[index];
|
addressState.value.addressInfo = res.data[index];
|
||||||
getSettlementInfo(res.data[index].id);
|
getSettlementInfo();
|
||||||
} else {
|
} else {
|
||||||
getSettlementInfo();
|
getSettlementInfo();
|
||||||
}
|
}
|
||||||
@@ -130,22 +197,42 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => [
|
||||||
|
addressState.value.deliveryType,
|
||||||
|
addressState.value.addressInfo?.id,
|
||||||
|
addressState.value.pickUpInfo?.id,
|
||||||
|
],
|
||||||
|
() => {
|
||||||
|
getSettlementInfo();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
onLoad(() => {
|
onLoad(() => {
|
||||||
// getCartList();
|
|
||||||
getAddress();
|
getAddress();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.pages {
|
|
||||||
}
|
|
||||||
|
|
||||||
.bottom {
|
|
||||||
}
|
|
||||||
|
|
||||||
.borderTop {
|
.borderTop {
|
||||||
border-top: 1px solid #d4d4d4;
|
border-top: 1px solid #d4d4d4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:deep(.order-input) {
|
||||||
|
width: 320rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.order-input .uni-easyinput__content) {
|
||||||
|
background: transparent !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.order-input .uni-easyinput__content-input) {
|
||||||
|
text-align: right !important;
|
||||||
|
font-size: 26rpx;
|
||||||
|
height: 56rpx;
|
||||||
|
padding-right: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
.btn {
|
.btn {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
|||||||
+47
-4
@@ -121,10 +121,31 @@ export function getSettlementInfo(params: any) {
|
|||||||
|
|
||||||
// 生成订单 aishop/order/createOrder
|
// 生成订单 aishop/order/createOrder
|
||||||
export function createOrder(params: any) {
|
export function createOrder(params: any) {
|
||||||
|
const query = {
|
||||||
|
...params,
|
||||||
|
}
|
||||||
|
if (!(Number(query?.id) > 0)) {
|
||||||
|
delete query.id
|
||||||
|
}
|
||||||
|
if (!(Number(query?.deliveryType) > 0)) {
|
||||||
|
delete query.deliveryType
|
||||||
|
}
|
||||||
|
if (!(Number(query?.pickUpStoreId) > 0)) {
|
||||||
|
delete query.pickUpStoreId
|
||||||
|
}
|
||||||
|
if (!String(query?.receiverName || '').trim()) {
|
||||||
|
delete query.receiverName
|
||||||
|
}
|
||||||
|
if (!String(query?.receiverPhone || query?.receiverMobile || '').trim()) {
|
||||||
|
delete query.receiverPhone
|
||||||
|
} else {
|
||||||
|
query.receiverPhone = String(query?.receiverPhone || query?.receiverMobile || '').trim()
|
||||||
|
}
|
||||||
|
delete query.receiverMobile
|
||||||
return request({
|
return request({
|
||||||
url: '/aishop/order/createOrder',
|
url: '/aishop/order/createOrder',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params,
|
params: query,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,10 +259,34 @@ export function getGiftSettlementInfo(params : any) {
|
|||||||
}
|
}
|
||||||
// 创建发货状态订单
|
// 创建发货状态订单
|
||||||
export function createOrderOpen(params : any) {
|
export function createOrderOpen(params : any) {
|
||||||
|
const query = {
|
||||||
|
...params,
|
||||||
|
}
|
||||||
|
if (!(Number(query?.id) > 0)) {
|
||||||
|
delete query.id
|
||||||
|
}
|
||||||
|
if (!(Number(query?.spuId) > 0)) {
|
||||||
|
delete query.spuId
|
||||||
|
}
|
||||||
|
if (!(Number(query?.deliveryType) > 0)) {
|
||||||
|
delete query.deliveryType
|
||||||
|
}
|
||||||
|
if (!(Number(query?.pickUpStoreId) > 0)) {
|
||||||
|
delete query.pickUpStoreId
|
||||||
|
}
|
||||||
|
if (!String(query?.receiverName || '').trim()) {
|
||||||
|
delete query.receiverName
|
||||||
|
}
|
||||||
|
if (!String(query?.receiverPhone || query?.receiverMobile || '').trim()) {
|
||||||
|
delete query.receiverPhone
|
||||||
|
} else {
|
||||||
|
query.receiverPhone = String(query?.receiverPhone || query?.receiverMobile || '').trim()
|
||||||
|
}
|
||||||
|
delete query.receiverMobile
|
||||||
return request({
|
return request({
|
||||||
url: '/aishop/order/createOrderOpen',
|
url: '/aishop/order/createOrderOpen',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params,
|
params: query,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
//查询赠品订单
|
//查询赠品订单
|
||||||
@@ -297,5 +342,3 @@ export function aiPendingShipment(params : any) {
|
|||||||
params,
|
params,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user