退款失败赠送优惠券

main
Frontend-徐志烘 1 year ago
parent 7c3ce33932
commit 7daf3b7e17

@ -1,16 +1,20 @@
{ // launch.json configurations app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtypelocalremote, localremote
"version": "0.0",
"configurations": [{
"default" :
{
"launchtype" : "local"
},
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
{
// launch.json configurations app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtypelocalremote, localremote
"version" : "0.0",
"configurations" : [
{
"default" : {
"launchtype" : "local"
},
"mp-weixin" : {
"launchtype" : "local"
},
"type" : "uniCloud"
},
{
"playground" : "custom",
"type" : "uni-app:app-android"
}
]
}

@ -114,4 +114,6 @@ export const getRefund = (data)=>requests(`mobile/order/refund`,data,"POST")
export const getHeaderImg = (data)=>requests(`mobile/file/upload`,data,"POST")
//获取用户头像昵称性别
export const getUserSex = (data)=>requests(`mobile/login/setInfo`,data,"POST")
//获取优惠券
export const getExcellent =(data)=> reqs(`shop/tab-coupon/traffic-flow`,data,"POST")

@ -42,9 +42,13 @@
]
},
/* ios */
"ios" : {},
"ios" : {
"dSYMs" : false
},
/* SDK */
"sdkConfigs" : {}
"sdkConfigs" : {
"ad" : {}
}
}
},
/* */

