合完了
This commit is contained in:
parent
c25d31ea79
commit
e95b660761
|
|
@ -26,13 +26,13 @@ export const stateList = [
|
|||
},
|
||||
{
|
||||
state: '交易成功',
|
||||
img: '',
|
||||
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
|
||||
msg: '订单完成，感谢您的支持',
|
||||
tips: '感谢您的支持'
|
||||
},
|
||||
{
|
||||
state: '交易关闭',
|
||||
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
|
||||
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
|
||||
msg: '您的订单已关闭',
|
||||
tips: '下次看好了之后再买哦'
|
||||
}
|
||||
|
|
@ -62,13 +62,13 @@ export const serviceStateList = [
|
|||
},
|
||||
{
|
||||
state: '交易成功',
|
||||
img: '',
|
||||
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
|
||||
msg: '订单完成，感谢您的支持',
|
||||
tips: '感谢您的支持'
|
||||
},
|
||||
{
|
||||
state: '交易关闭',
|
||||
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
|
||||
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
|
||||
msg: '您的订单已关闭',
|
||||
tips: '下次看好了之后再买哦'
|
||||
}
|
||||
|
|
|
|||
18
pages.json
18
pages.json
|
|
@ -1,5 +1,14 @@
|
|||
{
|
||||
"pages": [
|
||||
{
|
||||
"path" : "pages/home/home",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "首页",
|
||||
"enablePullDownRefresh":true, //开启下拉刷新
|
||||
"navigationBarBackgroundColor": "#ede8e7"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
|
||||
"style" :
|
||||
|
|
@ -28,15 +37,6 @@
|
|||
"navigationBarTitleText" : ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/home/home",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "首页",
|
||||
"enablePullDownRefresh":true, //开启下拉刷新
|
||||
"navigationBarBackgroundColor": "#ede8e7"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/workshop/searchResult/searchResult",
|
||||
"style" :
|
||||
|
|
|
|||
32
pages/my-order/component/nav.vue
Normal file
32
pages/my-order/component/nav.vue
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
<template>
|
||||
<view class="flex-row items-center equal-division-item" style="display: flex; align-items: center;">
|
||||
<image
|
||||
class="shrink-0 image_3"
|
||||
src="https://ide.code.fun/api/image?token=67d0f1a04ae84d0012292f49&name=863037eb0051f07b12da8be904d01267.png"
|
||||
/>
|
||||
<text class="ml-2 font text_18" style="margin-left: 5rpx;">导航</text>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.equal-division-item {
|
||||
padding: 15rpx 0;
|
||||
}
|
||||
.image_3 {
|
||||
width: 46.88rpx;
|
||||
height: 46.88rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: FZSongKeBenXiuKaiS-R-GB;
|
||||
line-height: 25.84rpx;
|
||||
color: #e79ea1;
|
||||
}
|
||||
.text_18 {
|
||||
line-height: 24.62rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
<view class="flex-col group_5">
|
||||
<text class="self-start font_7 text_13">买家留言</text>
|
||||
<view class="mt-2 flex-col justify-start self-stretch text-wrapper">
|
||||
<text class="font_2 text_14">
|
||||
<text class="font_2 text_14" style="word-break: break-all; word-wrap: break-word;">
|
||||
{{ order.note }}
|
||||
</text>
|
||||
</view>
|
||||
|
|
@ -103,11 +103,11 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="order.operationList[0]" class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd(order.id)">
|
||||
<view v-if="order.operationList[0]" class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd(order)">
|
||||
<text class="font text_24">去支付</text>
|
||||
</view>
|
||||
|
||||
<view v-if="order.operationList[1]" class="flex-col justify-start items-center text-wrapper_3" @click="gotoDelieverPage(order.id)">
|
||||
<view v-if="order.operationList[1]" class="flex-col justify-start items-center text-wrapper_3" @click="fd(order.id)">
|
||||
<text class="font text_24">查看物流</text>
|
||||
</view>
|
||||
|
||||
|
|
@ -115,8 +115,15 @@
|
|||
<text class="font text_24">删除订单</text>
|
||||
</view>
|
||||
|
||||
<view v-if="order.operationList[3]" style="background-color: #fff;" class="flex-col justify-start items-center text-wrapper_3">
|
||||
<text class="font text_24"></text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 遮罩层 -->
|
||||
<view v-if="isShow" class="overlay"></view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
@ -125,6 +132,7 @@
|
|||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { JudgeIsNullity } from '../../../common/globalFunction';
|
||||
import emitter from '../../../utils/emitter';
|
||||
const order = ref({})
|
||||
const cookie = wx.getStorageSync('cookie')
|
||||
let orderId = ''
|
||||
|
|
@ -132,6 +140,12 @@
|
|||
const allAmount = ref(0)
|
||||
const addressObj = ref({})
|
||||
const orderStatusObj = ref({})
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
|
||||
onLoad((options) => {
|
||||
orderId = options.id
|
||||
})
|
||||
|
|
@ -159,22 +173,22 @@
|
|||
couponAmount.value = JudgeIsNullity(order.value.couponSnapshot) ? 0 : order.value.couponSnapshot.conditionAmount
|
||||
allAmount.value = order.value.totalAmount + couponAmount.value
|
||||
if (order.value.orderStatus === '待支付') {
|
||||
order.value.operationList = [true, false, false]
|
||||
order.value.operationList = [true, false, false, false]
|
||||
orderStatusObj.value = stateList[0]
|
||||
} else if (order.value.orderStatus === '交易关闭') {
|
||||
order.value.operationList = [false, false, true]
|
||||
order.value.operationList = [false, false, true, false]
|
||||
orderStatusObj.value = stateList[5]
|
||||
} else if (order.value.orderStatus === '待发货') {
|
||||
order.value.operationList = [false, false, false]
|
||||
order.value.operationList = [false, false, false, true]
|
||||
orderStatusObj.value = stateList[1]
|
||||
} else if (order.value.orderStatus === '已退款') {
|
||||
order.value.operationList = [false, false, false]
|
||||
order.value.operationList = [false, false, false, true]
|
||||
orderStatusObj.value = stateList[2]
|
||||
} else if (order.value.orderStatus === '交易成功') {
|
||||
order.value.operationList = [false, false, false]
|
||||
order.value.operationList = [false, false, false, true]
|
||||
orderStatusObj.value = stateList[4]
|
||||
} else if (order.value.orderStatus === '待收货') {
|
||||
order.value.operationList = [false, true, false]
|
||||
order.value.operationList = [false, true, false, false]
|
||||
orderStatusObj.value = stateList[3]
|
||||
}
|
||||
}
|
||||
|
|
@ -251,9 +265,7 @@
|
|||
content: '支付成功',
|
||||
showCancel: false
|
||||
})
|
||||
uni.redirectTo({
|
||||
url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
|
||||
})
|
||||
getOrderById(oid)
|
||||
console.log('支付成功res--->',res);
|
||||
},
|
||||
fail(e) {
|
||||
|
|
@ -274,15 +286,12 @@
|
|||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '您确定要删除订单吗？',
|
||||
success: (res) => {
|
||||
success: async (res) => {
|
||||
if (res.confirm) {
|
||||
deleteOrder(val)
|
||||
await deleteOrder(val)
|
||||
await emitter.emit('flushOrderList')
|
||||
routerJump('pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail')
|
||||
}
|
||||
},
|
||||
complete: () => {
|
||||
uni.redirectTo({
|
||||
url: '../myOrderList/myOrderList'
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -303,6 +312,15 @@
|
|||
}
|
||||
|
||||
|
||||
const fd = (val) => { //防抖
|
||||
clearTimeout(debounceTimer)
|
||||
showLoading()
|
||||
debounceTimer = setTimeout(async () => {
|
||||
await gotoDelieverPage(val)
|
||||
hideLoading()
|
||||
}, 1000)
|
||||
}
|
||||
|
||||
|
||||
let waybillToken = ''
|
||||
var plugin = requirePlugin('logisticsPlugin')
|
||||
|
|
@ -326,9 +344,40 @@
|
|||
})
|
||||
}
|
||||
|
||||
|
||||
const routerJump = (val) => {
|
||||
let pages = getCurrentPages();
|
||||
var num = pages.length
|
||||
if (num == 1) return ;
|
||||
console.log(pages)
|
||||
//当前页面栈总数
|
||||
var backnum = num
|
||||
for( var i = 0; i < num; i ++ ) {
|
||||
//循环找到指定页面路由所在的页数
|
||||
if(pages[i].route == val){
|
||||
//'pages/mypage/mypage'替换成A页面的路由地址
|
||||
backnum = num - i - 1
|
||||
//计算返回的层数，总数-指定页面页数-1
|
||||
}
|
||||
}
|
||||
uni.navigateBack({
|
||||
delta:backnum
|
||||
//返回的页面数，如果 delta 大于现有页面数，则返回到首页。
|
||||
})
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.4); /* 半透明黑色背景 */
|
||||
z-index: 999;
|
||||
}
|
||||
button {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
|
@ -354,15 +403,14 @@ button::after{
|
|||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
.section {
|
||||
background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=24453f696e665b4a146abeed1b16ec7c.png');
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
width: 750rpx;
|
||||
height: 100vh;
|
||||
}
|
||||
// .section {
|
||||
// background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=24453f696e665b4a146abeed1b16ec7c.png');
|
||||
// background-size: 100% 100%;
|
||||
// background-repeat: no-repeat;
|
||||
// width: 750rpx;
|
||||
// }
|
||||
.section_2 {
|
||||
padding: 15rpx 16.88rpx;
|
||||
background-color: #ffffff;
|
||||
|
|
@ -429,10 +477,11 @@ button::after{
|
|||
border-radius: 18.75rpx;
|
||||
}
|
||||
.pos_3 {
|
||||
position: absolute;
|
||||
left: 15rpx;
|
||||
right: 16.88rpx;
|
||||
top: 287.5rpx;
|
||||
// position: absolute;
|
||||
// left: 15rpx;
|
||||
// right: 16.88rpx;
|
||||
// top: 287.5rpx;
|
||||
margin: 287.5rpx 16.88rpx 150rpx 15rpx;
|
||||
}
|
||||
.list-item:first-child {
|
||||
margin-top: 0;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<view class="flex-col justify-start items-center relative page">
|
||||
<image
|
||||
<!-- <image
|
||||
class="image_3"
|
||||
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=666fe70fbe2b3eb6bec964adf12deccc.png"
|
||||
/>
|
||||
/> -->
|
||||
<view class="flex-col section pos">
|
||||
<view class="flex-col relative section_2">
|
||||
<view class="flex-row justify-center section_3" style="display: flex; align-items: center;" @click="gotoResearch">
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
<view class="flex-row">
|
||||
<image
|
||||
class="image_2"
|
||||
src="https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=1ab7a54755e0a23722c1b9dd0ae981c4.png"
|
||||
:src="subItem.goodSnapshot.goodImg"
|
||||
/>
|
||||
<view class="flex-col items-start group_19 ml-11">
|
||||
<text class="font_2">{{ subItem.goodSnapshot.name }}</text>
|
||||
|
|
@ -79,40 +79,57 @@
|
|||
<text class="font_9 text_17 ml-9">￥{{ item.totalAmount.toFixed(2) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="flex-row justify-end group_14">
|
||||
|
||||
<view class="nav" @click.stop="nav" v-if="item.orderType === 'service'">
|
||||
<navVue></navVue>
|
||||
</view>
|
||||
|
||||
<view class="flex-col justify-start items-center text-wrapper" v-if="item.operationList[0]" @click.stop="gotoCancelOrder(item.id, item.orderType)">
|
||||
<text class="font_10">取消订单</text>
|
||||
</view>
|
||||
|
||||
<view @click.stop>
|
||||
<button class="flex-col justify-start items-center text-wrapper" v-if="item.operationList[1]" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
|
||||
<text class="font_10">联系客服</text>
|
||||
</button>
|
||||
</view>
|
||||
|
||||
<view class="flex-col justify-start items-center text-wrapper" v-if="item.operationList[2]" @click.stop="gotoDeleteOrder(item.id)">
|
||||
<text class="font_10">删除订单</text>
|
||||
</view>
|
||||
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-11" v-if="item.operationList[3]" @click.stop="gotoPay">
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-11" v-if="item.operationList[3]" @click.stop="wxPayFd(item)">
|
||||
<text class="font_11 text_18">去付款</text>
|
||||
</view>
|
||||
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-11" v-if="item.operationList[4] && item.orderType === 'product'" @click.stop="gotoDelieverPage(item.id)">
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-11" v-if="item.operationList[4] && item.orderType === 'product'" @click.stop="fd(item.id)">
|
||||
<text class="font_11 text_18">查看物流</text>
|
||||
</view>
|
||||
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-11" style="background-color: #fff;" v-if="item.operationList[5]">
|
||||
<text class="font_11 text_18"></text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 遮罩层 -->
|
||||
<view v-if="isShow" class="overlay"></view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {onBeforeUnmount, onMounted, ref} from 'vue'
|
||||
import {onBeforeUnmount, onMounted, onUnmounted, ref} from 'vue'
|
||||
import { baseUrl } from '../../../api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { onLoad, onShow } from "@dcloudio/uni-app";
|
||||
import { JudgeIsNullity } from '../../../common/globalFunction';
|
||||
import navVue from '../component/nav.vue';
|
||||
import emitter from '../../../utils/emitter';
|
||||
const color = ref(new Array(5).fill('#323232'))
|
||||
const point = ref(0)
|
||||
const isShowUnderLine = ref([true, false, false, false, false])
|
||||
|
|
@ -124,6 +141,16 @@
|
|||
const isHiddenInput = ref(true)
|
||||
const status = ref(0)
|
||||
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
|
||||
const flushOrderList = () => {
|
||||
getMyOrder()
|
||||
}
|
||||
|
||||
onLoad((options) => {
|
||||
orderNumber.value = options.orderNumber
|
||||
if (!JudgeIsNullity(orderNumber.value)) {
|
||||
|
|
@ -139,9 +166,18 @@
|
|||
} else {
|
||||
getMyOrder()
|
||||
}
|
||||
|
||||
emitter.on('flushOrderList', flushOrderList)
|
||||
})
|
||||
|
||||
|
||||
onUnmounted(() => {
|
||||
emitter.off('flushOrderList', flushOrderList)
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
const getMyStatusOrder = async (val) => {
|
||||
point.value = val
|
||||
for (var i = 0; i < 5; i ++ ) {
|
||||
|
|
@ -194,20 +230,7 @@
|
|||
})
|
||||
console.log(res.data.data)
|
||||
orderList.value = res.data.data
|
||||
for (var i = 0; i < orderList.value.length; i ++ ) {
|
||||
let order = orderList.value[i]
|
||||
if (order.orderStatus === '待支付') {
|
||||
orderList.value[i].operationList = [true, false, false, true, false]
|
||||
} else if (order.orderStatus === '待发货') {
|
||||
orderList.value[i].operationList = [false, true, false, false, false]
|
||||
} else if (order.orderStatus === '待收货') {
|
||||
orderList.value[i].operationList = [false, true, false, false, true]
|
||||
} else if (order.orderStatus === '已退款') {
|
||||
orderList.value[i].operationList = [false, true, false, false, false]
|
||||
} else {
|
||||
orderList.value[i].operationList = [false, false, true, false, false]
|
||||
}
|
||||
}
|
||||
dealTimeout()
|
||||
orderList.value.forEach(order => {
|
||||
if (order.orderStatus === '待支付') {
|
||||
startCountdown(order)
|
||||
|
|
@ -243,7 +266,7 @@
|
|||
showLoading()
|
||||
isShow.value = true //打开遮罩
|
||||
wxPayTimer = setTimeout(async () => {
|
||||
await wxPay(order.id)
|
||||
await wxPay(order.id, order.orderType)
|
||||
}, 1000)
|
||||
setTimeout(()=>{
|
||||
hideLoading()
|
||||
|
|
@ -272,7 +295,7 @@
|
|||
|
||||
|
||||
|
||||
const wxPay = async( oid )=> { //传入订单id
|
||||
const wxPay = async( oid , type)=> { //传入订单id
|
||||
try {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/wechat/payment/create',
|
||||
|
|
@ -295,13 +318,26 @@
|
|||
content: '支付成功',
|
||||
showCancel: false
|
||||
})
|
||||
if (type === 'product') {
|
||||
uni.redirectTo({
|
||||
url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
|
||||
url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid
|
||||
})
|
||||
console.log('支付成功res--->',res);
|
||||
} else {
|
||||
uni.redirectTo({
|
||||
url: '/pages/my-order/myServiceOrderDetail/myServiceOrderDetail?id=' + oid
|
||||
})
|
||||
}
|
||||
},
|
||||
fail(e) {
|
||||
|
||||
if (type === 'product') {
|
||||
uni.redirectTo({
|
||||
url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid
|
||||
})
|
||||
} else {
|
||||
uni.redirectTo({
|
||||
url: '/pages/my-order/myServiceOrderDetail/myServiceOrderDetail?id=' + oid
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}catch(error) {
|
||||
|
|
@ -315,6 +351,14 @@
|
|||
|
||||
|
||||
|
||||
const fd = (val) => { //防抖
|
||||
clearTimeout(debounceTimer)
|
||||
showLoading()
|
||||
debounceTimer = setTimeout(async () => {
|
||||
await gotoDelieverPage(val)
|
||||
hideLoading()
|
||||
}, 1000)
|
||||
}
|
||||
|
||||
let waybillToken = ''
|
||||
var plugin = requirePlugin('logisticsPlugin')
|
||||
|
|
@ -343,14 +387,16 @@
|
|||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '您确定要取消订单吗？',
|
||||
success: (res) => {
|
||||
success: async (res) => {
|
||||
if (res.confirm) {
|
||||
if (type === 'product') cancelGeneralOrder(val)
|
||||
else cancelServiceOrder(val)
|
||||
if (type === 'product'){
|
||||
await cancelGeneralOrder(val)
|
||||
}
|
||||
else {
|
||||
await cancelServiceOrder(val)
|
||||
}
|
||||
await getMyOrder()
|
||||
}
|
||||
},
|
||||
complete: () => {
|
||||
getMyOrder()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -360,13 +406,11 @@
|
|||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '您确定要删除订单吗？',
|
||||
success: (res) => {
|
||||
success: async (res) => {
|
||||
if (res.confirm) {
|
||||
deleteOrder(val)
|
||||
await deleteOrder(val)
|
||||
await getMyOrder()
|
||||
}
|
||||
},
|
||||
complete: () => {
|
||||
getMyOrder()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -415,7 +459,28 @@
|
|||
id: val
|
||||
}
|
||||
})
|
||||
console.log(res.data.data)
|
||||
console.log('=================================>', res.data.data)
|
||||
}
|
||||
|
||||
|
||||
|
||||
const dealTimeout = () => {
|
||||
for (var i = 0; i < orderList.value.length; i ++ ) {
|
||||
let order = orderList.value[i]
|
||||
if (order.orderStatus === '待支付') {
|
||||
orderList.value[i].operationList = [true, false, false, true, false, false]
|
||||
} else if (order.orderStatus === '待发货') {
|
||||
orderList.value[i].operationList = [false, true, false, false, false, false]
|
||||
} else if (order.orderStatus === '待收货') {
|
||||
orderList.value[i].operationList = [false, true, false, false, true, false]
|
||||
} else if (order.orderStatus === '已退款') {
|
||||
orderList.value[i].operationList = [false, true, false, false, false, false]
|
||||
} else if (order.orderStatus === '交易关闭') {
|
||||
orderList.value[i].operationList = [false, false, true, false, false, false]
|
||||
} else if (order.orderStatus === '交易成功') {
|
||||
orderList.value[i].operationList = [false, false, false, false, false, true]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -433,6 +498,7 @@
|
|||
order.countdown = '00:00';
|
||||
clearInterval(order.countdownInterval); // 清除定时器
|
||||
order.orderStatus = '交易关闭'
|
||||
dealTimeout()
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '订单超时未支付，已取消',
|
||||
|
|
@ -473,6 +539,19 @@
|
|||
});
|
||||
|
||||
|
||||
const nav = () => {
|
||||
wx.openLocation({
|
||||
latitude: 45.867741,
|
||||
longitude: 126.560037,
|
||||
name: '哈尔滨师范大学(松北校区)',
|
||||
address: '黑龙江省哈尔滨市呼兰区利民经济开发区师大路1号',
|
||||
success: (res) => {
|
||||
console.log(res)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function getWeekday(dateStr) {
|
||||
const date = new Date(dateStr);
|
||||
const weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
|
||||
|
|
@ -483,6 +562,20 @@
|
|||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.nav {
|
||||
position: absolute;
|
||||
left: 15rpx;
|
||||
top: 25rpx;
|
||||
}
|
||||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.4); /* 半透明黑色背景 */
|
||||
z-index: 999;
|
||||
}
|
||||
button{padding: 0;margin: 0;}
|
||||
button::after{ border: none; }
|
||||
.appointmentDate {
|
||||
|
|
@ -512,20 +605,14 @@
|
|||
}
|
||||
.page {
|
||||
background-color: #ffffff;
|
||||
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png);
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100vh;
|
||||
}
|
||||
.image_3 {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
}
|
||||
.section {
|
||||
background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png);
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.pos {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
|
@ -718,6 +805,7 @@
|
|||
line-height: 21.13rpx;
|
||||
}
|
||||
.group_14 {
|
||||
position: relative;
|
||||
margin-top: 26.92rpx;
|
||||
padding: 33.75rpx 0 35.63rpx;
|
||||
border-top: solid 1.88rpx #dfdfdf;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
<view class="flex-col group_5">
|
||||
<text class="self-start font_8 text_14">买家留言</text>
|
||||
<view class="flex-col justify-start self-stretch text-wrapper mt-2">
|
||||
<text class="font_2 text_15">
|
||||
<text class="font_2 text_15" style="word-break: break-all; word-wrap: break-word;">
|
||||
{{ order.note }}
|
||||
</text>
|
||||
</view>
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="order.operationList[0]" class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd(order.id)">
|
||||
<view v-if="order.operationList[0]" class="flex-col justify-start items-center text-wrapper_3" @click="wxPayFd(order)">
|
||||
<text class="font text_25">去支付</text>
|
||||
</view>
|
||||
|
||||
|
|
@ -97,8 +97,15 @@
|
|||
<text class="font text_25">删除订单</text>
|
||||
</view>
|
||||
|
||||
<view v-if="order.operationList[2]" style="background-color: #fff;" class="flex-col justify-start items-center text-wrapper_3">
|
||||
<text class="font text_25"></text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 遮罩层 -->
|
||||
<view v-if="isShow" class="overlay"></view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
@ -107,6 +114,7 @@
|
|||
import { baseUrl } from '../../../api/request';
|
||||
import { JudgeIsNullity } from '../../../common/globalFunction';
|
||||
import { serviceStateList } from '../../../common/global.js'
|
||||
import emitter from '../../../utils/emitter';
|
||||
const cookie = wx.getStorageSync('cookie')
|
||||
let orderId = ''
|
||||
const order = ref({})
|
||||
|
|
@ -114,6 +122,13 @@
|
|||
const allAmount = ref(0)
|
||||
const contactObj = ref({})
|
||||
const orderStatusObj = ref({})
|
||||
let debounceTimer = null;
|
||||
let wxPayTimer = null;
|
||||
let loading = false;
|
||||
let isLoading = ref(false)
|
||||
let isShow = ref(false)
|
||||
|
||||
|
||||
onLoad((options) => {
|
||||
orderId = options.id
|
||||
})
|
||||
|
|
@ -139,19 +154,19 @@
|
|||
couponAmount.value = JudgeIsNullity(order.value.couponSnapshot) ? 0 : order.value.couponSnapshot.conditionAmount
|
||||
allAmount.value = order.value.totalAmount + couponAmount.value
|
||||
if (order.value.orderStatus === '待支付') {
|
||||
order.value.operationList = [true, false]
|
||||
order.value.operationList = [true, false, false]
|
||||
orderStatusObj.value = serviceStateList[0]
|
||||
} else if (order.value.orderStatus === '交易关闭') {
|
||||
order.value.operationList = [false, true]
|
||||
order.value.operationList = [false, true, false]
|
||||
orderStatusObj.value = serviceStateList[4]
|
||||
} else if (order.value.orderStatus === '待发货') {
|
||||
order.value.operationList = [false, false]
|
||||
order.value.operationList = [false, false, true]
|
||||
orderStatusObj.value = serviceStateList[1]
|
||||
} else if (order.value.orderStatus === '已退款') {
|
||||
order.value.operationList = [false, false]
|
||||
order.value.operationList = [false, false, true]
|
||||
orderStatusObj.value = serviceStateList[2]
|
||||
} else if (order.value.orderStatus === '交易成功') {
|
||||
order.value.operationList = [false, false]
|
||||
order.value.operationList = [false, false, true]
|
||||
orderStatusObj.value = serviceStateList[3]
|
||||
}
|
||||
}
|
||||
|
|
@ -226,9 +241,7 @@
|
|||
content: '支付成功',
|
||||
showCancel: false
|
||||
})
|
||||
uni.redirectTo({
|
||||
url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
|
||||
})
|
||||
getOrderById(oid)
|
||||
console.log('支付成功res--->',res);
|
||||
},
|
||||
fail(e) {
|
||||
|
|
@ -249,15 +262,12 @@
|
|||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '您确定要删除订单吗？',
|
||||
success: (res) => {
|
||||
success: async (res) => {
|
||||
if (res.confirm) {
|
||||
deleteOrder(val)
|
||||
await deleteOrder(val)
|
||||
await emitter.emit('flushOrderList')
|
||||
routerJump('pages/my-order/myServiceOrderDetail/myServiceOrderDetail')
|
||||
}
|
||||
},
|
||||
complete: () => {
|
||||
uni.redirectTo({
|
||||
url: '../myOrderList/myOrderList'
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -285,9 +295,40 @@
|
|||
return weekdays[date.getDay()];
|
||||
}
|
||||
|
||||
|
||||
const routerJump = (val) => {
|
||||
let pages = getCurrentPages();
|
||||
var num = pages.length
|
||||
if (num == 1) return ;
|
||||
console.log(pages)
|
||||
//当前页面栈总数
|
||||
var backnum = num
|
||||
for( var i = 0; i < num; i ++ ) {
|
||||
//循环找到指定页面路由所在的页数
|
||||
if(pages[i].route == val){
|
||||
//'pages/mypage/mypage'替换成A页面的路由地址
|
||||
backnum = num - i - 1
|
||||
//计算返回的层数，总数-指定页面页数-1
|
||||
}
|
||||
}
|
||||
uni.navigateBack({
|
||||
delta:backnum
|
||||
//返回的页面数，如果 delta 大于现有页面数，则返回到首页。
|
||||
})
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.4); /* 半透明黑色背景 */
|
||||
z-index: 999;
|
||||
}
|
||||
button {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
|
@ -311,15 +352,14 @@ button::after{
|
|||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
.section {
|
||||
background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=9df295c356c1b6849e20b6b4853b4d1c.png');
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
width: 750rpx;
|
||||
height: 100vh;
|
||||
}
|
||||
// .section {
|
||||
// background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=9df295c356c1b6849e20b6b4853b4d1c.png');
|
||||
// background-size: 100% 100%;
|
||||
// background-repeat: no-repeat;
|
||||
// width: 750rpx;
|
||||
// }
|
||||
.section_2 {
|
||||
padding: 16.88rpx;
|
||||
background-color: #ffffff;
|
||||
|
|
@ -384,10 +424,11 @@ button::after{
|
|||
border-radius: 18.75rpx;
|
||||
}
|
||||
.pos_3 {
|
||||
position: absolute;
|
||||
left: 15rpx;
|
||||
right: 16.88rpx;
|
||||
top: 281.25rpx;
|
||||
// position: absolute;
|
||||
// left: 15rpx;
|
||||
// right: 16.88rpx;
|
||||
// top: 281.25rpx;
|
||||
margin: 281.25rpx 16.88rpx 150rpx 15rpx;
|
||||
}
|
||||
.list-item {
|
||||
padding-left: 12.9rpx;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
<view class="flex-col section_2">
|
||||
<view class="flex-row justify-between">
|
||||
<view class="flex-col">
|
||||
<text class="self-center font text">{{ addressRealInfo.region }}</text>
|
||||
<text class="self-center font text" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.region }}</text>
|
||||
<view class="flex-row items-center self-stretch">
|
||||
<image
|
||||
class="shrink-0 image"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"
|
||||
/>
|
||||
<text class="font_2 text_2 ml-8">{{ addressRealInfo.detailAddress }}</text>
|
||||
<text class="font_2 text_2 ml-8" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.detailAddress }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row self-start group" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row items-center self-center mt-48" style="margin-top: 56rpx;">
|
||||
<!-- <view class="flex-row items-center self-center mt-48" style="margin-top: 56rpx;">
|
||||
<view class="group_9">
|
||||
<text class="font_2 text_12">注：购买商品均视为同意</text>
|
||||
<text class="font_2 text_13">用户须知</text>
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
class="shrink-0 image_8 ml-2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"
|
||||
/>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="flex-col section_5">
|
||||
<view class="flex-row justify-between items-center group_14">
|
||||
|
|
@ -103,17 +103,6 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="flex-col mt-9">
|
||||
<!-- <view class="flex-row justify-between items-center group_11">
|
||||
<text class="font_7 text_15">满120减0优惠</text>
|
||||
<view class="flex-row items-center">
|
||||
<image
|
||||
class="shrink-0 image_9 image_10"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"
|
||||
/>
|
||||
<text class="font_3 text_16">减</text>
|
||||
<text class="font_9 text_17">0.00</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="flex-row justify-between items-center group_12">
|
||||
<text class="font_7 text_18">合计</text>
|
||||
<view class="flex-row items-center">
|
||||
|
|
@ -129,10 +118,8 @@
|
|||
</view>
|
||||
<view class="flex-col section_6">
|
||||
<text class="self-start font_7 text_19">订单备注</text>
|
||||
<view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
<!-- <text class="font_2 text_20">备注建议提前协商（250字以内）</text> -->
|
||||
<textarea @input="textAssign" auto-height style="width: 360px;"></textarea>
|
||||
</view>
|
||||
<textarea maxlength="250" placeholder-style="font-size: 25rpx;" v-model="note" placeholder="备注建议提前协商（250字以内）" class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
</textarea>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center section_7 pos_8">
|
||||
|
|
@ -430,10 +417,6 @@ const wxPay = async( oid )=> { //传入订单id
|
|||
})
|
||||
}
|
||||
}
|
||||
const textAssign = (e) => { //文本输入框赋值方法
|
||||
note.value = e.detail.value
|
||||
// console.log('note--->',note.value);
|
||||
}
|
||||
//获取字体
|
||||
const getFonts =()=>{
|
||||
uni.loadFontFace({
|
||||
|
|
@ -812,11 +795,13 @@ const getFonts =()=>{
|
|||
line-height: 29.53rpx;
|
||||
}
|
||||
.text-wrapper_2 {
|
||||
margin-left: 3.99rpx;
|
||||
margin-right: 3.99rpx;
|
||||
padding: 22.35rpx 20rpx;
|
||||
height: 200rpx;
|
||||
width: 650rpx;
|
||||
padding: 22.35rpx;
|
||||
box-sizing: border-box;
|
||||
background-color: #ffefef;
|
||||
border-radius: 9.38rpx;
|
||||
margin: 20rpx auto 0;
|
||||
}
|
||||
.text_20 {
|
||||
margin-left: 21.15rpx;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
class="shrink-0 image"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXymRmdOc-lianxiren.png"
|
||||
/>
|
||||
<text class="text ml-10">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
|
||||
<text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
|
||||
</view>
|
||||
<view class="flex-row items-center group" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
|
||||
<image
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-center items-center group_9 mt-15">
|
||||
<!-- <view class="flex-row justify-center items-center group_9 mt-15">
|
||||
<view class="group_10">
|
||||
<text class="font_7 text_11">注：购买商品均视为同意</text>
|
||||
<text class="font_7 text_12">用户须知</text>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
class="image_7 ml-2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FcoxrJLJf-quesrion.png"
|
||||
/>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="flex-col section_4">
|
||||
<view class="flex-row justify-between items-center my-coupon">
|
||||
|
|
@ -105,9 +105,8 @@
|
|||
</view>
|
||||
<view class="flex-col section_5">
|
||||
<text class="self-start font_8 text_15">订单备注</text>
|
||||
<view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
<text class="font_7 text_16">备注建议提前协商（250字以内）</text>
|
||||
</view>
|
||||
<textarea maxlength="250" placeholder-style="font-size: 25rpx;" v-model="note" placeholder="备注建议提前协商（250字以内）" class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
</textarea>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center section_6">
|
||||
<view class="flex-row items-center">
|
||||
|
|
@ -414,10 +413,6 @@
|
|||
})
|
||||
}
|
||||
}
|
||||
const textAssign = (e) => { //文本输入框赋值方法
|
||||
note.value = e.detail.value
|
||||
// console.log('note--->',note.value);
|
||||
}
|
||||
//获取字体
|
||||
const getFonts =()=>{
|
||||
uni.loadFontFace({
|
||||
|
|
@ -766,11 +761,13 @@
|
|||
line-height: 29.53rpx;
|
||||
}
|
||||
.text-wrapper_2 {
|
||||
margin-left: 3.99rpx;
|
||||
margin-right: 3.99rpx;
|
||||
padding: 22.35rpx 0 115.22rpx;
|
||||
height: 200rpx;
|
||||
width: 650rpx;
|
||||
padding: 22.35rpx;
|
||||
box-sizing: border-box;
|
||||
background-color: #ffefef;
|
||||
border-radius: 9.38rpx;
|
||||
margin: 20rpx auto 0;
|
||||
}
|
||||
.text_16 {
|
||||
margin-left: 21.15rpx;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
<view class="flex-col section_2" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
|
||||
<view class="flex-row justify-between">
|
||||
<view class="flex-col">
|
||||
<text class="self-center font text">{{ addressRealInfo.region }}</text>
|
||||
<text class="self-center font text" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.region }}</text>
|
||||
<view class="flex-row items-center self-stretch">
|
||||
<image
|
||||
class="shrink-0 image"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"
|
||||
/>
|
||||
<text class="font_2 text_2 ml-8">{{ addressRealInfo.detailAddress }}</text>
|
||||
<text class="font_2 text_2 ml-8" style="word-break: break-all; word-wrap: break-word;">{{ addressRealInfo.detailAddress }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row self-start group">
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row items-center self-center mt-48" style="margin-top: 56rpx;">
|
||||
<!-- <view class="flex-row items-center self-center mt-48" style="margin-top: 56rpx;">
|
||||
<view class="group_9">
|
||||
<text class="font_2 text_12">注：购买商品均视为同意</text>
|
||||
<text class="font_2 text_13">用户须知</text>
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
class="shrink-0 image_8 ml-2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"
|
||||
/>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="flex-col section_5">
|
||||
<view class="flex-row justify-between items-center group_14">
|
||||
|
|
@ -104,17 +104,6 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="flex-col mt-9">
|
||||
<!-- <view class="flex-row justify-between items-center group_11" v-if="couponIsShow">
|
||||
<text class="font_7 text_15">{{ couponVO.name }}优惠</text>
|
||||
<view class="flex-row items-center">
|
||||
<image
|
||||
class="shrink-0 image_9 image_10"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"
|
||||
/>
|
||||
<text class="font_3 text_16">减</text>
|
||||
<text class="font_9 text_17">0.00</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="flex-row justify-between items-center group_12">
|
||||
<text class="font_7 text_18">合计</text>
|
||||
<view class="flex-row items-center">
|
||||
|
|
@ -130,10 +119,8 @@
|
|||
</view>
|
||||
<view class="flex-col section_6">
|
||||
<text class="self-start font_7 text_19">订单备注</text>
|
||||
<view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
<!-- <text class="font_2 text_20">备注建议提前协商（250字以内）</text> -->
|
||||
<textarea @input="textAssign" auto-height style="width: 360px;"></textarea>
|
||||
</view>
|
||||
<textarea maxlength="250" placeholder-style="font-size: 25rpx;" v-model="note" placeholder="备注建议提前协商（250字以内）" class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
</textarea>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center section_7 pos_8">
|
||||
|
|
@ -520,10 +507,6 @@ const wxPay = async ( oid )=> { //传入订单id
|
|||
console.log('支付成功res--->',res);
|
||||
},
|
||||
fail(e) {
|
||||
uni.showModal({
|
||||
content: '支付失败',
|
||||
showCancel: false
|
||||
})
|
||||
uni.redirectTo({
|
||||
url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid
|
||||
})
|
||||
|
|
@ -551,11 +534,6 @@ const getFonts =()=>{
|
|||
}
|
||||
})
|
||||
}
|
||||
const textAssign = (e) => { //文本输入框赋值方法
|
||||
// console.log(e);
|
||||
note.value = e.detail.value
|
||||
console.log('note--->',note.value);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
@ -828,11 +806,13 @@ const textAssign = (e) => { //文本输入框赋值方法
|
|||
line-height: 29.53rpx;
|
||||
}
|
||||
.text-wrapper_2 {
|
||||
margin-left: 3.99rpx;
|
||||
margin-right: 3.99rpx;
|
||||
padding: 22.35rpx 20rpx;
|
||||
height: 200rpx;
|
||||
width: 650rpx;
|
||||
padding: 22.35rpx;
|
||||
box-sizing: border-box;
|
||||
background-color: #ffefef;
|
||||
border-radius: 9.38rpx;
|
||||
margin: 20rpx auto 0;
|
||||
}
|
||||
.text_20 {
|
||||
margin-left: 21.15rpx;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-center items-center group_9 mt-15">
|
||||
<!-- <view class="flex-row justify-center items-center group_9 mt-15">
|
||||
<view class="group_10">
|
||||
<text class="font_7 text_11">注：购买课程均视为同意</text>
|
||||
<text class="font_7 text_12">用户须知</text>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
class="image_7 ml-2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FcoxrJLJf-quesrion.png"
|
||||
/>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="flex-col section_4">
|
||||
<view class="flex-row justify-between items-center my-coupon">
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
</view>
|
||||
<view class="flex-col section_5">
|
||||
<text class="self-start font_8 text_15" style="margin: 10rpx 0 0 5rpx">订单备注</text>
|
||||
<textarea maxlength="250" placeholder-style="font-size: 25rpx;" placeholder="备注建议提前协商（250字以内）" class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
<textarea maxlength="250" placeholder-style="font-size: 25rpx;" v-model="note" placeholder="备注建议提前协商（250字以内）" class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
|
||||
</textarea>
|
||||
</view>
|
||||
<view class="flex-row justify-between items-center section_6">
|
||||
|
|
@ -391,10 +391,6 @@ import { dealResult } from '../../../common/globalFunction';
|
|||
})
|
||||
}
|
||||
}
|
||||
const textAssign = (e) => { //文本输入框赋值方法
|
||||
note.value = e.detail.value
|
||||
// console.log('note--->',note.value);
|
||||
}
|
||||
//获取字体
|
||||
const getFonts =()=>{
|
||||
uni.loadFontFace({
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user