Compare commits

...

11 Commits

Author SHA1 Message Date
kk 9439bcf9d7 解析state参数
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 50s
2026-07-17 12:20:20 +08:00
kk d862cad1a0 授权回调时code参数名支持支付宝的auth_code
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 39s
2026-07-15 18:02:48 +08:00
kk 85d5193071 修改app_no_map值
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 45s
2026-07-15 17:57:23 +08:00
kk 9551d9d8b2 传入对应环境的scope参数
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 49s
2026-07-15 17:37:23 +08:00
kk 81bec5ba3b 开门增加来源
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 45s
2026-07-15 17:02:07 +08:00
kk 729bc3c70e 支持预发布环境构建
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 39s
2026-07-15 10:46:02 +08:00
kk 2e84a00f6e 支持预发布环境部署
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 40s
2026-07-15 10:25:08 +08:00
kk 8b5d68592b 开门中时,提示开门超时并返回首页
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 44s
2026-07-13 17:37:51 +08:00
kk 42c2b8de07 开关门状态显示页样式调整 2026-07-13 17:27:06 +08:00
kk 580350cb33 常见问答修改
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 39s
2026-07-11 21:47:29 +08:00
kk 020e131df0 解决user_id为空提示
Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 42s
2026-07-11 20:43:56 +08:00
13 changed files with 152 additions and 827 deletions
+11
View File
@@ -92,11 +92,15 @@ jobs:
# 3. 安装依赖 & 构建 Uni-app (H5)
###############################################
- name: Install dependencies and Build H5
env:
DEPLOY_ENV: ${{ steps.detect.outputs.env }}
run: |
set -e
# pnpm真实路径
PNPM_PATH="/root/.nvm/versions/node/v20.20.2/bin/pnpm"
echo "构建环境: DEPLOY_ENV=$DEPLOY_ENV"
# 1. 配置镜像并安装依赖
$PNPM_PATH config set registry https://registry.npmmirror.com
$PNPM_PATH install --frozen-lockfile
@@ -110,9 +114,16 @@ jobs:
- name: Upload dist to server
run: |
TARGET="${{ steps.detect.outputs.target }}"
ENV_NAME="${{ steps.detect.outputs.env }}"
# 请根据你的实际构建输出路径调整
H5_SOURCE_DIR="dist/build/h5"
# 根据发布类型选择项目路径
if [ "$ENV_NAME" = "staging" ]; then
WEB_ROOT="${{ vars.STG_PROJECT_DIR }}"
else
WEB_ROOT="${{ vars.PROJECT_DIR }}"
fi
echo "部署到: $TARGET"
echo "源目录: $H5_SOURCE_DIR"
+62 -49
View File
@@ -20,8 +20,8 @@
<view class="icon-door-right"></view>
</view>
</view>
<text class="door-state-title">门已打开</text>
<text class="door-state-desc">请取走商品后随手关门</text>
<text class="door-state-title">已打开</text>
<text class="door-state-desc">先拉开柜门取走商品后随手关门</text>
<view class="door-state-divider"></view>
<view class="door-steps">
<view class="step-item">
@@ -131,6 +131,7 @@
<script>
import { get, post } from '@/utils/request.js';
import { detectPlatform } from '@/utils/env.js';
export default {
props: {
@@ -151,17 +152,20 @@ export default {
},
methods: {
// 外部调用:启动开门流程
async open() {
async open(userId) {
if (this.step) return;
this.cancelled = false;
this.step = 'opening';
const uid = userId || this.userId;
try {
const res = await post('/device-scan/open', {
device_id: this.deviceId,
door_index: 0,
user_id: this.userId
user_id: uid,
platform: detectPlatform()
});
const ret = res.data || {};
@@ -191,6 +195,7 @@ export default {
const maxRetries = 30;
const interval = 2000;
let remaining = maxRetries;
let lastStep = '';
while (remaining > 0) {
if (this.step === 'complete' || this.cancelled) return;
@@ -204,18 +209,24 @@ export default {
const ret = res.data || {};
if (ret.code === 0 && Array.isArray(ret.data) && ret.data.length > 0) {
const latestStatus = ret.data[0].status;
let newStep = '';
if (latestStatus === 101) {
remaining = maxRetries;
this.step = 'opened';
newStep = 'opened';
} else if (latestStatus === 103) {
remaining = maxRetries;
this.step = 'closed';
newStep = 'closed';
} else if (latestStatus === 201) {
this.step = 'complete';
this.fetchOrder(flowId);
return;
}
// 状态真正变化时才重置计数器
if (newStep && newStep !== lastStep) {
this.step = newStep;
lastStep = newStep;
remaining = maxRetries;
}
}
} catch (e) {
console.error('[door-panel] 轮询失败:', e);
@@ -225,9 +236,11 @@ export default {
await new Promise(resolve => setTimeout(resolve, interval));
}
// 超时
// 轮询结束
if (this.step === 'opening') {
this.step = '';
uni.showToast({ title: '开门超时,请重试', icon: 'none' });
}
},
// 查询订单信息
@@ -342,7 +355,7 @@ export default {
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(160deg, #0a1628 0%, #132743 40%, #1a3a5c 100%);
background: #fff;
z-index: 3000;
display: flex;
align-items: center;
@@ -369,20 +382,22 @@ export default {
align-items: center;
justify-content: center;
margin-bottom: 48rpx;
/* 动效环 scale(1.6) 会超出容器,预留空间避免被裁剪 */
margin-top: 60rpx;
}
.door-state-ring {
position: absolute;
width: 180rpx;
height: 180rpx;
border-radius: 50%;
border: 4rpx solid rgba(41, 121, 255, 0.4);
border: 4rpx solid rgba(41, 121, 255, 0.3);
animation: ring-pulse 2s ease-out infinite;
}
.warning-ring {
border-color: rgba(250, 173, 20, 0.4);
border-color: rgba(250, 173, 20, 0.3);
}
.success-ring {
border-color: rgba(82, 196, 26, 0.4);
border-color: rgba(82, 196, 26, 0.3);
}
@keyframes ring-pulse {
0% { transform: scale(0.8); opacity: 1; }
@@ -402,7 +417,7 @@ export default {
.icon-door-left {
width: 28rpx;
height: 56rpx;
background: rgba(41, 121, 255, 0.9);
background: #2979ff;
border-radius: 6rpx;
transform: perspective(200rpx) rotateY(25deg);
animation: door-left-open 0.8s ease-out forwards;
@@ -410,7 +425,7 @@ export default {
.icon-door-right {
width: 28rpx;
height: 56rpx;
background: rgba(41, 121, 255, 0.9);
background: #2979ff;
border-radius: 6rpx;
transform: perspective(200rpx) rotateY(-25deg);
animation: door-right-open 0.8s ease-out forwards;
@@ -433,7 +448,7 @@ export default {
.lock-body {
width: 48rpx;
height: 36rpx;
background: rgba(250, 173, 20, 0.9);
background: #faad14;
border-radius: 6rpx;
position: absolute;
bottom: 0;
@@ -441,7 +456,7 @@ export default {
.lock-hole {
width: 28rpx;
height: 24rpx;
border: 5rpx solid rgba(250, 173, 20, 0.9);
border: 5rpx solid #faad14;
border-radius: 14rpx 14rpx 0 0;
border-bottom: none;
position: absolute;
@@ -454,8 +469,8 @@ export default {
.icon-check {
width: 40rpx;
height: 24rpx;
border-left: 5rpx solid #fff;
border-bottom: 5rpx solid #fff;
border-left: 5rpx solid #52c41a;
border-bottom: 5rpx solid #52c41a;
transform: rotate(-45deg);
margin-top: -8rpx;
}
@@ -464,13 +479,13 @@ export default {
.door-state-title {
font-size: 44rpx;
font-weight: bold;
color: #fff;
color: #333;
margin-bottom: 16rpx;
letter-spacing: 4rpx;
}
.door-state-desc {
font-size: 28rpx;
color: rgba(255, 255, 255, 0.5);
color: #999;
margin-bottom: 48rpx;
}
@@ -478,7 +493,7 @@ export default {
.door-state-divider {
width: 80rpx;
height: 4rpx;
background: linear-gradient(90deg, transparent, rgba(41, 121, 255, 0.6), transparent);
background: linear-gradient(90deg, transparent, #2979ff, transparent);
border-radius: 2rpx;
margin-bottom: 48rpx;
}
@@ -498,46 +513,45 @@ export default {
width: 44rpx;
height: 44rpx;
border-radius: 50%;
background: rgba(255, 255, 255, 0.08);
border: 2rpx solid rgba(255, 255, 255, 0.15);
background: #f5f5f5;
border: 2rpx solid #e0e0e0;
display: flex;
align-items: center;
justify-content: center;
font-size: 22rpx;
color: rgba(255, 255, 255, 0.35);
color: #999;
}
.step-dot.active {
background: rgba(41, 121, 255, 0.2);
background: rgba(41, 121, 255, 0.1);
border-color: #2979ff;
color: #2979ff;
box-shadow: 0 0 16rpx rgba(41, 121, 255, 0.3);
}
.step-dot.done {
background: rgba(41, 121, 255, 0.15);
border-color: rgba(41, 121, 255, 0.5);
color: rgba(41, 121, 255, 0.8);
background: rgba(41, 121, 255, 0.1);
border-color: #2979ff;
color: #2979ff;
font-size: 20rpx;
}
.step-text {
font-size: 22rpx;
color: rgba(255, 255, 255, 0.45);
color: #999;
white-space: nowrap;
}
.step-line {
width: 60rpx;
height: 2rpx;
background: rgba(255, 255, 255, 0.1);
background: #e0e0e0;
margin-bottom: 36rpx;
}
.step-line.done {
background: rgba(41, 121, 255, 0.4);
background: #2979ff;
}
/* ====== 订单卡片 ====== */
.door-order-card {
width: 100%;
background: rgba(255, 255, 255, 0.06);
border: 1rpx solid rgba(255, 255, 255, 0.08);
background: #f8f8f8;
border: 1rpx solid #f0f0f0;
border-radius: 20rpx;
padding: 24rpx 30rpx;
margin-top: 16rpx;
@@ -553,13 +567,13 @@ export default {
padding: 12rpx 0;
}
.door-product-item + .door-product-item {
border-top: 1rpx solid rgba(255, 255, 255, 0.06);
border-top: 1rpx solid #f0f0f0;
}
.door-product-img {
width: 80rpx;
height: 80rpx;
border-radius: 10rpx;
background: rgba(255, 255, 255, 0.1);
background: #f0f0f0;
flex-shrink: 0;
}
.door-product-info {
@@ -571,14 +585,14 @@ export default {
}
.door-product-name {
font-size: 26rpx;
color: rgba(255, 255, 255, 0.85);
color: #333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.door-product-price {
font-size: 24rpx;
color: rgba(255, 255, 255, 0.45);
color: #999;
}
.door-order-row {
display: flex;
@@ -587,29 +601,29 @@ export default {
padding: 16rpx 0;
}
.door-order-row + .door-order-row {
border-top: 1rpx solid rgba(255, 255, 255, 0.06);
border-top: 1rpx solid #f0f0f0;
}
.door-order-row.total {
border-top: 1rpx solid rgba(255, 255, 255, 0.1);
border-top: 1rpx solid #e0e0e0;
margin-top: 8rpx;
padding-top: 20rpx;
}
.door-order-label {
font-size: 26rpx;
color: rgba(255, 255, 255, 0.5);
color: #999;
}
.door-order-value {
font-size: 26rpx;
color: rgba(255, 255, 255, 0.9);
color: #333;
}
.door-price {
font-size: 36rpx;
font-weight: bold;
color: #ff6b6b;
color: #e4393c;
}
.door-order-loading {
font-size: 26rpx;
color: rgba(255, 255, 255, 0.4);
color: #999;
text-align: center;
padding: 16rpx 0;
}
@@ -631,16 +645,15 @@ export default {
background: linear-gradient(135deg, #2979ff, #1e60e0);
border-radius: 48rpx;
letter-spacing: 2rpx;
box-shadow: 0 8rpx 24rpx rgba(41, 121, 255, 0.35);
}
/* ====== 关闭按钮 ====== */
.door-btn-close {
font-size: 30rpx;
color: rgba(255, 255, 255, 0.85);
color: #2979ff;
padding: 24rpx 100rpx;
background: rgba(41, 121, 255, 0.15);
border: 1rpx solid rgba(41, 121, 255, 0.4);
background: #fff;
border: 2rpx solid #2979ff;
border-radius: 48rpx;
letter-spacing: 2rpx;
}
+16 -2
View File
@@ -1,16 +1,30 @@
/**
* 环境配置入口
* 根据编译模式自动选择 dev / prod 配置
* 根据编译模式自动选择 dev / staging / prod 配置
*
* DEPLOY_ENV 环境变量:
* - 'staging' → 预发布环境
* - 'production' → 生产环境(默认)
* - 未设置且 NODE_ENV !== 'production' → 开发环境
*/
import common from './index.js';
import dev from './dev.js';
import staging from './staging.js';
import prod from './prod.js';
// uni-app 编译时通过 define 注译 __UNI_PLATFORM__
// H5 开发模式下 process.env.NODE_ENV === 'development'
const isProd = process.env.NODE_ENV === 'production';
const deployEnv = process.env.DEPLOY_ENV;
const envConfig = isProd ? prod : dev;
let envConfig;
if (!isProd) {
envConfig = dev;
} else if (deployEnv === 'staging') {
envConfig = staging;
} else {
envConfig = prod;
}
const config = {
...common,
+20
View File
@@ -0,0 +1,20 @@
/**
* 预发布环境配置
*/
const staging = {
// 业务 API 地址(vms-api
apiBaseUrl: 'https://vmsapi.arklinksmart.cn',
// 网关地址(vms-gateway)— 用户授权、短信等接口走网关
apiGatewayUrl: 'https://gateway.arklinksmart.cn',
// 授权回调地址(微信 OAuth redirect_uri,必须 HTTPS,指向前端页面)
authRedirectUri: 'https://pre-m.arklinksmart.cn/pages/auth/loading',
// 生产环境 Token 从登录流程获取,此处为空
bearerToken: '',
enableRequestLog: false,
};
export default staging;
-18
View File
@@ -47,24 +47,6 @@
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/door/opened",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/door/closed",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/door/complete",
"style": {
"navigationStyle": "custom"
}
}
],
"globalStyle": {
+29 -5
View File
@@ -30,10 +30,29 @@ export default {
}
// 从 URL 参数获取 codeApp.vue 跳转时带过来)
let code = options.code || '';
// 支付宝回调参数名是 auth_code,微信是 code
let code = options.code || options.auth_code || '';
if (!code) {
const urlParams = new URLSearchParams(window.location.search);
code = urlParams.get('code') || '';
code = urlParams.get('code') || urlParams.get('auth_code') || '';
}
// 解析 state 参数(OAuth 标准保证 state 原样回传,包含 action 和 device_id
if (!this.action || !this.deviceId) {
const stateRaw = options.state || '';
if (stateRaw) {
try {
const stateObj = JSON.parse(decodeURIComponent(stateRaw));
if (!this.action && stateObj.action) {
this.action = stateObj.action;
}
if (!this.deviceId && stateObj.device_id) {
this.deviceId = stateObj.device_id;
}
} catch (_) {
// state 解析失败,继续用 localStorage 兜底
}
}
}
// 兜底:从 localStorage 恢复(页面复用时 onLoad 不触发,localStorage 由跳转函数清理)
@@ -97,10 +116,11 @@ export default {
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
);
// 使用 snsapi_base 静默授权,不弹窗
// 静默授权:微信用 snsapi_base,支付宝用 auth_base
const scopes = platform === 'alipay' ? 'auth_base' : 'snsapi_base';
const res = await gatewayGet('/api/v1/user/auth/url', {
app_no: appNo,
scopes: 'snsapi_base',
scopes: scopes,
redirect_uri: redirectUri,
});
@@ -154,6 +174,7 @@ export default {
// 立即清除 URL 中的 code 参数,避免刷新重复处理
const url = new URL(window.location.href);
url.searchParams.delete('code');
url.searchParams.delete('auth_code');
url.searchParams.delete('state');
window.history.replaceState({}, '', url.toString());
@@ -256,9 +277,11 @@ export default {
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
);
// 用户信息授权:微信用 snsapi_userinfo,支付宝用 auth_user
const scopes = platform === 'alipay' ? 'auth_user' : 'snsapi_userinfo';
const res = await gatewayGet('/api/v1/user/auth/url', {
app_no: appNo,
scopes: 'snsapi_userinfo',
scopes: scopes,
redirect_uri: redirectUri,
});
@@ -313,6 +336,7 @@ export default {
// 立即清除 URL 中的 code/action 参数,避免刷新重复处理
const url = new URL(window.location.href);
url.searchParams.delete('code');
url.searchParams.delete('auth_code');
url.searchParams.delete('state');
url.searchParams.delete('action');
window.history.replaceState({}, '', url.toString());
-229
View File
@@ -1,229 +0,0 @@
<template>
<view class="door-page">
<!-- 顶部状态区域 -->
<view class="status-section">
<view class="status-icon closed">
<view class="icon-lock">
<view class="lock-body"></view>
<view class="lock-hole"></view>
</view>
</view>
<text class="status-title">柜门已关闭</text>
<text class="status-desc">订单处理中请稍候...</text>
</view>
<!-- 设备信息 -->
<view class="info-card">
<view class="info-row">
<text class="info-label">设备编号</text>
<text class="info-value">{{ deviceId }}</text>
</view>
<view class="info-row" v-if="flowId">
<text class="info-label">流水号</text>
<text class="info-value">{{ flowId }}</text>
</view>
</view>
<!-- 提示信息 -->
<view class="tips-card">
<view class="tips-title">温馨提示</view>
<view class="tips-list">
<text class="tips-item"> 系统正在处理您的订单</text>
<text class="tips-item"> 请在"我的订单"中查看订单状态</text>
<text class="tips-item"> 如有问题请联系客服</text>
</view>
</view>
<!-- 底部按钮 -->
<view class="bottom-actions">
<view class="btn-outline" @click="handleViewOrder">查看订单</view>
<view class="btn-primary" @click="handleBack">返回首页</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
deviceId: '',
flowId: ''
};
},
onLoad(options) {
this.deviceId = options.device_id || '';
this.flowId = options.flow_id || '';
},
methods: {
handleViewOrder() {
uni.navigateTo({ url: '/pages/order/order' });
},
handleBack() {
uni.navigateBack({ delta: 10 });
}
}
};
</script>
<style scoped>
page {
height: 100%;
background-color: #f5f5f5;
}
.door-page {
min-height: 100vh;
background-color: #f5f5f5;
display: flex;
flex-direction: column;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
/* 状态区域 */
.status-section {
background: linear-gradient(135deg, #faad14, #d48806);
padding: 80rpx 40rpx 60rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.status-icon {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
background: rgba(255, 255, 255, 0.2);
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 32rpx;
}
.icon-lock {
position: relative;
width: 48rpx;
height: 56rpx;
}
.lock-body {
width: 48rpx;
height: 36rpx;
background: #fff;
border-radius: 6rpx;
position: absolute;
bottom: 0;
}
.lock-hole {
width: 28rpx;
height: 24rpx;
border: 5rpx solid #fff;
border-radius: 14rpx 14rpx 0 0;
border-bottom: none;
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
}
.status-title {
font-size: 40rpx;
font-weight: bold;
color: #fff;
margin-bottom: 16rpx;
}
.status-desc {
font-size: 28rpx;
color: rgba(255, 255, 255, 0.85);
}
/* 信息卡片 */
.info-card {
background: #fff;
margin: 30rpx;
border-radius: 16rpx;
padding: 10rpx 30rpx;
}
.info-row {
display: flex;
justify-content: space-between;
align-items: center;
padding: 28rpx 0;
border-bottom: 1rpx solid #f0f0f0;
}
.info-row:last-child {
border-bottom: none;
}
.info-label {
font-size: 28rpx;
color: #999;
}
.info-value {
font-size: 28rpx;
color: #333;
}
/* 提示卡片 */
.tips-card {
background: #fff;
margin: 0 30rpx 30rpx;
border-radius: 16rpx;
padding: 30rpx;
}
.tips-title {
font-size: 30rpx;
font-weight: bold;
color: #333;
margin-bottom: 20rpx;
}
.tips-list {
display: flex;
flex-direction: column;
gap: 12rpx;
}
.tips-item {
font-size: 26rpx;
color: #666;
line-height: 1.6;
}
/* 底部按钮 */
.bottom-actions {
margin-top: auto;
padding: 30rpx;
display: flex;
gap: 20rpx;
}
.btn-outline {
flex: 1;
background: #fff;
color: #2979ff;
font-size: 32rpx;
font-weight: bold;
text-align: center;
padding: 28rpx;
border-radius: 48rpx;
border: 2rpx solid #2979ff;
}
.btn-primary {
flex: 1;
background: linear-gradient(135deg, #2979ff, #1e60e0);
color: #fff;
font-size: 32rpx;
font-weight: bold;
text-align: center;
padding: 28rpx;
border-radius: 48rpx;
}
</style>
-305
View File
@@ -1,305 +0,0 @@
<template>
<view class="door-page">
<!-- 顶部状态区域 -->
<view class="status-section">
<view class="status-icon success">
<view class="icon-check"></view>
</view>
<text class="status-title">订单已完成</text>
<text class="status-desc">感谢您的购买</text>
</view>
<!-- 订单信息 -->
<view class="order-card">
<view class="card-title">订单信息</view>
<view v-if="orderLoading" class="loading-tip">
<text>加载中...</text>
</view>
<view v-else-if="orderInfo">
<view class="info-row">
<text class="info-label">订单编号</text>
<text class="info-value">{{ orderInfo.order_no }}</text>
</view>
<view class="info-row">
<text class="info-label">下单时间</text>
<text class="info-value">{{ orderInfo.created_at }}</text>
</view>
<view class="info-row">
<text class="info-label">商品数量</text>
<text class="info-value">{{ orderInfo.product_count || '-' }} </text>
</view>
<view class="info-row total">
<text class="info-label">订单金额</text>
<text class="info-value price">¥{{ orderInfo.total_amount || '0.00' }}</text>
</view>
</view>
<view v-else class="empty-tip">
<text>暂无订单信息</text>
</view>
</view>
<!-- 商品明细 -->
<view v-if="orderInfo && orderInfo.items && orderInfo.items.length" class="products-card">
<view class="card-title">商品明细</view>
<view class="product-item" v-for="(item, idx) in orderInfo.items" :key="idx">
<view class="product-info">
<text class="product-name">{{ item.name }}</text>
<text class="product-spec">{{ item.spec || '' }}</text>
</view>
<view class="product-right">
<text class="product-price">¥{{ item.price }}</text>
<text class="product-qty">x{{ item.quantity }}</text>
</view>
</view>
</view>
<!-- 底部按钮 -->
<view class="bottom-actions">
<view class="btn-outline" @click="handleViewOrder">查看全部订单</view>
<view class="btn-primary" @click="handleBack">返回首页</view>
</view>
</view>
</template>
<script>
import { get } from '@/utils/request.js';
export default {
data() {
return {
deviceId: '',
flowId: '',
orderInfo: null,
orderLoading: false
};
},
onLoad(options) {
this.deviceId = options.device_id || '';
this.flowId = options.flow_id || '';
this.fetchOrderInfo();
},
methods: {
async fetchOrderInfo() {
if (!this.flowId) return;
this.orderLoading = true;
try {
// 通过 flow_id 查询订单信息
const res = await get('/order/getByFlowId', {
flow_id: this.flowId
});
const ret = res.data || {};
if (ret.code === 0 && ret.data) {
this.orderInfo = ret.data;
} else {
console.warn('[complete] 获取订单信息失败:', ret.message);
}
} catch (e) {
console.error('[complete] 获取订单信息异常:', e);
} finally {
this.orderLoading = false;
}
},
handleViewOrder() {
uni.navigateTo({ url: '/pages/order/order' });
},
handleBack() {
uni.navigateBack({ delta: 10 });
}
}
};
</script>
<style scoped>
page {
height: 100%;
background-color: #f5f5f5;
}
.door-page {
min-height: 100vh;
background-color: #f5f5f5;
display: flex;
flex-direction: column;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
/* 状态区域 */
.status-section {
background: linear-gradient(135deg, #52c41a, #389e0d);
padding: 80rpx 40rpx 60rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.status-icon {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
background: rgba(255, 255, 255, 0.2);
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 32rpx;
}
.status-icon.success .icon-check {
width: 50rpx;
height: 28rpx;
border-left: 6rpx solid #fff;
border-bottom: 6rpx solid #fff;
transform: rotate(-45deg);
margin-top: -10rpx;
}
.status-title {
font-size: 40rpx;
font-weight: bold;
color: #fff;
margin-bottom: 16rpx;
}
.status-desc {
font-size: 28rpx;
color: rgba(255, 255, 255, 0.85);
}
/* 通用卡片 */
.order-card,
.products-card {
background: #fff;
margin: 30rpx;
border-radius: 16rpx;
padding: 30rpx;
}
.card-title {
font-size: 30rpx;
font-weight: bold;
color: #333;
margin-bottom: 24rpx;
padding-bottom: 20rpx;
border-bottom: 1rpx solid #f0f0f0;
}
/* 订单信息行 */
.info-row {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20rpx 0;
}
.info-row.total {
padding-top: 24rpx;
margin-top: 12rpx;
border-top: 1rpx solid #f0f0f0;
}
.info-label {
font-size: 28rpx;
color: #999;
}
.info-value {
font-size: 28rpx;
color: #333;
}
.info-value.price {
font-size: 36rpx;
font-weight: bold;
color: #e4393c;
}
/* 商品明细 */
.product-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20rpx 0;
border-bottom: 1rpx solid #f5f5f5;
}
.product-item:last-child {
border-bottom: none;
}
.product-info {
flex: 1;
display: flex;
flex-direction: column;
gap: 8rpx;
}
.product-name {
font-size: 28rpx;
color: #333;
}
.product-spec {
font-size: 24rpx;
color: #999;
}
.product-right {
display: flex;
flex-direction: column;
align-items: flex-end;
gap: 8rpx;
}
.product-price {
font-size: 28rpx;
color: #333;
font-weight: bold;
}
.product-qty {
font-size: 24rpx;
color: #999;
}
/* 加载/空状态 */
.loading-tip,
.empty-tip {
text-align: center;
padding: 40rpx;
color: #999;
font-size: 28rpx;
}
/* 底部按钮 */
.bottom-actions {
margin-top: auto;
padding: 30rpx;
display: flex;
gap: 20rpx;
}
.btn-outline {
flex: 1;
background: #fff;
color: #2979ff;
font-size: 32rpx;
font-weight: bold;
text-align: center;
padding: 28rpx;
border-radius: 48rpx;
border: 2rpx solid #2979ff;
}
.btn-primary {
flex: 1;
background: linear-gradient(135deg, #2979ff, #1e60e0);
color: #fff;
font-size: 32rpx;
font-weight: bold;
text-align: center;
padding: 28rpx;
border-radius: 48rpx;
}
</style>
-189
View File
@@ -1,189 +0,0 @@
<template>
<view class="door-page">
<!-- 顶部状态区域 -->
<view class="status-section">
<view class="status-icon success">
<view class="icon-check"></view>
</view>
<text class="status-title">柜门已打开</text>
<text class="status-desc">请取走商品后关闭柜门</text>
</view>
<!-- 设备信息 -->
<view class="info-card">
<view class="info-row">
<text class="info-label">设备编号</text>
<text class="info-value">{{ deviceId }}</text>
</view>
<view class="info-row" v-if="flowId">
<text class="info-label">流水号</text>
<text class="info-value">{{ flowId }}</text>
</view>
</view>
<!-- 提示信息 -->
<view class="tips-card">
<view class="tips-title">温馨提示</view>
<view class="tips-list">
<text class="tips-item"> 取走商品后请随手关门</text>
<text class="tips-item"> 关门后系统将自动完成订单</text>
<text class="tips-item"> 如有问题请联系客服</text>
</view>
</view>
<!-- 底部按钮 -->
<view class="bottom-actions">
<view class="btn-primary" @click="handleBack">返回首页</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
deviceId: '',
flowId: ''
};
},
onLoad(options) {
this.deviceId = options.device_id || '';
this.flowId = options.flow_id || '';
},
methods: {
handleBack() {
uni.navigateBack({ delta: 10 });
}
}
};
</script>
<style scoped>
page {
height: 100%;
background-color: #f5f5f5;
}
.door-page {
min-height: 100vh;
background-color: #f5f5f5;
display: flex;
flex-direction: column;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
/* 状态区域 */
.status-section {
background: linear-gradient(135deg, #52c41a, #389e0d);
padding: 80rpx 40rpx 60rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.status-icon {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
background: rgba(255, 255, 255, 0.2);
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 32rpx;
}
.status-icon.success .icon-check {
width: 50rpx;
height: 28rpx;
border-left: 6rpx solid #fff;
border-bottom: 6rpx solid #fff;
transform: rotate(-45deg);
margin-top: -10rpx;
}
.status-title {
font-size: 40rpx;
font-weight: bold;
color: #fff;
margin-bottom: 16rpx;
}
.status-desc {
font-size: 28rpx;
color: rgba(255, 255, 255, 0.85);
}
/* 信息卡片 */
.info-card {
background: #fff;
margin: 30rpx;
border-radius: 16rpx;
padding: 10rpx 30rpx;
}
.info-row {
display: flex;
justify-content: space-between;
align-items: center;
padding: 28rpx 0;
border-bottom: 1rpx solid #f0f0f0;
}
.info-row:last-child {
border-bottom: none;
}
.info-label {
font-size: 28rpx;
color: #999;
}
.info-value {
font-size: 28rpx;
color: #333;
}
/* 提示卡片 */
.tips-card {
background: #fff;
margin: 0 30rpx 30rpx;
border-radius: 16rpx;
padding: 30rpx;
}
.tips-title {
font-size: 30rpx;
font-weight: bold;
color: #333;
margin-bottom: 20rpx;
}
.tips-list {
display: flex;
flex-direction: column;
gap: 12rpx;
}
.tips-item {
font-size: 26rpx;
color: #666;
line-height: 1.6;
}
/* 底部按钮 */
.bottom-actions {
margin-top: auto;
padding: 30rpx;
}
.btn-primary {
background: linear-gradient(135deg, #2979ff, #1e60e0);
color: #fff;
font-size: 32rpx;
font-weight: bold;
text-align: center;
padding: 28rpx;
border-radius: 48rpx;
}
</style>
+2 -22
View File
@@ -44,17 +44,7 @@ export default {
faqList: [
{
question: '如何购买商品?',
answer: '在首页浏览商品,点击商品卡片选择商品,确认后即可完成购买。支持微信支付和支付宝支付。',
expanded: false
},
{
question: '如何开门取货?',
answer: '下单成功后,点击首页底部中间的"开门"按钮,柜门会自动打开,取出商品后关闭柜门即可。',
expanded: false
},
{
question: '商品质量问题怎么办?',
answer: '如发现商品有质量问题,请在24小时内通过"联系客服"反馈,我们会为您办理退款或换货。',
answer: '使用微信或支付宝扫描柜体上的二维码,进入开门页面,如果是首次使用需先进行授权登录与注册,浏览设备中售卖的商品及价格,点击开门,待门锁打开后,拉开门选购商品,关门即完成购买,约1-2分钟内系统将自动识别并完成扣款。',
expanded: false
},
{
@@ -62,16 +52,6 @@ export default {
answer: '进入"我的"页面,点击"我的订单"可查看所有订单记录,包括待付款、已完成、已退款等状态。',
expanded: false
},
{
question: '忘记密码怎么办?',
answer: '在登录页面点击"忘记密码",输入注册手机号,通过短信验证码即可重置密码。',
expanded: false
},
{
question: '如何修改收货地址?',
answer: '进入"我的"页面,点击"收货地址",可以新增、编辑或删除收货地址信息。',
expanded: false
},
{
question: '支持哪些支付方式?',
answer: '目前支持微信支付、支付宝支付两种方式,后续将开通更多支付渠道。',
@@ -79,7 +59,7 @@ export default {
},
{
question: '退款多久到账?',
answer: '退款申请审核通过后,微信支付1-3个工作日到账,支付宝1-5个工作日到账,具体以银行处理时间为准。',
answer: '审核通过后,一般1-3个工作日到账,具体到账时间以支付渠道为准。',
expanded: false
}
]
+1 -1
View File
@@ -441,7 +441,7 @@ export default {
}
// 调用组件方法启动开门流程
this.$refs.doorPanel.open();
this.$refs.doorPanel.open(this.userId);
},
handleMenuClick(item) {
switch (item.action) {
+3 -3
View File
@@ -6,9 +6,9 @@
// app_no 编码表:platform + terminalType → app_no
const APP_NO_MAP = {
'wechat_h5': '60000001102001',
'wechat_mp': '600102101',
'alipay_h5': '600112001',
'alipay_mp': '600112101',
'wechat_mp': '60000001102101',
'alipay_h5': '60000001112001',
'alipay_mp': '60000001112101',
};
/**
+4
View File
@@ -26,6 +26,10 @@ function servePublicFiles() {
export default defineConfig({
plugins: [servePublicFiles(), uni()],
// 将构建时的 DEPLOY_ENV 环境变量注入到客户端代码中
define: {
'process.env.DEPLOY_ENV': JSON.stringify(process.env.DEPLOY_ENV || ''),
},
css: {
preprocessorOptions: {
scss: {