@ -4,13 +4,13 @@
<view class="tops">
</view>
<scroll-view style="width: 100%;height: 84rpx; position: fixed;z-index: 10;" scroll-x="true" >
<view class="orderForm-h">
<view class="txt" v-for="(item,index) in tag" :key="index" @click="tagBtn(index)">
<text class="txt-a" :class='{active:tagIndex===index}'>{{item}}</text>
<scroll-view class="orderForm-Scroll" scroll-x="true">
<view class="orderForm-h">
<view class="txt" v-for="(item,index) in tag" :key="index" @click="tagBtn(index)">
<text class="txt-a" :class='{active:tagIndex===index}'>{{item}}</text>
</view>
</view>
</view>
</scroll-view>
</scroll-view>
<view class="ding-h">
</view>
@ -22,7 +22,7 @@
<text class="greensa" v-if="item.status===3">退</text>
<text class="reds" v-if="item.status===0"></text>
<text class="greensa" v-if="item.status===4">退</text>
<text style="color: red;" v-if="item.status===5">退</text>
</view>
<view class="orderForm-b-b">
<img class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt="" />
@ -47,11 +47,14 @@
</view>
<view class="orderForm-b-m">
<text class="blacsa">原价 <text class="bla">{{item.amount}}</text> </text> <text
class="blu">实付款<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text class="blues" v-if="item.status===0">0</text> </text>
<view class="btns" v-if="item.status===1&&item.payType===2||item.payType===1&&item.status===1" @click.stop="goOks(index)">
class="blu">实付款<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text
class="blues" v-if="item.status===0">0</text> </text>
<view class="btns" v-if="item.status===1&&item.payType===2||item.payType===1&&item.status===1"
@click.stop="goOks(index)">
申请退款
</view>
<view class="btns" v-if="item.status===1&&item.payType===3||item.payType===4&&item.status===1" @click.stop="startOks(index)">
<view class="btns" v-if="item.status===1&&item.payType===3||item.payType===4&&item.status===1"
@click.stop="startOks(index)">
结束洗车
</view>
<view class="btnas" v-if="item.status===2">
@ -63,13 +66,14 @@
<view class="btnst" v-if="item.status===4">
<!-- 退款成功 -->
</view>
<!-- <view class="btnsc" v-if="item.status===0" @click="openClose">
<view class="btnsc" v-if="item.status===5" @click="openClose">
查看原因
</view> -->
</view>
</view>
</view>
</view>
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;" v-if="tagIndex===0&&orders.length<=0">
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;"
v-if="tagIndex===0&&orders.length<=0">
<img style="width: 480rpx;height: 400rpx;margin-top: 360rpx;margin-left: 50%;transform: translateX(-50%);"
src="https://www.jiubaotongxue.love/image/demo111.png" alt="" />
<view style="width: 100%;height: 50rpx;line-height: 50rpx;text-align: center;">
@ -77,7 +81,7 @@
</view>
</view>
<view class="order-box" v-for="(item,index) in orders" :key="item.id" v-if="tagIndex===1&&orders.length>0">
<view class="orderForm-b" v-if="item.status===1" @click="goComplete(index)">
<view class="orderForm-b" v-if="item.status===1" @click="goComplete(index)">
<view class="orderForm-b-t">
<text>订单号:{{item.orderId}}</text> <text class="blues" v-if="item.status===1"></text>
@ -106,16 +110,19 @@
<view class="orderForm-b-m">
<text class="blacsa">原价 <text class="bla">{{item.amount}}</text> </text> <text
class="blu">实付款<text class="blues">{{item.amount}}</text> </text>
<view class="btns" v-if="item.status===1&&item.payType===2||item.payType===1&&item.status===1" @click.stop="goOks(index)">
申请退款
</view>
<view class="btns" v-if="item.status===1&&item.payType===3||item.payType===4&&item.status===1" @click.stop="startOks(index)">
结束洗车
</view>
<view class="btns" v-if="item.status===1&&item.payType===2||item.payType===1&&item.status===1"
@click.stop="goOks(index)">
申请退款
</view>
<view class="btns" v-if="item.status===1&&item.payType===3||item.payType===4&&item.status===1"
@click.stop="startOks(index)">
结束洗车
</view>
</view>
</view>
</view>
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;" v-if="tagIndex===1&&orders.length<=0">
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;"
v-if="tagIndex===1&&orders.length<=0">
<img style="width: 480rpx;height: 400rpx;margin-top: 360rpx;margin-left: 50%;transform: translateX(-50%);"
src="https://www.jiubaotongxue.love/image/demo111.png" alt="" />
<view style="width: 100%;height: 50rpx;line-height: 50rpx;text-align: center;">
@ -157,7 +164,8 @@
</view>
</view>
</view>
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;" v-if="tagIndex===2&&orders.length<=0">
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;"
v-if="tagIndex===2&&orders.length<=0">
<img style="width: 480rpx;height: 400rpx;margin-top: 360rpx;margin-left: 50%;transform: translateX(-50%);"
src="https://www.jiubaotongxue.love/image/demo111.png" alt="" />
<view style="width: 100%;height: 50rpx;line-height: 50rpx;text-align: center;">
@ -203,7 +211,8 @@
</view>
</view>
</view>
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;" v-if="tagIndex===3&&orders.length<=0">
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;"
v-if="tagIndex===3&&orders.length<=0">
<img style="width: 480rpx;height: 400rpx;margin-top: 360rpx;margin-left: 50%;transform: translateX(-50%);"
src="https://www.jiubaotongxue.love/image/demo111.png" alt="" />
<view style="width: 100%;height: 50rpx;line-height: 50rpx;text-align: center;">
@ -239,7 +248,8 @@
</view>
<view class="orderForm-b-m">
<text class="blacsa">原价 <text class="bla">{{item.amount}}</text> </text> <text
class="blu">实付款<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text class="blues" v-if="item.status===0">0</text> </text>
class="blu">实付款<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text
class="blues" v-if="item.status===0">0</text> </text>
<!-- <view class="btnsc" v-if="item.status===0" @click="openClose">
查看原因
@ -247,7 +257,8 @@
</view>
</view>
</view>
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;" v-if="tagIndex===4&&orders.length<=0">
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;"
v-if="tagIndex===4&&orders.length<=0">
<img style="width: 480rpx;height: 400rpx;margin-top: 360rpx;margin-left: 50%;transform: translateX(-50%);"
src="https://www.jiubaotongxue.love/image/demo111.png" alt="" />
<view style="width: 100%;height: 50rpx;line-height: 50rpx;text-align: center;">
@ -284,7 +295,8 @@
</view>
<view class="orderForm-b-m">
<text class="blacsa">原价 <text class="bla">{{item.amount}}</text> </text> <text
class="blu">实付款<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text class="blues" v-if="item.status===0">0</text> </text>
class="blu">实付款<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text
class="blues" v-if="item.status===0">0</text> </text>
<view class="btnst" v-if="item.status===4">
<!--退款成功-->
</view>
@ -294,7 +306,57 @@
</view>
</view>
</view>
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;" v-if="tagIndex===5&&orders.length<=0">
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;"
v-if="tagIndex===5&&orders.length<=0">
<img style="width: 480rpx;height: 400rpx;margin-top: 360rpx;margin-left: 50%;transform: translateX(-50%);"
src="https://www.jiubaotongxue.love/image/demo111.png" alt="" />
<view style="width: 100%;height: 50rpx;line-height: 50rpx;text-align: center;">
暂无数据
</view>
</view>
<view class="order-box" v-for="(item,index) in orders" :key="item.id" v-if="tagIndex===6&&orders.length>0">
<view class="orderForm-b" @click="goComplete(index)">
<view class="orderForm-b-t">
<text>订单号:{{item.orderId}}</text>
<text style="color: red;" v-if="item.status===5">退</text>
</view>
<view class="orderForm-b-b">
<img class="b-b-i" src="https://www.jiubaotongxue.love/image/demo91.png" alt="" />
<view class="b-b-r">
<view class="b-b-r-t">
<text class="maxs">{{item.networkName}}</text>
</view>
<view class="b-b-r-b" v-if="item.goodsName!='未查询到该商品'">
{{item.goodsName}}<text>X1</text>
</view>
<view class="b-b-r-b" v-if="item.goodsName==='未查询到该商品'">
拉新券<text>X1</text>
</view>
<view class="b-b-r-b">
{{item.orderTime}}
</view>
<view class="b-b-r-cs" v-if="item.deviceId!=null">
{{item.deviceId ? item.deviceId :''}}
</view>
</view>
</view>
<view class="orderForm-b-m">
<text class="blacsa">原价 <text class="bla">{{item.amount}}</text> </text> <text
class="blu">实付款<text class="blues" v-if="item.status!=0">{{item.amount}}</text><text
class="blues" v-if="item.status===0">0</text> </text>
<!-- <view class="btnst" v-if="item.status===5">
退款失败
</view> -->
<view class="btnsc" v-if="item.status===5" @click="openClose">
查看原因
</view>
</view>
</view>
</view>
<view class="kong" style="width: 100%;height: 1000rpx;text-align: center;"
v-if="tagIndex===6&&orders.length<=0">
<img style="width: 480rpx;height: 400rpx;margin-top: 360rpx;margin-left: 50%;transform: translateX(-50%);"
src="https://www.jiubaotongxue.love/image/demo111.png" alt="" />
<view style="width: 100%;height: 50rpx;line-height: 50rpx;text-align: center;">
@ -310,9 +372,12 @@
<view class="thishiWindow" v-if="shibai===1">
<view class="tishi">
<img class="pori" src="https://www.jiubaotongxue.love/image/demo41.png" alt="" @click="closeShibai" />
<img class="tishi-Img" src="https://www.jiubaotongxue.love/image/demo40.png" alt="" />
<!-- <img class="tishi-Img" src="https://www.jiubaotongxue.love/image/demo40.png" alt="" /> -->
<text class="tishiTxt">失败原因</text>
<text class="tishiHuidu">很抱歉由于您的信息有误有部分退款失败,请您确认信息并重新提交</text>
<view style="width: 100%;height: 100rpx;">
</view>
</view>
</view>
<view class="hujiao" v-if="hujiao===1">
@ -338,7 +403,8 @@
请输入退款原因
</view>
<view class="inputBox">
<textarea class="inputBox_go" name="" id="" cols="30" rows="30" placeholder="请输入退款原因" maxlength=-1 v-model="inputBoxVlaue"></textarea>
<textarea class="inputBox_go" name="" id="" cols="30" rows="30" placeholder="请输入退款原因" maxlength=-1
v-model="inputBoxVlaue"></textarea>
</view>
<view class="btn">
<view class="btn-left" @click="moneyRefund=1">
@ -374,7 +440,7 @@
total,
currentBtn
} = storeToRefs(o)
const tag = ref(['全部', '进行中', '已完成','退款中', '未支付','已退款'])
const tag = ref(['全部', '进行中', '已完成', '退款中', '未支付', '已退款', '退款失败'])
const demos = ref([])
const titleMsg = ref('是否结束洗车?')
const titles = ref('洗车订单')
@ -400,37 +466,43 @@
const tagBtn = (index) => {
tagIndex.value = index
if (tag.value[tagIndex.value] === '全部') {
orders.value=[]
orders.value = []
o.getOrders({
num: '',
Maxs: 0
})
} else if (tag.value[tagIndex.value] === '进行中') {
orders.value=[]
orders.value = []
o.getOrders({
num: 1,
Maxs: 0
})
} else if (tag.value[tagIndex.value] === '已完成') {
orders.value=[]
orders.value = []
o.getOrders({
num: 2,
Maxs: 0
})
} else if (tag.value[tagIndex.value] === '退款中') {
orders.value=[]
orders.value = []
o.getOrders({
num: 3,
Maxs: 0
})
} else if(tag.value[tagIndex.value] === '已退款'){
orders.value=[]
} else if (tag.value[tagIndex.value] === '已退款') {
orders.value = []
o.getOrders({
num: 4,
Maxs: 0
})
} else {
orders.value=[]
} else if (tag.value[tagIndex.value] === '退款失败') {
orders.value = []
o.getOrders({
num: 5,
Maxs: 0
})
}else {
orders.value = []
o.getOrders({
num: 0,
Maxs: 0
@ -445,27 +517,27 @@
const goOks = (index) => {
orderIndex.value = index
console.log(orders.value[index].status);
if(orders.val[index].payType===4||orders.val[index].goodsName==='拉新券洗车'){
if (orders.val[index].payType === 4 || orders.val[index].goodsName === '拉新券洗车') {
uni.showToast({
icon:"none",
title:"拉新券洗车无法退款",
duration:1000
icon: "none",
title: "拉新券洗车无法退款",
duration: 1000
})
return
}
if(orders.val[index].payType===3||orders.val[index].goodsName==='次卡消费'){
if (orders.val[index].payType === 3 || orders.val[index].goodsName === '次卡消费') {
uni.showToast({
icon:"none",
title:"次卡洗车无法退款",
duration:1000
icon: "none",
title: "次卡洗车无法退款",
duration: 1000
})
return
}
if(orders.value[index].status===1){
moneyRefund.value=0
if (orders.value[index].status === 1) {
moneyRefund.value = 0
}
}
const startOks = (index)=>{
const startOks = (index) => {
orderIndex.value = index
ccc.value = 1
}
@ -503,35 +575,41 @@
num: 3,
Maxs: total.value
})
} else if(tag.value[tagIndex.value] === '已退款'){
orders.value=[]
} else if (tag.value[tagIndex.value] === '已退款') {
orders.value = []
o.getOrders({
num: 4,
Maxs: 0
})
}else {
}else if (tag.value[tagIndex.value] === '退款失败') {
orders.value = []
o.getOrders({
num: 5,
Maxs: 0
})
} else {
o.getOrders({
num: 0,
Maxs: total.value
})
}
}
const getMoneyRefund = ()=>{
const getMoneyRefund = () => {
console.log(inputBoxVlaue.value);
console.log(orders.value[orderIndex.value]);
o.getClose({
id:orders.value[orderIndex.value].id,
inputs:inputBoxVlaue.value,
money:orders.value[orderIndex.value].amount,
mid:orders.value[orderIndex.value].deviceId,
orderId:orders.value[orderIndex.value].orderId
})
moneyRefund.value=1
id: orders.value[orderIndex.value].id,
inputs: inputBoxVlaue.value,
money: orders.value[orderIndex.value].amount,
mid: orders.value[orderIndex.value].deviceId,
orderId: orders.value[orderIndex.value].orderId
})
moneyRefund.value = 1
}
const goComplete = (index)=>{
if(orders.value[index].status===1){
const goComplete = (index) => {
if (orders.value[index].status === 1) {
uni.navigateTo({
url:'/pages/complete/complete'
url: '/pages/complete/complete'
})
}
}
@ -549,40 +627,48 @@
height: 11%;
}
.orderForm-h {
// margin-top: 160rpx;
position: fixed;
.orderForm-Scroll {
width: 100%;
height: 84rpx;
background-color: white;
display: flex;
justify-content: center;
align-items: center;
position: fixed;
z-index: 10;
.txt {
width: 25%;
.orderForm-h {
// margin-top: 160rpx;
position: fixed;
width: 100%;
height: 84rpx;
text-align: center;
font-size: 28rpx;
margin-right: 20rpx;
line-height: 84rpx;
background-color: white;
display: flex;
align-items: center;
justify-content: space-around;
z-index: 10;
.txt-a {
box-sizing: border-box;
padding-top: 5rpx;
height: 80rpx;
display: inline-block;
}
.txt {
// width: 200rpx;
height: 84rpx;
text-align: center;
font-size: 28rpx;
// margin-left: 20rpx;
line-height: 84rpx;
}
.txt-a {
box-sizing: border-box;
padding-top: 5rpx;
height: 80rpx;
display: inline-block;
}
.active {
border-bottom: 8rpx solid #1378F7;
color: #1378F7;
}
.active {
border-bottom: 8rpx solid #1378F7;
color: #1378F7;
}
}
}
.ding-h {
width: 100%;
height: 80rpx;
@ -742,10 +828,10 @@
height: 60rpx;
line-height: 60rpx;
text-align: center;
border: 1rpx solid #2878ff;
color: #2878ff;
border: 1rpx solid red;
color: red;
border-radius: 40rpx 40rpx 40rpx 40rpx;
margin-top: 10rpx;
margin-top: 6rpx;
}
}
}
@ -770,7 +856,7 @@
.tishi {
width: 96%;
height: 430rpx;
// height: 430rpx;
position: fixed;
top: 50%;
left: 50%;
@ -797,7 +883,7 @@
.tishiTxt {
display: block;
font-size: 34rpx;
font-size: 28rpx;
margin-top: 40rpx;
width: 100%;
text-align: center;
@ -904,22 +990,24 @@
}
}
.refund{
.refund {
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
position: fixed;
z-index: 99999;
.refundWindows{
.refundWindows {
width: 606rpx;
height:436rpx;
height: 436rpx;
background-color: white;
position: relative;
top: 50%;
left: 50%;
transform:translate(-50%,-50%);
transform: translate(-50%, -50%);
border-radius: 15rpx 15rpx 15rpx 15rpx;
.title{
.title {
width: 100%;
height: 100rpx;
line-height: 100rpx;
@ -927,12 +1015,14 @@
font-size: 30rpx;
font-weight: 600;
}
.inputBox{
.inputBox {
width: 100%;
height: 230rpx;
// background-color: salmon;
font-size: 26rpx;
.inputBox_go{
.inputBox_go {
display: block;
box-sizing: border-box;
padding-left: 15rpx;
@ -945,13 +1035,15 @@
font-size: 26rpx;
}
}
.btn{
.btn {
width: 100%;
height: 100rpx;
display: flex;
justify-content: center;
border-top: 1rpx solid #ccc;
.btn-left {
width: 50%;
height: 100rpx;

@ -14,7 +14,8 @@ import {
getTimeStamps,
start,
shop,
getTincheCoupons
getTincheCoupons,
getExcellent
} from '../api/api.js'
import dayjs from 'dayjs'
export const storindex = defineStore('storindex', () => {
@ -90,7 +91,7 @@ export const storindex = defineStore('storindex', () => {
p.value = 0
} else {
console.log("out_trade_no", res);
console.log('这是订单号'+res);
console.log('这是订单号' + res);
const res1 = await getWxPlay({
appId: appid,
phone: uni.getStorageSync('phoneNumber'),
@ -147,12 +148,32 @@ export const storindex = defineStore('storindex', () => {
})
const qaq = await getTincheCoupons({
phoneNumber: uni.getStorageSync(
'phoneNumber')
'phoneNumber'),
oderId: orderid.value
})
uni.showToast({
icon: "none",
title: `${qaq.msg}`
})
const currentDate = new Date();
const year = currentDate.getFullYear();
const month = String(currentDate.getMonth() + 1)
.padStart(2, '0');
const day = String(currentDate.getDate())
.padStart(2, '0');
const hours = String(currentDate.getHours())
.padStart(2, '0');
const minutes = String(currentDate.getMinutes())
.padStart(2, '0');
const seconds = String(currentDate.getSeconds())
.padStart(2, '0');
const formattedDate =
`${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
const qaq1 = await getExcellent({
time: formattedDate,
networkId: datas.networkId
})
console.log(qaq1)
}
})
//不为200或者0的时候启动失败并提示原因。
@ -245,9 +266,19 @@ export const storindex = defineStore('storindex', () => {
package: res1.package,
signType: res1.signType,
paySign: res1.paySign,
success: (res2) => {
success: async(res2) => {
console.log('用户付款成功', res2);
p.value = 0
const qaq = await getTincheCoupons({
phoneNumber: uni.getStorageSync('phoneNumber'),
oderId: orderid.value
})
console.log(qaq);
uni.showToast({
icon: "none",
title: `${qaq.msg}`,
duration:1000
})
uni.navigateTo({
url: `/pages/myBalance/myBalance`
})
@ -288,7 +319,7 @@ export const storindex = defineStore('storindex', () => {
uni.navigateTo({
url: '/pages/login/login'
})
}, 1000)
}, 1500)
}
})
} else {
@ -320,9 +351,18 @@ export const storindex = defineStore('storindex', () => {
package: res1.package,
signType: res1.signType,
paySign: res1.paySign,
success: (res2) => {
success: async(res2) => {
console.log('用户付款成功', res2);
const qaq = await getTincheCoupons({
phoneNumber: uni.getStorageSync('phoneNumber'),
oderId: orderid.value
})
console.log(qaq);
uni.showToast({
icon: "none",
title: `${qaq.msg}`,
duration:1500
})
p.value = 0
uni.navigateTo({
url: `/pages/secondaryCard/secondaryCard?id=${datas.networkId}`
@ -392,13 +432,29 @@ export const storindex = defineStore('storindex', () => {
url: '/pages/complete/complete'
})
const qaq = await getTincheCoupons({
phoneNumber: uni.getStorageSync('phoneNumber')
phoneNumber: uni.getStorageSync('phoneNumber'),
oderId: orderid.value
})
console.log(qaq);
uni.showToast({
icon: "none",
title: `${qaq.msg}`
title: `${qaq.msg}`,
duration:1500
})
const currentDate = new Date();
const year = currentDate.getFullYear();
const month = String(currentDate.getMonth() + 1).padStart(2, '0');
const day = String(currentDate.getDate()).padStart(2, '0');
const hours = String(currentDate.getHours()).padStart(2, '0');
const minutes = String(currentDate.getMinutes()).padStart(2, '0');
const seconds = String(currentDate.getSeconds()).padStart(2, '0');
const formattedDate =
`${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
const qaq1 = await getExcellent({
time: formattedDate,
networkId: datas.networkId
})
console.log(qaq1)
}
})
} else {
@ -462,11 +518,26 @@ export const storindex = defineStore('storindex', () => {
url: '/pages/complete/complete'
})
const qaq = await getTincheCoupons({
phoneNumber: uni.getStorageSync('phoneNumber')
phoneNumber: uni.getStorageSync('phoneNumber'),
oderId: orderid.value
})
const currentDate = new Date();
const year = currentDate.getFullYear();
const month = String(currentDate.getMonth() + 1).padStart(2, '0');
const day = String(currentDate.getDate()).padStart(2, '0');
const hours = String(currentDate.getHours()).padStart(2, '0');
const minutes = String(currentDate.getMinutes()).padStart(2, '0');
const seconds = String(currentDate.getSeconds()).padStart(2, '0');
const formattedDate =`${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
const qaq1 = await getExcellent({
time: formattedDate,
networkId: datas.networkId
})
console.log(qaq1)
uni.showToast({
icon: "none",
title: `${qaq.msg}`
title: `${qaq.msg}`,
duration:1500
})
}
})
@ -507,7 +578,7 @@ export const storindex = defineStore('storindex', () => {
const playleix = (data) => {
playl.value = data
}
const upPay = ()=>{
const upPay = () => {
p.value = 0
}
return {

@ -58,6 +58,7 @@ export const order = defineStore('order', () => {
uni.switchTab({
url:"/pages/my/my",
success: () => {
console.log("我处发了")
uni.showToast({
icon:"none",
title:"结束洗车成功",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

File diff suppressed because one or more lines are too long

@ -39,6 +39,7 @@ const getShopGoOut = (data) => utils_request.reqs(`shop/good/out-goods?imei=${da
const getIllustrate = (data) => utils_request.requests(`mobile/config/getInfo`, data, "GET");
const getRefund = (data) => utils_request.requests(`mobile/order/refund`, data, "POST");
const getUserSex = (data) => utils_request.requests(`mobile/login/setInfo`, data, "POST");
const getExcellent = (data) => utils_request.reqs(`shop/tab-coupon/traffic-flow`, data, "POST");
exports.GetBranchInformation = GetBranchInformation;
exports.GetCarList = GetCarList;
exports.GetInformation = GetInformation;
@ -56,6 +57,7 @@ exports.getCouponList = getCouponList;
exports.getCurren = getCurren;
exports.getCurrenOrder = getCurrenOrder;
exports.getDriver = getDriver;
exports.getExcellent = getExcellent;
exports.getIllustrate = getIllustrate;
exports.getInfoa = getInfoa;
exports.getNewcomerCoupon = getNewcomerCoupon;

@ -23,7 +23,7 @@ const _sfc_main = {
total,
currentBtn
} = common_vendor.storeToRefs(o);
const tag = common_vendor.ref(["全部", "进行中", "已完成", "退款中", "未支付", "已退款"]);
const tag = common_vendor.ref(["全部", "进行中", "已完成", "退款中", "未支付", "已退款", "退款失败"]);
common_vendor.ref([]);
const titleMsg = common_vendor.ref("是否结束洗车?");
const titles = common_vendor.ref("洗车订单");
@ -42,6 +42,9 @@ const _sfc_main = {
const closeShibai = () => {
shibai.value = 0;
};
const openClose = () => {
shibai.value = 1;
};
const tagBtn = (index) => {
tagIndex.value = index;
if (tag.value[tagIndex.value] === "全部") {
@ -74,6 +77,12 @@ const _sfc_main = {
num: 4,
Maxs: 0
});
} else if (tag.value[tagIndex.value] === "退款失败") {
orders.value = [];
o.getOrders({
num: 5,
Maxs: 0
});
} else {
orders.value = [];
o.getOrders({
@ -154,6 +163,12 @@ const _sfc_main = {
num: 4,
Maxs: 0
});
} else if (tag.value[tagIndex.value] === "退款失败") {
orders.value = [];
o.getOrders({
num: 5,
Maxs: 0
});
} else {
o.getOrders({
num: 0,
@ -210,41 +225,47 @@ const _sfc_main = {
}, item.status === 0 ? {} : {}, {
f: item.status === 4
}, item.status === 4 ? {} : {}, {
g: common_vendor.t(item.networkName),
h: item.goodsName != "未查询到该商品"
g: item.status === 5
}, item.status === 5 ? {} : {}, {
h: common_vendor.t(item.networkName),
i: item.goodsName != "未查询到该商品"
}, item.goodsName != "未查询到该商品" ? {
i: common_vendor.t(item.goodsName)
j: common_vendor.t(item.goodsName)
} : {}, {
j: item.goodsName === "未查询到该商品"
k: item.goodsName === "未查询到该商品"
}, item.goodsName === "未查询到该商品" ? {} : {}, {
k: common_vendor.t(item.orderTime),
l: item.deviceId != null
l: common_vendor.t(item.orderTime),
m: item.deviceId != null
}, item.deviceId != null ? {
m: common_vendor.t(item.deviceId ? item.deviceId : "")
n: common_vendor.t(item.deviceId ? item.deviceId : "")
} : {}, {
n: common_vendor.t(item.amount),
o: item.status != 0
o: common_vendor.t(item.amount),
p: item.status != 0
}, item.status != 0 ? {
p: common_vendor.t(item.amount)
q: common_vendor.t(item.amount)
} : {}, {
q: item.status === 0
r: item.status === 0
}, item.status === 0 ? {} : {}, {
r: item.status === 1 && item.payType === 2 || item.payType === 1 && item.status === 1
s: item.status === 1 && item.payType === 2 || item.payType === 1 && item.status === 1
}, item.status === 1 && item.payType === 2 || item.payType === 1 && item.status === 1 ? {
s: common_vendor.o(($event) => goOks(index), item.id)
t: common_vendor.o(($event) => goOks(index), item.id)
} : {}, {
t: item.status === 1 && item.payType === 3 || item.payType === 4 && item.status === 1
v: item.status === 1 && item.payType === 3 || item.payType === 4 && item.status === 1
}, item.status === 1 && item.payType === 3 || item.payType === 4 && item.status === 1 ? {
v: common_vendor.o(($event) => startOks(index), item.id)
w: common_vendor.o(($event) => startOks(index), item.id)
} : {}, {
w: item.status === 2
x: item.status === 2
}, item.status === 2 ? {} : {}, {
x: item.status === 3
y: item.status === 3
}, item.status === 3 ? {} : {}, {
y: item.status === 4
z: item.status === 4
}, item.status === 4 ? {} : {}, {
z: common_vendor.o(($event) => goComplete(index), item.id),
A: item.id
A: item.status === 5
}, item.status === 5 ? {
B: common_vendor.o(openClose, item.id)
} : {}, {
C: common_vendor.o(($event) => goComplete(index), item.id),
D: item.id
});
})
} : {}, {
@ -420,28 +441,65 @@ const _sfc_main = {
} : {}, {
t: tagIndex.value === 5 && common_vendor.unref(orders).length <= 0
}, tagIndex.value === 5 && common_vendor.unref(orders).length <= 0 ? {} : {}, {
v: common_vendor.o(onScroll),
w: shibai.value === 1
v: tagIndex.value === 6 && common_vendor.unref(orders).length > 0
}, tagIndex.value === 6 && common_vendor.unref(orders).length > 0 ? {
w: common_vendor.f(common_vendor.unref(orders), (item, index, i0) => {
return common_vendor.e({
a: common_vendor.t(item.orderId),
b: item.status === 5
}, item.status === 5 ? {} : {}, {
c: common_vendor.t(item.networkName),
d: item.goodsName != "未查询到该商品"
}, item.goodsName != "未查询到该商品" ? {
e: common_vendor.t(item.goodsName)
} : {}, {
f: item.goodsName === "未查询到该商品"
}, item.goodsName === "未查询到该商品" ? {} : {}, {
g: common_vendor.t(item.orderTime),
h: item.deviceId != null
}, item.deviceId != null ? {
i: common_vendor.t(item.deviceId ? item.deviceId : "")
} : {}, {
j: common_vendor.t(item.amount),
k: item.status != 0
}, item.status != 0 ? {
l: common_vendor.t(item.amount)
} : {}, {
m: item.status === 0
}, item.status === 0 ? {} : {}, {
n: item.status === 5
}, item.status === 5 ? {
o: common_vendor.o(openClose, item.id)
} : {}, {
p: common_vendor.o(($event) => goComplete(index), item.id),
q: item.id
});
})
} : {}, {
x: tagIndex.value === 6 && common_vendor.unref(orders).length <= 0
}, tagIndex.value === 6 && common_vendor.unref(orders).length <= 0 ? {} : {}, {
y: common_vendor.o(onScroll),
z: shibai.value === 1
}, shibai.value === 1 ? {
x: common_vendor.o(closeShibai)
A: common_vendor.o(closeShibai)
} : {}, {
y: hujiao.value === 1
B: hujiao.value === 1
}, hujiao.value === 1 ? {
z: common_vendor.o(($event) => hujiao.value = 0),
A: common_vendor.o(dianhua)
C: common_vendor.o(($event) => hujiao.value = 0),
D: common_vendor.o(dianhua)
} : {}, {
B: moneyRefund.value === 0
E: moneyRefund.value === 0
}, moneyRefund.value === 0 ? {
C: inputBoxVlaue.value,
D: common_vendor.o(($event) => inputBoxVlaue.value = $event.detail.value),
E: common_vendor.o(($event) => moneyRefund.value = 1),
F: common_vendor.o(getMoneyRefund)
F: inputBoxVlaue.value,
G: common_vendor.o(($event) => inputBoxVlaue.value = $event.detail.value),
H: common_vendor.o(($event) => moneyRefund.value = 1),
I: common_vendor.o(getMoneyRefund)
} : {}, {
G: ccc.value === 1
J: ccc.value === 1
}, ccc.value === 1 ? {
H: common_vendor.o(cloSe),
I: common_vendor.o(oks),
J: common_vendor.p({
K: common_vendor.o(cloSe),
L: common_vendor.o(oks),
M: common_vendor.p({
titleMsg: titleMsg.value
})
} : {});

File diff suppressed because one or more lines are too long

@ -33,31 +33,35 @@
width: 100%;
height: 11%;
}
.orderForm .orderForm-h {
.orderForm .orderForm-Scroll {
width: 100%;
height: 84rpx;
position: fixed;
z-index: 10;
}
.orderForm .orderForm-Scroll .orderForm-h {
position: fixed;
width: 100%;
height: 84rpx;
background-color: white;
display: flex;
justify-content: center;
align-items: center;
justify-content: space-around;
z-index: 10;
}
.orderForm .orderForm-h .txt {
width: 25%;
.orderForm .orderForm-Scroll .orderForm-h .txt {
height: 84rpx;
text-align: center;
font-size: 28rpx;
margin-right: 20rpx;
line-height: 84rpx;
}
.orderForm .orderForm-h .txt .txt-a {
.orderForm .orderForm-Scroll .orderForm-h .txt .txt-a {
box-sizing: border-box;
padding-top: 5rpx;
height: 80rpx;
display: inline-block;
}
.orderForm .orderForm-h .active {
.orderForm .orderForm-Scroll .orderForm-h .active {
border-bottom: 8rpx solid #1378F7;
color: #1378F7;
}
@ -196,10 +200,10 @@
height: 60rpx;
line-height: 60rpx;
text-align: center;
border: 1rpx solid #2878ff;
color: #2878ff;
border: 1rpx solid red;
color: red;
border-radius: 40rpx 40rpx 40rpx 40rpx;
margin-top: 10rpx;
margin-top: 6rpx;
}
.orderForm .ding {
width: 100%;
@ -214,7 +218,6 @@
}
.thishiWindow .tishi {
width: 96%;
height: 430rpx;
position: fixed;
top: 50%;
left: 50%;
@ -239,7 +242,7 @@
}
.thishiWindow .tishi .tishiTxt {
display: block;
font-size: 34rpx;
font-size: 28rpx;
margin-top: 40rpx;
width: 100%;
text-align: center;

@ -108,12 +108,26 @@ const storindex = common_vendor.defineStore("storindex", () => {
const qaq = await api_api.getTincheCoupons({
phoneNumber: common_vendor.index.getStorageSync(
"phoneNumber"
)
),
oderId: orderid.value
});
common_vendor.index.showToast({
icon: "none",
title: `${qaq.msg}`
});
const currentDate = /* @__PURE__ */ new Date();
const year = currentDate.getFullYear();
const month = String(currentDate.getMonth() + 1).padStart(2, "0");
const day = String(currentDate.getDate()).padStart(2, "0");
const hours = String(currentDate.getHours()).padStart(2, "0");
const minutes = String(currentDate.getMinutes()).padStart(2, "0");
const seconds = String(currentDate.getSeconds()).padStart(2, "0");
const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
const qaq1 = await api_api.getExcellent({
time: formattedDate,
networkId: datas.networkId
});
console.log(qaq1);
}
});
} else {
@ -203,9 +217,19 @@ const storindex = common_vendor.defineStore("storindex", () => {
package: res1.package,
signType: res1.signType,
paySign: res1.paySign,
success: (res2) => {
success: async (res2) => {
console.log("用户付款成功", res2);
p.value = 0;
const qaq = await api_api.getTincheCoupons({
phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
oderId: orderid.value
});
console.log(qaq);
common_vendor.index.showToast({
icon: "none",
title: `${qaq.msg}`,
duration: 1e3
});
common_vendor.index.navigateTo({
url: `/pages/myBalance/myBalance`
});
@ -241,7 +265,7 @@ const storindex = common_vendor.defineStore("storindex", () => {
common_vendor.index.navigateTo({
url: "/pages/login/login"
});
}, 1e3);
}, 1500);
}
});
} else {
@ -274,8 +298,18 @@ const storindex = common_vendor.defineStore("storindex", () => {
package: res1.package,
signType: res1.signType,
paySign: res1.paySign,
success: (res2) => {
success: async (res2) => {
console.log("用户付款成功", res2);
const qaq = await api_api.getTincheCoupons({
phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
oderId: orderid.value
});
console.log(qaq);
common_vendor.index.showToast({
icon: "none",
title: `${qaq.msg}`,
duration: 1500
});
p.value = 0;
common_vendor.index.navigateTo({
url: `/pages/secondaryCard/secondaryCard?id=${datas.networkId}`
@ -344,13 +378,28 @@ const storindex = common_vendor.defineStore("storindex", () => {
url: "/pages/complete/complete"
});
const qaq = await api_api.getTincheCoupons({
phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
oderId: orderid.value
});
console.log(qaq);
common_vendor.index.showToast({
icon: "none",
title: `${qaq.msg}`
title: `${qaq.msg}`,
duration: 1500
});
const currentDate = /* @__PURE__ */ new Date();
const year = currentDate.getFullYear();
const month = String(currentDate.getMonth() + 1).padStart(2, "0");
const day = String(currentDate.getDate()).padStart(2, "0");
const hours = String(currentDate.getHours()).padStart(2, "0");
const minutes = String(currentDate.getMinutes()).padStart(2, "0");
const seconds = String(currentDate.getSeconds()).padStart(2, "0");
const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
const qaq1 = await api_api.getExcellent({
time: formattedDate,
networkId: datas.networkId
});
console.log(qaq1);
}
});
} else {
@ -415,11 +464,26 @@ const storindex = common_vendor.defineStore("storindex", () => {
url: "/pages/complete/complete"
});
const qaq = await api_api.getTincheCoupons({
phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
oderId: orderid.value
});
const currentDate = /* @__PURE__ */ new Date();
const year = currentDate.getFullYear();
const month = String(currentDate.getMonth() + 1).padStart(2, "0");
const day = String(currentDate.getDate()).padStart(2, "0");
const hours = String(currentDate.getHours()).padStart(2, "0");
const minutes = String(currentDate.getMinutes()).padStart(2, "0");
const seconds = String(currentDate.getSeconds()).padStart(2, "0");
const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
const qaq1 = await api_api.getExcellent({
time: formattedDate,
networkId: datas.networkId
});
console.log(qaq1);
common_vendor.index.showToast({
icon: "none",
title: `${qaq.msg}`
title: `${qaq.msg}`,
duration: 1500
});
}
});

@ -51,6 +51,7 @@ const order = common_vendor.defineStore("order", () => {
common_vendor.index.switchTab({
url: "/pages/my/my",
success: () => {
console.log("我处发了");
common_vendor.index.showToast({
icon: "none",
title: "结束洗车成功",

Loading…
Cancel
Save