feat: 增加现金支付

This commit is contained in:
HongRun Liu
2026-08-05 10:51:29 +08:00
parent 1daec0121b
commit 25da673443
16 changed files with 1535 additions and 1230 deletions
+1
View File
@@ -10,3 +10,4 @@ package-lock.json
*.keystore *.keystore
pnpm-lock.yaml pnpm-lock.yaml
.history .history
/AGENTS.md
+33 -37
View File
@@ -1,21 +1,25 @@
<template> <template>
<view class="flex-center" :class="{ <view
class="flex-center"
:class="{
'ju-flex-end': props.type == 2, 'ju-flex-end': props.type == 2,
'ju-between': props.type != 2, 'ju-between': props.type != 2,
}"> }"
>
<view class="more size24" v-if="props.type != 2"></view> <view class="more size24" v-if="props.type != 2"></view>
<view class="flex-center ju-flex-end"> <view class="flex-center ju-flex-end">
<view v-for="(item, index) in btns" :key="index"> <view v-for="(item, index) in btns" :key="index">
<view <view
v-if=" v-if="
item.value.split(',').indexOf(String(props?.data?.status)) !== -1 && item.value.split(',').indexOf(String(props?.data?.status)) !== -1 &&
!(item.id === 3 && Number(props?.data?.type) === 5) !(item.id === 3 && Number(props?.data?.type) === 5) &&
!(item.id === 3 && props?.data?.payChannelCode === 'cash_payment')
" "
class="btn size28 f500" class="btn size28 f500"
@click.stop="btnClick(item.id)" @click.stop="btnClick(item.id)"
:style="{ color: item.color, background: item.background, border: item.border }" :style="{ color: item.color, background: item.background, border: item.border }"
:class="{btn1: props.type == 2}"> :class="{ btn1: props.type == 2 }"
>
{{ item.name }} {{ item.name }}
</view> </view>
</view> </view>
@@ -24,17 +28,10 @@
</template> </template>
<script setup> <script setup>
import { import { ref, getCurrentInstance, defineProps, defineEmits } from 'vue';
ref,
getCurrentInstance,
defineProps,
defineEmits
} from 'vue';
import sheep from '@/sheep'; import sheep from '@/sheep';
import OrderApi from '@/sheep/api/trade/order'; import OrderApi from '@/sheep/api/trade/order';
const { const { proxy } = getCurrentInstance();
proxy
} = getCurrentInstance();
let emit = defineEmits(['downData']); let emit = defineEmits(['downData']);
const props = defineProps({ const props = defineProps({
@@ -49,10 +46,11 @@
default: '0', //0列表2订单详情 default: '0', //0列表2订单详情
}, },
}); });
let btns = ref([{ let btns = ref([
{
id: 1, id: 1,
name: '取消订单', name: '取消订单',
value: '0', value: '0,70',
}, },
{ {
id: 2, id: 2,
@@ -60,9 +58,10 @@
value: '0', value: '0',
color: '#EE0A24', color: '#EE0A24',
background: 'rgba(238,10,36,0.2)', background: 'rgba(238,10,36,0.2)',
border: 'none' border: 'none',
}, },
{ //在订单详情退货 {
//在订单详情退货
id: 3, id: 3,
name: '申请售后', name: '申请售后',
value: '10,20', value: '10,20',
@@ -73,7 +72,7 @@
value: '20,60', value: '20,60',
color: '#EE0A24', color: '#EE0A24',
background: 'rgba(238,10,36,0.2)', background: 'rgba(238,10,36,0.2)',
border: 'none' border: 'none',
}, },
{ {
id: 5, id: 5,
@@ -89,11 +88,11 @@
]); ]);
const btnClick = (index) => { const btnClick = (index) => {
let timestamp = new Date().getTime(); let timestamp = new Date().getTime();
let payExpireTime = props.data.payExpireTime let payExpireTime = props.data.payExpireTime;
if (timestamp > payExpireTime && props.data.status == 0 && index == 2) { if (timestamp > payExpireTime && props.data.status == 0 && index == 2) {
uni.showToast({ uni.showToast({
title: '订单已过期', title: '订单已过期',
icon: 'none' icon: 'none',
}); });
return; return;
} }
@@ -135,13 +134,11 @@
} }
upData(); upData();
const { const { code } = await OrderApi.cancelOrder(orderId);
code
} = await OrderApi.cancelOrder(orderId);
if (code === 0) { if (code === 0) {
uni.showToast({ uni.showToast({
title: '订单已取消', title: '订单已取消',
icon: 'none' icon: 'none',
}); });
upData(); upData();
} }
@@ -160,21 +157,21 @@
}; };
// 确认收货 // 确认收货
const confirmReceive = () => { const confirmReceive = () => {
let change = false let change = false;
if (props.data?.items.length) { if (props.data?.items.length) {
props.data.items.forEach(item => { props.data.items.forEach((item) => {
if (item.afterSaleStatus == 10) { if (item.afterSaleStatus == 10) {
change = true change = true;
return return;
} }
}) });
} }
if (change) { if (change) {
uni.showToast({ uni.showToast({
title: '有售后中的商品,请先处理完售后', title: '有售后中的商品,请先处理完售后',
icon: 'none' icon: 'none',
}) });
return return;
} }
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
@@ -185,9 +182,7 @@
return; return;
} }
// 正常的确认收货流程 // 正常的确认收货流程
const { const { code } = await OrderApi.receiveOrder(props.data?.id);
code
} = await OrderApi.receiveOrder(props.data?.id);
if (code === 0) { if (code === 0) {
upData(); upData();
} }
@@ -203,7 +198,8 @@
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.more {} .more {
}
.btn { .btn {
line-height: 24rpx; line-height: 24rpx;
+12 -2
View File
@@ -14,7 +14,11 @@
> >
立即发货 立即发货
</view> </view>
<view class="ai-button3 w_144" v-if="props.showView" @tap.stop="emit('view')"> <view
class="ai-button3 w_144"
v-if="props.showView && props.status !== 70"
@tap.stop="emit('view')"
>
{{ props.viewText }} {{ props.viewText }}
</view> </view>
<view class="ai-button1 w_144 m-l-16" v-if="props.status === 20" @tap.stop="emit('confirm')"> <view class="ai-button1 w_144 m-l-16" v-if="props.status === 20" @tap.stop="emit('confirm')">
@@ -23,6 +27,12 @@
<view class="ai-button1 w_144 m-l-16" v-if="props.status === 0" @tap.stop="emit('pay')"> <view class="ai-button1 w_144 m-l-16" v-if="props.status === 0" @tap.stop="emit('pay')">
去支付 去支付
</view> </view>
<view class="ai-button1 w_144 m-l-16" v-if="props.status === 70" @tap.stop="emit('cancel')">
取消订单
</view>
<view class="ai-button1 w_144 m-l-16" v-if="props.status === 70" @tap.stop="emit('pay')">
切换支付
</view>
</view> </view>
</template> </template>
@@ -46,5 +56,5 @@
}, },
}); });
const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay']); const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay', 'cancel']);
</script> </script>
+44 -16
View File
@@ -1,27 +1,41 @@
<template> <template>
<view class="order_con" :class="{ bg24: props.theme == 2 }"> <view class="order_con" :class="{ bg24: props.theme == 2 }">
<view
<view class="flex-center ju-between m-b-28" class="flex-center ju-between m-b-28"
v-if="(props.type == 2 || props.type == 4) && props.data.logisticsNo"> v-if="(props.type == 2 || props.type == 4) && props.data.logisticsNo"
>
<view>{{ props.data.logisticsName }} {{ props.data.logisticsNo }}</view> <view>{{ props.data.logisticsName }} {{ props.data.logisticsNo }}</view>
<view class="flex-center"> <view class="flex-center">
<view @click.stop="onCopy(props.data.logisticsNo)">复制</view> <view @click.stop="onCopy(props.data.logisticsNo)">复制</view>
<truckLine :data="props.data" :code="2" v-if="props.data.deliveryTime && props.data.logisticsNo"></truckLine> <truckLine
:data="props.data"
:code="2"
v-if="props.data.deliveryTime && props.data.logisticsNo"
></truckLine>
</view> </view>
</view> </view>
<view class="con_item flex-center ju-between" v-for="(v, i) in props.data.items" :key="i" <view
:class="{ 'al-flex-start': props.type == 3 || props.type == 4 }"> class="con_item flex-center ju-between"
v-for="(v, i) in props.data.items"
:key="i"
:class="{ 'al-flex-start': props.type == 3 || props.type == 4 }"
>
<view class="order_img shrink" :class="{ 'm-r-16': props.type == 3 }"> <view class="order_img shrink" :class="{ 'm-r-16': props.type == 3 }">
<image :src="`${v.picUrl}`" mode="aspectFill" /> <image :src="`${v.picUrl}`" mode="aspectFill" />
</view> </view>
<view class="flex1"> <view class="flex1">
<view class="flex-row ju-between m-b-6"> <view class="flex-row ju-between m-b-6">
<view class="size28 spuName lineTwo" :class="{ 'p-r-10': props.type == 3, c0: props.theme == 2 }"> <view
class="size28 spuName lineTwo"
:class="{ 'p-r-10': props.type == 3, c0: props.theme == 2 }"
>
{{ v.spuName }} {{ v.spuName }}
</view> </view>
<view class="shrink price" v-if="props.type != 4"><span class="size24">¥</span><span class="size36" <view class="shrink price" v-if="props.type != 4"
style="font-weight: 600">{{ fen2yuan(v.price) }}</span></view> ><span class="size24">¥</span
><span class="size36" style="font-weight: 600">{{ fen2yuan(v.price) }}</span></view
>
</view> </view>
<view v-if="props.type == 4"> <view v-if="props.type == 4">
<view class="m-b-12 size24 h_52" v-for="(item, i) in v.items" :key="i"> <view class="m-b-12 size24 h_52" v-for="(item, i) in v.items" :key="i">
@@ -31,7 +45,8 @@
</view> </view>
<view class="flex-center"> <view class="flex-center">
<view class="c19">x{{ item.count }}</view> <view class="c19">x{{ item.count }}</view>
<view class=" size28 m-l-12 weight900">¥<span class="">{{ fen2yuan(item.price) }}</span> <view class="size28 m-l-12 weight900"
>¥<span class="">{{ fen2yuan(item.price) }}</span>
</view> </view>
</view> </view>
</view> </view>
@@ -41,22 +56,35 @@
</view> </view>
</view> </view>
<view class="flex-row ju-between" :class="{ 'm-t-8': props.type == 3 }" v-else> <view class="flex-row ju-between" :class="{ 'm-t-8': props.type == 3 }" v-else>
<view class="valueName size28" :class="{ c19: props.theme == 2 }">{{ formatSkuProperties(v.properties) }}</view> <view class="valueName size28" :class="{ c19: props.theme == 2 }">{{
formatSkuProperties(v.properties)
}}</view>
<view class="shrink size28 c_333" :class="{ c0: props.theme == 2 }">{{ <view class="shrink size28 c_333" :class="{ c0: props.theme == 2 }">{{
`x${v.count}` `x${v.count}`
}}</view> }}</view>
</view> </view>
<view class="btn flex-row ju-flex-end" v-if="props.type == 2"> <view class="btn flex-row ju-flex-end" v-if="props.type == 2">
<button class="ss-reset-button btnItem btnItem1" <button
v-if="[10, 20].includes(props.data.status) && v.afterSaleStatus === 0" @tap.stop=" class="ss-reset-button btnItem btnItem1"
v-if="
[10, 20].includes(props.data.status) &&
v.afterSaleStatus === 0 &&
props.data.payChannelCode !== 'cash_payment'
"
@tap.stop="
sheep.$router.go('/pages/order/aftersale/apply', { sheep.$router.go('/pages/order/aftersale/apply', {
orderId: props.data.id, orderId: props.data.id,
itemId: v.id, itemId: v.id,
}) })
"> "
>
申请售后 申请售后
</button> </button>
<view class="btnItem btnItem1" v-if="v.afterSaleStatus === 10" @click="cancelAfterSale(v)"> <view
class="btnItem btnItem1"
v-if="v.afterSaleStatus === 10"
@click="cancelAfterSale(v)"
>
取消售后 取消售后
</view> </view>
<view class="btnItem" v-if="v.afterSaleStatus === 20"> 售后成功 </view> <view class="btnItem" v-if="v.afterSaleStatus === 20"> 售后成功 </view>
@@ -163,6 +191,6 @@
} }
.btnItem1 { .btnItem1 {
background: #F2F2F2; background: #f2f2f2;
} }
</style> </style>
+72 -32
View File
@@ -1,7 +1,14 @@
<template> <template>
<view class="card_order bg24 size34" @click=" <view
utils.go('/pages/order/detail', { id: props.index != 5 ? props.data.id : props.data.orderId, type: props.data.type, source: props.data.__source }) class="card_order bg24 size34"
"> @click="
utils.go('/pages/order/detail', {
id: !props.isAfterSale ? props.data.id : props.data.orderId,
type: props.data.type,
source: props.data.__source,
})
"
>
<view class="flex-center ju-between createTime"> <view class="flex-center ju-between createTime">
<view class="flex-center shrink"> <view class="flex-center shrink">
<view class="size28">订单编号: {{ props.data.no }}</view> <view class="size28">订单编号: {{ props.data.no }}</view>
@@ -9,15 +16,19 @@
<image :src="`${$url}goods/copy2.svg`" mode="scaleToFill" /> <image :src="`${$url}goods/copy2.svg`" mode="scaleToFill" />
</view> </view>
</view> </view>
<view class="stateText size28" style="margin-left: 10px" :class="formatOrderColor(props.data)" <view
v-if="props.index != 5"> class="stateText size28"
style="margin-left: 10px"
:class="formatOrderColor(props.data)"
v-if="!props.isAfterSale"
>
{{ formatOrderStatus(props.data) }} {{ formatOrderStatus(props.data) }}
</view> </view>
<view class="stateText size28" v-else> <view class="stateText size28" v-else>
{{ formatAfterSaleStatus(props.data) }} {{ formatAfterSaleStatus(props.data) }}
</view> </view>
</view> </view>
<card_order :data="props.data" v-if="props.index != 5" type="3"></card_order> <card_order :data="props.data" v-if="!props.isAfterSale" type="3"></card_order>
<view v-else class="con_item flex-center ju-between al-flex-start"> <view v-else class="con_item flex-center ju-between al-flex-start">
<view class="order_img shrink"> <view class="order_img shrink">
<image :src="`${props.data.picUrl}`" mode="aspectFill" /> <image :src="`${props.data.picUrl}`" mode="aspectFill" />
@@ -26,8 +37,10 @@
<view class="flex-row ju-between"> <view class="flex-row ju-between">
<view class="size28 spuName lineTwo c0">{{ props.data.spuName }}</view> <view class="size28 spuName lineTwo c0">{{ props.data.spuName }}</view>
<view class="shrink price"> <view class="shrink price">
<span class="size24">¥</span><span class="size36" <span class="size24">¥</span
style="font-weight: 600">{{ fen2yuan(props.data.refundPrice) }}</span> ><span class="size36" style="font-weight: 600">{{
fen2yuan(props.data.refundPrice)
}}</span>
</view> </view>
</view> </view>
<view class="flex-row ju-between m-t-10"> <view class="flex-row ju-between m-t-10">
@@ -37,18 +50,26 @@
<view class="shrink size24 c0">{{ `x${props.data.count}` }}</view> <view class="shrink size24 c0">{{ `x${props.data.count}` }}</view>
</view> </view>
<view class="btn flex-row ju-flex-end"> <view class="btn flex-row ju-flex-end">
<button class="ss-reset-button btnItem btnItem1" @tap.stop="onApply" <button
v-if="statusChange(['10', '20', '30', '62', '63'], String(props.data.status))">取消售后</button> class="ss-reset-button btnItem btnItem1"
<button class="ss-reset-button btnItem btnItem1" style="margin-left: 20rpx" @tap.stop="onApply"
v-if="statusChange(['20'], String(props.data.status))" @tap.stop=" v-if="statusChange(['10', '20', '30', '62', '63'], String(props.data.status))"
>取消售后</button
>
<button
class="ss-reset-button btnItem btnItem1"
style="margin-left: 20rpx"
v-if="statusChange(['20'], String(props.data.status))"
@tap.stop="
sheep.$router.go('/pages/order/aftersale/return-delivery', { id: props.data.id }) sheep.$router.go('/pages/order/aftersale/return-delivery', { id: props.data.id })
"> "
>
填写物流信息 填写物流信息
</button> </button>
</view> </view>
</view> </view>
</view> </view>
<view class="discount-row flex-between" v-if="props.index != 5"> <view class="discount-row flex-between" v-if="!props.isAfterSale">
<view v-if="isDelayedShipmentOrder()" class="delay-notice flex-center"> <view v-if="isDelayedShipmentOrder()" class="delay-notice flex-center">
<view class="delay-notice__icon">!</view> <view class="delay-notice__icon">!</view>
<view class="delay-notice__text"> <view class="delay-notice__text">
@@ -58,15 +79,19 @@
<view class="size24 c_999">{{ formatCreateTime(props.data.createTime) }}</view> <view class="size24 c_999">{{ formatCreateTime(props.data.createTime) }}</view>
<view class="size24 c32">已优惠¥{{ fen2yuan(props.data.randomDiscountPrice) }}</view> <view class="size24 c32">已优惠¥{{ fen2yuan(props.data.randomDiscountPrice) }}</view>
</view> </view>
<view class="flex-row ju-flex-end" v-if="props.index != 5"> <view class="flex-row ju-flex-end" v-if="!props.isAfterSale">
<view class="flex-center size24">{{ `共${props.data.productCount}件商品 合计: ` <view class="flex-center size24"
}} >{{ `共${props.data.productCount}件商品 合计: ` }}
<!-- <view class="price">¥{{ fen2yuan(props.data.payPrice) }}</view> --> <!-- <view class="price">¥{{ fen2yuan(props.data.payPrice) }}</view> -->
<view class="shrink price"><span class="size24">¥</span><span class="size36" <view class="shrink price"
style="font-weight: 600;">{{ fen2yuan(props.data.payPrice) }}</span></view> ><span class="size24">¥</span
><span class="size36" style="font-weight: 600">{{
fen2yuan(props.data.payPrice)
}}</span></view
>
</view> </view>
</view> </view>
<view class="flex-center ju-flex-end m-t-12" v-if="props.index != 5 && isAiActionOrder"> <view class="flex-center ju-flex-end m-t-12" v-if="!props.isAfterSale && isAiActionOrder">
<AiOrderActionBar <AiOrderActionBar
:status="currentStatus" :status="currentStatus"
:disableDelayShipment="isPickUpOrder" :disableDelayShipment="isPickUpOrder"
@@ -76,22 +101,16 @@
@view="goAiOrderInfo" @view="goAiOrderInfo"
@confirm="confirmReceiveOrder" @confirm="confirmReceiveOrder"
@pay="goPay" @pay="goPay"
@cancel="cancelAiOrder"
/> />
</view> </view>
<view class="" style="margin-top: 32rpx" v-else-if="props.index != 5"> <view class="" style="margin-top: 32rpx" v-else-if="!props.isAfterSale">
<card_orderBan :data="props.data" @downData="downData"></card_orderBan> <card_orderBan :data="props.data" @downData="downData"></card_orderBan>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { import { getCurrentInstance, defineProps, defineEmits, computed, ref, watch } from 'vue';
getCurrentInstance,
defineProps,
defineEmits,
computed,
ref,
watch,
} from 'vue';
import { import {
fen2yuan, fen2yuan,
formatOrderColor, formatOrderColor,
@@ -108,6 +127,8 @@
aiPendingShipment, aiPendingShipment,
confirmReceive as aiConfirmReceive, confirmReceive as aiConfirmReceive,
giftConfirmReceive, giftConfirmReceive,
cancelOrder as cancelAiOrderRequest,
cancelOpenOrder,
} from '@/sheep/api/ai'; } from '@/sheep/api/ai';
let emit = defineEmits(['downData']); let emit = defineEmits(['downData']);
let { proxy } = getCurrentInstance(); let { proxy } = getCurrentInstance();
@@ -122,6 +143,10 @@
type: Number, type: Number,
default: 0, default: 0,
}, },
isAfterSale: {
type: Boolean,
default: false,
},
}); });
const downData = () => { const downData = () => {
emit('downData'); emit('downData');
@@ -176,8 +201,7 @@
}, },
{ immediate: true }, { immediate: true },
); );
const isDelayedShipmentOrder = () => const isDelayedShipmentOrder = () => currentStatus.value === 50 && !isPickUpOrder.value;
currentStatus.value === 50 && !isPickUpOrder.value;
const resolveAiOrderId = (data) => { const resolveAiOrderId = (data) => {
return data?.id || data?.orderId; return data?.id || data?.orderId;
@@ -284,6 +308,22 @@
payOrderId, payOrderId,
}); });
}; };
const cancelAiOrder = () => {
const id = resolveAiOrderId(props.data);
if (!id) return;
uni.showModal({
title: '提示',
content: '确定要取消订单吗?',
confirmColor: '#FA7E31',
success: async (res) => {
if (!res.confirm) return;
const request = Number(props.data?.type) === 5 ? cancelOpenOrder : cancelAiOrderRequest;
const result = await request({ id });
if (result.code === 0) emit('downData');
},
});
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.card_order { .card_order {
@@ -388,6 +428,6 @@
} }
.btnItem1 { .btnItem1 {
background: #F2F2F2; background: #f2f2f2;
} }
</style> </style>
+1
View File
@@ -103,6 +103,7 @@
}, },
"devDependencies": { "devDependencies": {
"prettier": "^2.8.7", "prettier": "^2.8.7",
"sass": "^1.99.0",
"vconsole": "^3.15.0" "vconsole": "^3.15.0"
} }
} }
+59 -13
View File
@@ -1,7 +1,8 @@
<template> <template>
<s-pages title="收银台" :pink_bg="true" :goLeft="false" @onClickLeft="onClickLeft"> <s-pages title="收银台" :pink_bg="true" :goLeft="false" @onClickLeft="onClickLeft">
<view class="p-x-32"> <view class="p-x-32">
<view class="center p-t-96 weight500 size100"><span class="size48">¥</span> <view class="center p-t-96 weight500 size100"
><span class="size48">¥</span>
{{ fen2yuan(state.orderInfo.payPrice) }} {{ fen2yuan(state.orderInfo.payPrice) }}
</view> </view>
<view class="center size22 c_money"> <view class="center size22 c_money">
@@ -11,12 +12,23 @@
<view> <view>
<radio-group @change="onTapPay"> <radio-group @change="onTapPay">
<label class="" v-for="item in state.payMethods" :key="item.title"> <label class="" v-for="item in state.payMethods" :key="item.title">
<view class="flex-center ju-between m-b-40" :class="{ 'disabled-pay-item': item.disabled }"> <view
class="flex-center ju-between m-b-40"
:class="{ 'disabled-pay-item': item.disabled }"
>
<view class="flex-center"> <view class="flex-center">
<image class="h_64 w_64" v-if="item.disabled" <image
class="h_64 w_64"
v-if="item.disabled"
:src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')" :src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')"
mode="aspectFit" /> mode="aspectFit"
<image class="h_64 w_64" v-else :src="sheep.$url.static(item.icon)" mode="aspectFit" /> />
<image
class="h_64 w_64"
v-else
:src="sheep.$url.static(item.icon)"
mode="aspectFit"
/>
<text class="pay-title m-l-12">{{ item.title }}</text> <text class="pay-title m-l-12">{{ item.title }}</text>
</view> </view>
<view class="check-box ss-flex ss-col-center ss-p-l-10"> <view class="check-box ss-flex ss-col-center ss-p-l-10">
@@ -24,9 +36,13 @@
余额: {{ fen2yuan(totalRecharge) }}元 余额: {{ fen2yuan(totalRecharge) }}元
</view> </view>
<view class=""> <view class="">
<radio :value="item.value" color="var(--ui-BG-Main)" <radio
backgroundColor="rgba(255, 255, 255, 0)" :disabled="item.disabled" :value="item.value"
:checked="state.payment === item.value" /> color="var(--ui-BG-Main)"
backgroundColor="rgba(255, 255, 255, 0)"
:disabled="item.disabled"
:checked="state.payment === item.value"
/>
</view> </view>
</view> </view>
</view> </view>
@@ -42,8 +58,16 @@
<button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled> <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
支付已过期 支付已过期
</button> </button>
<button v-else class="ai-button2" @tap="onPay" :disabled="state.payStatus !== 1" <button v-else-if="state.payStatus === 3" class="ai-button2" @tap="onPay">
:class="{ 'disabled-btn': state.payStatus !== 1 }"> 切换支付方式
</button>
<button
v-else
class="ai-button2"
@tap="onPay"
:disabled="state.payStatus !== 1"
:class="{ 'disabled-btn': state.payStatus !== 1 }"
>
立即支付 立即支付
</button> </button>
</view> </view>
@@ -66,6 +90,7 @@
import * as api from '@/sheep/api/ai/index'; import * as api from '@/sheep/api/ai/index';
import sheep from '@/sheep'; import sheep from '@/sheep';
import PayChannelApi from '@/sheep/api/pay/channel'; import PayChannelApi from '@/sheep/api/pay/channel';
import PayOrderApi from '@/sheep/api/pay/order';
import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods'; import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
import { getPayMethods, goPayResult } from '@/sheep/platform/pay'; import { getPayMethods, goPayResult } from '@/sheep/platform/pay';
import { SYSCONST } from '@/sheep/helper/const'; import { SYSCONST } from '@/sheep/helper/const';
@@ -81,7 +106,7 @@
const state = reactive({ const state = reactive({
orderType: 'aiGoods', // 订单类型; goods - 商品订单, recharge - 充值订单 aiRecharge orderType: 'aiGoods', // 订单类型; goods - 商品订单, recharge - 充值订单 aiRecharge
orderInfo: {}, // 支付单信息 orderInfo: {}, // 支付单信息
payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息, -1=支付已过期, 1=待支付,2=订单已支付 payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息, -1=支付已过期, 1=待支付,2=订单已支付,3=现金待确认
payMethods: [], // 可选的支付方式 payMethods: [], // 可选的支付方式
payment: '', // 选中的支付方式 payment: '', // 选中的支付方式
}); });
@@ -101,12 +126,26 @@
// 获得支付方式 // 获得支付方式
async function setPayMethods() { async function setPayMethods() {
const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId || 1); // 业务订单详情不含支付应用编号,拆分后需从支付单获取真实 appId,避免误用商城应用渠道
let appId = Number(state.orderInfo.appId);
if (!appId && payOrderId.value) {
const payOrderRes = await PayOrderApi.getOrder(payOrderId.value, false);
appId = Number(payOrderRes?.data?.appId);
}
if (!appId) {
sheep.$helper.toast('支付应用信息异常');
state.payMethods = [];
return;
}
const { data, code } = await PayChannelApi.getEnableChannelCodeList(appId);
// console.log('支付方式', code, data); // console.log('支付方式', code, data);
if (code !== 0) { if (code !== 0) {
return; return;
} }
state.payMethods = getPayMethods(data); // 现金待确认状态下去除现金渠道,仅展示可切换的线上渠道
state.payMethods = getPayMethods(data).filter(
(item) => item.value !== 'cash' || state.payStatus !== 3,
);
console.log('支付方式', state.payMethods); console.log('支付方式', state.payMethods);
// 金额超出阈值,仅允许余额支付 // 金额超出阈值,仅允许余额支付
if (state.orderInfo?.totalPrice >= SYSCONST.MAX_PRICE) { if (state.orderInfo?.totalPrice >= SYSCONST.MAX_PRICE) {
@@ -128,6 +167,9 @@
if (state.payStatus === 2) { if (state.payStatus === 2) {
return '该订单已支付'; return '该订单已支付';
} }
if (state.payStatus === 3) {
return '现金待确认';
}
if (state.payStatus === 1 && state.orderInfo?.payExpireTime) { if (state.payStatus === 1 && state.orderInfo?.payExpireTime) {
const time = useDurationTime(state.orderInfo.payExpireTime); const time = useDurationTime(state.orderInfo.payExpireTime);
if (time?.ms <= 0) { if (time?.ms <= 0) {
@@ -164,6 +206,10 @@
state.payStatus = -1; state.payStatus = -1;
return; return;
} }
if (Number(state.orderInfo.status) === 70) {
state.payStatus = 3;
return;
}
state.payStatus = 1; // 待支付 state.payStatus = 1; // 待支付
} }
+28 -3
View File
@@ -60,6 +60,9 @@
<button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled> <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
支付已过期 支付已过期
</button> </button>
<button v-else-if="state.payStatus === 3" class="ai-button2" @tap="onPay">
切换支付方式
</button>
<button <button
v-else v-else
class="ai-button2" class="ai-button2"
@@ -89,6 +92,7 @@
import * as api from '@/sheep/api/ai/index'; import * as api from '@/sheep/api/ai/index';
import sheep from '@/sheep'; import sheep from '@/sheep';
import PayChannelApi from '@/sheep/api/pay/channel'; import PayChannelApi from '@/sheep/api/pay/channel';
import PayOrderApi from '@/sheep/api/pay/order';
import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods'; import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
import { getPayMethods, goPayResult } from '@/sheep/platform/pay'; import { getPayMethods, goPayResult } from '@/sheep/platform/pay';
import { SYSCONST } from '@/sheep/helper/const'; import { SYSCONST } from '@/sheep/helper/const';
@@ -104,7 +108,7 @@
const state = reactive({ const state = reactive({
orderType: 'aiGoods', // 订单类型; goods - 商品订单, recharge - 充值订单 aiRecharge orderType: 'aiGoods', // 订单类型; goods - 商品订单, recharge - 充值订单 aiRecharge
orderInfo: {}, // 支付单信息 orderInfo: {}, // 支付单信息
payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息, -1=支付已过期, 1=待支付,2=订单已支付 payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息, -1=支付已过期, 1=待支付,2=订单已支付,3=现金待确认
payMethods: [], // 可选的支付方式 payMethods: [], // 可选的支付方式
payment: '', // 选中的支付方式 payment: '', // 选中的支付方式
}); });
@@ -123,11 +127,25 @@
// 获得支付方式 // 获得支付方式
async function setPayMethods() { async function setPayMethods() {
const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId || 1); // 业务订单详情不含支付应用编号,拆分后需从支付单获取真实 appId,避免误用商城应用渠道
let appId = Number(state.orderInfo.appId);
if (!appId && payOrderId.value) {
const payOrderRes = await PayOrderApi.getOrder(payOrderId.value, false);
appId = Number(payOrderRes?.data?.appId);
}
if (!appId) {
sheep.$helper.toast('支付应用信息异常');
state.payMethods = [];
return;
}
const { data, code } = await PayChannelApi.getEnableChannelCodeList(appId);
if (code !== 0) { if (code !== 0) {
return; return;
} }
state.payMethods = getPayMethods(data); // 现金待确认状态下去除现金渠道,仅展示可切换的线上渠道
state.payMethods = getPayMethods(data).filter(
(item) => item.value !== 'cash' || state.payStatus !== 3,
);
// 金额超出阈值,仅允许余额支付 // 金额超出阈值,仅允许余额支付
if (state.orderInfo?.totalPrice >= SYSCONST.MAX_PRICE) { if (state.orderInfo?.totalPrice >= SYSCONST.MAX_PRICE) {
state.payMethods = state.payMethods.map((item) => ({ state.payMethods = state.payMethods.map((item) => ({
@@ -148,6 +166,9 @@
if (state.payStatus === 2) { if (state.payStatus === 2) {
return '该订单已支付'; return '该订单已支付';
} }
if (state.payStatus === 3) {
return '现金待确认';
}
if (state.payStatus === 1 && state.orderInfo?.payExpireTime) { if (state.payStatus === 1 && state.orderInfo?.payExpireTime) {
const time = useDurationTime(state.orderInfo.payExpireTime); const time = useDurationTime(state.orderInfo.payExpireTime);
if (time?.ms <= 0) { if (time?.ms <= 0) {
@@ -184,6 +205,10 @@
state.payStatus = -1; state.payStatus = -1;
return; return;
} }
if (Number(state.orderInfo.status) === 70) {
state.payStatus = 3;
return;
}
state.payStatus = 1; // 待支付 state.payStatus = 1; // 待支付
} }
+30 -4
View File
@@ -73,7 +73,11 @@
<view class="copy" @click.stop="onCopy"> <view class="copy" @click.stop="onCopy">
<image :src="`${$url}goods/copy1.png`" mode="scaleToFill" /> <image :src="`${$url}goods/copy1.png`" mode="scaleToFill" />
</view> </view>
<truckLine :data="state.orderInfo" :code="3" v-if="state.orderInfo.deliveryTime"></truckLine> <truckLine
:data="state.orderInfo"
:code="3"
v-if="state.orderInfo.deliveryTime"
></truckLine>
</view> </view>
<view class="notice-item flex-row ju-between"> <view class="notice-item flex-row ju-between">
<text class="title c25">下单时间</text> <text class="title c25">下单时间</text>
@@ -169,6 +173,12 @@
text: '已取消', text: '已取消',
text1: '您的订单已取消!', text1: '您的订单已取消!',
}, },
70: {
text: '现金待确认',
text1: '等待工作人员确认收款',
btn1: '切换支付',
btn2: '取消订单',
},
}); });
// ========== 门店自提(核销) ========== // ========== 门店自提(核销) ==========
@@ -234,7 +244,14 @@
} }
if (state.orderInfo.status === 0 && type === 2) { if (state.orderInfo.status === 0 && type === 2) {
// 取消订单 // 取消订单
cancelOrder(); cancelUnpaidOpenOrder();
}
if (Number(state.orderInfo.status) === 70 && type === 2) {
cancelOpenOrder();
}
if (Number(state.orderInfo.status) === 70 && type === 1) {
// 现金待确认切回线上支付
goPay();
} }
if (state.orderInfo.status === 20 && type === 1) { if (state.orderInfo.status === 20 && type === 1) {
// 确认收货confirmReceive // 确认收货confirmReceive
@@ -253,8 +270,17 @@
payOrderId: state.orderInfo.payOrderId, payOrderId: state.orderInfo.payOrderId,
}); });
}; };
const cancelOrder = () => { const cancelUnpaidOpenOrder = () => {
OrderApi.cancelOrder({ OrderApi.cancelUnpaidOpenOrder({
id: orderId.value,
}).then((res) => {
if (res.code === 0) {
getOrderDetail();
}
});
};
const cancelOpenOrder = () => {
OrderApi.cancelOpenOrder({
id: orderId.value, id: orderId.value,
}).then((res) => { }).then((res) => {
if (res.code === 0) { if (res.code === 0) {
+13
View File
@@ -178,6 +178,12 @@
text: '已取消', text: '已取消',
text1: '您的订单已取消!', text1: '您的订单已取消!',
}, },
70: {
text: '现金待确认',
text1: '等待工作人员确认收款',
btn1: '切换支付',
btn2: '取消订单',
},
}); });
// ========== 门店自提(核销) ========== // ========== 门店自提(核销) ==========
@@ -264,6 +270,13 @@
// 取消订单 // 取消订单
cancelOrder(); cancelOrder();
} }
if (Number(state.orderInfo.status) === 70 && type === 2) {
cancelOrder();
}
if (Number(state.orderInfo.status) === 70 && type === 1) {
// 现金待确认切回线上支付
goPay();
}
if (state.orderInfo.status === 20 && type === 1) { if (state.orderInfo.status === 20 && type === 1) {
// 确认收货confirmReceive // 确认收货confirmReceive
OrderApi.confirmReceive({ OrderApi.confirmReceive({
+39 -11
View File
@@ -72,7 +72,11 @@
<view class="copy" @click.stop="onCopy"> <view class="copy" @click.stop="onCopy">
<image :src="`${$url}goods/copy2.svg`" mode="scaleToFill" /> <image :src="`${$url}goods/copy2.svg`" mode="scaleToFill" />
</view> </view>
<truckLine :data="state.orderInfo" :code="1" v-if="state.orderInfo.deliveryTime"></truckLine> <truckLine
:data="state.orderInfo"
:code="1"
v-if="state.orderInfo.deliveryTime"
></truckLine>
</view> </view>
<view class="notice-item flex-row ju-between"> <view class="notice-item flex-row ju-between">
<text class="title c0">下单时间</text> <text class="title c0">下单时间</text>
@@ -103,8 +107,14 @@
@now="nowShipment" @now="nowShipment"
@confirm="confirmReceiveOrder" @confirm="confirmReceiveOrder"
@pay="goPay" @pay="goPay"
@cancel="cancelAiOrder"
/> />
<card_orderBan v-else :data="state.orderInfo" @downData="getOrderDetail" type="2"></card_orderBan> <card_orderBan
v-else
:data="state.orderInfo"
@downData="getOrderDetail"
type="2"
></card_orderBan>
</view> </view>
</su-fixed> </su-fixed>
</s-pages> </s-pages>
@@ -114,10 +124,7 @@
import sheep from '@/sheep'; import sheep from '@/sheep';
import { onLoad, onShow } from '@dcloudio/uni-app'; import { onLoad, onShow } from '@dcloudio/uni-app';
import { computed, reactive, ref } from 'vue'; import { computed, reactive, ref } from 'vue';
import { import { fen2yuan, handleOrderButtons } from '@/sheep/hooks/useGoods';
fen2yuan,
handleOrderButtons,
} from '@/sheep/hooks/useGoods';
import OrderApi from '@/sheep/api/trade/order'; import OrderApi from '@/sheep/api/trade/order';
import { import {
aiDelayedShipment, aiDelayedShipment,
@@ -126,11 +133,13 @@
giftConfirmReceive, giftConfirmReceive,
getOrderDetail as getAiOrderDetail, getOrderDetail as getAiOrderDetail,
getOpenOrderDetail, getOpenOrderDetail,
cancelOrder as cancelAiOrderRequest,
cancelOpenOrder,
} from '@/sheep/api/ai'; } from '@/sheep/api/ai';
import StoreApi from '@/sheep/api/trade/store'; import StoreApi from '@/sheep/api/trade/store';
import card_order from '@/components/orderItem/card_order.vue'; import card_order from '@/components/orderItem/card_order.vue';
import AiOrderActionBar from '@/components/orderItem/AiOrderActionBar.vue'; import AiOrderActionBar from '@/components/orderItem/AiOrderActionBar.vue';
import truckLine from '@/components/truckLine/truckLine.vue' import truckLine from '@/components/truckLine/truckLine.vue';
import PickUpVerify from '@/pages/order/pickUpVerify.vue'; import PickUpVerify from '@/pages/order/pickUpVerify.vue';
const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png'); const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
@@ -143,7 +152,6 @@
source: '', source: '',
}); });
// ========== 门店自提(核销) ========== // ========== 门店自提(核销) ==========
const systemStore = ref({}); // 门店信息 const systemStore = ref({}); // 门店信息
@@ -178,7 +186,7 @@
const status = Number(state.orderInfo?.status); const status = Number(state.orderInfo?.status);
if ([0, 20].includes(status)) return true; if ([0, 20].includes(status)) return true;
if (isPickUpOrder.value) return false; if (isPickUpOrder.value) return false;
return [10, 50].includes(status); return [10, 50, 70].includes(status);
}); });
const resolvePickUpStoreId = (data = {}) => { const resolvePickUpStoreId = (data = {}) => {
@@ -256,7 +264,8 @@
const confirmReceiveOrder = async () => { const confirmReceiveOrder = async () => {
const id = resolveAiOrderId(state.orderInfo); const id = resolveAiOrderId(state.orderInfo);
if (!id) return; if (!id) return;
const req = Number(state.orderInfo?.type) === 5 || String(state.orderType) === '5' const req =
Number(state.orderInfo?.type) === 5 || String(state.orderType) === '5'
? giftConfirmReceive ? giftConfirmReceive
: aiConfirmReceive; : aiConfirmReceive;
const { code } = await req({ id }); const { code } = await req({ id });
@@ -281,6 +290,25 @@
}); });
}; };
const cancelAiOrder = () => {
const id = resolveAiOrderId(state.orderInfo);
if (!id) return;
uni.showModal({
title: '提示',
content: '确定要取消订单吗?',
confirmColor: '#FA7E31',
success: async (res) => {
if (!res.confirm) return;
const request =
Number(state.orderInfo?.type) === 5 || String(state.orderType) === '5'
? cancelOpenOrder
: cancelAiOrderRequest;
const result = await request({ id });
if (result.code === 0) await getOrderDetail();
},
});
};
async function getOrderDetail() { async function getOrderDetail() {
let id = state.orderInfo.id; let id = state.orderInfo.id;
// 对详情数据进行适配 // 对详情数据进行适配
@@ -350,7 +378,7 @@
type: 1, type: 1,
}, },
{ {
title: "随机优惠", title: '随机优惠',
value: 'randomDiscountPrice', value: 'randomDiscountPrice',
type: 1, type: 1,
}, },
+6
View File
@@ -72,6 +72,7 @@
:data="v" :data="v"
@downData="downCallback(state.currentTab)" @downData="downCallback(state.currentTab)"
:index="state.currentTab" :index="state.currentTab"
:isAfterSale="tabMaps[state.currentTab].id === 4"
> >
</orderItem> </orderItem>
</view> </view>
@@ -119,6 +120,11 @@
name: '待支付', name: '待支付',
value: 0, value: 0,
}, },
{
id: 70,
name: '现金待确认',
value: 70,
},
{ {
id: 10, id: 10,
name: '待发货', name: '待发货',
+22 -10
View File
@@ -31,12 +31,7 @@
src="/static/pay/cod_disabled.png" src="/static/pay/cod_disabled.png"
mode="aspectFit" mode="aspectFit"
/> />
<image <image class="pay-icon" v-else :src="item.icon" mode="aspectFit" />
class="pay-icon"
v-else
:src="item.icon"
mode="aspectFit"
/>
<text class="pay-title c0">{{ item.title }}</text> <text class="pay-title c0">{{ item.title }}</text>
</view> </view>
<view class="check-box ss-flex ss-col-center ss-p-l-10"> <view class="check-box ss-flex ss-col-center ss-p-l-10">
@@ -64,6 +59,9 @@
<button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled> <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
支付已过期 支付已过期
</button> </button>
<button v-else-if="state.payStatus === 3" class="submit-btn" @tap="onPay">
切换支付方式
</button>
<button <button
v-else v-else
class="submit-btn" class="submit-btn"
@@ -94,7 +92,7 @@
const state = reactive({ const state = reactive({
orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单 orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单
orderInfo: {}, // 支付单信息 orderInfo: {}, // 支付单信息
payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息, -1=支付已过期, 1=待支付,2=订单已支付 payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息, -1=支付已过期, 1=待支付,2=订单已支付,3=现金待确认
payMethods: [], // 可选的支付方式 payMethods: [], // 可选的支付方式
payment: '', // 选中的支付方式 payment: '', // 选中的支付方式
}); });
@@ -139,7 +137,11 @@
}, },
}); });
} else { } else {
console.log('支付方式:'+state.payment, '订单类型:'+state.orderType, '订单ID:'+state.orderInfo.id); console.log(
'支付方式:' + state.payment,
'订单类型:' + state.orderType,
'订单ID:' + state.orderInfo.id,
);
sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id); sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id);
} }
}; };
@@ -149,6 +151,9 @@
if (state.payStatus === 2) { if (state.payStatus === 2) {
return '该订单已支付'; return '该订单已支付';
} }
if (state.payStatus === 3) {
return '现金待确认';
}
// if (state.payStatus === 1 && state.orderInfo?.expireTime) { // if (state.payStatus === 1 && state.orderInfo?.expireTime) {
// const time = useDurationTime(state.orderInfo.expireTime); // const time = useDurationTime(state.orderInfo.expireTime);
// if (time?.ms <= 0) { // if (time?.ms <= 0) {
@@ -185,6 +190,10 @@
state.payStatus = -1; state.payStatus = -1;
return; return;
} }
if (Number(state.orderInfo.status) === 40) {
state.payStatus = 3;
return;
}
state.payStatus = 1; // 待支付 state.payStatus = 1; // 待支付
} }
@@ -213,7 +222,7 @@
// 设置支付状态 // 设置支付状态
checkPayStatus(); checkPayStatus();
// 获得支付方式 // 现金待确认不再展示支付渠道
await setPayMethods(); await setPayMethods();
} }
@@ -224,7 +233,10 @@
return; return;
} }
console.log(data); console.log(data);
state.payMethods = getPayMethods(data); // 现金待确认状态下去除现金渠道,仅展示可切换的线上渠道
state.payMethods = getPayMethods(data).filter(
(item) => item.value !== 'cash' || state.payStatus !== 3,
);
console.log(state.payMethods); console.log(state.payMethods);
state.payMethods.find((item) => { state.payMethods.find((item) => {
console.log(item); console.log(item);
+102 -76
View File
@@ -1,19 +1,19 @@
import request from '@/sheep/request' import request from '@/sheep/request';
// 消息列表 aishop/shop-messages/list // 消息列表 aishop/shop-messages/list
export function getMessageList(params: any) { export function getMessageList(params: any) {
return request({ return request({
url: '/aishop/shop-messages/list', url: '/aishop/shop-messages/list',
method: 'get', method: 'get',
params params,
}) });
} }
// 是否开通店铺 member/user/check-shop-status // 是否开通店铺 member/user/check-shop-status
export function checkShopStatus(params: any) { export function checkShopStatus(params: any) {
return request({ return request({
url: '/member/user/check-shop-status', url: '/member/user/check-shop-status',
method: 'get', method: 'get',
params params,
}) });
} }
// 判断剩余开通数量 member/user/ai-shop-remaining // 判断剩余开通数量 member/user/ai-shop-remaining
@@ -21,8 +21,8 @@ export function getRemainingCount(params: any) {
return request({ return request({
url: '/member/user/ai-shop-remaining', url: '/member/user/ai-shop-remaining',
method: 'get', method: 'get',
params params,
}) });
} }
// 选品广场 aishop/product/spu/page // 选品广场 aishop/product/spu/page
@@ -30,16 +30,16 @@ export function getSpuPage(params: any) {
return request({ return request({
url: '/aishop/product/spu/page', url: '/aishop/product/spu/page',
method: 'get', method: 'get',
params params,
}) });
} }
// 选品广场 轮次 // 选品广场 轮次
export function getSpuTimeList(params: any) { export function getSpuTimeList(params: any) {
return request({ return request({
url: '/aishop/product/spu/time-list', url: '/aishop/product/spu/time-list',
method: 'get', method: 'get',
params params,
}) });
} }
// 代理收益订单排行 aishop/agent-earnings-order/earnings-page // 代理收益订单排行 aishop/agent-earnings-order/earnings-page
@@ -51,7 +51,7 @@ export function earningsPage(params: any) {
custom: { custom: {
showLoading: false, showLoading: false,
}, },
}) });
} }
// 明细 aishop/product/spu/get-detail // 明细 aishop/product/spu/get-detail
export function getSpuDetail(id: any, shoppingPlazaId: any) { export function getSpuDetail(id: any, shoppingPlazaId: any) {
@@ -60,9 +60,9 @@ export function getSpuDetail(id: any, shoppingPlazaId: any) {
method: 'get', method: 'get',
params: { params: {
id, id,
shoppingPlazaId shoppingPlazaId,
} },
}) });
} }
// 添加购物车 app-api/aishop/shop-cart/add // 添加购物车 app-api/aishop/shop-cart/add
@@ -73,17 +73,17 @@ export function addShopCart(params: any) {
data: params, data: params,
custom: { custom: {
showSuccess: true, showSuccess: true,
successMsg: '添加成功' successMsg: '添加成功',
}, },
}) });
} }
// 获取购物车列表app-api/aishop/shop-cart/list // 获取购物车列表app-api/aishop/shop-cart/list
export function getShopCartList(params: any) { export function getShopCartList(params: any) {
return request({ return request({
url: '/aishop/shop-cart/list', url: '/aishop/shop-cart/list',
method: 'get', method: 'get',
params params,
}) });
} }
// 删除购物车 app-api/aishop/shop-cart/delete // 删除购物车 app-api/aishop/shop-cart/delete
export function deleteShopCart(params: any) { export function deleteShopCart(params: any) {
@@ -93,9 +93,9 @@ export function deleteShopCart(params: any) {
params, params,
custom: { custom: {
showSuccess: true, showSuccess: true,
successMsg: '删除成功' successMsg: '删除成功',
}, },
}) });
} }
// 更新购物车 app-api/aishop/shop-cart/update // 更新购物车 app-api/aishop/shop-cart/update
export function updateShopCart(params: any) { export function updateShopCart(params: any) {
@@ -105,9 +105,9 @@ export function updateShopCart(params: any) {
data: params, data: params,
custom: { custom: {
showSuccess: true, showSuccess: true,
successMsg: '更新成功' successMsg: '更新成功',
}, },
}) });
} }
// 获取订单结算信息aishop/order/settlement // 获取订单结算信息aishop/order/settlement
@@ -115,38 +115,38 @@ export function getSettlementInfo(params: any) {
return request({ return request({
url: '/aishop/order/settlement', url: '/aishop/order/settlement',
method: 'get', method: 'get',
params params,
}) });
} }
// 生成订单 aishop/order/createOrder // 生成订单 aishop/order/createOrder
export function createOrder(params: any) { export function createOrder(params: any) {
const query = { const query = {
...params, ...params,
} };
if (!(Number(query?.id) > 0)) { if (!(Number(query?.id) > 0)) {
delete query.id delete query.id;
} }
if (!(Number(query?.deliveryType) > 0)) { if (!(Number(query?.deliveryType) > 0)) {
delete query.deliveryType delete query.deliveryType;
} }
if (!(Number(query?.pickUpStoreId) > 0)) { if (!(Number(query?.pickUpStoreId) > 0)) {
delete query.pickUpStoreId delete query.pickUpStoreId;
} }
if (!String(query?.receiverName || '').trim()) { if (!String(query?.receiverName || '').trim()) {
delete query.receiverName delete query.receiverName;
} }
if (!String(query?.receiverPhone || query?.receiverMobile || '').trim()) { if (!String(query?.receiverPhone || query?.receiverMobile || '').trim()) {
delete query.receiverPhone delete query.receiverPhone;
} else { } else {
query.receiverPhone = String(query?.receiverPhone || query?.receiverMobile || '').trim() query.receiverPhone = String(query?.receiverPhone || query?.receiverMobile || '').trim();
} }
delete query.receiverMobile delete query.receiverMobile;
return request({ return request({
url: '/aishop/order/createOrder', url: '/aishop/order/createOrder',
method: 'post', method: 'post',
params: query, params: query,
}) });
} }
//查询订单 aishop/order/get-detail //查询订单 aishop/order/get-detail
@@ -154,24 +154,24 @@ export function getOrderDetail(params: any) {
return request({ return request({
url: '/aishop/order/get-detail', url: '/aishop/order/get-detail',
method: 'get', method: 'get',
params params,
}) });
} }
// 获取订单列表 aishop/order/page // 获取订单列表 aishop/order/page
export function getOrderPage(params: any) { export function getOrderPage(params: any) {
return request({ return request({
url: '/aishop/order/page', url: '/aishop/order/page',
method: 'get', method: 'get',
params params,
}) });
} }
// 店铺订单列表 aishop/order/aiShopPage // 店铺订单列表 aishop/order/aiShopPage
export function getAiShopPage(params: any) { export function getAiShopPage(params: any) {
return request({ return request({
url: '/aishop/order/aiShopPage', url: '/aishop/order/aiShopPage',
method: 'get', method: 'get',
params params,
}) });
} }
// 取消订单 aishop/order/cancel // 取消订单 aishop/order/cancel
@@ -182,9 +182,35 @@ export function cancelOrder(params: any) {
params, params,
custom: { custom: {
showSuccess: true, showSuccess: true,
successMsg: '取消成功' successMsg: '取消成功',
}, },
}) });
}
// 取消现金待确认的 AI 店铺开通订单
export function cancelOpenOrder(params: { id: number }) {
return request({
url: '/aishop/order/cancel-open',
method: 'DELETE',
params,
custom: {
showSuccess: true,
successMsg: '取消成功',
},
});
}
// 取消未支付的 AI 店铺开通订单
export function cancelUnpaidOpenOrder(params: { id: number }) {
return request({
url: '/aishop/order/cancel-open-unpaid',
method: 'DELETE',
params,
custom: {
showSuccess: true,
successMsg: '取消成功',
},
});
} }
// 确认收货 aishop/order/receive // 确认收货 aishop/order/receive
export function confirmReceive(params: any) { export function confirmReceive(params: any) {
@@ -194,9 +220,9 @@ export function confirmReceive(params: any) {
params, params,
custom: { custom: {
showSuccess: true, showSuccess: true,
successMsg: '确认收货成功' successMsg: '确认收货成功',
}, },
}) });
} }
// 开通ai店铺aishop/order/createOpen // 开通ai店铺aishop/order/createOpen
@@ -205,47 +231,47 @@ export function createOpen(params: any) {
url: '/aishop/order/createOpen', url: '/aishop/order/createOpen',
method: 'post', method: 'post',
params, params,
}) });
} }
// 用户等级 aishop/level-card/info // 用户等级 aishop/level-card/info
export function getLevelInfo(params: any) { export function getLevelInfo(params: any) {
return request({ return request({
url: '/aishop/level-card/info', url: '/aishop/level-card/info',
method: 'get', method: 'get',
params params,
}) });
} }
export function getPrice(params: any) { export function getPrice(params: any) {
return request({ return request({
url: '/app/markingConfig/getPrice', url: '/app/markingConfig/getPrice',
method: 'get', method: 'get',
params params,
}) });
} }
// 获取是否开通商品发货 // 获取是否开通商品发货
export function getAiOpenStatus(params: any) { export function getAiOpenStatus(params: any) {
return request({ return request({
url: '/aishop/shop-cart/AiOpenStatus', url: '/aishop/shop-cart/AiOpenStatus',
method: 'get', method: 'get',
params params,
}) });
} }
//获取已购买赠品 //获取已购买赠品
export function getGiftOrder(params: any) { export function getGiftOrder(params: any) {
return request({ return request({
url: '/aishop/order/get-pay-order', url: '/aishop/order/get-pay-order',
method: 'get', method: 'get',
params params,
}) });
} }
//查询赠品订单 //查询赠品订单
export function getGiftOrderDetail(params: any) { export function getGiftOrderDetail(params: any) {
return request({ return request({
url: '/aishop/order/get-detail-open', url: '/aishop/order/get-detail-open',
method: 'get', method: 'get',
params params,
}) });
} }
export const getOpenOrderDetail = getGiftOrderDetail; export const getOpenOrderDetail = getGiftOrderDetail;
@@ -254,48 +280,48 @@ export function getGiftSettlementInfo(params : any) {
return request({ return request({
url: '/aishop/order/settlement-open', url: '/aishop/order/settlement-open',
method: 'get', method: 'get',
params params,
}) });
} }
// 创建发货状态订单 // 创建发货状态订单
export function createOrderOpen(params: any) { export function createOrderOpen(params: any) {
const query = { const query = {
...params, ...params,
} };
if (!(Number(query?.id) > 0)) { if (!(Number(query?.id) > 0)) {
delete query.id delete query.id;
} }
if (!(Number(query?.spuId) > 0)) { if (!(Number(query?.spuId) > 0)) {
delete query.spuId delete query.spuId;
} }
if (!(Number(query?.deliveryType) > 0)) { if (!(Number(query?.deliveryType) > 0)) {
delete query.deliveryType delete query.deliveryType;
} }
if (!(Number(query?.pickUpStoreId) > 0)) { if (!(Number(query?.pickUpStoreId) > 0)) {
delete query.pickUpStoreId delete query.pickUpStoreId;
} }
if (!String(query?.receiverName || '').trim()) { if (!String(query?.receiverName || '').trim()) {
delete query.receiverName delete query.receiverName;
} }
if (!String(query?.receiverPhone || query?.receiverMobile || '').trim()) { if (!String(query?.receiverPhone || query?.receiverMobile || '').trim()) {
delete query.receiverPhone delete query.receiverPhone;
} else { } else {
query.receiverPhone = String(query?.receiverPhone || query?.receiverMobile || '').trim() query.receiverPhone = String(query?.receiverPhone || query?.receiverMobile || '').trim();
} }
delete query.receiverMobile delete query.receiverMobile;
return request({ return request({
url: '/aishop/order/createOrderOpen', url: '/aishop/order/createOrderOpen',
method: 'post', method: 'post',
params: query, params: query,
}) });
} }
//查询赠品订单 //查询赠品订单
export function getGiftOrderInfo(params: any) { export function getGiftOrderInfo(params: any) {
return request({ return request({
url: '/aishop/order/get-detail-open', url: '/aishop/order/get-detail-open',
method: 'get', method: 'get',
params params,
}) });
} }
// 赠品确认收货 // 赠品确认收货
export function giftConfirmReceive(params: any) { export function giftConfirmReceive(params: any) {
@@ -305,17 +331,17 @@ export function giftConfirmReceive(params: any) {
params, params,
custom: { custom: {
showSuccess: true, showSuccess: true,
successMsg: '确认收货成功' successMsg: '确认收货成功',
}, },
}) });
} }
//开通ai店铺赠送商品套餐 //开通ai店铺赠送商品套餐
export function getAiProduct(params: any) { export function getAiProduct(params: any) {
return request({ return request({
url: '/aishop/product/page', url: '/aishop/product/page',
method: 'get', method: 'get',
params params,
}) });
} }
// 延迟发货 // 延迟发货
export function aiDelayedShipment(params: any) { export function aiDelayedShipment(params: any) {
@@ -323,7 +349,7 @@ export function aiDelayedShipment(params : any) {
url: '/aishop/order/update/delayedShipment', url: '/aishop/order/update/delayedShipment',
method: 'post', method: 'post',
params, params,
}) });
} }
export function getMyShop(params: any) { export function getMyShop(params: any) {
@@ -331,7 +357,7 @@ export function getMyShop(params: any) {
url: '/aishop/app/myshop/get', url: '/aishop/app/myshop/get',
method: 'get', method: 'get',
params, params,
}) });
} }
// 立即发货 // 立即发货
@@ -340,5 +366,5 @@ export function aiPendingShipment(params : any) {
url: '/aishop/order/update/pendingShipment', url: '/aishop/order/update/pendingShipment',
method: 'post', method: 'post',
params, params,
}) });
} }
+8 -2
View File
@@ -141,8 +141,8 @@ export function formatOrderStatus(order) {
if (order.status == 60) { if (order.status == 60) {
return '待处理'; return '待处理';
} }
if (order.status == 70) { if (Number(order.status) === 70) {
return '已下架'; return '现金待确认';
} }
return '已关闭'; return '已关闭';
} }
@@ -156,6 +156,9 @@ export function formatOrderStatusDescription(order) {
if (order.status === 0) { if (order.status === 0) {
return `请在 ${formatDate(order.payExpireTime)} 前完成支付`; return `请在 ${formatDate(order.payExpireTime)} 前完成支付`;
} }
if (Number(order.status) === 70) {
return '等待工作人员确认收款';
}
if (order.status === 10) { if (order.status === 10) {
return '商家未发货,请耐心等待'; return '商家未发货,请耐心等待';
} }
@@ -195,6 +198,9 @@ export function handleOrderButtons(order) {
order.buttons.push('cancel'); order.buttons.push('cancel');
order.buttons.push('pay'); order.buttons.push('pay');
} }
if (Number(order.status) === 70) {
order.buttons.push('cancel');
}
if (order.status === 30 && !order.commentStatus) { if (order.status === 30 && !order.commentStatus) {
// 发起评价 // 发起评价
order.buttons.push('comment'); order.buttons.push('comment');
+79 -38
View File
@@ -108,7 +108,12 @@ export default class SheepPay {
}, },
}, },
}; };
return payAction[sheep.$platform.name][this.payment](); const action = payAction[sheep.$platform.name]?.[this.payment];
if (!action) {
sheep.$helper.toast('当前支付方式不可用');
return;
}
return action();
} }
// 预支付 // 预支付
@@ -134,14 +139,13 @@ export default class SheepPay {
console.log('发起预支付 API 调用' + JSON.stringify(data)); console.log('发起预支付 API 调用' + JSON.stringify(data));
// 发起预支付 API 调用 // 发起预支付 API 调用
PayOrderApi.submitOrder(data).then((res) => { PayOrderApi.submitOrder(data).then((res) => {
// 成功时 resolve(res);
res.code === 0 && resolve(res);
// 失败时 // 失败时
if (res.code !== 0 && res.msg.indexOf('无效的openid') >= 0) { if (res.code !== 0 && res.msg?.indexOf('无效的openid') >= 0) {
// 特殊逻辑:微信公众号、小程序支付时,必须传入 openid 不正确的情况 // 特殊逻辑:微信公众号、小程序支付时,必须传入 openid 不正确的情况
if ( if (
res.msg.indexOf('无效的openid') >= 0 || // 获取的 openid 不正确时,或者随便输入了个 openid res.msg?.indexOf('无效的openid') >= 0 || // 获取的 openid 不正确时,或者随便输入了个 openid
res.msg.indexOf('下单账号与支付账号不一致') >= 0 res.msg?.indexOf('下单账号与支付账号不一致') >= 0
) { ) {
// https://developers.weixin.qq.com/community/develop/doc/00008c53c347804beec82aed051c00 // https://developers.weixin.qq.com/community/develop/doc/00008c53c347804beec82aed051c00
this.bindWeixin(); this.bindWeixin();
@@ -181,7 +185,8 @@ export default class SheepPay {
async wechatWapPay() { async wechatWapPay() {
const { error, data } = await this.prepay(); const { error, data } = await this.prepay();
if (error === 0) { if (error === 0) {
const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${
this.payment
}&orderType=${this.orderType}`; }&orderType=${this.orderType}`;
location.href = `${data.pay_data.h5_url}&redirect_url=${encodeURIComponent(redirect_url)}`; location.href = `${data.pay_data.h5_url}&redirect_url=${encodeURIComponent(redirect_url)}`;
} }
@@ -234,8 +239,44 @@ export default class SheepPay {
} }
async cashPay() { async cashPay() {
const { code } = await this.prepay('cash_payment'); const result = await this.prepay('cash_payment');
code === 0 && this.payResult('success'); const code = result?.code;
const data = result?.data;
if (code !== 0) {
return;
}
if (Number(data?.status) !== 40 || data?.displayContent !== 'cash_pending') {
sheep.$helper.toast('现金支付状态异常');
return;
}
const payOrderResult = await PayOrderApi.getOrder(this.id, false);
const payOrder = payOrderResult?.code === 0 ? payOrderResult.data : null;
uni.showModal({
title: '现金支付',
content: '现金支付申请已提交,等待工作人员确认',
showCancel: false,
success: () => this.redirectCashPendingOrder(payOrder),
});
}
redirectCashPendingOrder(payOrder = {}) {
const businessOrderId = payOrder?.merchantOrderId;
const orderType = Number(payOrder?.orderType);
if (!businessOrderId) {
uni.reLaunch({ url: '/pages/order/list' });
return;
}
const routes = {
1: `/pages/order/detail?id=${businessOrderId}`,
2: `/pages/AI/orderInfo?id=${businessOrderId}`,
3: `/pages/AI/giftOrderInfo?id=${businessOrderId}`,
};
const url = routes[orderType];
if (!url) {
uni.reLaunch({ url: '/pages/order/list' });
return;
}
uni.redirectTo({ url });
} }
// 模拟支付 // 模拟支付
@@ -273,7 +314,7 @@ export default class SheepPay {
if (code !== 0) { if (code !== 0) {
return; return;
} }
console.log(data.displayContent) console.log(data.displayContent);
uni.requestPayment({ uni.requestPayment({
provider: 'alipay', provider: 'alipay',
orderInfo: data.displayContent, // 直接使用返回的支付参数 orderInfo: data.displayContent, // 直接使用返回的支付参数
@@ -349,8 +390,9 @@ export default class SheepPay {
console.log('token:' + uni.getStorageSync('token')); console.log('token:' + uni.getStorageSync('token'));
console.log('orderId:' + that.id); console.log('orderId:' + that.id);
// #ifdef APP-PLUS // #ifdef APP-PLUS
plus.share.getServices(services => { plus.share.getServices(
const weixinService = services.find(service => service.id === 'weixin'); (services) => {
const weixinService = services.find((service) => service.id === 'weixin');
if (weixinService) { if (weixinService) {
weixinService.launchMiniProgram({ weixinService.launchMiniProgram({
// appid: 'wx23b0c321b5d74d63', // appid: 'wx23b0c321b5d74d63',
@@ -361,17 +403,18 @@ export default class SheepPay {
} else { } else {
uni.showToast({ title: '未检测到微信客户端', icon: 'none' }); uni.showToast({ title: '未检测到微信客户端', icon: 'none' });
} }
}, err => { },
(err) => {
console.error('获取服务失败:', err); console.error('获取服务失败:', err);
}); },
);
// #endif // #endif
} }
//检测code是否过期 //检测code是否过期
verify_wechat_code(code) { verify_wechat_code(code) {
let appid = 'wx23b0c321b5d74d63' let appid = 'wx23b0c321b5d74d63';
let secret = 'aff28ef70e00c12245e77a9804dfd8a2' let secret = 'aff28ef70e00c12245e77a9804dfd8a2';
let url = `https://api.weixin.qq.com/sns/oauth2/access_token?appid=${appid}&secret=${secret}&code=${code}&grant_type=authorization_code` let url = `https://api.weixin.qq.com/sns/oauth2/access_token?appid=${appid}&secret=${secret}&code=${code}&grant_type=authorization_code`;
return uni.request({ return uni.request({
url: url, url: url,
method: 'GET', method: 'GET',
@@ -382,11 +425,10 @@ export default class SheepPay {
fail(err) { fail(err) {
console.log('verify_wechat_code 失败:' + JSON.stringify(err)); console.log('verify_wechat_code 失败:' + JSON.stringify(err));
}, },
}) });
} }
//检测是否开通支付 //检测是否开通支付
is_open_wxPay(pay_info) { is_open_wxPay(pay_info) {
uni.requestPayment({ uni.requestPayment({
provider: 'wxpay', provider: 'wxpay',
orderInfo: pay_info, orderInfo: pay_info,
@@ -395,35 +437,36 @@ export default class SheepPay {
}, },
fail(err) { fail(err) {
console.error('开通支付失败:', err); console.error('开通支付失败:', err);
} },
}); });
} }
// 汇付支付宝支付 // 汇付支付宝支付
async hfAlipayPay() { async hfAlipayPay() {
let { code, data } = await this.prepay('hf_alipay_app'); let { code, data } = await this.prepay('hf_alipay_app');
console.log(data) console.log(data);
if (code !== 0) return if (code !== 0) return;
if (data.displayMode.toLowerCase() == sheep.$platform.name.toLowerCase()) { if (data.displayMode.toLowerCase() == sheep.$platform.name.toLowerCase()) {
//拼接支付宝内部功能,直接打开支付页面 //拼接支付宝内部功能,直接打开支付页面
let url = `alipays://platformapi/startapp?saId=10000007&qrcode=${encodeURI(data.displayContent)}?_s=web-other`; let url = `alipays://platformapi/startapp?saId=10000007&qrcode=${encodeURI(
console.log(url) data.displayContent,
)}?_s=web-other`;
console.log(url);
let platform = uni.getSystemInfoSync().platform; //获取平台判断 let platform = uni.getSystemInfoSync().platform; //获取平台判断
if (platform == 'android') { if (platform == 'android') {
plus.runtime.openURL(url) plus.runtime.openURL(url);
} else if (platform == 'ios') { } else if (platform == 'ios') {
plus.runtime.launchApplication({ plus.runtime.launchApplication({
action: url action: url,
}) });
} }
} else { } else {
sheep.$helper.toast(`请使用${data.displayMode}进行支付`); sheep.$helper.toast(`请使用${data.displayMode}进行支付`);
} }
} }
} }
export function getPayMethods(channels) { export function getPayMethods(channels) {
channels = Array.isArray(channels) ? channels : [];
const payMethods1 = [ const payMethods1 = [
{ {
icon: '/static/pay/wechat.svg', icon: '/static/pay/wechat.svg',
@@ -470,10 +513,9 @@ export function getPayMethods(channels) {
{ {
icon: '/static/pay/alipay.svg', icon: '/static/pay/alipay.svg',
title: 'H支付宝支付', title: 'H支付宝支付',
value: "hf_alipay_app", value: 'hf_alipay_app',
disabled: false, disabled: false,
}, },
]; ];
let payMethods = []; let payMethods = [];
// 1. 处理【微信支付】 // 1. 处理【微信支付】
@@ -492,8 +534,7 @@ export function getPayMethods(channels) {
let hfAlipayMethod = null; let hfAlipayMethod = null;
payMethods1.forEach((e) => { payMethods1.forEach((e) => {
const exists = const exists =
channels.indexOf(e.value) !== -1 || channels.indexOf(e.value) !== -1 || (e.value === 'cash' && channels.includes('cash_payment'));
(e.value === 'cash' && channels.includes('cash_payment'));
if (exists) { if (exists) {
payMethods.push(e); payMethods.push(e);
if (e.value == 'wechat') { if (e.value == 'wechat') {
@@ -520,7 +561,7 @@ export function getPayMethods(channels) {
(platform === 'WechatMiniProgram' && channels.includes('wx_lite')) || (platform === 'WechatMiniProgram' && channels.includes('wx_lite')) ||
(platform === 'App' && channels.includes('wx_app')) (platform === 'App' && channels.includes('wx_app'))
) { ) {
wechatMethod.disabled = false; if (wechatMethod) wechatMethod.disabled = false;
} }
if ( if (
@@ -529,10 +570,10 @@ export function getPayMethods(channels) {
(platform === 'WechatMiniProgram' && channels.includes('alipay_wap')) || (platform === 'WechatMiniProgram' && channels.includes('alipay_wap')) ||
(platform === 'App' && channels.includes('alipay_app')) (platform === 'App' && channels.includes('alipay_app'))
) { ) {
alipayMethod.disabled = false; if (alipayMethod) alipayMethod.disabled = false;
} }
if (channels.includes('wallet')) { if (channels.includes('wallet')) {
walletMethod.disabled = false; if (walletMethod) walletMethod.disabled = false;
} }
if (channels.includes('cash_payment') && cashMethod) { if (channels.includes('cash_payment') && cashMethod) {
cashMethod.disabled = false; cashMethod.disabled = false;
@@ -558,7 +599,7 @@ export function goPayResult(id, orderType, resultType) {
// }); // });
uni.redirectTo({ uni.redirectTo({
url: '/pages/pay/result?id=' + id + '&orderType=' + orderType + '&payState=' + resultType, url: '/pages/pay/result?id=' + id + '&orderType=' + orderType + '&payState=' + resultType,
}) });
} }
export function goBindWeixin() { export function goBindWeixin() {