first:修正上传地址,优化界面,尝试对接微信支付分免押(50%)

This commit is contained in:
2025-06-27 18:38:10 +08:00
parent bdde4ae2cf
commit 8ac1666e6b
55 changed files with 3142 additions and 1656 deletions
+464 -215
View File
@@ -1,46 +1,100 @@
<template>
<view class="container">
<!-- 宣传图片区域 -->
<view class="banner">
<view class="temp-banner">
<text class="banner-text">共享风扇</text>
<text class="banner-subtitle">让清凉随身携带</text>
<view class="banner-bg"></view>
<!-- 顶部区域 -->
<view class="header">
<view class="header-bg">
<view class="circle-decoration circle-1"></view>
<view class="circle-decoration circle-2"></view>
<view class="wave-decoration"></view>
</view>
</view>
<!-- 扫码按钮区域 -->
<view class="scan-area">
<view class="scan-btn" @click="handleScan">
<view class="btn-content">
<image class="btn-icon" src="../../static/scan-icon.png" mode="aspectFit" />
<text class="btn-text">扫一扫</text>
<view class="header-content">
<view class="brand-area">
<image class="brand-logo" src="@/static/logo.png" mode="aspectFit"></image>
<view class="brand-text">
<text class="title">共享风扇</text>
<text class="subtitle">随时随地享受清凉</text>
</view>
</view>
<view class="header-info">
<view class="service-tag">
<text>便捷租赁</text>
<text class="dot">·</text>
<text>品质保障</text>
</view>
</view>
<text class="btn-desc">扫描设备二维码使用或归还</text>
</view>
</view>
<!-- 使用提示区域 -->
<view class="tips-section">
<view class="tips-header">
<view class="tips-title">使用小贴士</view>
<!-- 主扫码区域 -->
<view class="scan-section">
<view class="scan-card">
<view class="scan-btn" @click="handleScan">
<image class="scan-icon" src="@/static/scan-icon.png" mode="aspectFit" />
<text class="scan-text">扫码使用</text>
</view>
<view class="scan-desc">
<text>扫描设备二维码即可使用或归还</text>
</view>
</view>
<view class="tips-list">
<view class="tip-item">
<view class="tip-dot"></view>
<text>租借时间每次最长可租借12小时</text>
</view>
<!-- 收费规则卡片 -->
<view class="price-card">
<view class="card-header">
<text class="card-title">收费规则</text>
</view>
<!-- 微信免押金标识 -->
<!-- <view class="deposit-free">
<image class="deposit-icon" src="@/static/images/wxpayflag.png" mode="aspectFit" />
<text class="deposit-text">微信支付分免押金</text>
</view> -->
<view class="price-rules">
<view class="price-item">
<view class="price-tag">5.0<text class="unit">/小时</text></view>
</view>
<view class="tip-item">
<view class="tip-dot"></view>
<text>押金说明租借需支付99元押金归还后自动退还</text>
<view class="divider"></view>
<view class="rule-list">
<view class="rule-item">
<view class="rule-dot"></view>
<text>15分钟内归还免费</text>
</view>
<view class="rule-item">
<view class="rule-dot"></view>
<text>不足1小时按1小时计费</text>
</view>
<view class="rule-item">
<view class="rule-dot"></view>
<text>封顶99元计费达99元视为买断</text>
</view>
</view>
<view class="tip-item">
<view class="tip-dot"></view>
<text>收费标准2/小时不足1小时按1小时计算</text>
</view>
</view>
<!-- 使用流程 -->
<view class="usage-steps">
<view class="steps-header">
<text class="steps-title">使用流程</text>
</view>
<view class="steps-container">
<view class="step-item">
<view class="step-icon">
<text class="step-number">1</text>
</view>
<text class="step-text">扫码开锁</text>
</view>
<view class="tip-item">
<view class="tip-dot"></view>
<text>爱护提示请勿将设备带离指定区域保持设备清洁</text>
<view class="step-arrow"></view>
<view class="step-item">
<view class="step-icon">
<text class="step-number">2</text>
</view>
<text class="step-text">使用风扇</text>
</view>
<view class="step-arrow"></view>
<view class="step-item">
<view class="step-icon">
<text class="step-number">3</text>
</view>
<text class="step-text">归还结算</text>
</view>
</view>
</view>
@@ -48,11 +102,16 @@
</template>
<script>
import {getQueryString, wxLogin }from '@/util/index.js'
import {
getQueryString,
wxLogin
} from '@/util/index.js'
import {
URL
}from"@/config/url.js"
import { getDeviceInfo } from '@/config/user.js'
} from "@/config/url.js"
import {
getDeviceInfo
} from '@/config/user.js'
export default {
methods: {
async handleScan() {
@@ -63,11 +122,12 @@
fail: reject
})
})
console.log(scanResult.path);
let deviceNo = getQueryString(scanResult.path, 'deviceNo')
console.log('扫码路径:', scanResult.path)
console.log('解析到的设备号:', deviceNo)
if (!deviceNo) {
uni.showToast({
title: '无效的设备二维码',
@@ -75,12 +135,12 @@
})
return
}
// 直接在当前页面查询是否有使用中的订单,避免跳转到中间页面
if (!uni.getStorageSync('token')) {
await wxLogin()
}
// 检查是否有使用中的订单
const inUseRes = await uni.request({
url: `${URL || 'http://127.0.0.1:8080'}/app/order/inUse`,
@@ -90,14 +150,14 @@
'Clientid': uni.getStorageSync('client_id')
}
})
console.log('使用中订单检查结果:', JSON.stringify(inUseRes))
if (inUseRes.statusCode == 200 && inUseRes.data.code == 200 && inUseRes.data.data) {
// 存在使用中的订单,跳转到归还页面
const inUseOrder = inUseRes.data.data
console.log('检测到使用中订单,准备跳转:', inUseOrder)
// 直接使用reLaunch而不是navigateTo以确保页面跳转
uni.reLaunch({
url: `/pages/return/index?orderId=${inUseOrder.orderId}&deviceId=${deviceNo || inUseOrder.deviceNo}`
@@ -105,7 +165,7 @@
console.log('已发起页面跳转')
return
}
// 检查是否有待支付订单
const orderRes = await uni.request({
url: `${URL || 'http://127.0.0.1:8080'}/app/order/unpaid`,
@@ -115,9 +175,9 @@
'Clientid': uni.getStorageSync('client_id')
}
})
console.log('待支付订单检查结果:', JSON.stringify(orderRes))
if (orderRes.statusCode == 200 && orderRes.data.code == 200 && orderRes.data.data) {
// 存在待支付订单,跳转到支付页面
const unpaidOrder = orderRes.data.data
@@ -128,30 +188,30 @@
} else {
// 修改:直接获取设备信息,而不是跳转到详情页面
console.log('无待支付订单,获取设备信息, deviceNo:', deviceNo)
try {
// 获取设备信息
const deviceInfoRes = await getDeviceInfo(deviceNo)
if (deviceInfoRes.code == 200 && deviceInfoRes.data && deviceInfoRes.data.device) {
const deviceInfo = deviceInfoRes.data.device
// 如果有feeConfig,直接解析并处理
if (deviceInfo.feeConfig) {
console.log('获取到设备feeConfig信息:', deviceInfo.feeConfig)
// 这里可以直接解析feeConfig并进行前端处理
try {
const feeConfig = JSON.parse(deviceInfo.feeConfig)
// 根据解析后的feeConfig进行页面跳转并传递信息
uni.navigateTo({
url: `/pages/device/detail?deviceNo=${deviceNo}&feeConfig=${encodeURIComponent(deviceInfo.feeConfig)}`
})
} catch (e) {
console.error('解析feeConfig失败:', e)
// 解析失败时仍然跳转到详情页面,由详情页面处理
// 解析失败时仍然跳转到详情页面
uni.navigateTo({
url: `/pages/device/detail?deviceNo=${deviceNo}`
})
@@ -168,7 +228,7 @@
title: '获取设备信息失败',
icon: 'none'
})
// 失败时仍然跳转到详情页面
uni.navigateTo({
url: `/pages/device/detail?deviceNo=${deviceNo}`
@@ -180,7 +240,7 @@
title: '获取设备信息失败',
icon: 'none'
})
// 异常时仍然跳转到详情页面
uni.navigateTo({
url: `/pages/device/detail?deviceNo=${deviceNo}`
@@ -201,195 +261,384 @@
<style lang="scss" scoped>
.container {
height: 87.5vh;
background: #f8f8f8;
min-height: 100vh;
background-color: #f6f7fb;
padding-bottom: 40rpx;
.banner {
padding: 30rpx;
.temp-banner {
height: 300rpx;
background: linear-gradient(135deg, #1976D2, #42A5F5);
border-radius: 30rpx;
position: relative;
overflow: hidden;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
color: #fff;
box-shadow: 0 8rpx 32rpx rgba(25, 118, 210, 0.2);
}
.banner-text {
font-size: 56rpx;
font-weight: bold;
margin-bottom: 20rpx;
position: relative;
z-index: 1;
text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.1);
}
/* 顶部区域 */
.header {
height: 300rpx;
background: linear-gradient(135deg, #1E88E5, #29B6F6);
position: relative;
overflow: hidden;
.banner-subtitle {
font-size: 32rpx;
opacity: 0.95;
position: relative;
z-index: 1;
text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.1);
}
.header-bg {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 1;
.banner-bg {
position: absolute;
right: -60rpx;
bottom: -60rpx;
width: 300rpx;
height: 300rpx;
background: rgba(255,255,255,0.1);
border-radius: 50%;
transform: rotate(-15deg);
}
.circle-decoration {
position: absolute;
border-radius: 50%;
background: rgba(255, 255, 255, 0.1);
}
&::after {
content: '';
position: absolute;
left: -80rpx;
top: -80rpx;
width: 240rpx;
height: 240rpx;
background: rgba(255,255,255,0.08);
border-radius: 50%;
}
.circle-1 {
width: 240rpx;
height: 240rpx;
right: -60rpx;
top: -90rpx;
}
.circle-2 {
width: 160rpx;
height: 160rpx;
left: -40rpx;
bottom: 30rpx;
background: rgba(255, 255, 255, 0.08);
}
.wave-decoration {
position: absolute;
left: 0;
bottom: 0;
width: 100%;
height: 40rpx;
// background: url('@/static/images/wave.png') repeat-x;
background-size: auto 100%;
opacity: 0.6;
}
}
.scan-area {
padding: 20rpx 30rpx 40rpx;
.header-content {
position: relative;
z-index: 2;
padding: 40rpx 40rpx 0;
height: 100%;
display: flex;
justify-content: center;
.scan-btn {
width: 460rpx;
height: 200rpx;
flex-direction: column;
justify-content: space-between;
.brand-area {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background: linear-gradient(135deg, #00C853, #69F0AE);
border-radius: 30rpx;
box-shadow: 0 8rpx 32rpx rgba(0, 200, 83, 0.2);
transition: all 0.3s ease;
position: relative;
overflow: hidden;
&:active {
transform: scale(0.98);
box-shadow: 0 4rpx 16rpx rgba(0, 200, 83, 0.15);
.brand-logo {
width: 90rpx;
height: 90rpx;
margin-right: 20rpx;
}
&::after {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(rgba(255,255,255,0.1), transparent);
}
.btn-content {
.brand-text {
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 12rpx;
position: relative;
z-index: 1;
flex-direction: column;
.btn-icon {
width: 48rpx;
height: 48rpx;
margin-right: 16rpx;
.title {
font-size: 48rpx;
color: #ffffff;
font-weight: bold;
line-height: 1.2;
text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
}
.btn-text {
font-size: 42rpx;
font-weight: 600;
color: #fff;
text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.1);
}
}
.btn-desc {
font-size: 26rpx;
color: rgba(255, 255, 255, 0.95);
position: relative;
z-index: 1;
}
}
}
.tips-section {
margin: 0 30rpx;
background: #fff;
border-radius: 24rpx;
box-shadow: 0 8rpx 32rpx rgba(0,0,0,0.05);
overflow: hidden;
.tips-header {
padding: 30rpx;
background: linear-gradient(to right, #F5F9FF, #fff);
border-bottom: 2rpx solid #f0f0f0;
.tips-title {
font-size: 32rpx;
font-weight: 600;
color: #333;
position: relative;
padding-left: 24rpx;
&::before {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
width: 8rpx;
height: 32rpx;
background: #1976D2;
border-radius: 4rpx;
.subtitle {
font-size: 28rpx;
color: rgba(255, 255, 255, 0.9);
}
}
}
.tips-list {
padding: 20rpx 30rpx;
.header-info {
display: flex;
flex-wrap: wrap;
gap: 20rpx;
margin-bottom: 30rpx;
.tip-item {
.service-tag {
display: flex;
align-items: center;
margin-bottom: 24rpx;
padding: 0 10rpx;
&:last-child {
margin-bottom: 0;
}
.tip-dot {
width: 12rpx;
height: 12rpx;
background: #1976D2;
border-radius: 50%;
margin-right: 16rpx;
flex-shrink: 0;
box-shadow: 0 2rpx 6rpx rgba(25,118,210,0.2);
}
background: rgba(255, 255, 255, 0.2);
border-radius: 40rpx;
padding: 10rpx 20rpx;
text {
font-size: 28rpx;
color: #666;
line-height: 1.6;
font-size: 24rpx;
color: #ffffff;
}
.dot {
margin: 0 8rpx;
font-weight: bold;
}
}
}
}
}
</style>
/* 扫码区域 */
.scan-section {
padding: 0 30rpx;
margin-top: -60rpx;
.scan-card {
background: #ffffff;
border-radius: 16rpx;
box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.05);
padding: 36rpx 0;
display: flex;
flex-direction: column;
align-items: center;
.scan-btn {
width: 220rpx;
height: 220rpx;
background: linear-gradient(135deg, #00B0FF, #0091EA);
border-radius: 50%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-bottom: 24rpx;
box-shadow: 0 10rpx 20rpx rgba(0, 176, 255, 0.2);
position: relative;
transition: all 0.2s ease;
&:active {
transform: scale(0.96);
}
.scan-icon {
width: 80rpx;
height: 80rpx;
margin-bottom: 12rpx;
}
.scan-text {
font-size: 36rpx;
color: #ffffff;
font-weight: 500;
}
}
.scan-desc {
font-size: 28rpx;
color: #666;
}
}
}
/* 收费规则卡片 */
.price-card {
margin: 30rpx;
background: #ffffff;
border-radius: 16rpx;
overflow: hidden;
box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.04);
.card-header {
padding: 24rpx 30rpx;
background: linear-gradient(to right, #f5f9ff, #ffffff);
border-bottom: 2rpx solid #f0f0f0;
.card-title {
font-size: 32rpx;
font-weight: 600;
color: #333;
position: relative;
padding-left: 20rpx;
&::before {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
width: 6rpx;
height: 28rpx;
background: #2196F3;
border-radius: 3rpx;
}
}
}
/* 微信免押金区域 */
.deposit-free {
margin: 20rpx 30rpx 0;
padding: 12rpx 16rpx;
background: #f0f9ff;
border-radius: 8rpx;
border-left: 4rpx solid #03A9F4;
display: flex;
align-items: center;
.deposit-icon {
width: 40rpx;
height: 40rpx;
margin-right: 16rpx;
}
.deposit-text {
font-size: 26rpx;
color: #03A9F4;
font-weight: 500;
}
}
.price-rules {
padding: 20rpx 30rpx 30rpx;
.price-item {
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 20rpx;
.price-tag {
font-size: 60rpx;
color: #FF6E00;
font-weight: bold;
line-height: 1;
.unit {
font-size: 32rpx;
font-weight: normal;
margin-left: 4rpx;
}
}
.price-desc {
font-size: 28rpx;
color: #666;
margin-top: 10rpx;
}
}
.divider {
height: 2rpx;
background-color: #f0f0f0;
margin: 20rpx 0 30rpx;
}
.rule-list {
.rule-item {
display: flex;
align-items: flex-start;
margin-bottom: 20rpx;
&:last-child {
margin-bottom: 0;
}
.rule-dot {
width: 12rpx;
height: 12rpx;
background: #2196F3;
border-radius: 50%;
margin: 12rpx 16rpx 0 0;
flex-shrink: 0;
}
text {
font-size: 28rpx;
color: #666;
line-height: 1.5;
}
}
}
}
}
/* 使用流程 */
.usage-steps {
margin: 0 30rpx;
background: #ffffff;
border-radius: 16rpx;
box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.04);
overflow: hidden;
.steps-header {
padding: 24rpx 30rpx;
background: linear-gradient(to right, #f5f9ff, #ffffff);
border-bottom: 2rpx solid #f0f0f0;
.steps-title {
font-size: 32rpx;
font-weight: 600;
color: #333;
position: relative;
padding-left: 20rpx;
&::before {
content: '';
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
width: 6rpx;
height: 28rpx;
background: #2196F3;
border-radius: 3rpx;
}
}
}
.steps-container {
padding: 40rpx 30rpx;
display: flex;
align-items: center;
justify-content: space-between;
.step-item {
display: flex;
flex-direction: column;
align-items: center;
flex: 1;
.step-icon {
width: 80rpx;
height: 80rpx;
background: #f0f9ff;
border: 2rpx solid #e1f5fe;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 16rpx;
.step-number {
font-size: 36rpx;
color: #2196F3;
font-weight: 600;
}
}
.step-text {
font-size: 26rpx;
color: #666;
}
}
.step-arrow {
width: 40rpx;
height: 4rpx;
background: #e1f5fe;
position: relative;
&::after {
content: '';
position: absolute;
right: 0;
top: 50%;
margin-top: -8rpx;
border-left: 12rpx solid #e1f5fe;
border-top: 8rpx solid transparent;
border-bottom: 8rpx solid transparent;
}
}
}
}
</style>