wuchao
/
uniapp-h5
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wuchao:ycnc-sjyh
Branches Tags
wuchao:main
wuchao:ycnc-sjyh
..
compare: wuchao:main
Branches Tags
wuchao:ycnc-sjyh
wuchao:main

No commits in common. "ycnc-sjyh" and "main" have entirely different histories.
ycnc-sjyh ... main

11 changed files with 847 additions and 1043 deletions
Show Stats Expand all files Collapse all files

2
.env.development
View File

@ -1,5 +1,5 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# 邮储奶茶活动 # 邮储奶茶活动
VITE_BASE_URL = 'http://milk.h5.test.86698.cn' VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
# 邮储音视频 # 邮储音视频
# VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav' # VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav'

2
.env.production
View File

@ -1,7 +1,7 @@
NODE_ENV = 'production' NODE_ENV = 'production'
# 邮储奶茶活动(正式环境) # 邮储奶茶活动(正式环境)
VITE_BASE_URL = 'https://tea.cdlsxd.cn' VITE_BASE_URL = 'https://milk.api.cdlsxd.cn'
VITE_YCNC_MERCH_CODE = '100510102303326' VITE_YCNC_MERCH_CODE = '100510102303326'
# 邮储音视频活动(生产环境) # 邮储音视频活动(生产环境)

3
.env.test
View File

@ -1,8 +1,7 @@
NODE_ENV = 'test' NODE_ENV = 'test'
# 邮储奶茶活动(测试环境) # 邮储奶茶活动(测试环境)
# VITE_BASE_URL = 'http://milk.h5.test.86698.cn' VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
VITE_BASE_URL = ''
VITE_YCNC_MERCH_CODE = '100310100018908' VITE_YCNC_MERCH_CODE = '100310100018908'

9
index.html
View File

@ -16,15 +16,16 @@
<body> <body>
<div id="app"><!--app-html--></div> <div id="app"><!--app-html--></div>
<script type="module" src="/src/main.js"></script> <script type="module" src="/src/main.js"></script>
<!-- <script> <script src="./static/YT_Client_api.js"></script>
<script>
document.addEventListener('touchmove', function(e) { document.addEventListener('touchmove', function(e) {
e.preventDefault(); e.preventDefault();
}, {passive: false}) }, {passive: false})
</script> --> </script>
<script src="https://fastly.jsdelivr.net/npm/eruda"></script> <!-- <script src="https://fastly.jsdelivr.net/npm/eruda"></script>
<script> <script>
eruda.init() eruda.init()
</script> </script> -->
<script> <script>
// var clickCount = 0 // var clickCount = 0
// var timer = null // var timer = null

2
src/pages.json
View File

@ -5,7 +5,7 @@
"type": "home", "type": "home",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": "奶茶专区", "navigationBarTitleText": "奶茶活动",
"navigationBarBackgroundColor": "#FFF" "navigationBarBackgroundColor": "#FFF"
} }
}, },

16
src/pages/ycnc/components/nav-bar.vue
View File

@ -1,16 +0,0 @@
<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>

124
src/pages/ycnc/detail.vue
View File

