czg_team
/
cashier_admin_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

This commit is contained in:
YeMingfei666 2024-11-18 11:04:28 +08:00
parent d6f148c2a9 c9825f8df7
commit 67f92a91b8
12 changed files with 591 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
commons/utils/goodsUtil.js
View File

@ -2,7 +2,7 @@ export function canComputedPackFee(v) {
return v.pack && v.status != 'return' && v.status != 'refund' && v.status != 'refunding'
}
export function returnCanComputedGoodsArr(arr) {
return arr.filter(v=>canComputedPackFee(v))
return arr.filter(v => canComputedPackFee(v))
}
export function returnPackFee(arr) {
return arr.reduce((prve, cur) => {
@ -10,22 +10,26 @@ export function returnPackFee(arr) {
}, 0).toFixed(2)
}
export function canTuicai(orderInfo,item){
return orderInfo.status=='unpaid'&&orderInfo.useType!='dine-in-before'&& item.status!='return'
export function canTuicai(orderInfo, item) {
if (orderInfo.status == 'unpaid' && orderInfo.isPostpaid !== null && orderInfo.isPostpaid == 0) {
return false
}
return orderInfo.status == 'unpaid' && orderInfo.useType != 'dine-in-before' && item.status != 'return'
}
export function canTuiKuan(orderInfo,item){
// 不是未支付退款等状态,也不是商品券抵扣才可以退款
return orderInfo.status!='unpaid'&& item.status!='return'&&item.status!='refund'&&item.status!='refunding'&&!item.userCouponId
export function canTuiKuan(orderInfo, item) {
// 已完成的订单,也不是商品券抵扣才可以退款
return orderInfo.status == 'closed' && item.status != 'return' && item.status != 'refund' && item.status !=
'refunding' && !item.userCouponId
}
export function isTui(item){
return item.status=='return'||item.status=='refund'||item.status=='refunding'
export function isTui(item) {
return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
}
export function isGift(item){
return !isTui(item)&&item.gift
export function isGift(item) {
return !isTui(item) && item.gift
}
export function numSum(arr){
const sum=arr.reduce((a,b)=>{
return a+b*100
},0)
return (sum/100).toFixed(2)
export function numSum(arr) {
const sum = arr.reduce((a, b) => {
return a + b * 100
}, 0)
return (sum / 100).toFixed(2)
}

25
commons/utils/safe-bottom.js
View File

@ -1,23 +1,32 @@
import {
getCurrentInstance,
} from 'vue';
export function getElRect(elClass, dataVal) {
const instance = getCurrentInstance();
return new Promise((resolve, reject) => {
const query = uni.createSelectorQuery().in(instance.proxy);
export async function getElRect(elClass, instance,option) {
instance = instance ? instance : getCurrentInstance();
const query = uni.createSelectorQuery().in(instance.proxy);
try{
const res= await getEle(query,elClass,option)
return res
}catch(e){
console.log(e);
}
}
async function getEle(query,elClass,option){
return new Promise((resolve, reject)=>{
query.select('.' + elClass).fields({
size: true
size: true,
...option
}, res => {
// 如果节点尚未生成，res值为null，循环调用执行
if (!res) {
setTimeout(() => {
getElRect(elClass);
return setTimeout(() => {
getEle(query,elClass,option);
}, 10);
return;
}
resolve(res);
}).exec();
})
}
export async function getSafeBottomHeight(className, height = 16) {

4
pageUser/index/components/user.vue
View File

@ -38,7 +38,7 @@
</view>
</view>
<view class="u-flex-1 u-text-center" >
<view class="font-bold color-000 pr-16" >{{data.totalScore}}</view>
<view class="font-bold color-000 pr-16" >{{data.accountPoints}}</view>
<view class="u-flex u-row-center" >
<view class="color-999">积分</view>
<view class="u-flex">
@ -56,7 +56,7 @@
</view>
</view>
<!-- <view class="u-flex-1 u-text-center" @tap="toUser">
<view class="font-bold color-000 pr-16">{{data.totalScore}}</view>
<view class="font-bold color-000 pr-16">{{data.accountPoints}}</view>
<view class="u-flex u-row-center">
<view class="color-999">已消费</view>
<view class="u-flex">

4
pagesCreateOrder/choose-user/choose-user.vue
View File

@ -37,7 +37,7 @@
</view>
<view class="u-m-l-30 u-flex">
<text class="">积分：</text>
<text class="color-main">{{item.totalScore}}</text>
<text class="color-main">{{item.accountPoints}}</text>
</view>
</view>
</view>
@ -93,7 +93,7 @@
headImg: '',
telephone: '',
amount: '0.00',
totalScore: '0.00'
accountPoints: '0.00'
})
} else {
list[index].checked = true

4
pagesCreateOrder/confirm-order/confirm-order.vue
View File

@ -23,7 +23,7 @@
class="color-main">{{user.amount}}</text>
</view>
<view class="u-font-24 u-m-l-30"><text>积分：</text><text
class="color-main">{{user.totalScore}}</text></view>
class="color-main">{{user.accountPoints}}</text></view>
</view>
<uni-icons type="right" color="#999" size="16"></uni-icons>
</view>
@ -85,7 +85,7 @@
</view>
<view class="u-flex">
<view>积分</view>
<view class="color-333 u-m-l-10"> {{user.totalScore}}</view>
<view class="color-333 u-m-l-10"> {{user.accountPoints}}</view>
</view>
<view class="u-flex">
<view>已消费</view>

125
pagesCreateOrder/index/index.vue
View File

@ -28,7 +28,7 @@
<view class="u-font-24 u-m-l-30"><text>余额：</text><text
class="color-main">{{data.vipUser.amount}}</text></view>
<view class="u-font-24 u-m-l-30"><text>积分：</text><text
class="color-main">{{data.vipUser.totalScore}}</text></view>
class="color-main">{{data.vipUser.accountPoints}}</text></view>
</view>
</view>
<view class="u-flex">
@ -269,6 +269,14 @@
return res
}
function returnUrlPar(str) {
let arr = str.split("?")[1].split("&"); //先通过？分解得到？后面的所需字符串，再将其通过&分解开存放在数组里
let obj = {};
for (let i of arr) {
obj[i.split("=")[0]] = i.split("=")[1]; //对数组每项用=分解开，=前为对象属性名，=后为属性值
}
return obj
}
function scanCode() {
// 只允许通过相机扫码
@ -278,6 +286,24 @@
success: function(res) {
console.log('条码类型：' + res.scanType);
console.log('条码内容：' + res.result);
if (res.result.includes('codeplate?code=')) {
const par = returnUrlPar(res.result)
const tableId = par.code
console.log('par');
console.log(par);
onChooseTable({
tableId
})
} else {
uni.showToast({
icon: 'error',
title: '请扫描正确的桌台码'
})
}
// uni.showModal({
// title:'',
// content:res.result
// })
}
});
}
@ -329,8 +355,10 @@
return v.foods.length
})
data.tabbar = tabbar
nextTick(() => {
getMenuItemTop()
})
storageManage.cacheGoods(data.tabbar)
getMenuItemTop()
}
@ -448,17 +476,20 @@
})
console.log(res);
if (res && res.content[0]) {
data.table={...res.content[0],...data.table}
data.table = {
...res.content[0],
...data.table
}
}
}
}
let $originGoods = []
let $category = []
async function init() {
if(option.type=='add'){
if (option.type == 'add') {
data.masterId = option.masterId
setTabBar($category, $originGoods, [])
}else{
} else {
const masterRes = await getMasterId()
data.masterId = masterRes.masterId
}
@ -488,7 +519,7 @@
});
$originGoods = goods
console.log(option);
if(option.type=='add'){
if (option.type == 'add') {
cars.length = 0
setTabBar(category, goods, [])
return
@ -504,7 +535,7 @@
setTabBar(category, goods, cars)
return
}
const cartRes = await getCart()
cars.length = 0
const cartArr = getNowCart(cartRes.records)
@ -586,29 +617,56 @@
})
}
async function onChooseTable(item) {
console.log('onChooseTable');
const res = await $returnTableDetail({
tableId: item.tableId,
});
if (!res) {
// #ifdef MP-WEIXIN
uni.showModal({
title: '提示',
content: '桌台不存在或不是该店铺的桌台'
})
// #endif
// #ifndef MP-WEIXIN
infoBox.showToast('桌台不存在或不是该店铺的桌台')
// #endif
return
}
console.log('---table:detail-----');
console.log(res);
if (data.table.tableId || cars.length <= 0) {
data.table = {
...res,
...item
}
return;
}
if (res.status == "unbind") {
return infoBox.showToast('该台桌未绑定，清先去桌台管理里绑定码牌')
}
if (res.status != "idle") {
return infoBox.showToast('该台桌已在使用中')
}
if (res.cartCount > 0) {
setModalShow('clear', true, item)
} else {
await $choseTable({
masterId: data.masterId,
tableId: item.tableId,
isClear: false
});
data.table = item
}
}
function watchChooseTable() {
uni.$off('choose-table')
uni.$on('choose-table', async (item) => {
if (data.table.tableId || cars.length <= 0) {
data.table = item
return;
}
if (item.status != "idle") {
return infoBox.showToast('该台桌已在使用中')
}
const res = await $returnTableDetail({
tableId: item.tableId,
});
if (res.cartCount > 0) {
setModalShow('clear', true, item)
} else {
await $choseTable({
masterId: data.masterId,
tableId: item.tableId,
isClear:false
});
data.table = item
}
uni.$on('choose-table', (item) => {
onChooseTable(item)
})
}
@ -1045,12 +1103,15 @@
}, 10);
return;
}
let arr = []
rects.forEach((rect) => {
// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
data.arr.push(rect.top - rects[0].top);
storageManage.cacheGoodsNode(data.arr)
resolve();
arr.push(rect.top - rects[0].top);
})
data.arr = arr
console.log(data.arr);
storageManage.cacheGoodsNode(data.arr)
resolve();
}).exec()
})
}
@ -1102,7 +1163,7 @@
})
}
watch(() => data.table.tableId, (newval, oldval) => {
if(option.type!='add'){
if (option.type != 'add') {
onSelTable()
}
})

48
pagesOrder/detail/components/list.vue
View File

@ -119,9 +119,13 @@
</view>
<view class="u-flex">
<view class="color-red u-m-r-24" v-if="youhuiAllPrice>0">
已优惠￥{{youhuiAllPrice}}
<view class="u-flex u-m-r-24" v-if="youhuiAllPrice>0">
<view class="color-red u-m-r-6 " >
已优惠￥{{youhuiAllPrice}}
</view>
<up-icon name="info-circle" color="#999" :size="14" @click="youhuiDetailShow"></up-icon>
</view>
<view>
<text>小计￥</text>
<text class="font-bold u-font-32">{{allPrice}}</text>
@ -161,12 +165,41 @@
<my-button @tap="printOrder" type="cancel" :color="color.ColorMain">重新打印</my-button>
</view>
</view>
<up-popup :round="10" :show="pop.youhui" mode="center" closeOnClickOverlay @close="youhuiDetailHide" >
<view class="u-p-30" style="width: 80vw;">
<view class="font-bold u-text-center">优惠详情</view>
<view class="u-m-t-32">
<view class="u-flex u-row-between">
<view>满减券抵扣</view>
<view class="color-red">
<text>￥</text>
<text>{{orderInfo.fullCouponDiscountAmount}}</text>
</view>
</view>
<view class="u-flex u-row-between u-m-t-18">
<view>商品券抵扣</view>
<view class="color-red">
<text>￥</text>
<text>{{orderInfo.productCouponDiscountAmount}}</text>
</view>
</view>
<view class="u-flex u-row-between u-m-t-18">
<view>积分抵扣</view>
<view class="color-red">
<text>￥</text>
<text>{{orderInfo.pointsDiscountAmount}}</text>
</view>
</view>
</view>
</view>
</up-popup>
</view>
</template>
<script setup>
import {
computed
computed, reactive
} from 'vue';
import color from '@/commons/color.js'
import {
@ -178,6 +211,15 @@
canTuicai,
numSum
} from '@/commons/utils/goodsUtil.js'
const pop=reactive({
youhui:false
})
function youhuiDetailShow(){
pop.youhui=true
}
function youhuiDetailHide(){
pop.youhui=false
}
const props = defineProps({
orderInfo: {
type: Object,

4
pagesOrder/detail/components/user.vue
View File

@ -33,7 +33,7 @@
<view class="color-666 u-m-t-8 u-font-24">余额</view>
</view>
<view class="">
<view class="font-bold">{{user.totalScore}}</view>
<view class="font-bold">{{user.accountPoints}}</view>
<view class="color-666 u-m-t-8 u-font-24">积分</view>
</view>
<view class="">
@ -61,7 +61,7 @@
headImg:'',
telephone:'',
amount:'0.00',
totalScore:'0.00'
accountPoints:'0.00'
}
}
}

2
pagesOrder/detail/detail.vue
View File

@ -316,7 +316,7 @@
headImg:'',
telephone:'',
amount:'0.00',
totalScore:'0.00'
accountPoints:'0.00'
})
//更新选择用户
async function setUser(par) {

209
pagesOrder/pay-order/pay-order.vue
View File

@ -24,7 +24,7 @@
<view @click="discountShow">修改</view>
</view>
</template>
</view>
<view class="content bg-fff border-r-12">
<view class=" u-p-t-30 u-p-l-26 u-p-r-26 card top u-m-t-30">
@ -44,6 +44,7 @@
<view class="u-flex">
<view class="hui">减</view>
<view class="u-m-l-18">{{item.name}}</view>
<view class="u-m-l-18 color-999">x{{item.num}}</view>
</view>
<view class="color-red">
-￥{{item.discountAmount}}
@ -53,7 +54,7 @@
</view>
<view class="border-bottom u-p-b-30" v-if="payPrice!=order.amount||accountPoints.sel">
<view class="border-bottom u-p-b-30" v-if="discount.price||accountPoints.sel">
<view class="u-flex u-p-l-24 u-p-r-24 u-row-between u-p-t-30 "
v-if="discount.price&&discount.currentPrice!=order.amount">
<view>服务员改价</view>
@ -69,7 +70,7 @@
</view>
</view>
</view>
</view>
<view class="bg-fff border-r-12 ">
<view class="u-p-t-30 u-p-l-50 u-p-r-50 card bottom">
@ -111,14 +112,14 @@
<view class="u-flex ">
<view class="">积分抵扣</view>
<view class="color-999 u-m-l-10">
<text>(</text>
<text>(</text>
<text>{{user.accountPoints||'0'}}</text>
<text>)</text>
</view>
<!-- <view><text class="color-red font-bold">{{accountPoints.price}}</text>元</view> -->
</view>
<view class="u-flex">
<view class="u-flex" @click.stop="refPointsOpen">
<view><text>{{accountPoints.num}}</text></view>
<view v-if="accountPoints.calcRes.usable">
@ -126,22 +127,22 @@
</view>
</view>
<view class="u-m-l-32 u-relative" v-if="accountPoints.calcRes.usable" >
<view class="u-m-l-32 u-relative" v-if="accountPoints.calcRes.usable">
<view class="u-absolute position-all"></view>
<my-radio
:modelValue="accountPoints.sel">
<my-radio :modelValue="accountPoints.sel">
</my-radio>
</view>
</view>
</view>
<view class="color-999 u-font-24 u-m-t-16" >
<view class="color-999 u-font-24 u-m-t-16">
<view class="" v-if="accountPoints.calcRes.unusableReason">
<text class="color-red">*</text>
<text >{{accountPoints.calcRes.unusableReason}}</text>
<text>{{accountPoints.calcRes.unusableReason}}</text>
</view>
<view class="" v-if="accountPoints.calcRes.usable">
<text class="color-red">*</text>
<text class="" v-if="accountPoints.calcRes.equivalentPoints">100积分等于{{to2(accountPoints.calcRes.equivalentPoints*100)}}元,</text>
<text class=""
v-if="accountPoints.calcRes.equivalentPoints">100积分等于{{to2(accountPoints.calcRes.equivalentPoints*100)}}元,</text>
<text>
最大抵扣积分{{accountPoints.calcRes.maxUsablePoints}}
</text>
@ -225,10 +226,16 @@
import infoBox from '@/commons/utils/infoBox.js'
import editDiscount from '@/components/my-components/edit-discount.vue'
import editAccountPoints from './components/edit-accountPoints.vue'
import {
returnGoodsPayPriceMap,returnProCoupStartIndex ,returnProductCoupAllPrice
} from '../quan_util.js'
//商品数量从0到n每一个对应的价格
let $goodsPayPriceMap={}
const refPoints=ref(null)
function refPointsOpen(){
if(!accountPoints.calcRes.usable&&accountPoints.sel){
const refPoints = ref(null)
function refPointsOpen() {
if (!accountPoints.calcRes.usable && accountPoints.sel) {
return
}
refPoints.value.open()
@ -236,50 +243,50 @@
const accountPoints = reactive({
sel: false,
num: 0,
calcRes:{
usable:false,
unusableReason:'',
minDeductionPoints:0,
maxUsablePoints:0
calcRes: {
usable: false,
unusableReason: '',
minDeductionPoints: 0,
maxUsablePoints: 0
},
price:0
price: 0
})
async function calcUsablePoints(){
if(!order.memberId){
return
async function calcUsablePoints() {
if (!order.memberId) {
return
}
const res=await Api.$calcUsablePoints({
memberId:order.memberId,
orderAmount:pointCanDicountPrice.value
const res = await Api.$calcUsablePoints({
memberId: order.memberId,
orderAmount: pointCanDicountPrice.value
})
accountPoints.calcRes=res
accountPoints.num=res.maxUsablePoints
accountPoints.calcRes = res
accountPoints.num = res.maxUsablePoints
return res;
}
watch(()=>accountPoints.sel,(newval)=>{
if(newval){
watch(() => accountPoints.sel, (newval) => {
if (newval) {
calcUsablePoints()
}
})
async function calcDeDuctionPoints(){
const res=await Api.$calcDeDuctionPoints({
async function calcDeDuctionPoints() {
const res = await Api.$calcDeDuctionPoints({
memberId: order.memberId,
orderAmount: order.amount,
points: accountPoints.num
})
accountPoints.price=res
accountPoints.price = res
return res
}
watch(()=>accountPoints.num,(newval)=>{
if(!newval){
accountPoints.price=0
return
watch(() => accountPoints.num, (newval) => {
if (!newval) {
accountPoints.price = 0
return
}
calcDeDuctionPoints()
})
function changeAccountPoints() {
if(!accountPoints.calcRes.usable){
if (!accountPoints.calcRes.usable) {
return
}
accountPoints.sel = !accountPoints.sel
@ -297,7 +304,8 @@
}
go.to('PAGES_ORDER_QUAN', {
orderId: order.id,
memberId: order.memberId
memberId: order.memberId,
orderPrice: payPrice.value*1+coupAllPrice.value*1
})
}
async function discountShow() {
@ -320,7 +328,6 @@
// }
// return false
})
let payStatus = ref(null) //loading success
let timer = null
@ -385,7 +392,32 @@
uni.$off('choose-quan')
uni.$on('choose-quan', (arr) => {
console.log(arr);
pays.quan = arr
const manjianCoup = arr.filter(v => v.type == 1)
let productCoup = arr.filter(v => v.type == 2)
console.log(productCoup);
//商品券分组
let coupMap={}
for(let i in productCoup){
const coup=productCoup[i]
if(coupMap.hasOwnProperty(coup.proId)){
coupMap[coup.proId].push(coup)
}else{
coupMap[coup.proId]=[coup]
}
}
for(let key in coupMap){
const arr=coupMap[key]
for(let i in arr){
const coup=arr[i]
const proCoupStartIndex=returnProCoupStartIndex(arr,i)
console.log(proCoupStartIndex);
console.log($goodsPayPriceMap[coup.proId]);
coup.discountAmount=returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num)
console.log(coup.discountAmount);
}
}
console.log(productCoup);
pays.quan = [...manjianCoup, ...productCoup]
})
}
@ -427,13 +459,13 @@
const discount = reactive({
})
function editDiscountConfirm(form) {
console.log(form);
Object.assign(discount, form)
getPayUrl()
}
async function getPayType() {
const payTypeList = await Api.$getPayType()
pays.payTypes.list = payTypeList
@ -445,9 +477,11 @@
chooseUser()
}
}
let payStatus = '';
//支付成功回调
function paySuccess() {
infoBox.showToast('支付成功')
payStatus = 'success'
setTimeout(() => {
// uni.$emit('orderDetail:update')
payFinish.value = true
@ -467,35 +501,44 @@
}
payOrder()
}
const tipsMap = {
paying: '支付中',
success: '已支付成功'
}
async function payOrder() {
const payType = pays.payTypes.list[pays.payTypes.selIndex].payType
if (payType == 'vipPay' && user.value.amount * 1 < order.amount * 1) {
infoBox.showToast('余额不足')
return
}
await Api.$payOrder({
tableId: order.tableId,
masterId: order.masterId,
orderId: order.id || order.orderId,
payType,
vipUserId: order.memberId,
discount: 1,
code: '',
pointsNum:accountPoints.sel?accountPoints.num:0,
userCouponInfos:pays.quan.map(v=>{
return {
userCouponId:v.id,
num:v.num
}
if (payStatus) {
return infoBox.showToast(tipsMap[payStatus])
}
try {
payStatus = 'paying'
await Api.$payOrder({
tableId: order.tableId,
masterId: order.masterId,
orderId: order.id || order.orderId,
payType,
vipUserId: order.memberId,
discount: 1,
code: '',
pointsNum: accountPoints.sel ? accountPoints.num : 0,
userCouponInfos: pays.quan.map(v => {
return {
userCouponId: v.id,
num: v.num
}
})
})
})
paySuccess()
paySuccess()
} catch (e) {
//TODO handle the exception
payStatus = ''
}
}
onMounted(() => {
getPayType()
})
const order = reactive({
amount: 0
})
@ -539,6 +582,8 @@
async function init() {
const orderRes = await orderApi.tbOrderInfoDetail(order.orderId)
Object.assign(order, orderRes)
$goodsPayPriceMap=returnGoodsPayPriceMap(order.detailList)
console.log($goodsPayPriceMap);
if (orderRes.memberId) {
calcUsablePoints()
queryAllShopUser({
@ -549,7 +594,6 @@
}
})
}
getPayUrl()
}
function getPayUrl() {
@ -560,37 +604,36 @@
payCodeUrl.value = res
})
}
const coupAllPrice=computed(()=>{
return pays.quan.reduce((prve,cur)=>{
return prve+cur.discountAmount*1
},0)
const coupAllPrice = computed(() => {
return pays.quan.reduce((prve, cur) => {
return prve + cur.discountAmount * 1
}, 0)
})
const payPrice=computed(()=>{
const discountPrice=discount.currentPrice?discount.currentPrice:order.amount
const calcPrice=discountPrice-coupAllPrice.value-accountPoints.price*(accountPoints.sel?1:0)
return (calcPrice<=0?0:calcPrice).toFixed(2)
const payPrice = computed(() => {
const discountPrice = discount.currentPrice ? discount.currentPrice : order.amount
const calcPrice = discountPrice - coupAllPrice.value - accountPoints.price * (accountPoints.sel ? 1 : 0)
return (calcPrice <= 0 ? 0 : calcPrice).toFixed(2)
})
watch(()=>payPrice.value,()=>{
watch(() => payPrice.value, () => {
getPayUrl()
})
const pointCanDicountPrice=computed(()=>{
const discountPrice=discount.currentPrice?discount.currentPrice:order.amount
const calcPrice=discountPrice-coupAllPrice.value
return (calcPrice<=0?0:calcPrice).toFixed(2)
const pointCanDicountPrice = computed(() => {
const discountPrice = discount.currentPrice ? discount.currentPrice : order.amount
const calcPrice = discountPrice - coupAllPrice.value
return (calcPrice <= 0 ? 0 : calcPrice).toFixed(2)
})
watch(()=>pointCanDicountPrice.value,(newval)=>{
watch(() => pointCanDicountPrice.value, (newval) => {
calcUsablePoints()
})
onLoad(async (opt) => {
console.log(opt);
option = opt
Object.assign(order, opt)
const payTypeList = await Api.$getPayType()
pays.payTypes.list = payTypeList
getPayType()
init()
})
onBeforeUnmount(() => {
console.log('onBeforeUnmount');
clear()

137
pagesOrder/quan/quan.vue
View File

@ -6,9 +6,11 @@
<view class="u-m-t-32">
<template v-if="myQuan.types.sel==0">
<view class="" @click="changeFullReductionCouponSel(item)"
v-for="(item,index) in myQuan.res.fullReductionCoupon" :class="{filtergray:item.status}"
:key="index">
v-for="(item,index) in myQuan.res.fullReductionCoupon" :class="{filtergray:!item.use}" :key="index">
<view class="quan u-row-between u-flex u-col-center u-m-b-32 border-r-10 ">
<view class="no-use" v-if="!item.use">
<image class="img" src="/pagesOrder/static/image/no-use.svg" mode=""></image>
</view>
<view class="sel u-abso" v-if="item.id==myQuan.fullReductionCouponSel.id ">
<up-icon name="checkbox-mark" color="#fff"></up-icon>
</view>
@ -70,9 +72,9 @@
</view>
</view>
<view class="right u-flex u-flex-col u-col-bottom u-row-center">
<view class="u-flex u-row-center w-full">
<!-- <view class="u-flex u-row-center w-full">
<view class="color-red font-bold u-m-b-24 ">￥{{item.discountAmount}}</view>
</view>
</view> -->
<view class="u-flex ">
<view class="use-btn" @click.stop="toEmitChooseQuan(item)">去使用</view>
</view>
@ -90,10 +92,24 @@
<view :style="{height:safebottomHeight+'px'}"></view>
<view class="fixed-b bottom safe-bottom border-top">
<view class="u-m-b-32">
<text>抵扣金额：</text>
<text class="color-red">￥</text>
<text class="color-red">{{discountAmount}}</text>
<view class="u-m-b-32 u-flex u-row-between u-p-t-10">
<view class="u-flex">
<text>抵扣金额：</text>
<text class="color-red">￥</text>
<text class="color-red">{{discountAmount}}</text>
</view>
<view class="u-flex u-relative">
<text>支付金额：</text>
<text class="color-red">￥</text>
<text class="color-red">{{payPrice }}</text>
<view class="u-absolute u-flex u-row-between" style="bottom: 100%;right: 0;" v-if="payPrice*1!=option.orderPrice*1">
<view class="u-flex line-th color-999">
<text class="">￥</text>
<text class="">{{option.orderPrice}}</text>
</view>
</view>
</view>
</view>
<view class="u-flex gap-20">
<up-button shape="circle" plain @click="back">
@ -105,7 +121,12 @@
</view>
</view>
<up-modal :title="modal.title" :content="modal.content" :show="modal.clear" :confirmText="modal.confirmText"
:cancelText="modal.cancelText" showCancelButton closeOnClickOverlay @confirm="confirmModelConfirm"
@cancel="confirmModelCancel" @close="setModalShow('clear',false)" width="300px" />
</view>
</template>
<script setup>
@ -129,6 +150,7 @@
import {
$activateByOrderId
} from '@/http/yskApi/Instead.js'
import infoBox from '@/commons/utils/infoBox.js'
import {
queryAllShopUser
} from '@/http/yskApi/shop-user.js'
@ -136,9 +158,48 @@
returnNewGoodsList,
returnCoupCanUse,
returnCouponAllPrice,
returnProductCoupon
returnProductCoupon,
returnCanUseFullReductionCoupon
} from '../quan_util.js'
const modal = reactive({
title: '提示',
cancelText: '取消',
confirmText: '确定',
content: '',
key: '',
clear: false,
data: ''
})
function confirmModelCancel() {
setModalShow('clear', false, '')
}
async function confirmModelConfirm() {
if (modal.key == 'clear') {
myQuan.fullReductionCouponSel = {
id: ''
}
const item = modal.data
item.checked = !item.checked
const CheckedArr = myQuan.res.productCoupon.filter(v => v.checked)
const noCheckedArr = myQuan.res.productCoupon.filter(v => !v.checked)
noCheckedArr.map(v => {
console.log(returnCoupCanUse(canDikouGoodsArr, v, CheckedArr));
v.use = returnCoupCanUse(canDikouGoodsArr, v, CheckedArr)
})
setModalShow('clear', false, '')
}
}
function setModalShow(key = 'show', show = true, data) {
modal.key = key
modal[key] = show
modal.data = data
}
function back() {
uni.navigateBack()
}
@ -167,6 +228,22 @@
if (!item.use) {
return
}
console.log();
if (myQuan.fullReductionCouponSel.id && !item.checked) {
const goodsQuan = myQuan.res.productCoupon.filter(v => v.checked)
const fullReductionCoupon = myQuan.fullReductionCouponSel.id ? [myQuan.fullReductionCouponSel] : []
let coupArr = [...goodsQuan, item]
const payPrice = option.orderPrice - returnCouponAllPrice(coupArr, canDikouGoodsArr, user.value)
console.log(payPrice);
if (myQuan.fullReductionCouponSel.fullAmount > payPrice) {
modal.content = '选择该商品券后将不满足选择抵扣券的最低满减需求，继续选择将取消选择的满减券'
modal.cancelText = '取消'
modal.confirmText = '继续选择'
setModalShow('clear', true, item)
return
}
}
item.checked = !item.checked
const CheckedArr = myQuan.res.productCoupon.filter(v => v.checked)
const noCheckedArr = myQuan.res.productCoupon.filter(v => !v.checked)
@ -177,7 +254,18 @@
}
function changeFullReductionCouponSel(item) {
myQuan.fullReductionCouponSel = item
if (!item.use) {
return
}
console.log(item);
if (item.id == myQuan.fullReductionCouponSel.id) {
myQuan.fullReductionCouponSel = {
id: ''
}
}else{
myQuan.fullReductionCouponSel = item
}
myQuan.res.fullReductionCoupon=returnCanUseFullReductionCoupon($fullReductionCoupon, payPrice.value, myQuan.fullReductionCouponSel)
}
function formatStr(str) {
@ -190,6 +278,9 @@
let user = reactive({
isVip: false
})
let $fullReductionCoupon = []
let $productCoupon = []
async function getQuan() {
order.value = await orderApi.tbOrderInfoDetail(option.orderId)
if (order.value.memberId) {
@ -202,9 +293,13 @@
}
console.log(order.value);
const res = await $activateByOrderId(option)
const res = await $activateByOrderId({
orderId: option.orderId,
memberId: option.memberId
})
canDikouGoodsArr = returnNewGoodsList(order.value.detailList || [])
res.fullReductionCoupon = res.fullReductionCoupon.filter((v) => v.use)
res.fullReductionCoupon = res.fullReductionCoupon.filter((v) => v.use && option.orderPrice * 1 >= v
.fullAmount * 1)
res.productCoupon = res.productCoupon.map(v => {
const calcCoup = returnProductCoupon(v, canDikouGoodsArr, user.value)
return {
@ -212,12 +307,15 @@
checked: false
}
}).filter((v) => v.use);
$fullReductionCoupon = res.fullReductionCoupon
$productCoupon = res.productCoupon
myQuan.res = res
myQuan.hasAjax = true;
}
const option = reactive({
orderId: '',
memberId: ''
memberId: '',
orderPrice:0
})
function toEmitChooseQuan(item) {
@ -240,6 +338,18 @@
let coupArr = [...fullReductionCoupon, ...goodsQuan]
return returnCouponAllPrice(coupArr, canDikouGoodsArr, user.value)
})
const payPrice=computed(()=>{
const pay= option.orderPrice-discountAmount.value
return (pay<0?0:pay).toFixed(2)
})
watch(() => myQuan.types.sel, (newval) => {
if (newval == 0) {
myQuan.res.fullReductionCoupon = returnCanUseFullReductionCoupon($fullReductionCoupon, payPrice.value, myQuan.fullReductionCouponSel)
}
if (newval == 1) {
}
})
onLoad((opt) => {
Object.assign(option, opt)
getQuan()
@ -247,6 +357,7 @@
let safebottomHeight = ref(0)
onReady(() => {
getSafeBottomHeight('bottom', 0).then(height => {
console.log(height);
safebottomHeight.value = height
})
})

215
pagesOrder/quan_util.js
View File

@ -1,58 +1,66 @@
export function isTui(item){
return item.status=='return'||item.status=='refund'||item.status=='refunding'
export function isTui(item) {
return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
}
//计算商品券优惠价格
export function returnProductCouponPrice(coup, goodsArr, vipUser) {
const item = goodsArr.find(v => v.productId == coup.proId);
if(!item){
return 0
}
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
return price*coup.num
const item = goodsArr.find(v => v.productId == coup.proId);
if (!item) {
return 0
}
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
return price * coup.num
}
//返回新的商品列表，过滤掉退菜的，退单的商品
export function returnNewGoodsList(arr) {
let goodsMap={}
return arr.filter(v => !isTui(v))
let goodsMap = {}
return arr.filter(v => !isTui(v))
}
//根据当前购物车商品以及数量,已选券对应商品数量，判断该商品券是否可用
export function returnCoupCanUse(goodsArr=[],coup,selCoupArr=[]) {
export function returnCoupCanUse(goodsArr = [], coup, selCoupArr = []) {
// if(!coup.use){
// return false
// }
const findGoods=goodsArr.filter(v=>v.productId==coup.proId)
if(!findGoods.length){
const findGoods = goodsArr.filter(v => v.productId == coup.proId)
if (!findGoods.length) {
return false
}
const findGoodsTotalNumber=findGoods.reduce((prve,cur)=>{
return prve+cur.num*1
},0)
const selCoupNumber=selCoupArr.filter(v=>v.proId==coup.proId).reduce((prve,cur)=>{
return prve+cur.num*1
},0)
if(selCoupNumber>=findGoodsTotalNumber){
const findGoodsTotalNumber = findGoods.reduce((prve, cur) => {
return prve + cur.num * 1
}, 0)
const selCoupNumber = selCoupArr.filter(v => v.proId == coup.proId).reduce((prve, cur) => {
return prve + cur.num * 1
}, 0)
if (selCoupNumber >= findGoodsTotalNumber) {
return false
}
return findGoodsTotalNumber<(coup.num+selCoupNumber)?false:true
return findGoodsTotalNumber < (coup.num + selCoupNumber) ? false : true
}
//查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
export function returnProductCoupon(coup, goodsArr, vipUser,selCoupArr=[]) {
const newGoodsArr = returnNewGoodsList(goodsArr)
const item = newGoodsArr.find(v => v.productId == coup.proId);
if(!item){
return {...coup, discountAmount: 0,use:false}
}
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
const discountAmount=(price*coup.num).toFixed(2)
export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
const newGoodsArr = returnNewGoodsList(goodsArr)
const item = newGoodsArr.find(v => v.productId == coup.proId);
if (!item) {
return {
...coup,
discountAmount: 0,
use: false
}
}
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
const discountAmount = (price * coup.num).toFixed(2)
console.log(discountAmount);
const canUse=!coup.use?false:(discountAmount>0&&returnCoupCanUse(goodsArr,coup,selCoupArr))
// const canUse=discountAmount>0
return { ...coup, discountAmount: discountAmount,use:canUse}
const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
// const canUse=discountAmount>0
return {
...coup,
discountAmount: discountAmount,
use: canUse
}
}
/**
@ -64,38 +72,131 @@ export function returnProductCoupon(coup, goodsArr, vipUser,selCoupArr=[]) {
* @param {*} vipUser
* @returns
*/
export function returnProductAllCoup(coupArr, goodsArr, vipUser){
return coupArr.map((v) => {
return returnProductCoupon(v, goodsArr, vipUser)
})
export function returnProductAllCoup(coupArr, goodsArr, vipUser) {
return coupArr.map((v) => {
return returnProductCoupon(v, goodsArr, vipUser)
})
}
//返回商品实际支付价格
export function returnProductPayPrice(goods,vipUser){
const memberPrice = goods.memberPrice ? goods.memberPrice : goods.price;
const price = vipUser.isVip ? memberPrice : item.price;
return price
}
//返回商品券抵扣的商品价格
export function returnProductCoupAllPrice(productPriceArr,startIndex,num){
return productPriceArr.slice(startIndex,startIndex+num).reduce((prve,cur)=>{
let curPrice=0
if(typeof cur==='object'){
curPrice=cur.memberPrice*1
}else{
curPrice=cur*1
}
return prve+curPrice
},0)
}
//返回同类商品券在同类商品价格数组里的开始位置
export function returnProCoupStartIndex(coupArr,index){
return coupArr.slice(0,index).reduce((prve,cur)=>{
return prve+cur.num*1
},0)
}
//返回商品数量从0到n每一个对应的价格对照表
export function returnGoodsPayPriceMap(goodsArr){
return goodsArr.reduce((prve,cur)=>{
if(!prve.hasOwnProperty(cur.productId)){
prve[cur.productId]=[]
}
const arr=new Array(cur.num).fill(cur).map(v=>{
return {
memberPrice:v.memberPrice?v.memberPrice:v.price,
price:v.price
}
})
prve[cur.productId].push(...arr)
return prve
},{})
}
//计算商品券总优惠价格
export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
if(coupArr.length == 0){
return 0;
}
return coupArr.reduce((a, b) => {
const price = returnProductCouponPrice(b, goodsArr, vipUser)
return a + price;
}, 0).toFixed(2);
if (coupArr.length == 0) {
return 0;
}
//商品分组
const goodsMap={}
//商品数量从0到n每一个对应的价格
const goodsPayPriceMap={}
//商品券分组
let coupMap={}
for(let i in coupArr){
const coup=coupArr[i]
if(coupMap.hasOwnProperty(coup.proId)){
coupMap[coup.proId].push(coup)
}else{
coupMap[coup.proId]=[coup]
}
}
let total=0
for(let key in coupMap){
const arr=coupMap[key]
for(let i in arr){
const coup=arr[i]
if(!goodsMap.hasOwnProperty(coup.proId)){
goodsMap[coup.proId]=goodsArr.filter(v=>v.productId==coup.proId).map(v=>{
return {
...v,
payPrice:returnProductPayPrice(v,vipUser)
}
}).sort((a,b)=>{
const aPrice=a.payPrice
const bPrice=b.payPrice
return aPrice-bPrice
})
goodsPayPriceMap[coup.proId]=goodsMap[coup.proId].reduce((prve,cur)=>{
const arr=new Array(cur.num).fill(cur.payPrice)
console.log(arr);
prve.push(...arr)
return prve
},[])
}
const proCoupStartIndex=returnProCoupStartIndex(arr,i)
console.log(proCoupStartIndex);
total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num)
}
}
return total.toFixed(2);
}
//计算满减券总优惠价格
export function returnFullReductionCouponAllPrice(coupArr) {
if(coupArr.length == 0){
return 0;
}
return coupArr.filter(v => v.type == 1).reduce((a, b) => {
const price = b.discountAmount
return a + price;
}, 0).toFixed(2);
if (coupArr.length == 0) {
return 0;
}
return coupArr.filter(v => v.type == 1).reduce((a, b) => {
const price = b.discountAmount
return a + price;
}, 0).toFixed(2);
}
//计算优惠券总价格
export function returnCouponAllPrice(coupArr, goodsArr, vipUser) {
const poductAllprice=returnProductCouponAllPrice(coupArr, goodsArr, vipUser)
const pointAllPrice=returnFullReductionCouponAllPrice(coupArr)
return (poductAllprice*1+pointAllPrice*1).toFixed(2);
const poductAllprice = returnProductCouponAllPrice(coupArr, goodsArr, vipUser)
const pointAllPrice = returnFullReductionCouponAllPrice(coupArr)
return (poductAllprice * 1 + pointAllPrice * 1).toFixed(2);
}
//返回当前满减券列表可用状态
export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
return coupArr.map(v => {
if (v.id == selCoup.id) {
return v
}
const isfullAmount = payPrice >= v.fullAmount * 1
return {
...v,
use: v.use && isfullAmount
}
})
}