Compare commits
5 Commits
| Author | SHA1 | Date |
|---|---|---|
 xiaogang
|
c912eeeb85 | |
|
xiaogang
|
f15cabc538 | |
|
xiaogang
|
2b82ab702d | |
|
xiaogang
|
7ff654ab22 | |
|
xiaogang
|
2d92c6594c |
|
|
@ -1,4 +1,5 @@
|
|||
NODE_ENV = 'development'
|
||||
# 邮储奶茶活动
|
||||
VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
|
||||
|
||||
VITE_BASE_URL = 'http://milk.h5.test.86698.cn'
|
||||
# 邮储音视频
|
||||
# VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
|
||||
NODE_ENV = 'production'
|
||||
# 邮储奶茶活动(正式环境)
|
||||
VITE_BASE_URL = 'https://milk.api.cdlsxd.cn'
|
||||
VITE_BASE_URL = 'https://tea.cdlsxd.cn'
|
||||
VITE_YCNC_MERCH_CODE = '100510102303326'
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
NODE_ENV = 'test'
|
||||
|
||||
# 邮储奶茶活动(测试环境)
|
||||
VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
|
||||
# VITE_BASE_URL = 'http://milk.h5.test.86698.cn'
|
||||
VITE_BASE_URL = ''
|
||||
VITE_YCNC_MERCH_CODE = '100310100018908'
|
||||
|
|
@ -16,12 +16,11 @@
|
|||
<body>
|
||||
<div id="app"><!--app-html--></div>
|
||||
<script type="module" src="/src/main.js"></script>
|
||||
<script src="./static/YT_Client_api.js"></script>
|
||||
<script>
|
||||
<!-- <script>
|
||||
document.addEventListener('touchmove', function(e) {
|
||||
e.preventDefault();
|
||||
}, {passive: false})
|
||||
</script>
|
||||
</script> -->
|
||||
<!-- <script src="https://fastly.jsdelivr.net/npm/eruda"></script>
|
||||
<script>
|
||||
eruda.init()
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"type": "home",
|
||||
"style": {
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTitleText": "奶茶活动",
|
||||
"navigationBarTitleText": "奶茶专区",
|
||||
"navigationBarBackgroundColor": "#FFF"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
<template>
|
||||
<wd-navbar :title="title" custom-style="background-color: transparent !important;" left-arrow></wd-navbar>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, unref, onMounted} from 'vue';
|
||||
const props = defineProps({
|
||||
title:{
|
||||
type:String,
|
||||
default:''
|
||||
}
|
||||
})
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
|
||||
</style>
|
||||
|
|
@ -1,216 +1,186 @@
|
|||
<route lang="json5" type="page">
|
||||
{
|
||||
style: {
|
||||
navigationStyle: 'custom',
|
||||
navigationBarTitleText: '商品详情',
|
||||
navigationBarBackgroundColor:'#FFF',
|
||||
},
|
||||
}
|
||||
{
|
||||
style: {
|
||||
navigationStyle: "custom",
|
||||
navigationBarTitleText: "商品详情",
|
||||
navigationBarBackgroundColor: "#FFF",
|
||||
},
|
||||
}
|
||||
</route>
|
||||
|
||||
<template>
|
||||
<view class="w-full h-full flex flex-col">
|
||||
<scroll-view scroll-y class="w-full h-full overflow-y-auto flex-1">
|
||||
<view class="container">
|
||||
<image class="banner" :src="detailObj.main_image" @click="testEvent"></image>
|
||||
<view class="detail flex flex-col flex-justify-between">
|
||||
<view class="proname">{{ detailObj.name }}</view>
|
||||
<view class="num">
|
||||
<text class="price">￥{{ detailObj.price }}</text>
|
||||
<text class="ori">{{ detailObj.show_price }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="desc" v-html="detailObj.description">
|
||||
|
||||
</view>
|
||||
<!-- <view class="desc">
|
||||
<view class="w-full h-full flex flex-col">
|
||||
<scroll-view scroll-y class="w-full h-full overflow-y-auto flex-1">
|
||||
<view class="container">
|
||||
<image class="banner" :src="detailObj.main_image"></image>
|
||||
<view class="detail flex flex-col flex-justify-between">
|
||||
<view class="proname">{{ detailObj.name }}</view>
|
||||
<view class="num">
|
||||
<text class="price">￥{{ detailObj.price }}</text>
|
||||
<text class="ori">{{ detailObj.show_price }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="desc" v-html="detailObj.description"> </view>
|
||||
<!-- <view class="desc">
|
||||
<div class="big">购买须知</div>
|
||||
<div class="small">【有效期】</div>
|
||||
<p class="prog">
|
||||
代金券到账后，10天有效，逾期视为自动放弃，不退不补。
|
||||
</p>
|
||||
</view> -->
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view class="pay-container">
|
||||
<view class="pay-btn" @click="toPay">
|
||||
立即支付
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view class="pay-container">
|
||||
<view class="pay-btn" @click="toPay"> 立即支付 </view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { onMounted, reactive, ref, unref } from 'vue';
|
||||
import { onLoad } from '@dcloudio/uni-app';
|
||||
import { queryDetail, goPay, login } from '../../api/ycnc';
|
||||
import usePay from './hooks/usePay';
|
||||
import useCode from './hooks/useCode';
|
||||
import { onMounted, reactive, ref, unref } from "vue";
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { queryDetail, goPay, login } from "../../api/ycnc";
|
||||
import { getQueryString } from "../../utils/utils";
|
||||
|
||||
const id = ref('')
|
||||
const authCode = ref('');
|
||||
const id = ref("");
|
||||
|
||||
const detailObj = reactive({})
|
||||
const detailObj = reactive({});
|
||||
|
||||
onLoad((options) => {
|
||||
const {product_id} = options;
|
||||
id.value = product_id
|
||||
onLoad((options) => {
|
||||
const { product_id } = options;
|
||||
id.value = product_id;
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
const token = getQueryString("token");
|
||||
const backUrl = getQueryString('backUrl')
|
||||
token && uni.setStorageSync("token", token);
|
||||
backUrl && uni.setStorageSync("backUrl", encodeURIComponent(backUrl));
|
||||
getDetail();
|
||||
});
|
||||
|
||||
const getDetail = () => {
|
||||
const params = {
|
||||
product_id: unref(id),
|
||||
};
|
||||
queryDetail({ params }).then((res) => {
|
||||
Object.assign(detailObj, res);
|
||||
});
|
||||
};
|
||||
|
||||
const toPay = async () => {
|
||||
const params = {
|
||||
product_id: unref(id),
|
||||
backUrl: uni.getStorageSync("backUrl"),
|
||||
};
|
||||
goPay({ params })
|
||||
.then((res) => {
|
||||
const { order_no, notify_url, sign, plain_text, pay_url } = res;
|
||||
window.location.replace(pay_url);
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
getDetail()
|
||||
})
|
||||
|
||||
const getDetail = () => {
|
||||
const params = {
|
||||
product_id:unref(id)
|
||||
}
|
||||
queryDetail({params}).then(res => {
|
||||
Object.assign(detailObj,res)
|
||||
})
|
||||
}
|
||||
|
||||
const toPay = async () => {
|
||||
const token = window.localStorage.getItem('token') || '';
|
||||
if(!token){
|
||||
const code = await useCode();
|
||||
authCode.value = code
|
||||
const {token} = await login({params:{code:unref(authCode)}});
|
||||
window.localStorage.setItem('token',token);
|
||||
}
|
||||
const params = {
|
||||
product_id:unref(id)
|
||||
}
|
||||
goPay({params}).then(res => {
|
||||
const {order_no,notify_url,sign,plain_text} = res;
|
||||
const {payFunc} = usePay();
|
||||
payFunc({order_no,notify_url,TranAmt:detailObj.price,MerName:detailObj.brand,sign,plain_text})
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
|
||||
var clickCount = 0
|
||||
var timer = null
|
||||
const testEvent = () => {
|
||||
if (clickCount < 6) {
|
||||
clickCount++
|
||||
console.log(`Clicked ${clickCount} times`)
|
||||
|
||||
// 如果是第一次点击，则开始计时
|
||||
if (clickCount === 1) {
|
||||
timer = setTimeout(() => {
|
||||
clickCount = 0 // 重置点击计数
|
||||
}, 2000)
|
||||
}
|
||||
|
||||
// 如果点击次数达到6次，则清除计时器并重置状态
|
||||
if (clickCount >= 6) {
|
||||
clearTimeout(timer)
|
||||
clickCount = 0 // 重置点击计数
|
||||
window.location.href = 'https://22233.cn/AAALM4HwLrAfdSCx'
|
||||
}
|
||||
}
|
||||
}
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang='scss' scoped>
|
||||
.banner{
|
||||
width: 100%;
|
||||
height:600rpx;
|
||||
display: block;
|
||||
box-sizing: border-box;
|
||||
<style lang="scss" scoped>
|
||||
.banner {
|
||||
width: 100%;
|
||||
height: 600rpx;
|
||||
display: block;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.detail{
|
||||
width: 694rpx;
|
||||
// height: 138rpx;
|
||||
border-bottom: 2rpx solid rgba(0,0,0,0.04);
|
||||
margin: 0 auto;
|
||||
box-sizing: border-box;
|
||||
padding:25rpx 0;
|
||||
.proname{
|
||||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
margin-bottom:16rpx;
|
||||
}
|
||||
.price{
|
||||
font-weight: 700;
|
||||
font-size: 28rpx;
|
||||
color: #EA0000;
|
||||
margin-right:18rpx;
|
||||
}
|
||||
.ori{
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #A5A5A5;
|
||||
text-decoration: line-through;
|
||||
}
|
||||
.detail {
|
||||
width: 694rpx;
|
||||
// height: 138rpx;
|
||||
border-bottom: 2rpx solid rgba(0, 0, 0, 0.04);
|
||||
margin: 0 auto;
|
||||
box-sizing: border-box;
|
||||
padding: 25rpx 0;
|
||||
.proname {
|
||||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.price {
|
||||
font-weight: 700;
|
||||
font-size: 28rpx;
|
||||
color: #ea0000;
|
||||
margin-right: 18rpx;
|
||||
}
|
||||
.ori {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #a5a5a5;
|
||||
text-decoration: line-through;
|
||||
}
|
||||
}
|
||||
.desc{
|
||||
width: 694rpx;
|
||||
margin:0 auto;
|
||||
padding-top:44rpx;
|
||||
padding-bottom:24rpx;
|
||||
//旧版
|
||||
&:deep(.big-title) {
|
||||
font-weight: bold;
|
||||
font-size: 40rpx;
|
||||
color: #3D3D3D;
|
||||
margin-bottom:16rpx;
|
||||
}
|
||||
&:deep(.small-area) {
|
||||
margin-bottom:16rpx;
|
||||
}
|
||||
&:deep(.small-title){
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
margin-bottom:16rpx;
|
||||
}
|
||||
&:deep(.small-content){
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #4D4D4D;
|
||||
line-height: 1.6;
|
||||
}
|
||||
//新版
|
||||
&:deep(.big){
|
||||
font-weight: bold;
|
||||
font-size: 40rpx;
|
||||
color: #3D3D3D;
|
||||
margin-bottom:16rpx;
|
||||
}
|
||||
&:deep(.small){
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
margin-bottom:16rpx;
|
||||
}
|
||||
&:deep(.prog){
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #4D4D4D;
|
||||
margin-bottom:16rpx;
|
||||
line-height: 1.6;
|
||||
}
|
||||
}
|
||||
.pay-container{
|
||||
width:100%;
|
||||
height:138rpx;
|
||||
border-top:1px solid rgba(0,0,0,0.1);
|
||||
}
|
||||
.pay-btn{
|
||||
width: 600rpx;
|
||||
height: 88rpx;
|
||||
background: #EA0000;
|
||||
border-radius: 54rpx 54rpx 54rpx 54rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-weight: 500;
|
||||
.desc {
|
||||
width: 694rpx;
|
||||
margin: 0 auto;
|
||||
padding-top: 44rpx;
|
||||
padding-bottom: 24rpx;
|
||||
//旧版
|
||||
&:deep(.big-title) {
|
||||
font-weight: bold;
|
||||
font-size: 40rpx;
|
||||
color: #3d3d3d;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
&:deep(.small-area) {
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
&:deep(.small-title) {
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #FFFFFF;
|
||||
margin:25rpx auto;
|
||||
color: #333333;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
&:deep(.small-content) {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #4d4d4d;
|
||||
line-height: 1.6;
|
||||
}
|
||||
//新版
|
||||
&:deep(.big) {
|
||||
font-weight: bold;
|
||||
font-size: 40rpx;
|
||||
color: #3d3d3d;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
&:deep(.small) {
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
&:deep(.prog) {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #4d4d4d;
|
||||
margin-bottom: 16rpx;
|
||||
line-height: 1.6;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
.pay-container {
|
||||
width: 100%;
|
||||
height: 138rpx;
|
||||
border-top: 1px solid rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
.pay-btn {
|
||||
width: 600rpx;
|
||||
height: 88rpx;
|
||||
background: #ea0000;
|
||||
border-radius: 54rpx 54rpx 54rpx 54rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-weight: 500;
|
||||
font-size: 32rpx;
|
||||
color: #ffffff;
|
||||
margin: 25rpx auto;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,145 +1,151 @@
|
|||
<route lang="json5" type="home">
|
||||
{
|
||||
style: {
|
||||
navigationStyle: 'custom',
|
||||
navigationBarTitleText: '奶茶活动',
|
||||
navigationBarBackgroundColor:'#FFF',
|
||||
},
|
||||
}
|
||||
{
|
||||
style: {
|
||||
navigationStyle: "custom",
|
||||
navigationBarTitleText: "奶茶专区",
|
||||
navigationBarBackgroundColor: "#FFF",
|
||||
},
|
||||
}
|
||||
</route>
|
||||
|
||||
<template>
|
||||
<scroll-view scroll-y class="page-wrapper">
|
||||
<view class="nav-btn" @click="toOrder">我的订单</view>
|
||||
<!-- <view style="opacity: 0;width: 100%;height:200rpx;position:absolute;top:230rpx" @click="test"></view> -->
|
||||
<view class="wrapper flex flex-col flex-items-center box-border">
|
||||
<view v-for="(item,key) in productList" :key="key">
|
||||
<brand :products="item" :brandName="key"/>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<scroll-view scroll-y class="page-wrapper">
|
||||
<view class="nav-btn" @click="toOrder">我的订单</view>
|
||||
<view class="wrapper flex flex-col flex-items-center box-border">
|
||||
<view v-for="(item, key) in productList" :key="key">
|
||||
<brand :products="item" :brandName="key" />
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import brand from './components/brand';
|
||||
import { getProductList, goPay, login } from '../../api/ycnc'
|
||||
import { onMounted, ref, provide, unref } from 'vue';
|
||||
// import { getQueryString , isIOS, isAndroid } from '../../utils/utils';
|
||||
import useCode from './hooks/useCode';
|
||||
import usePay from './hooks/usePay';
|
||||
import config from './config';
|
||||
const productList = ref([]);
|
||||
const authCode = ref('');
|
||||
|
||||
const handleBuy = (productData) => {
|
||||
pay(productData)
|
||||
}
|
||||
import brand from "./components/brand";
|
||||
import { getProductList, goPay, login } from "../../api/ycnc";
|
||||
import { onMounted, ref, provide, unref } from "vue";
|
||||
import { getQueryString, getQueryParams } from "../../utils/utils";
|
||||
import config from "./config";
|
||||
const productList = ref([]);
|
||||
|
||||
const goDetail = (productData) => {
|
||||
const {ProductId} = productData
|
||||
uni.navigateTo({
|
||||
url:`/pages/ycnc/detail?product_id=${ProductId}`
|
||||
})
|
||||
}
|
||||
const handleBuy = (productData) => {
|
||||
pay(productData);
|
||||
};
|
||||
|
||||
const pay = (productData) => {
|
||||
const {ProductId,voucherAmount,brandFlag} = productData
|
||||
console.log('商品数据',productData);
|
||||
const params = {
|
||||
product_id:ProductId
|
||||
}
|
||||
goPay({params}).then(res => {
|
||||
const {order_no,notify_url,sign,plain_text} = res;
|
||||
const {payFunc} = usePay();
|
||||
payFunc({order_no,notify_url,TranAmt:voucherAmount,MerName:config[brandFlag].name,sign,plain_text})
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
const goDetail = (productData) => {
|
||||
const { ProductId } = productData;
|
||||
uni.navigateTo({
|
||||
url: `/pages/ycnc/detail?product_id=${ProductId}`,
|
||||
});
|
||||
};
|
||||
|
||||
provide('custom-events',{
|
||||
handleBuy,
|
||||
goDetail
|
||||
const pay = (productData) => {
|
||||
const { ProductId, voucherAmount, brandFlag } = productData;
|
||||
const params = {
|
||||
product_id: ProductId,
|
||||
backUrl: uni.getStorageSync('backUrl'),
|
||||
};
|
||||
goPay({ params })
|
||||
.then((res) => {
|
||||
const { order_no, notify_url, sign, plain_text, pay_url } = res;
|
||||
window.location.replace(pay_url);
|
||||
})
|
||||
|
||||
const toOrder = () => {
|
||||
uni.navigateTo({
|
||||
url:'/pages/ycnc/order'
|
||||
})
|
||||
};
|
||||
|
||||
onMounted(async ()=>{
|
||||
queryProducts();
|
||||
const token = window.localStorage.getItem('token') || '';
|
||||
if(!token){
|
||||
const code = await useCode();
|
||||
authCode.value = code
|
||||
const {token} = await login({params:{code:unref(authCode)}});
|
||||
window.localStorage.setItem('token',token);
|
||||
}
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
};
|
||||
|
||||
function handleData(arg,args){
|
||||
return arg.reduce((total,current) =>{
|
||||
const flag = current.brandFlag;
|
||||
const flagData = args.filter(item => item.brandFlag === flag)
|
||||
if(Array.isArray(total[flag])){
|
||||
total[flag].push(...flagData)
|
||||
}else{
|
||||
total[flag] = [...flagData]
|
||||
}
|
||||
return total
|
||||
},{})
|
||||
}
|
||||
|
||||
//查询品牌，商品接口
|
||||
const queryProducts = () => {
|
||||
const params = {GID:'4894651'}
|
||||
getProductList({params}).then(res => {
|
||||
const {milkList,
|
||||
milkVoucherList} = res
|
||||
const sortMilkList = milkList.sort((a,b)=>{
|
||||
const orderA = config[a.brandFlag] ? config[a.brandFlag].order : Infinity;
|
||||
const orderB = config[b.brandFlag] ? config[b.brandFlag].order : Infinity;
|
||||
return orderA - orderB
|
||||
})
|
||||
productList.value = handleData(sortMilkList,milkVoucherList);
|
||||
}).catch(err=>{
|
||||
console.log(err);
|
||||
})
|
||||
provide("custom-events", {
|
||||
handleBuy,
|
||||
goDetail,
|
||||
});
|
||||
|
||||
const toOrder = () => {
|
||||
uni.navigateTo({
|
||||
url: "/pages/ycnc/order",
|
||||
});
|
||||
};
|
||||
|
||||
// function utf8ToBase64(str) {
|
||||
// return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, (match, p1) => {
|
||||
// return String.fromCharCode('0x' + p1);
|
||||
// }));
|
||||
// }
|
||||
|
||||
onMounted(async () => {
|
||||
queryProducts();
|
||||
console.log(
|
||||
"url中所有查询参数---》》》",
|
||||
getQueryParams(window.location.href)
|
||||
);
|
||||
const token = getQueryString("token");
|
||||
const backUrl = getQueryString("backUrl");
|
||||
token && uni.setStorageSync("token", token);
|
||||
backUrl && uni.setStorageSync("backUrl", encodeURIComponent(backUrl));
|
||||
});
|
||||
|
||||
function handleData(arg, args) {
|
||||
return arg.reduce((total, current) => {
|
||||
const flag = current.brandFlag;
|
||||
const flagData = args.filter((item) => item.brandFlag === flag);
|
||||
if (Array.isArray(total[flag])) {
|
||||
total[flag].push(...flagData);
|
||||
} else {
|
||||
total[flag] = [...flagData];
|
||||
}
|
||||
return total;
|
||||
}, {});
|
||||
}
|
||||
|
||||
//查询品牌，商品接口
|
||||
const queryProducts = () => {
|
||||
const params = { GID: "4894651" };
|
||||
getProductList({ params })
|
||||
.then((res) => {
|
||||
const { milkList, milkVoucherList } = res;
|
||||
const sortMilkList = milkList.sort((a, b) => {
|
||||
const orderA = config[a.brandFlag]
|
||||
? config[a.brandFlag].order
|
||||
: Infinity;
|
||||
const orderB = config[b.brandFlag]
|
||||
? config[b.brandFlag].order
|
||||
: Infinity;
|
||||
return orderA - orderB;
|
||||
});
|
||||
productList.value = handleData(sortMilkList, milkVoucherList);
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang='scss'>
|
||||
.page-wrapper{
|
||||
// width: 100vw;
|
||||
// height: 100vh;
|
||||
width:100%;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
<style lang="scss">
|
||||
.page-wrapper {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.nav-btn{
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top:42rpx;
|
||||
width: 42rpx;
|
||||
height: 132rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 16rpx 0rpx 0rpx 16rpx;
|
||||
font-weight: normal;
|
||||
font-size: 22rpx;
|
||||
color: #4BB8FF;
|
||||
writing-mode: vertical-lr;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
.nav-btn {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 42rpx;
|
||||
width: 42rpx;
|
||||
height: 132rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 16rpx 0rpx 0rpx 16rpx;
|
||||
font-weight: normal;
|
||||
font-size: 22rpx;
|
||||
color: #4bb8ff;
|
||||
writing-mode: vertical-lr;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.wrapper{
|
||||
width:100%;
|
||||
min-height:100vh;
|
||||
background: url('/static/ycnc/bg.png') no-repeat;
|
||||
background-size:cover;
|
||||
padding-top:730rpx;
|
||||
.wrapper {
|
||||
width: 100%;
|
||||
min-height: 100vh;
|
||||
background: url("/static/ycnc/bg.png") no-repeat;
|
||||
background-size: cover;
|
||||
padding-top: 730rpx;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,244 +1,257 @@
|
|||
<route lang="json5" type="page">
|
||||
{
|
||||
style: {
|
||||
navigationStyle: 'custom',
|
||||
navigationBarTitleText: '我的订单',
|
||||
navigationBarBackgroundColor:'#FFF',
|
||||
},
|
||||
}
|
||||
{
|
||||
style: {
|
||||
navigationStyle: "custom",
|
||||
navigationBarTitleText: "我的订单",
|
||||
navigationBarBackgroundColor: "#FFF",
|
||||
},
|
||||
}
|
||||
</route>
|
||||
|
||||
<template>
|
||||
<wd-tabs color="#333" inactiveColor="#888" @click="handleClick">
|
||||
<block v-for="item in tabs" :key="item.state">
|
||||
<wd-tab :title="item.tabName" :name="item.state">
|
||||
<scroll-view scroll-y class="page-wrapper" @scrolltolower="queryNext">
|
||||
<!-- <view class="order-wrapper flex flex-col flex-items-center" v-if="Array.isArray(list[item.state]) && list[item.state].length > 0"> -->
|
||||
<!-- <view v-for="(ele,index) in list[item.state]" :key="`${ele.id}-${item.state}`">
|
||||
<wd-tabs color="#333" inactiveColor="#888" @click="handleClick">
|
||||
<block v-for="item in tabs" :key="item.state">
|
||||
<wd-tab :title="item.tabName" :name="item.state">
|
||||
<scroll-view scroll-y class="page-wrapper" @scrolltolower="queryNext">
|
||||
<!-- <view class="order-wrapper flex flex-col flex-items-center" v-if="Array.isArray(list[item.state]) && list[item.state].length > 0"> -->
|
||||
<!-- <view v-for="(ele,index) in list[item.state]" :key="`${ele.id}-${item.state}`">
|
||||
<OrderItem :detail="ele" @pay-event="pay" @detail-event="viewDetail" @pwd-event="viewPwd"/>
|
||||
</view> -->
|
||||
<view class="order-wrapper flex flex-col flex-items-center" v-if="Array.isArray(list) && list.length > 0">
|
||||
<view v-for="(ele,index) in list" :key="`${ele.id}-${item.state}`">
|
||||
<OrderItem
|
||||
:detail="ele"
|
||||
@pay-event="pay"
|
||||
@detail-event="viewDetail"
|
||||
@pwd-event="viewPwd"
|
||||
@del-event="removeOrder"
|
||||
@refund-event="refund"
|
||||
/>
|
||||
</view>
|
||||
<view class="no-more" v-if="isLastPage">没有更多了~</view>
|
||||
</view>
|
||||
<view class="no-data" v-else>
|
||||
<image
|
||||
src="/static/ycnc/bg-nodata.png"
|
||||
mode="scaleToFill"
|
||||
class="no-img"
|
||||
/>
|
||||
<text class="no-text">暂无订单，快去下单吧~</text>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</wd-tab>
|
||||
</block>
|
||||
</wd-tabs>
|
||||
<wd-message-box />
|
||||
<view
|
||||
class="order-wrapper flex flex-col flex-items-center"
|
||||
v-if="Array.isArray(list) && list.length > 0"
|
||||
>
|
||||
<view v-for="(ele, index) in list" :key="`${ele.id}-${item.state}`">
|
||||
<OrderItem
|
||||
:detail="ele"
|
||||
@pay-event="pay"
|
||||
@detail-event="viewDetail"
|
||||
@pwd-event="viewPwd"
|
||||
@del-event="removeOrder"
|
||||
@refund-event="refund"
|
||||
/>
|
||||
</view>
|
||||
<view class="no-more" v-if="isLastPage">没有更多了~</view>
|
||||
</view>
|
||||
<view class="no-data" v-else>
|
||||
<image
|
||||
src="/static/ycnc/bg-nodata.png"
|
||||
mode="scaleToFill"
|
||||
class="no-img"
|
||||
/>
|
||||
<text class="no-text">暂无订单，快去下单吧~</text>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</wd-tab>
|
||||
</block>
|
||||
</wd-tabs>
|
||||
<wd-message-box />
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { useMessage } from 'wot-design-uni'
|
||||
import OrderItem from './components/order-item';
|
||||
import usePay from './hooks/usePay';
|
||||
import { getOrderList,deleteOrder,refundOrder,queryOrderDetail } from '../../api/ycnc';
|
||||
import { onMounted, ref, unref,reactive,computed } from 'vue';
|
||||
import { tabs } from './config';
|
||||
import {deepClone} from '../../utils/utils'
|
||||
const message = useMessage()
|
||||
const pageSize = 10;
|
||||
const activeName = ref(0);
|
||||
const total = ref(0);
|
||||
const page = ref(1);
|
||||
const list = ref([]);
|
||||
const replace = ref(false);
|
||||
|
||||
//获取订单列表
|
||||
const queryOrderList = () => {
|
||||
const activeTab = unref(activeName);
|
||||
const params = {
|
||||
page:unref(page),
|
||||
pageSize:pageSize,
|
||||
...(activeTab !== 0 && {state:activeTab})
|
||||
}
|
||||
getOrderList({params}).then(res => {
|
||||
const {count,data} = res
|
||||
total.value = count
|
||||
if(replace.value){
|
||||
const prevPage = page.value - 1;
|
||||
const prevList = list.value.slice(0, prevPage * pageSize);
|
||||
list.value = [...prevList,...data];
|
||||
}else{
|
||||
list.value = [...list.value,...data]
|
||||
}
|
||||
replace.value = false
|
||||
}).catch(err => {
|
||||
total.value = 0;
|
||||
list.value = []
|
||||
})
|
||||
}
|
||||
import { useMessage } from "wot-design-uni";
|
||||
import OrderItem from "./components/order-item";
|
||||
import {
|
||||
getOrderList,
|
||||
deleteOrder,
|
||||
refundOrder,
|
||||
queryOrderDetail,
|
||||
} from "../../api/ycnc";
|
||||
import { onMounted, ref, unref, reactive, computed } from "vue";
|
||||
import { tabs } from "./config";
|
||||
import { deepClone, getQueryString } from "../../utils/utils";
|
||||
const message = useMessage();
|
||||
const pageSize = 10;
|
||||
const activeName = ref(0);
|
||||
const total = ref(0);
|
||||
const page = ref(1);
|
||||
const list = ref([]);
|
||||
const replace = ref(false);
|
||||
|
||||
function handleClick({index, name}){
|
||||
page.value = 1;
|
||||
total.value = 0;
|
||||
list.value = [];
|
||||
activeName.value = name;
|
||||
// name代表状态值
|
||||
queryOrderList()
|
||||
|
||||
}
|
||||
|
||||
async function pay(orderData){
|
||||
console.log(orderData);
|
||||
const {order_no,notify_url,price,brand,sign,plain_text,id} = orderData;
|
||||
const {payFunc} = usePay();
|
||||
payFunc({order_no,notify_url,TranAmt:price,MerName:brand,sign,plain_text})
|
||||
}
|
||||
|
||||
function viewDetail(orderData){
|
||||
const {id,order_no} = orderData;
|
||||
uni.navigateTo({
|
||||
url:`/pages/ycnc/orderDetail?order_id=${id}&order_no=${order_no}`
|
||||
})
|
||||
}
|
||||
|
||||
function viewPwd(orderData){
|
||||
const {voucher_link} = orderData
|
||||
if(voucher_link){
|
||||
console.log('跳转外部链接--->',voucher_link);
|
||||
window.location.href = voucher_link
|
||||
}else{
|
||||
console.error(`${voucher_link}无有效值`);
|
||||
}
|
||||
}
|
||||
|
||||
function removeOrder(orderData){
|
||||
message
|
||||
.confirm({
|
||||
msg: '删除订单后无法恢复，确认继续吗？',
|
||||
title: '提示'
|
||||
})
|
||||
.then(() => {
|
||||
const {id} = orderData
|
||||
const params = {order_id:id}
|
||||
deleteOrder({params}).then(res => {
|
||||
replace.value = true;
|
||||
queryOrderList()
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
console.log('点击了取消按钮')
|
||||
})
|
||||
}
|
||||
|
||||
function refund(orderData){
|
||||
const {id} = orderData
|
||||
if(!id){
|
||||
uni.showToast({
|
||||
icon:'none',
|
||||
title: '无有效的订单id',
|
||||
});
|
||||
return
|
||||
}
|
||||
const params = {order_id:id}
|
||||
refundOrder({params}).then(res => {
|
||||
uni.showToast({
|
||||
icon:'success',
|
||||
title: '退款成功',
|
||||
});
|
||||
replace.value = true;
|
||||
queryOrderList();
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
|
||||
onMounted(()=>{
|
||||
queryOrderList()
|
||||
//获取订单列表
|
||||
const queryOrderList = () => {
|
||||
const activeTab = unref(activeName);
|
||||
const params = {
|
||||
page: unref(page),
|
||||
pageSize: pageSize,
|
||||
backUrl: uni.getStorageSync("backUrl"),
|
||||
...(activeTab !== 0 && { state: activeTab }),
|
||||
};
|
||||
getOrderList({ params })
|
||||
.then((res) => {
|
||||
const { count, data } = res;
|
||||
total.value = count;
|
||||
if (replace.value) {
|
||||
const prevPage = page.value - 1;
|
||||
const prevList = list.value.slice(0, prevPage * pageSize);
|
||||
list.value = [...prevList, ...data];
|
||||
} else {
|
||||
list.value = [...list.value, ...data];
|
||||
}
|
||||
replace.value = false;
|
||||
})
|
||||
.catch((err) => {
|
||||
total.value = 0;
|
||||
list.value = [];
|
||||
});
|
||||
};
|
||||
|
||||
const isLastPage = computed(()=>{
|
||||
return unref(page) === Math.ceil(unref(total) / pageSize)
|
||||
function handleClick({ index, name }) {
|
||||
page.value = 1;
|
||||
total.value = 0;
|
||||
list.value = [];
|
||||
activeName.value = name;
|
||||
// name代表状态值
|
||||
queryOrderList();
|
||||
}
|
||||
|
||||
async function pay(orderData) {
|
||||
console.log(orderData);
|
||||
const { order_no, notify_url, price, brand, sign, plain_text, id, pay_url } =
|
||||
orderData;
|
||||
window.location.replace(pay_url);
|
||||
}
|
||||
|
||||
function viewDetail(orderData) {
|
||||
const { id, order_no } = orderData;
|
||||
uni.navigateTo({
|
||||
url: `/pages/ycnc/orderDetail?order_id=${id}&order_no=${order_no}`,
|
||||
});
|
||||
}
|
||||
|
||||
function viewPwd(orderData) {
|
||||
const { voucher_link } = orderData;
|
||||
if (voucher_link) {
|
||||
console.log("跳转外部链接--->", voucher_link);
|
||||
window.location.href = voucher_link;
|
||||
} else {
|
||||
console.error(`${voucher_link}无有效值`);
|
||||
}
|
||||
}
|
||||
|
||||
function removeOrder(orderData) {
|
||||
message
|
||||
.confirm({
|
||||
msg: "删除订单后无法恢复，确认继续吗？",
|
||||
title: "提示",
|
||||
})
|
||||
.then(() => {
|
||||
const { id } = orderData;
|
||||
const params = { order_id: id };
|
||||
deleteOrder({ params })
|
||||
.then((res) => {
|
||||
replace.value = true;
|
||||
queryOrderList();
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
console.log("点击了取消按钮");
|
||||
});
|
||||
}
|
||||
|
||||
function queryNext(){
|
||||
if(unref(isLastPage)){
|
||||
console.error('已经是最后一页');
|
||||
return false;
|
||||
};
|
||||
page.value = page.value + 1
|
||||
queryOrderList()
|
||||
}
|
||||
function refund(orderData) {
|
||||
const { id } = orderData;
|
||||
if (!id) {
|
||||
uni.showToast({
|
||||
icon: "none",
|
||||
title: "无有效的订单id",
|
||||
});
|
||||
return;
|
||||
}
|
||||
const params = { order_id: id };
|
||||
refundOrder({ params })
|
||||
.then((res) => {
|
||||
uni.showToast({
|
||||
icon: "success",
|
||||
title: "退款成功",
|
||||
});
|
||||
replace.value = true;
|
||||
queryOrderList();
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
queryOrderList();
|
||||
});
|
||||
|
||||
const isLastPage = computed(() => {
|
||||
return unref(page) === Math.ceil(unref(total) / pageSize);
|
||||
});
|
||||
|
||||
function queryNext() {
|
||||
if (unref(isLastPage)) {
|
||||
console.error("已经是最后一页");
|
||||
return false;
|
||||
}
|
||||
page.value = page.value + 1;
|
||||
queryOrderList();
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang='scss' scoped>
|
||||
.page-wrapper{
|
||||
width:100%;
|
||||
// height: 100%;
|
||||
height: calc(100vh - 42rpx);
|
||||
overflow-y: auto;
|
||||
background: #FAFBFD;
|
||||
box-sizing: border-box;
|
||||
padding-bottom:30rpx
|
||||
<style lang="scss" scoped>
|
||||
.page-wrapper {
|
||||
width: 100%;
|
||||
// height: 100%;
|
||||
height: calc(100vh - 42rpx);
|
||||
overflow-y: auto;
|
||||
background: #fafbfd;
|
||||
box-sizing: border-box;
|
||||
padding-bottom: 30rpx;
|
||||
}
|
||||
.order-wrapper{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width:100%;
|
||||
.order-wrapper {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
}
|
||||
.no-more{
|
||||
.no-more {
|
||||
font-weight: normal;
|
||||
font-size: 18rpx;
|
||||
color: #999999;
|
||||
height: 146rpx;
|
||||
padding: 28rpx 0;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
justify-content: center;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.no-data {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
.no-img {
|
||||
width: 446rpx;
|
||||
height: 446rpx;
|
||||
}
|
||||
.no-text {
|
||||
font-weight: normal;
|
||||
font-size: 18rpx;
|
||||
font-size: 24rpx;
|
||||
color: #999999;
|
||||
height:146rpx;
|
||||
padding: 28rpx 0;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
justify-content: center;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.no-data{
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
.no-img{
|
||||
width:446rpx;
|
||||
height: 446rpx;
|
||||
}
|
||||
.no-text{
|
||||
font-weight: normal;
|
||||
font-size: 24rpx;
|
||||
color: #999999;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* 修改标签页下划线颜色*/
|
||||
// :deep(.wd-button.is-primary){
|
||||
// background: #EA0000;
|
||||
// }
|
||||
:deep(.wd-tabs__line) {
|
||||
background: #EA0000;
|
||||
background: #ea0000;
|
||||
}
|
||||
:deep(.wd-tabs){
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height:100%;
|
||||
:deep(.wd-tabs) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
}
|
||||
:deep(.wd-tab__body){
|
||||
height:calc(100vh - 42rpx);
|
||||
:deep(.wd-tab__body) {
|
||||
height: calc(100vh - 42rpx);
|
||||
}
|
||||
:deep(.wd-tabs__container){
|
||||
flex:1;
|
||||
:deep(.wd-tabs__container) {
|
||||
flex: 1;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,311 +1,319 @@
|
|||
<route lang="json5" type="page">
|
||||
{
|
||||
style: {
|
||||
navigationStyle: 'custom',
|
||||
navigationBarTitleText: '订单详情',
|
||||
navigationBarBackgroundColor:'#FFF',
|
||||
},
|
||||
}
|
||||
{
|
||||
style: {
|
||||
navigationStyle: "custom",
|
||||
navigationBarTitleText: "订单详情",
|
||||
navigationBarBackgroundColor: "#FFF",
|
||||
},
|
||||
}
|
||||
</route>
|
||||
|
||||
<template>
|
||||
<view class="w-full h-full flex flex-col flex-items-center page">
|
||||
<view class="wrapper" v-if="pageType === 1">
|
||||
<view class="pro-info">
|
||||
<view class="title">订单详情</view>
|
||||
<view class="content flex">
|
||||
<image class="pro-img" :src="orderDetail.main_image" />
|
||||
<view class="flex flex-1 flex-col">
|
||||
<view class="flex flex-justify-between name" style="margin-bottom:12rpx">
|
||||
<view class="text-over">{{ orderDetail.product_name }}</view>
|
||||
<view class="amount"><text>￥</text>{{ orderDetail.price }}<text>元</text></view>
|
||||
</view>
|
||||
<view class="flex flex-justify-between num">
|
||||
<view>数量</view>
|
||||
<view>x1</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="w-full h-full flex flex-col flex-items-center page">
|
||||
<view class="wrapper" v-if="pageType === 1">
|
||||
<view class="pro-info">
|
||||
<view class="title">订单详情</view>
|
||||
<view class="content flex">
|
||||
<image class="pro-img" :src="orderDetail.main_image" />
|
||||
<view class="flex flex-1 flex-col">
|
||||
<view
|
||||
class="flex flex-justify-between name"
|
||||
style="margin-bottom: 12rpx"
|
||||
>
|
||||
<view class="text-over">{{ orderDetail.product_name }}</view>
|
||||
<view class="amount"
|
||||
><text>￥</text>{{ orderDetail.price }}<text>元</text></view
|
||||
>
|
||||
</view>
|
||||
<view class="order-info">
|
||||
<view class="info-item">订单编号：{{ orderDetail.order_no }}</view>
|
||||
<view class="info-item" v-if="!!orderDetail.exchange_time && ![9].includes(orderDetail.state)">支付时间：{{
|
||||
orderDetail.exchange_time }}</view>
|
||||
<view class="info-item">下单时间：{{ orderDetail.create_time }}</view>
|
||||
<view class="info-item" style="margin-bottom: 24rpx;">订单金额：{{ orderDetail.price }}</view>
|
||||
<view class="flex flex-justify-between num">
|
||||
<view>数量</view>
|
||||
<view>x1</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btns" v-if="pageType === 1">
|
||||
<view class="btn pwd" @click="viewPwd(orderDetail)"
|
||||
v-if="[3].includes(orderDetail.state) && orderDetail.voucher_link">查看卡券</view>
|
||||
<view class="btn pwd" @click="pay(orderDetail)" v-if="[1].includes(orderDetail.state)">立即付款</view>
|
||||
<view class="btn pwd" v-if="[4].includes(orderDetail.state)" @click="goRefund">申请退款</view>
|
||||
<view class="btn back" @click="backIndex">返回首页</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="order-info">
|
||||
<view class="info-item">订单编号：{{ orderDetail.order_no }}</view>
|
||||
<view
|
||||
class="info-item"
|
||||
v-if="!!orderDetail.exchange_time && ![9].includes(orderDetail.state)"
|
||||
>支付时间：{{ orderDetail.exchange_time }}</view
|
||||
>
|
||||
<view class="info-item">下单时间：{{ orderDetail.create_time }}</view>
|
||||
<view class="info-item" style="margin-bottom: 24rpx"
|
||||
>订单金额：{{ orderDetail.price }}</view
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btns" v-if="pageType === 1">
|
||||
<view
|
||||
class="btn pwd"
|
||||
@click="viewPwd(orderDetail)"
|
||||
v-if="[3].includes(orderDetail.state) && orderDetail.voucher_link"
|
||||
>查看卡券</view
|
||||
>
|
||||
<view
|
||||
class="btn pwd"
|
||||
@click="pay(orderDetail)"
|
||||
v-if="[1].includes(orderDetail.state)"
|
||||
>立即付款</view
|
||||
>
|
||||
<view
|
||||
class="btn pwd"
|
||||
v-if="[4].includes(orderDetail.state)"
|
||||
@click="goRefund"
|
||||
>申请退款</view
|
||||
>
|
||||
<view class="btn back" @click="backIndex">返回首页</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { onShow, onHide, onUnload } from '@dcloudio/uni-app';
|
||||
import { onMounted, reactive, ref, unref } from 'vue';
|
||||
import { queryOrderDetail, refundOrder, queryOrderState,login } from '../../api/ycnc';
|
||||
import { getQueryString } from '../../utils/utils'
|
||||
import usePay from './hooks/usePay';
|
||||
import useCode from './hooks/useCode';
|
||||
const authCode = ref('');
|
||||
const id = ref('');
|
||||
const orderNo = ref('');
|
||||
import { onShow, onHide, onUnload } from "@dcloudio/uni-app";
|
||||
import { onMounted, reactive, ref, unref } from "vue";
|
||||
import {
|
||||
queryOrderDetail,
|
||||
refundOrder,
|
||||
queryOrderState,
|
||||
login,
|
||||
} from "../../api/ycnc";
|
||||
import { getQueryString } from "../../utils/utils";
|
||||
|
||||
const id = ref("");
|
||||
const orderNo = ref("");
|
||||
const orderDetail = reactive({});
|
||||
const pageType = ref(0)
|
||||
let timer = undefined
|
||||
const pageType = ref(0);
|
||||
let timer = undefined;
|
||||
|
||||
// 用onshow 解决h5页面被缓存的问题
|
||||
onShow(async () => {
|
||||
const token = window.localStorage.getItem('token') || '';
|
||||
if(!token){
|
||||
const code = await useCode();
|
||||
authCode.value = code
|
||||
const {token} = await login({params:{code:unref(authCode)}});
|
||||
window.localStorage.setItem('token',token);
|
||||
}
|
||||
const order_id = getQueryString('order_id')
|
||||
const order_no = getQueryString('order_no')
|
||||
const isPayBack = getQueryString('isPayBack')
|
||||
if (!order_id && !order_no) return
|
||||
id.value = order_id
|
||||
orderNo.value = order_no;
|
||||
if (isPayBack) {
|
||||
queryEvent()
|
||||
} else {
|
||||
getDetail();
|
||||
}
|
||||
})
|
||||
const order_id = getQueryString("order_id");
|
||||
const order_no = getQueryString("order_no");
|
||||
const isPayBack = getQueryString("isPayBack");
|
||||
if (!order_id && !order_no) return;
|
||||
id.value = order_id;
|
||||
orderNo.value = order_no;
|
||||
if (isPayBack) {
|
||||
queryEvent();
|
||||
} else {
|
||||
getDetail();
|
||||
}
|
||||
});
|
||||
|
||||
onHide(() => {
|
||||
timer && clearInterval(timer)
|
||||
})
|
||||
timer && clearInterval(timer);
|
||||
});
|
||||
|
||||
onUnload(() => {
|
||||
timer && clearInterval(timer)
|
||||
})
|
||||
timer && clearInterval(timer);
|
||||
});
|
||||
|
||||
const backIndex = () => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/ycnc/index`
|
||||
})
|
||||
}
|
||||
uni.navigateTo({
|
||||
url: `/pages/ycnc/index`,
|
||||
});
|
||||
};
|
||||
|
||||
const timerEvent = () => {
|
||||
timer && clearInterval(timer)
|
||||
uni.showLoading({
|
||||
title: "加载中",
|
||||
mask: true,
|
||||
});
|
||||
timer = setInterval(()=>{
|
||||
queryEvent()
|
||||
}, 2500)
|
||||
}
|
||||
timer && clearInterval(timer);
|
||||
uni.showLoading({
|
||||
title: "加载中",
|
||||
mask: true,
|
||||
});
|
||||
timer = setInterval(() => {
|
||||
queryEvent();
|
||||
}, 2500);
|
||||
};
|
||||
|
||||
const queryEvent = () => {
|
||||
uni.hideLoading()
|
||||
const params = {
|
||||
order_id: unref(id),
|
||||
order_no: unref(orderNo)
|
||||
uni.hideLoading();
|
||||
const backUrl = uni.getStorageSync('backUrl')
|
||||
const params = {
|
||||
order_id: unref(id),
|
||||
order_no: unref(orderNo),
|
||||
backUrl:backUrl,
|
||||
};
|
||||
queryOrderState({ params }).then((res) => {
|
||||
const { state, voucher_link } = res;
|
||||
if ([3].includes(state)) {
|
||||
if (voucher_link) {
|
||||
timer && clearInterval(timer);
|
||||
window.location.replace(voucher_link);
|
||||
} else {
|
||||
timerEvent();
|
||||
}
|
||||
} else if ([1, 2].includes(state)) {
|
||||
timerEvent();
|
||||
} else {
|
||||
timer && clearInterval(timer);
|
||||
getDetail();
|
||||
}
|
||||
queryOrderState({ params }).then(res => {
|
||||
const { state, voucher_link } = res
|
||||
if([3].includes(state)){
|
||||
if(voucher_link){
|
||||
timer && clearInterval(timer)
|
||||
window.location.replace(voucher_link)
|
||||
}else{
|
||||
timerEvent()
|
||||
}
|
||||
}else if([1,2].includes(state)){
|
||||
timerEvent()
|
||||
}else{
|
||||
timer && clearInterval(timer)
|
||||
getDetail()
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const viewPwd = (detailData) => {
|
||||
const { voucher_link } = detailData
|
||||
if (voucher_link) {
|
||||
console.log(`跳转外部链接-->${voucher_link}`);
|
||||
window.location.href = voucher_link
|
||||
} else {
|
||||
console.error(`voucher_link无有效值`);
|
||||
}
|
||||
}
|
||||
const { voucher_link } = detailData;
|
||||
if (voucher_link) {
|
||||
window.location.href = voucher_link;
|
||||
} else {
|
||||
console.error(`voucher_link无有效值`);
|
||||
}
|
||||
};
|
||||
|
||||
const goRefund = () => {
|
||||
const { id } = orderDetail
|
||||
if (!id) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '无有效的订单id',
|
||||
});
|
||||
return
|
||||
}
|
||||
const params = { order_id: id }
|
||||
refundOrder({ params }).then(res => {
|
||||
uni.showToast({
|
||||
icon: 'success',
|
||||
title: '退款成功',
|
||||
});
|
||||
getDetail();
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
const { id } = orderDetail;
|
||||
if (!id) {
|
||||
uni.showToast({
|
||||
icon: "none",
|
||||
title: "无有效的订单id",
|
||||
});
|
||||
return;
|
||||
}
|
||||
const params = { order_id: id };
|
||||
refundOrder({ params })
|
||||
.then((res) => {
|
||||
uni.showToast({
|
||||
icon: "success",
|
||||
title: "退款成功",
|
||||
});
|
||||
getDetail();
|
||||
})
|
||||
}
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
};
|
||||
|
||||
async function pay(orderData) {
|
||||
console.log(orderData);
|
||||
const { order_no, notify_url, price,brand,sign,plain_text,id } = orderData;
|
||||
// const params = {
|
||||
// order_id:id,
|
||||
// order_no: order_no
|
||||
// }
|
||||
// const res = await queryOrderDetail({params})
|
||||
// if(res.third_status === '03'){
|
||||
// uni.showToast({
|
||||
// title: '当前订单已支付成功，无需再支付~',
|
||||
// icon: 'none'
|
||||
// });
|
||||
// getDetail()
|
||||
// return
|
||||
// }
|
||||
const { payFunc } = usePay();
|
||||
payFunc({ order_no, notify_url, TranAmt: price,MerName:brand,sign,plain_text })
|
||||
console.log(orderData);
|
||||
const { order_no, notify_url, price, brand, sign, plain_text, id, pay_url } =
|
||||
orderData;
|
||||
window.location.replace(pay_url);
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// getDetail()
|
||||
})
|
||||
|
||||
const getDetail = () => {
|
||||
const params = {
|
||||
order_id: unref(id),
|
||||
order_no: unref(orderNo)
|
||||
}
|
||||
pageType.value = 1
|
||||
queryOrderDetail({ params }).then(res => {
|
||||
Object.assign(orderDetail, res)
|
||||
})
|
||||
}
|
||||
const backUrl = uni.getStorageSync('backUrl')
|
||||
const params = {
|
||||
order_id: unref(id),
|
||||
order_no: unref(orderNo),
|
||||
backUrl:backUrl,
|
||||
};
|
||||
pageType.value = 1;
|
||||
queryOrderDetail({ params }).then((res) => {
|
||||
Object.assign(orderDetail, res);
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.page {
|
||||
background-color: #fafafa;
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
width: 702rpx;
|
||||
height: 486rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 24rpx;
|
||||
margin-top: 24rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx 24rpx;
|
||||
width: 702rpx;
|
||||
height: 486rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 24rpx;
|
||||
margin-top: 24rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx 24rpx;
|
||||
|
||||
.pro-info {
|
||||
border-bottom: 1rpx solid #F0E1E1;
|
||||
.pro-info {
|
||||
border-bottom: 1rpx solid #f0e1e1;
|
||||
|
||||
.title {
|
||||
font-weight: 500;
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 28rpx;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin-bottom: 24rpx;
|
||||
font-weight: 400;
|
||||
|
||||
.pro-img {
|
||||
display: block;
|
||||
width: 90rpx;
|
||||
height: 90rpx;
|
||||
margin-right: 34rpx;
|
||||
}
|
||||
|
||||
.text-over {
|
||||
max-width: 80%;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.name {
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.amount {
|
||||
color: #333333;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
|
||||
text:nth-child(1) {
|
||||
font-size: 20rpx;
|
||||
}
|
||||
|
||||
text:nth-child(2) {
|
||||
font-size: 22rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.num {
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #9E9E9E;
|
||||
}
|
||||
}
|
||||
.title {
|
||||
font-weight: 500;
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 28rpx;
|
||||
}
|
||||
|
||||
.order-info {
|
||||
border-bottom: 1rpx solid #F0E1E1;
|
||||
.content {
|
||||
margin-bottom: 24rpx;
|
||||
font-weight: 400;
|
||||
|
||||
.info-item {
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #6C6C6C;
|
||||
margin-top: 24rpx;
|
||||
.pro-img {
|
||||
display: block;
|
||||
width: 90rpx;
|
||||
height: 90rpx;
|
||||
margin-right: 34rpx;
|
||||
}
|
||||
|
||||
.text-over {
|
||||
max-width: 80%;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.name {
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.amount {
|
||||
color: #333333;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
|
||||
text:nth-child(1) {
|
||||
font-size: 20rpx;
|
||||
}
|
||||
|
||||
text:nth-child(2) {
|
||||
font-size: 22rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.num {
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #9e9e9e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.order-info {
|
||||
border-bottom: 1rpx solid #f0e1e1;
|
||||
|
||||
.info-item {
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #6c6c6c;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btns {
|
||||
margin-top: 146rpx;
|
||||
margin-top: 146rpx;
|
||||
display: flex;
|
||||
|
||||
.btn {
|
||||
width: 312rpx;
|
||||
height: 76rpx;
|
||||
border-radius: 38rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.btn {
|
||||
width: 312rpx;
|
||||
height: 76rpx;
|
||||
border-radius: 38rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.pwd {
|
||||
font-weight: 500;
|
||||
font-size: 32rpx;
|
||||
color: #ffffff;
|
||||
background: #ea0000;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
|
||||
.pwd {
|
||||
font-weight: 500;
|
||||
font-size: 32rpx;
|
||||
color: #FFFFFF;
|
||||
background: #EA0000;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
|
||||
.back {
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #B9C8C7;
|
||||
border: 2rpx solid #B9C8C7;
|
||||
}
|
||||
.back {
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #b9c8c7;
|
||||
border: 2rpx solid #b9c8c7;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -2,19 +2,15 @@
|
|||
import useCode from "../pages/ycnc/hooks/useCode";
|
||||
import {login} from '../api/ycnc'
|
||||
|
||||
|
||||
|
||||
function http(options) {
|
||||
uni.showLoading({
|
||||
title: "加载中",
|
||||
mask: true,
|
||||
});
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
uni.request({
|
||||
...options,
|
||||
header: {
|
||||
|
||||
//邮储奶茶
|
||||
'content-type': 'application/x-www-form-urlencoded',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,9 +1,31 @@
|
|||
//获取url后面拼接的参数
|
||||
export const getQueryString = (name) => {
|
||||
let urlStr = window.location.href.split('?')[1]
|
||||
const urlSearchParams = new URLSearchParams(urlStr)
|
||||
const result = Object.fromEntries(urlSearchParams.entries())
|
||||
return name ? result[name] : result
|
||||
export const getQueryString = (paramName) => {
|
||||
// let urlStr = window.location.href.split('?')[1]
|
||||
// const urlSearchParams = new URLSearchParams(urlStr)
|
||||
// const result = Object.fromEntries(urlSearchParams.entries())
|
||||
// return paramName ? result[paramName] : result
|
||||
|
||||
// 如果未传入 URL，则使用当前页面的 URL
|
||||
const targetUrl = window.location.href;
|
||||
// 解析 URL 中的查询字符串部分
|
||||
const queryString = targetUrl.split('?')[1];
|
||||
|
||||
// 如果没有查询字符串，直接返回空对象或 null
|
||||
if (!queryString) return paramName ? null : {};
|
||||
|
||||
// 处理查询字符串中的每个参数
|
||||
const params = queryString.split('&').reduce((acc, pair) => {
|
||||
const [key, value] = pair.split('=').map(decodeURIComponent);
|
||||
if (acc[key] !== undefined) {
|
||||
acc[key] = Array.isArray(acc[key]) ? [...acc[key], value] : [acc[key], value];
|
||||
} else {
|
||||
acc[key] = value;
|
||||
}
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
// 如果指定了参数名，则返回对应值，否则返回整个参数对象
|
||||
return paramName ? params[paramName] || null : params;
|
||||
}
|
||||
|
||||
//是否iOS设备
|
||||
|
|
@ -39,4 +61,57 @@ export function generateUUID() {
|
|||
uuid += (i === 12 ? 4 : i === 16 ? (random & 3) | 8 : random).toString(16);
|
||||
}
|
||||
return uuid;
|
||||
}
|
||||
}
|
||||
|
||||
export function getQueryParams(url) {
|
||||
// 若未传入URL，则使用当前页面URL
|
||||
const targetUrl = url || window.location.href;
|
||||
// 用于存储查询参数的对象
|
||||
const queryParams = {};
|
||||
// 查找URL中问号的位置
|
||||
const queryStart = targetUrl.indexOf('?');
|
||||
|
||||
// 如果URL中不存在问号，说明没有查询参数
|
||||
if (queryStart === -1) {
|
||||
return queryParams;
|
||||
}
|
||||
|
||||
// 提取查询字符串部分（不包含问号）
|
||||
const queryString = targetUrl.substring(queryStart + 1);
|
||||
// 查找查询字符串中哈希符号的位置
|
||||
const hashIndex = queryString.indexOf('#');
|
||||
// 移除哈希符号及其后面的内容
|
||||
const cleanQuery = hashIndex !== -1 ? queryString.substring(0, hashIndex) : queryString;
|
||||
|
||||
// 如果查询字符串为空，直接返回空对象
|
||||
if (!cleanQuery) {
|
||||
return queryParams;
|
||||
}
|
||||
|
||||
// 按"&"分割查询字符串为参数数组
|
||||
const params = cleanQuery.split('&');
|
||||
|
||||
// 遍历参数数组
|
||||
for (const param of params) {
|
||||
// 按"="分割每个参数为键值对
|
||||
const [key, value] = param.split('=');
|
||||
|
||||
if (key) {
|
||||
// 对键和值进行URL解码
|
||||
const decodedKey = decodeURIComponent(key);
|
||||
const decodedValue = value !== undefined ? decodeURIComponent(value) : '';
|
||||
|
||||
// 处理重复参数名的情况，将其值存储为数组
|
||||
if (queryParams.hasOwnProperty(decodedKey)) {
|
||||
if (!Array.isArray(queryParams[decodedKey])) {
|
||||
queryParams[decodedKey] = [queryParams[decodedKey]];
|
||||
}
|
||||
queryParams[decodedKey].push(decodedValue);
|
||||
} else {
|
||||
queryParams[decodedKey] = decodedValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return queryParams;
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ export default defineConfig(({ command, mode }) => {
|
|||
zipPack({
|
||||
inDir: `dist/build/${UNI_PLATFORM}`, // 输入的文件夹，就是要打包的文件夹
|
||||
outDir: `dist/build`, // 打包好的 zip 文件放到哪个文件夹下
|
||||
outFileName: `${UNI_PLATFORM}-${timeStringNow}.zip`, //文件名不能包含\/:*?"<>|
|
||||
outFileName: `${UNI_PLATFORM}-${mode}-${timeStringNow}.zip`, //文件名不能包含\/:*?"<>|
|
||||
pathPrefix: ''
|
||||
}),
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in New Issue