@ -1,9 +1,9 @@
<route lang="json5" type="page"> <route lang="json5" type="page">
{ {
style: { style: {
navigationStyle: "custom", navigationStyle: 'custom',
navigationBarTitleText: "商品详情", navigationBarTitleText: '商品详情',
navigationBarBackgroundColor: "#FFF", navigationBarBackgroundColor:'#FFF',
}, },
} }
</route> </route>
@ -12,7 +12,7 @@
<view class="w-full h-full flex flex-col"> <view class="w-full h-full flex flex-col">
<scroll-view scroll-y class="w-full h-full overflow-y-auto flex-1"> <scroll-view scroll-y class="w-full h-full overflow-y-auto flex-1">
<view class="container"> <view class="container">
<image class="banner" :src="detailObj.main_image"></image> <image class="banner" :src="detailObj.main_image" @click="testEvent"></image>
<view class="detail flex flex-col flex-justify-between"> <view class="detail flex flex-col flex-justify-between">
<view class="proname">{{ detailObj.name }}</view> <view class="proname">{{ detailObj.name }}</view>
<view class="num"> <view class="num">
@ -20,7 +20,9 @@
<text class="ori">{{ detailObj.show_price }}</text> <text class="ori">{{ detailObj.show_price }}</text>
</view> </view>
</view> </view>
<view class="desc" v-html="detailObj.description"> </view> <view class="desc" v-html="detailObj.description">
</view>
<!-- <view class="desc"> <!-- <view class="desc">
<div class="big">购买须知</div> <div class="big">购买须知</div>
<div class="small">【有效期】</div> <div class="small">【有效期】</div>
@ -31,62 +33,88 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="pay-container"> <view class="pay-container">
<view class="pay-btn" @click="toPay"> 立即支付 </view> <view class="pay-btn" @click="toPay">
立即支付
</view>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { onMounted, reactive, ref, unref } from "vue"; import { onMounted, reactive, ref, unref } from 'vue';
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from '@dcloudio/uni-app';
import { queryDetail, goPay, login } from "../../api/ycnc"; import { queryDetail, goPay, login } from '../../api/ycnc';
import { getQueryString } from "../../utils/utils"; import usePay from './hooks/usePay';
import useCode from './hooks/useCode';
const id = ref(""); const id = ref('')
const authCode = ref('');
const detailObj = reactive({}); const detailObj = reactive({})
onLoad((options) => { onLoad((options) => {
const {product_id} = options; const {product_id} = options;
id.value = product_id; id.value = product_id
}); })
onMounted(() => { onMounted(() => {
const token = getQueryString("token") || uni.getStorageSync("token"); getDetail()
uni.setStorageSync("token", token); })
getDetail();
});
const getDetail = () => { const getDetail = () => {
const params = { const params = {
product_id: unref(id), product_id:unref(id)
}; }
queryDetail({ params }).then((res) => { queryDetail({params}).then(res => {
Object.assign(detailObj, res); Object.assign(detailObj,res)
}); })
}; }
const toPay = async () => { const toPay = async () => {
const tempBackUrl = getQueryString("backUrl"); const token = window.localStorage.getItem('token') || '';
const backUrl = tempBackUrl if(!token){
? encodeURIComponent(tempBackUrl) const code = await useCode();
: uni.getStorageSync("backUrl"); authCode.value = code
const {token} = await login({params:{code:unref(authCode)}});
window.localStorage.setItem('token',token);
}
const params = { const params = {
product_id: unref(id), product_id:unref(id)
backUrl: backUrl, }
}; goPay({params}).then(res => {
goPay({ params }) const {order_no,notify_url,sign,plain_text} = res;
.then((res) => { const {payFunc} = usePay();
const { order_no, notify_url, sign, plain_text, pay_url } = res; payFunc({order_no,notify_url,TranAmt:detailObj.price,MerName:detailObj.brand,sign,plain_text})
window.location.replace(pay_url); }).catch(err => {
})
.catch((err) => {
console.log(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'
}
}
}
</script> </script>
<style lang="scss" scoped> <style lang='scss' scoped>
.banner{ .banner{
width: 100%; width: 100%;
height:600rpx; height:600rpx;
@ -109,13 +137,13 @@ const toPay = async () => {
.price{ .price{
font-weight: 700; font-weight: 700;
font-size: 28rpx; font-size: 28rpx;
color: #ea0000; color: #EA0000;
margin-right:18rpx; margin-right:18rpx;
} }
.ori{ .ori{
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;
color: #a5a5a5; color: #A5A5A5;
text-decoration: line-through; text-decoration: line-through;
} }
} }
@ -128,7 +156,7 @@ const toPay = async () => {
&:deep(.big-title) { &:deep(.big-title) {
font-weight: bold; font-weight: bold;
font-size: 40rpx; font-size: 40rpx;
color: #3d3d3d; color: #3D3D3D;
margin-bottom:16rpx; margin-bottom:16rpx;
} }
&:deep(.small-area) { &:deep(.small-area) {
@ -143,14 +171,14 @@ const toPay = async () => {
&:deep(.small-content){ &:deep(.small-content){
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;
color: #4d4d4d; color: #4D4D4D;
line-height: 1.6; line-height: 1.6;
} }
//新版 //新版
&:deep(.big){ &:deep(.big){
font-weight: bold; font-weight: bold;
font-size: 40rpx; font-size: 40rpx;
color: #3d3d3d; color: #3D3D3D;
margin-bottom:16rpx; margin-bottom:16rpx;
} }
&:deep(.small){ &:deep(.small){
@ -162,7 +190,7 @@ const toPay = async () => {
&:deep(.prog){ &:deep(.prog){
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;
color: #4d4d4d; color: #4D4D4D;
margin-bottom:16rpx; margin-bottom:16rpx;
line-height: 1.6; line-height: 1.6;
} }
@ -175,14 +203,14 @@ const toPay = async () => {
.pay-btn{ .pay-btn{
width: 600rpx; width: 600rpx;
height: 88rpx; height: 88rpx;
background: #ea0000; background: #EA0000;
border-radius: 54rpx 54rpx 54rpx 54rpx; border-radius: 54rpx 54rpx 54rpx 54rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-weight: 500; font-weight: 500;
font-size: 32rpx; font-size: 32rpx;
color: #ffffff; color: #FFFFFF;
margin:25rpx auto; margin:25rpx auto;
} }
</style> </style>

264
src/pages/ycnc/index.vue
View File

@ -1,9 +1,9 @@
<route lang="json5" type="home"> <route lang="json5" type="home">
{ {
style: { style: {
navigationStyle: "custom", navigationStyle: 'custom',
navigationBarTitleText: "奶茶专区", navigationBarTitleText: '奶茶活动',
navigationBarBackgroundColor: "#FFF", navigationBarBackgroundColor:'#FFF',
}, },
} }
</route> </route>
@ -11,6 +11,7 @@
<template> <template>
<scroll-view scroll-y class="page-wrapper"> <scroll-view scroll-y class="page-wrapper">
<view class="nav-btn" @click="toOrder">我的订单</view> <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 class="wrapper flex flex-col flex-items-center box-border">
<view v-for="(item,key) in productList" :key="key"> <view v-for="(item,key) in productList" :key="key">
<brand :products="item" :brandName="key"/> <brand :products="item" :brandName="key"/>
@ -20,237 +21,100 @@
</template> </template>
<script setup> <script setup>
import brand from "./components/brand"; import brand from './components/brand';
import { getProductList, goPay, login } from "../../api/ycnc"; import { getProductList, goPay, login } from '../../api/ycnc'
import { onMounted, ref, provide, unref } from "vue"; import { onMounted, ref, provide, unref } from 'vue';
import { getQueryString, getQueryPa // import { getQueryString , isIOS, isAndroid } from '../../utils/utils';
import useCode from './hooks/useCode';
import usePay from './hooks/usePay';
import config from './config';
rams } from "../../utils/utils";
import config from "./config";
const productList = ref([]); const productList = ref([]);
const authCode = ref('');
const handleBuy = (productData) => { const handleBuy = (productData) => {
pay(productData); pay(productData)
}; }
const goDetail = (productData) => { const goDetail = (productData) => {
const { ProductId } = productData; const {ProductId} = productData
uni.navigateTo({ uni.navigateTo({
url: `/pages/ycnc/detail?product_id=${ProductId}`, url:`/pages/ycnc/detail?product_id=${ProductId}`
}); })
}; }
const pay = (productData) => { const pay = (productData) => {
const { ProductId, voucherAmount, brandFlag } = productData; const {ProductId,voucherAmount,brandFlag} = productData
const backUrl = encodeURIComponent(getQueryString("backUrl")); console.log('商品数据',productData);
const params = { const params = {
product_id: ProductId, product_id:ProductId
backUrl: backUrl, }
}; goPay({params}).then(res => {
goPay({ params }) const {order_no,notify_url,sign,plain_text} = res;
.then((res) => { const {payFunc} = usePay();
const { order_no, notify_url, sign, plain_text, pay_url } = res; payFunc({order_no,notify_url,TranAmt:voucherAmount,MerName:config[brandFlag].name,sign,plain_text})
window.location.replace(pay_url); }).catch(err => {
})
.catch((err) => {
console.log(err); console.log(err);
}); })
}; }
provide("custom-events", { provide('custom-events',{
handleBuy, handleBuy,
goDetail, goDetail
}); })
const toOrder = () => { const toOrder = () => {
uni.navigateTo({ uni.navigateTo({
url: "/pages/ycnc/order", 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 ()=>{ onMounted(async ()=>{
queryProducts(); queryProducts();
console.log( const token = window.localStorage.getItem('token') || '';
"url中所有查询参数---》》》", if(!token){
getQueryParams(window.location.href) const code = await useCode();
); authCode.value = code
const token = getQueryString("token"); const {token} = await login({params:{code:unref(authCode)}});
const backUrl = getQueryString("backUrl"); window.localStorage.setItem('token',token);
uni.setStorageSync("token", token); }
uni.setStorageSync("backUrl", encodeURIComponent(backUrl));
}); });
function handleData(arg,args){ function handleData(arg,args){
return arg.reduce((total,current) =>{ return arg.reduce((total,current) =>{
const flag = current.brandFlag; const flag = current.brandFlag;
const flagData = args.filter((item) => item.brandFlag === flag); const flagData = args.filter(item => item.brandFlag === flag)
if(Array.isArray(total[flag])){ if(Array.isArray(total[flag])){
total[flag].push(...flagData); total[flag].push(...flagData)
}else{ }else{
total[flag] = [...flagData]; total[flag] = [...flagData]
} }
return total; return total
}, {}); },{})
} }
//查询品牌，商品接口 //查询品牌，商品接口
const queryProducts = () => { const queryProducts = () => {
const params = { GID: "4894651" }; const params = {GID:'4894651'}
getProductList({ params }) getProductList({params}).then(res => {
.then((res) => { const {milkList,
const { milkList, milkVoucherList } = res; milkVoucherList} = res
const sortMilkList = milkList.sort((a,b)=>{ const sortMilkList = milkList.sort((a,b)=>{
const orderA = config[a.brandFlag] const orderA = config[a.brandFlag] ? config[a.brandFlag].order : Infinity;
? config[a.brandFlag].order const orderB = config[b.brandFlag] ? config[b.brandFlag].order : Infinity;
: Infinity; return orderA - orderB
const orderB = config[b.brandFlag]
? config[b.brandFlag].order
: Infinity;
return orderA - orderB;
});
productList.value = handleData(sortMilkList, milkVoucherList);
}) })
.catch((err) => { productList.value = handleData(sortMilkList,milkVoucherList);
}).catch(err=>{
console.log(err); console.log(err);
}); })
}; }
</script> </script>
<style lang="scss"> <style lang='scss'>
.page-wrapper{ .page-wrapper{
// width: 100vw;
// height: 100vh;
width:100%; width:100%;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
@ -261,11 +125,11 @@ const queryProducts = () => {
top:42rpx; top:42rpx;
width: 42rpx; width: 42rpx;
height: 132rpx; height: 132rpx;
background: #ffffff; background: #FFFFFF;
border-radius: 16rpx 0rpx 0rpx 16rpx; border-radius: 16rpx 0rpx 0rpx 16rpx;
font-weight: normal; font-weight: normal;
font-size: 22rpx; font-size: 22rpx;
color: #4bb8ff; color: #4BB8FF;
writing-mode: vertical-lr; writing-mode: vertical-lr;
display: flex; display: flex;
align-items: center; align-items: center;
@ -274,7 +138,7 @@ const queryProducts = () => {
.wrapper{ .wrapper{
width:100%; width:100%;
min-height:100vh; min-height:100vh;
background: url("/static/ycnc/bg.png") no-repeat; background: url('/static/ycnc/bg.png') no-repeat;
background-size:cover; background-size:cover;
padding-top:730rpx; padding-top:730rpx;
} }

188
src/pages/ycnc/order.vue
View File

@ -1,9 +1,9 @@
<route lang="json5" type="page"> <route lang="json5" type="page">
{ {
style: { style: {
navigationStyle: "custom", navigationStyle: 'custom',
navigationBarTitleText: "我的订单", navigationBarTitleText: '我的订单',
navigationBarBackgroundColor: "#FFF", navigationBarBackgroundColor:'#FFF',
}, },
} }
</route> </route>
@ -17,10 +17,7 @@
<!-- <view v-for="(ele,index) in list[item.state]" :key="`${ele.id}-${item.state}`"> <!-- <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"/> <OrderItem :detail="ele" @pay-event="pay" @detail-event="viewDetail" @pwd-event="viewPwd"/>
</view> --> </view> -->
<view <view class="order-wrapper flex flex-col flex-items-center" v-if="Array.isArray(list) && list.length > 0">
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}`"> <view v-for="(ele,index) in list" :key="`${ele.id}-${item.state}`">
<OrderItem <OrderItem
:detail="ele" :detail="ele"
@ -49,85 +46,110 @@
</template> </template>
<script setup> <script setup>
import { useMessage } from "wot-design-uni"; import { useMessage } from 'wot-design-uni'
import OrderItem from "./components/order-item"; import OrderItem from './components/order-item';
import { import usePay from './hooks/usePay';
getOrderList, import { getOrderList,deleteOrder,refundOrder,queryOrderDetail } from '../../api/ycnc';
deleteOrder, import { onMounted, ref, unref,reactive,computed } from 'vue';
refundOrder, import { tabs } from './config';
queryOrderDetail, import {deepClone} from '../../utils/utils'
} from "../../api/ycnc"; const message = useMessage()
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 pageSize = 10;
const activeName = ref(0); const activeName = ref(0);
const total = ref(0); const total = ref(0);
const page = ref(1); const page = ref(1);
const list = ref([]); const list = ref([]);
const replace = ref(false); const replace = ref(false);
//页码
// const enumPage = tabs.reduce((prev,cur) => {
// prev[cur.state] = 1
// return prev
// },{})
// const page = ref(enumPage)
// //总数
// const enumObj = tabs.reduce((prev,cur) => {
// prev[cur.state] = 0
// return prev
// },{})
// const total = reactive(enumObj);
//数据列表
// const enumOrder = tabs.reduce((prev,cur) => {
// prev[cur.state] = []
// return prev
// },{})
// const list = reactive(enumOrder)
//获取订单列表 //获取订单列表
const queryOrderList = () => { const queryOrderList = () => {
const activeTab = unref(activeName); const activeTab = unref(activeName);
const tempBackUrl = getQueryString("backUrl");
const backUrl = tempBackUrl
? encodeURIComponent(tempBackUrl)
: uni.getStorageSync("backUrl");
const params = { const params = {
page:unref(page), page:unref(page),
pageSize:pageSize, pageSize:pageSize,
backUrl: backUrl, ...(activeTab !== 0 && {state:activeTab})
...(activeTab !== 0 && { state: activeTab }), }
}; getOrderList({params}).then(res => {
getOrderList({ params }) const {count,data} = res
.then((res) => { total.value = count
const { count, data } = res; // Object.assign(list,{[activeTab]:[...list[activeTab],...data]})
total.value = count;
if(replace.value){ if(replace.value){
const prevPage = page.value - 1; const prevPage = page.value - 1;
const prevList = list.value.slice(0, prevPage * pageSize); const prevList = list.value.slice(0, prevPage * pageSize);
list.value = [...prevList,...data]; list.value = [...prevList,...data];
}else{ }else{
list.value = [...list.value, ...data]; list.value = [...list.value,...data]
} }
replace.value = false; replace.value = false
}) }).catch(err => {
.catch((err) => {
total.value = 0; total.value = 0;
list.value = []; // Object.assign(list,{[activeTab]:[]})
}); list.value = []
}; })
}
function handleClick({index, name}){ function handleClick({index, name}){
page.value = 1; page.value = 1;
total.value = 0; total.value = 0;
// Object.assign(list,{[name]:[]})
list.value = []; list.value = [];
activeName.value = name; activeName.value = name;
// name代表状态值 // name代表状态值
queryOrderList(); queryOrderList()
} }
async function pay(orderData){ async function pay(orderData){
console.log(orderData); console.log(orderData);
const { order_no, notify_url, price, brand, sign, plain_text, id, pay_url } = const {order_no,notify_url,price,brand,sign,plain_text,id} = orderData;
orderData; // const params = {
window.location.replace(pay_url); // order_id:id,
// order_no: order_no
// }
// const res = await queryOrderDetail({params})
// if(res.third_status === '03'){
// uni.showToast({
// title: '当前订单已支付成功，无需再支付~',
// icon: 'none'
// });
// replace.value = true;
// queryOrderList()
// return
// }
const {payFunc} = usePay();
payFunc({order_no,notify_url,TranAmt:price,MerName:brand,sign,plain_text})
} }
function viewDetail(orderData){ function viewDetail(orderData){
const {id,order_no} = orderData; const {id,order_no} = orderData;
uni.navigateTo({ uni.navigateTo({
url: `/pages/ycnc/orderDetail?order_id=${id}&order_no=${order_no}`, url:`/pages/ycnc/orderDetail?order_id=${id}&order_no=${order_no}`
}); })
} }
function viewPwd(orderData){ function viewPwd(orderData){
const { voucher_link } = orderData; const {voucher_link} = orderData
if(voucher_link){ if(voucher_link){
console.log("跳转外部链接--->", voucher_link); console.log('跳转外部链接--->',voucher_link);
window.location.href = voucher_link; window.location.href = voucher_link
}else{ }else{
console.error(`${voucher_link}无有效值`); console.error(`${voucher_link}无有效值`);
} }
@ -136,83 +158,73 @@ function viewPwd(orderData) {
function removeOrder(orderData){ function removeOrder(orderData){
message message
.confirm({ .confirm({
msg: "删除订单后无法恢复，确认继续吗？", msg: '删除订单后无法恢复，确认继续吗？',
title: "提示", title: '提示'
}) })
.then(() => { .then(() => {
const { id } = orderData; const {id} = orderData
const params = { order_id: id }; const params = {order_id:id}
deleteOrder({ params }) deleteOrder({params}).then(res => {
.then((res) => {
replace.value = true; replace.value = true;
queryOrderList(); queryOrderList()
}) }).catch(err => {
.catch((err) => {
console.log(err); console.log(err);
}); })
}) })
.catch(() => { .catch(() => {
console.log("点击了取消按钮"); console.log('点击了取消按钮')
}); })
} }
function refund(orderData){ function refund(orderData){
const { id } = orderData; const {id} = orderData
if(!id){ if(!id){
uni.showToast({ uni.showToast({
icon: "none", icon:'none',
title: "无有效的订单id", title: '无有效的订单id',
}); });
return; return
} }
const params = { order_id: id }; const params = {order_id:id}
refundOrder({ params }) refundOrder({params}).then(res => {
.then((res) => {
uni.showToast({ uni.showToast({
icon: "success", icon:'success',
title: "退款成功", title: '退款成功',
}); });
replace.value = true; replace.value = true;
queryOrderList(); queryOrderList();
}) }).catch(err => {
.catch((err) => {
console.log(err); console.log(err);
}); })
} }
onMounted(()=>{ onMounted(()=>{
const token = getQueryString("token") || uni.getStorageSync("token"); queryOrderList()
const _tempBackUrl = getQueryString("backUrl"); })
uni.setStorageSync("token", token);
if (_tempBackUrl) {
uni.setStorageSync("backUrl", encodeURIComponent(_tempBackUrl));
}
queryOrderList();
});
const isLastPage = computed(()=>{ const isLastPage = computed(()=>{
return unref(page) === Math.ceil(unref(total) / pageSize); return unref(page) === Math.ceil(unref(total) / pageSize)
}); })
function queryNext(){ function queryNext(){
if(unref(isLastPage)){ if(unref(isLastPage)){
console.error("已经是最后一页"); console.error('已经是最后一页');
return false; return false;
} };
page.value = page.value + 1; page.value = page.value + 1
queryOrderList(); queryOrderList()
} }
</script> </script>
<style lang="scss" scoped> <style lang='scss' scoped>
.page-wrapper{ .page-wrapper{
width:100%; width:100%;
// height: 100%; // height: 100%;
height: calc(100vh - 42rpx); height: calc(100vh - 42rpx);
overflow-y: auto; overflow-y: auto;
background: #fafbfd; background: #FAFBFD;
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 30rpx; padding-bottom:30rpx
} }
.order-wrapper{ .order-wrapper{
display: flex; display: flex;
@ -251,7 +263,7 @@ function queryNext() {
// background: #EA0000; // background: #EA0000;
// } // }
:deep(.wd-tabs__line) { :deep(.wd-tabs__line) {
background: #ea0000; background: #EA0000;
} }
:deep(.wd-tabs){ :deep(.wd-tabs){
display: flex; display: flex;

233
src/pages/ycnc/orderDetail.vue
View File

@ -1,9 +1,9 @@
<route lang="json5" type="page"> <route lang="json5" type="page">
{ {
style: { style: {
navigationStyle: "custom", navigationStyle: 'custom',
navigationBarTitleText: "订单详情", navigationBarTitleText: '订单详情',
navigationBarBackgroundColor: "#FFF", navigationBarBackgroundColor:'#FFF',
}, },
} }
</route> </route>
@ -16,14 +16,9 @@
<view class="content flex"> <view class="content flex">
<image class="pro-img" :src="orderDetail.main_image" /> <image class="pro-img" :src="orderDetail.main_image" />
<view class="flex flex-1 flex-col"> <view class="flex flex-1 flex-col">
<view <view class="flex flex-justify-between name" style="margin-bottom:12rpx">
class="flex flex-justify-between name"
style="margin-bottom: 12rpx"
>
<view class="text-over">{{ orderDetail.product_name }}</view> <view class="text-over">{{ orderDetail.product_name }}</view>
<view class="amount" <view class="amount"><text>￥</text>{{ orderDetail.price }}<text>元</text></view>
><text>￥</text>{{ orderDetail.price }}<text>元</text></view
>
</view> </view>
<view class="flex flex-justify-between num"> <view class="flex flex-justify-between num">
<view>数量</view> <view>数量</view>
@ -34,176 +29,172 @@
</view> </view>
<view class="order-info"> <view class="order-info">
<view class="info-item">订单编号：{{ orderDetail.order_no }}</view> <view class="info-item">订单编号：{{ orderDetail.order_no }}</view>
<view <view class="info-item" v-if="!!orderDetail.exchange_time && ![9].includes(orderDetail.state)">支付时间：{{
class="info-item" orderDetail.exchange_time }}</view>
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">下单时间：{{ orderDetail.create_time }}</view>
<view class="info-item" style="margin-bottom: 24rpx" <view class="info-item" style="margin-bottom: 24rpx;">订单金额：{{ orderDetail.price }}</view>
>订单金额：{{ orderDetail.price }}</view
>
</view> </view>
</view> </view>
<view class="btns" v-if="pageType === 1"> <view class="btns" v-if="pageType === 1">
<view <view class="btn pwd" @click="viewPwd(orderDetail)"
class="btn pwd" v-if="[3].includes(orderDetail.state) && orderDetail.voucher_link">查看卡券</view>
@click="viewPwd(orderDetail)" <view class="btn pwd" @click="pay(orderDetail)" v-if="[1].includes(orderDetail.state)">立即付款</view>
v-if="[3].includes(orderDetail.state) && orderDetail.voucher_link" <view class="btn pwd" v-if="[4].includes(orderDetail.state)" @click="goRefund">申请退款</view>
>查看卡券</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 class="btn back" @click="backIndex">返回首页</view>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { onShow, onHide, onUnload } from "@dcloudio/uni-app"; import { onShow, onHide, onUnload } from '@dcloudio/uni-app';
import { onMounted, reactive, ref, unref } from "vue"; import { onMounted, reactive, ref, unref } from 'vue';
import { import { queryOrderDetail, refundOrder, queryOrderState,login } from '../../api/ycnc';
queryOrderDetail, import { getQueryString } from '../../utils/utils'
refundOrder, import usePay from './hooks/usePay';
queryOrderState, import useCode from './hooks/useCode';
login, const authCode = ref('');
} from "../../api/ycnc"; const id = ref('');
import { getQueryString } from "../../utils/utils"; const orderNo = ref('');
const id = ref("");
const orderNo = ref("");
const orderDetail = reactive({}); const orderDetail = reactive({});
const pageType = ref(0); const pageType = ref(0)
let timer = undefined; let timer = undefined
// 用onshow 解决h5页面被缓存的问题 // 用onshow 解决h5页面被缓存的问题
onShow(async () => { onShow(async () => {
const token = getQueryString("token") || uni.getStorageSync("token"); const token = window.localStorage.getItem('token') || '';
uni.setStorageSync("token", token); if(!token){
const order_id = getQueryString("order_id"); const code = await useCode();
const order_no = getQueryString("order_no"); authCode.value = code
const isPayBack = getQueryString("isPayBack"); const {token} = await login({params:{code:unref(authCode)}});
if (!order_id && !order_no) return; window.localStorage.setItem('token',token);
id.value = order_id; }
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; orderNo.value = order_no;
if (isPayBack) { if (isPayBack) {
queryEvent(); queryEvent()
} else { } else {
getDetail(); getDetail();
} }
}); })
onHide(() => { onHide(() => {
timer && clearInterval(timer); timer && clearInterval(timer)
}); })
onUnload(() => { onUnload(() => {
timer && clearInterval(timer); timer && clearInterval(timer)
}); })
const backIndex = () => { const backIndex = () => {
uni.navigateTo({ uni.navigateTo({
url: `/pages/ycnc/index`, url: `/pages/ycnc/index`
}); })
}; }
const timerEvent = () => { const timerEvent = () => {
timer && clearInterval(timer); timer && clearInterval(timer)
uni.showLoading({ uni.showLoading({
title: "加载中", title: "加载中",
mask: true, mask: true,
}); });
timer = setInterval(()=>{ timer = setInterval(()=>{
queryEvent(); queryEvent()
}, 2500); }, 2500)
}; }
const queryEvent = () => { const queryEvent = () => {
uni.hideLoading(); uni.hideLoading()
const params = { const params = {
order_id: unref(id), order_id: unref(id),
order_no: unref(orderNo), order_no: unref(orderNo)
}; }
queryOrderState({ params }).then((res) => { queryOrderState({ params }).then(res => {
const { state, voucher_link } = res; const { state, voucher_link } = res
if([3].includes(state)){ if([3].includes(state)){
if(voucher_link){ if(voucher_link){
timer && clearInterval(timer); timer && clearInterval(timer)
window.location.replace(voucher_link); window.location.replace(voucher_link)
}else{ }else{
timerEvent(); timerEvent()
} }
}else if([1,2].includes(state)){ }else if([1,2].includes(state)){
timerEvent(); timerEvent()
}else{ }else{
timer && clearInterval(timer); timer && clearInterval(timer)
getDetail(); getDetail()
}
})
} }
});
};
const viewPwd = (detailData) => { const viewPwd = (detailData) => {
const { voucher_link } = detailData; const { voucher_link } = detailData
if (voucher_link) { if (voucher_link) {
window.location.href = voucher_link; console.log(`跳转外部链接-->${voucher_link}`);
window.location.href = voucher_link
} else { } else {
console.error(`voucher_link无有效值`); console.error(`voucher_link无有效值`);
} }
}; }
const goRefund = () => { const goRefund = () => {
const { id } = orderDetail; const { id } = orderDetail
if (!id) { if (!id) {
uni.showToast({ uni.showToast({
icon: "none", icon: 'none',
title: "无有效的订单id", title: '无有效的订单id',
}); });
return; return
} }
const params = { order_id: id }; const params = { order_id: id }
refundOrder({ params }) refundOrder({ params }).then(res => {
.then((res) => {
uni.showToast({ uni.showToast({
icon: "success", icon: 'success',
title: "退款成功", title: '退款成功',
}); });
getDetail(); getDetail();
}) }).catch(err => {
.catch((err) => {
console.log(err); console.log(err);
}); })
}; }
async function pay(orderData) { async function pay(orderData) {
console.log(orderData); console.log(orderData);
const { order_no, notify_url, price, brand, sign, plain_text, id, pay_url } = const { order_no, notify_url, price,brand,sign,plain_text,id } = orderData;
orderData; // const params = {
window.location.replace(pay_url); // 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 })
} }
onMounted(() => {
// getDetail()
})
const getDetail = () => { const getDetail = () => {
const tempBackUrl = getQueryString('backUrl')
const backUrl = tempBackUrl ? encodeURIComponent(tempBackUrl) : uni.getStorageSync('backUrl')
const params = { const params = {
order_id: unref(id), order_id: unref(id),
order_no: unref(orderNo), order_no: unref(orderNo)
backUrl:backUrl, }
}; pageType.value = 1
pageType.value = 1; queryOrderDetail({ params }).then(res => {
queryOrderDetail({ params }).then((res) => { Object.assign(orderDetail, res)
Object.assign(orderDetail, res); })
}); }
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -214,14 +205,14 @@ const getDetail = () => {
.wrapper { .wrapper {
width: 702rpx; width: 702rpx;
height: 486rpx; height: 486rpx;
background: #ffffff; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 32rpx 24rpx; padding: 32rpx 24rpx;
.pro-info { .pro-info {
border-bottom: 1rpx solid #f0e1e1; border-bottom: 1rpx solid #F0E1E1;
.title { .title {
font-weight: 500; font-weight: 500;
@ -271,18 +262,18 @@ const getDetail = () => {
.num { .num {
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #9e9e9e; color: #9E9E9E;
} }
} }
} }
.order-info { .order-info {
border-bottom: 1rpx solid #f0e1e1; border-bottom: 1rpx solid #F0E1E1;
.info-item { .info-item {
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 22rpx;
color: #6c6c6c; color: #6C6C6C;
margin-top: 24rpx; margin-top: 24rpx;
} }
} }
@ -305,16 +296,16 @@ const getDetail = () => {
.pwd { .pwd {
font-weight: 500; font-weight: 500;
font-size: 32rpx; font-size: 32rpx;
color: #ffffff; color: #FFFFFF;
background: #ea0000; background: #EA0000;
margin-right: 10rpx; margin-right: 10rpx;
} }
.back { .back {
font-weight: 400; font-weight: 400;
font-size: 32rpx; font-size: 32rpx;
color: #b9c8c7; color: #B9C8C7;
border: 2rpx solid #b9c8c7; border: 2rpx solid #B9C8C7;
} }
} }
</style> </style>

85
src/utils/utils.js
View File

@ -1,31 +1,9 @@
//获取url后面拼接的参数 //获取url后面拼接的参数
export const getQueryString = (paramName) => { export const getQueryString = (name) => {
// let urlStr = window.location.href.split('?')[1] let urlStr = window.location.href.split('?')[1]
// const urlSearchParams = new URLSearchParams(urlStr) const urlSearchParams = new URLSearchParams(urlStr)
// const result = Object.fromEntries(urlSearchParams.entries()) const result = Object.fromEntries(urlSearchParams.entries())
// return paramName ? result[paramName] : result return name ? result[name] : 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设备 //是否iOS设备
@ -62,56 +40,3 @@ export function generateUUID() {
} }
return uuid; 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;
}