fix:修复支付分订单创建，订单套餐没有更新的问题
This commit is contained in:
+31
-28
@@ -57,10 +57,10 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="pricing-rules">
|
<view class="pricing-rules">
|
||||||
<view class="rule-item">
|
<!-- <view class="rule-item">
|
||||||
<view class="rule-dot"></view>
|
<view class="rule-dot"></view>
|
||||||
<text class="rule-text">前15分钟内归还<text class="highlight">免费</text></text>
|
<text class="rule-text">前15分钟内归还<text class="highlight">免费</text></text>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="rule-item">
|
<view class="rule-item">
|
||||||
<view class="rule-dot"></view>
|
<view class="rule-dot"></view>
|
||||||
<text class="rule-text">不足60分钟按60分钟计费</text>
|
<text class="rule-text">不足60分钟按60分钟计费</text>
|
||||||
@@ -420,37 +420,40 @@
|
|||||||
|
|
||||||
// 获取后端返回的订单信息
|
// 获取后端返回的订单信息
|
||||||
const order = rentResult.data
|
const order = rentResult.data
|
||||||
//当支付方式为押金支付时
|
|
||||||
|
// --- 统一：先更新订单套餐信息 ---
|
||||||
|
try {
|
||||||
|
let packageTimeMinutes = 0;
|
||||||
|
if (selectedPkg.time.includes('小时')) {
|
||||||
|
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
||||||
|
} else if (selectedPkg.time.includes('分钟')) {
|
||||||
|
packageTimeMinutes = parseInt(selectedPkg.time);
|
||||||
|
} else {
|
||||||
|
packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateRes = await updateOrderPackage({
|
||||||
|
orderId: order.orderId,
|
||||||
|
packageTime: packageTimeMinutes,
|
||||||
|
packagePrice: parseFloat(selectedPkg.price)
|
||||||
|
});
|
||||||
|
if (updateRes.code !== 200) {
|
||||||
|
console.warn("更新订单套餐信息失败:", updateRes.msg);
|
||||||
|
// 这里可以选择是否提示用户或阻止流程，当前不阻止
|
||||||
|
} else {
|
||||||
|
console.log("订单套餐信息已提前更新");
|
||||||
|
}
|
||||||
|
} catch (updateError) {
|
||||||
|
console.error("更新订单套餐信息时出错:", updateError);
|
||||||
|
// 即使更新失败，也继续流程
|
||||||
|
}
|
||||||
|
// --- 套餐信息更新结束 ---
|
||||||
|
|
||||||
if (payWay == 'wx-pay') {
|
if (payWay == 'wx-pay') {
|
||||||
//当支付方式为押金支付时
|
//当支付方式为押金支付时
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
const res = await getOrderByOrderNo(order.orderNo);
|
const res = await getOrderByOrderNo(order.orderNo);
|
||||||
console.log(res);
|
console.log(res);
|
||||||
try {
|
|
||||||
let packageTimeMinutes = 0;
|
|
||||||
if (selectedPkg.time.includes('小时')) {
|
|
||||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
|
||||||
} else if (selectedPkg.time.includes('分钟')) {
|
|
||||||
packageTimeMinutes = parseInt(selectedPkg.time);
|
|
||||||
} else {
|
|
||||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateRes = await updateOrderPackage({
|
|
||||||
orderId: order.orderId,
|
|
||||||
packageTime: packageTimeMinutes,
|
|
||||||
packagePrice: parseFloat(selectedPkg.price)
|
|
||||||
});
|
|
||||||
if (updateRes.code !== 200) {
|
|
||||||
console.warn("更新订单套餐信息失败:", updateRes.msg);
|
|
||||||
// 这里可以选择是否提示用户或阻止流程，当前不阻止
|
|
||||||
} else {
|
|
||||||
console.log("订单套餐信息已提前更新");
|
|
||||||
}
|
|
||||||
} catch (updateError) {
|
|
||||||
console.error("更新订单套餐信息时出错:", updateError);
|
|
||||||
// 即使更新失败，也继续尝试跳转支付，让用户完成支付
|
|
||||||
}
|
|
||||||
// --- 新增：计算总金额 ---
|
// --- 新增：计算总金额 ---
|
||||||
const deposit = parseFloat(deviceInfo.value.depositAmount);
|
const deposit = parseFloat(deviceInfo.value.depositAmount);
|
||||||
const packagePrice = parseFloat(selectedPkg.price);
|
const packagePrice = parseFloat(selectedPkg.price);
|
||||||
|
|||||||
@@ -54,10 +54,10 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="divider"></view>
|
<view class="divider"></view>
|
||||||
<view class="rule-list">
|
<view class="rule-list">
|
||||||
<view class="rule-item">
|
<!-- <view class="rule-item">
|
||||||
<view class="rule-dot"></view>
|
<view class="rule-dot"></view>
|
||||||
<text>15分钟内归还免费</text>
|
<text>15分钟内归还免费</text>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="rule-item">
|
<view class="rule-item">
|
||||||
<view class="rule-dot"></view>
|
<view class="rule-dot"></view>
|
||||||
<text>不足1小时按1小时计费</text>
|
<text>不足1小时按1小时计费</text>
|
||||||
|
|||||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
|||||||
<view class="container data-v-8ffe558a"><view class="device-header data-v-8ffe558a"><view class="{{['device-status-card', 'data-v-8ffe558a', b]}}"><view class="status-indicator data-v-8ffe558a"></view><text class="status-text data-v-8ffe558a">{{a}}</text></view><view class="device-title data-v-8ffe558a"><text class="name data-v-8ffe558a">共享风扇</text><view class="device-meta data-v-8ffe558a"><text class="id-label data-v-8ffe558a">设备号：</text><text class="id-value data-v-8ffe558a">{{c}}</text></view></view></view><view class="card device-info-card data-v-8ffe558a"><view class="card-row data-v-8ffe558a"><view class="card-item data-v-8ffe558a"><view class="item-icon location-icon data-v-8ffe558a"><image class="data-v-8ffe558a" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-8ffe558a"><text class="item-label data-v-8ffe558a">当前位置</text><text class="item-value data-v-8ffe558a">{{e}}</text></view></view><view class="card-item data-v-8ffe558a"><view class="{{['item-icon', 'battery-icon', 'data-v-8ffe558a', g && 'battery-low']}}"><image class="data-v-8ffe558a" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-8ffe558a"><text class="item-label data-v-8ffe558a">电池电量</text><text class="item-value data-v-8ffe558a">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-8ffe558a"><view class="card-header data-v-8ffe558a"><text class="card-title data-v-8ffe558a">计费规则</text></view><view class="pricing-banner data-v-8ffe558a"><view class="pricing-main data-v-8ffe558a"><text class="price data-v-8ffe558a">¥5.00</text><text class="unit data-v-8ffe558a">/小时</text></view><text class="cap-price data-v-8ffe558a">封顶 ¥99</text></view><view class="pricing-rules data-v-8ffe558a"><view class="rule-item data-v-8ffe558a"><view class="rule-dot data-v-8ffe558a"></view><text class="rule-text data-v-8ffe558a">前15分钟内归还<text class="highlight data-v-8ffe558a">免费</text></text></view><view class="rule-item data-v-8ffe558a"><view class="rule-dot data-v-8ffe558a"></view><text class="rule-text data-v-8ffe558a">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-8ffe558a"><view class="rule-dot data-v-8ffe558a"></view><text class="rule-text data-v-8ffe558a">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-8ffe558a"><view class="card-header data-v-8ffe558a"><text class="card-title data-v-8ffe558a">使用须知</text></view><view class="notice-items data-v-8ffe558a"><view class="notice-item data-v-8ffe558a"><view class="notice-dot data-v-8ffe558a"></view><text class="notice-text data-v-8ffe558a">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-8ffe558a"><view class="notice-dot data-v-8ffe558a"></view><text class="notice-text data-v-8ffe558a">请在指定区域内使用设备</text></view><view class="notice-item data-v-8ffe558a"><view class="notice-dot data-v-8ffe558a"></view><text class="notice-text data-v-8ffe558a">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-8ffe558a"><button class="{{['rent-button', 'data-v-8ffe558a', j && 'return-button']}}" bindtap="{{k}}"><text class="data-v-8ffe558a">{{i}}</text></button><view class="wechat-credit data-v-8ffe558a"><image src="{{l}}" mode="aspectFit" class="wx-icon data-v-8ffe558a"></image><view class="credit-text data-v-8ffe558a"><text class="data-v-8ffe558a">微信支付分</text><text class="credit-divider data-v-8ffe558a">|</text><text class="credit-score data-v-8ffe558a">550分及以上优享</text></view></view></view><view wx:if="{{m}}" class="phone-auth-popup data-v-8ffe558a"><view class="popup-mask data-v-8ffe558a" catchtap="{{n}}"></view><view class="popup-content data-v-8ffe558a"><view class="popup-header data-v-8ffe558a"><text class="popup-title data-v-8ffe558a">授权获取手机号</text></view><view class="popup-body data-v-8ffe558a"><view class="auth-desc data-v-8ffe558a"><text class="data-v-8ffe558a">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-8ffe558a" open-type="getPhoneNumber" bindgetphonenumber="{{o}}"> 一键获取手机号 </button><view class="auth-cancel data-v-8ffe558a" bindtap="{{p}}"><text class="data-v-8ffe558a">暂不授权</text></view></view></view></view></view>
|
<view class="container data-v-716cc21d"><view class="device-header data-v-716cc21d"><view class="{{['device-status-card', 'data-v-716cc21d', b]}}"><view class="status-indicator data-v-716cc21d"></view><text class="status-text data-v-716cc21d">{{a}}</text></view><view class="device-title data-v-716cc21d"><text class="name data-v-716cc21d">共享风扇</text><view class="device-meta data-v-716cc21d"><text class="id-label data-v-716cc21d">设备号：</text><text class="id-value data-v-716cc21d">{{c}}</text></view></view></view><view class="card device-info-card data-v-716cc21d"><view class="card-row data-v-716cc21d"><view class="card-item data-v-716cc21d"><view class="item-icon location-icon data-v-716cc21d"><image class="data-v-716cc21d" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-716cc21d"><text class="item-label data-v-716cc21d">当前位置</text><text class="item-value data-v-716cc21d">{{e}}</text></view></view><view class="card-item data-v-716cc21d"><view class="{{['item-icon', 'battery-icon', 'data-v-716cc21d', g && 'battery-low']}}"><image class="data-v-716cc21d" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-716cc21d"><text class="item-label data-v-716cc21d">电池电量</text><text class="item-value data-v-716cc21d">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-716cc21d"><view class="card-header data-v-716cc21d"><text class="card-title data-v-716cc21d">计费规则</text></view><view class="pricing-banner data-v-716cc21d"><view class="pricing-main data-v-716cc21d"><text class="price data-v-716cc21d">¥5.00</text><text class="unit data-v-716cc21d">/小时</text></view><text class="cap-price data-v-716cc21d">封顶 ¥99</text></view><view class="pricing-rules data-v-716cc21d"><view class="rule-item data-v-716cc21d"><view class="rule-dot data-v-716cc21d"></view><text class="rule-text data-v-716cc21d">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-716cc21d"><view class="rule-dot data-v-716cc21d"></view><text class="rule-text data-v-716cc21d">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-716cc21d"><view class="card-header data-v-716cc21d"><text class="card-title data-v-716cc21d">使用须知</text></view><view class="notice-items data-v-716cc21d"><view class="notice-item data-v-716cc21d"><view class="notice-dot data-v-716cc21d"></view><text class="notice-text data-v-716cc21d">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-716cc21d"><view class="notice-dot data-v-716cc21d"></view><text class="notice-text data-v-716cc21d">请在指定区域内使用设备</text></view><view class="notice-item data-v-716cc21d"><view class="notice-dot data-v-716cc21d"></view><text class="notice-text data-v-716cc21d">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-716cc21d"><button class="{{['rent-button', 'data-v-716cc21d', j && 'return-button']}}" bindtap="{{k}}"><text class="data-v-716cc21d">{{i}}</text></button><view class="wechat-credit data-v-716cc21d"><image src="{{l}}" mode="aspectFit" class="wx-icon data-v-716cc21d"></image><view class="credit-text data-v-716cc21d"><text class="data-v-716cc21d">微信支付分</text><text class="credit-divider data-v-716cc21d">|</text><text class="credit-score data-v-716cc21d">550分及以上优享</text></view></view></view><view wx:if="{{m}}" class="phone-auth-popup data-v-716cc21d"><view class="popup-mask data-v-716cc21d" catchtap="{{n}}"></view><view class="popup-content data-v-716cc21d"><view class="popup-header data-v-716cc21d"><text class="popup-title data-v-716cc21d">授权获取手机号</text></view><view class="popup-body data-v-716cc21d"><view class="auth-desc data-v-716cc21d"><text class="data-v-716cc21d">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-716cc21d" open-type="getPhoneNumber" bindgetphonenumber="{{o}}"> 一键获取手机号 </button><view class="auth-cancel data-v-716cc21d" bindtap="{{p}}"><text class="data-v-716cc21d">暂不授权</text></view></view></view></view></view>
|
||||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
|||||||
"use strict";const e=require("../../common/vendor.js"),o=require("../../util/index.js"),t=require("../../config/url.js"),n=require("../../config/user.js"),i=require("../../common/assets.js"),a={methods:{async handleScan(){try{const d=await new Promise(((o,t)=>{e.index.scanCode({success:o,fail:t})}));console.log(d.path);let r=o.getQueryString(d.path,"deviceNo");if(!r)return void e.index.showToast({title:"无效的设备二维码",icon:"none"});e.index.getStorageSync("token")||await o.wxLogin();const c=await e.index.request({url:`${t.URL||"http://127.0.0.1:8080"}/app/order/inUse`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(200==c.statusCode&&200==c.data.code&&c.data.data){const o=c.data.data;return e.index.reLaunch({url:`/pages/return/index?orderId=${o.orderId}&deviceId=${r||o.deviceNo}`}),void console.log("已发起页面跳转")}const s=await e.index.request({url:`${t.URL||"http://127.0.0.1:8080"}/app/order/unpaid`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(console.log("待支付订单检查结果:",JSON.stringify(s)),200==s.statusCode&&200==s.data.code&&s.data.data){const o=s.data.data;e.index.navigateTo({url:`/pages/order/payment?orderId=${o.orderId}`})}else try{const o=await n.getDeviceInfo(r);if(200==o.code&&o.data&&o.data.device){const t=o.data.device;if(t.feeConfig){console.log("获取到设备feeConfig信息:",t.feeConfig);try{JSON.parse(t.feeConfig);e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}&feeConfig=${encodeURIComponent(t.feeConfig)}`})}catch(i){console.error("解析feeConfig失败:",i),e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}}else e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}else console.error("获取设备信息失败:",o.msg||"未知错误"),e.index.showToast({title:"获取设备信息失败",icon:"none"}),e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}catch(a){console.error("获取设备信息异常:",a),e.index.showToast({title:"获取设备信息失败",icon:"none"}),e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}}catch(a){console.error("扫码处理失败:",a),e.index.showToast({title:"扫码失败",icon:"none"})}}}};const d=e._export_sfc(a,[["render",function(o,t,n,a,d,r){return e.e({a:i._imports_0,b:i._imports_1,c:e.o(((...e)=>r.handleScan&&r.handleScan(...e))),d:o.showPhoneAuthPopup},o.showPhoneAuthPopup?{e:e.o((e=>o.showPhoneAuthPopup=!1)),f:e.o(((...e)=>o.onGetPhoneNumber&&o.onGetPhoneNumber(...e))),g:e.o((e=>o.showPhoneAuthPopup=!1))}:{})}],["__scopeId","data-v-527ff3b8"]]);wx.createPage(d);
|
"use strict";const e=require("../../common/vendor.js"),o=require("../../util/index.js"),t=require("../../config/url.js"),n=require("../../config/user.js"),i=require("../../common/assets.js"),a={methods:{async handleScan(){try{const d=await new Promise(((o,t)=>{e.index.scanCode({success:o,fail:t})}));console.log(d.path);let r=o.getQueryString(d.path,"deviceNo");if(!r)return void e.index.showToast({title:"无效的设备二维码",icon:"none"});e.index.getStorageSync("token")||await o.wxLogin();const c=await e.index.request({url:`${t.URL||"http://127.0.0.1:8080"}/app/order/inUse`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(200==c.statusCode&&200==c.data.code&&c.data.data){const o=c.data.data;return e.index.reLaunch({url:`/pages/return/index?orderId=${o.orderId}&deviceId=${r||o.deviceNo}`}),void console.log("已发起页面跳转")}const s=await e.index.request({url:`${t.URL||"http://127.0.0.1:8080"}/app/order/unpaid`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(console.log("待支付订单检查结果:",JSON.stringify(s)),200==s.statusCode&&200==s.data.code&&s.data.data){const o=s.data.data;e.index.navigateTo({url:`/pages/order/payment?orderId=${o.orderId}`})}else try{const o=await n.getDeviceInfo(r);if(200==o.code&&o.data&&o.data.device){const t=o.data.device;if(t.feeConfig){console.log("获取到设备feeConfig信息:",t.feeConfig);try{JSON.parse(t.feeConfig);e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}&feeConfig=${encodeURIComponent(t.feeConfig)}`})}catch(i){console.error("解析feeConfig失败:",i),e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}}else e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}else console.error("获取设备信息失败:",o.msg||"未知错误"),e.index.showToast({title:"获取设备信息失败",icon:"none"}),e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}catch(a){console.error("获取设备信息异常:",a),e.index.showToast({title:"获取设备信息失败",icon:"none"}),e.index.navigateTo({url:`/pages/device/detail?deviceNo=${r}`})}}catch(a){console.error("扫码处理失败:",a),e.index.showToast({title:"扫码失败",icon:"none"})}}}};const d=e._export_sfc(a,[["render",function(o,t,n,a,d,r){return e.e({a:i._imports_0,b:i._imports_1,c:e.o(((...e)=>r.handleScan&&r.handleScan(...e))),d:o.showPhoneAuthPopup},o.showPhoneAuthPopup?{e:e.o((e=>o.showPhoneAuthPopup=!1)),f:e.o(((...e)=>o.onGetPhoneNumber&&o.onGetPhoneNumber(...e))),g:e.o((e=>o.showPhoneAuthPopup=!1))}:{})}],["__scopeId","data-v-cb03dff0"]]);wx.createPage(d);
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
<view class="container data-v-527ff3b8"><view class="header data-v-527ff3b8"><view class="header-bg data-v-527ff3b8"><view class="circle-decoration circle-1 data-v-527ff3b8"></view><view class="circle-decoration circle-2 data-v-527ff3b8"></view><view class="wave-decoration data-v-527ff3b8"></view></view><view class="header-content data-v-527ff3b8"><view class="brand-area data-v-527ff3b8"><image class="brand-logo data-v-527ff3b8" src="{{a}}" mode="aspectFit"></image><view class="brand-text data-v-527ff3b8"><text class="title data-v-527ff3b8">共享风扇</text><text class="subtitle data-v-527ff3b8">随时随地，享受清凉</text></view></view><view class="header-info data-v-527ff3b8"><view class="service-tag data-v-527ff3b8"><text class="data-v-527ff3b8">便捷租赁</text><text class="dot data-v-527ff3b8">·</text><text class="data-v-527ff3b8">品质保障</text></view></view></view></view><view class="scan-section data-v-527ff3b8"><view class="scan-card data-v-527ff3b8"><view class="scan-btn data-v-527ff3b8" bindtap="{{c}}"><image class="scan-icon data-v-527ff3b8" src="{{b}}" mode="aspectFit"/><text class="scan-text data-v-527ff3b8">扫码使用</text></view><view class="scan-desc data-v-527ff3b8"><text class="data-v-527ff3b8">扫描设备二维码即可使用或归还</text></view></view></view><view class="price-card data-v-527ff3b8"><view class="card-header data-v-527ff3b8"><text class="card-title data-v-527ff3b8">收费规则</text></view><view class="price-rules data-v-527ff3b8"><view class="price-item data-v-527ff3b8"><view class="price-tag data-v-527ff3b8">5.0<text class="unit data-v-527ff3b8">元/小时</text></view></view><view class="divider data-v-527ff3b8"></view><view class="rule-list data-v-527ff3b8"><view class="rule-item data-v-527ff3b8"><view class="rule-dot data-v-527ff3b8"></view><text class="data-v-527ff3b8">15分钟内归还免费</text></view><view class="rule-item data-v-527ff3b8"><view class="rule-dot data-v-527ff3b8"></view><text class="data-v-527ff3b8">不足1小时按1小时计费</text></view><view class="rule-item data-v-527ff3b8"><view class="rule-dot data-v-527ff3b8"></view><text class="data-v-527ff3b8">封顶99元，计费达99元视为买断</text></view></view></view></view><view class="usage-steps data-v-527ff3b8"><view class="steps-header data-v-527ff3b8"><text class="steps-title data-v-527ff3b8">使用流程</text></view><view class="steps-container data-v-527ff3b8"><view class="step-item data-v-527ff3b8"><view class="step-icon data-v-527ff3b8"><text class="step-number data-v-527ff3b8">1</text></view><text class="step-text data-v-527ff3b8">扫码弹出</text></view><view class="step-arrow data-v-527ff3b8"></view><view class="step-item data-v-527ff3b8"><view class="step-icon data-v-527ff3b8"><text class="step-number data-v-527ff3b8">2</text></view><text class="step-text data-v-527ff3b8">使用风扇</text></view><view class="step-arrow data-v-527ff3b8"></view><view class="step-item data-v-527ff3b8"><view class="step-icon data-v-527ff3b8"><text class="step-number data-v-527ff3b8">3</text></view><text class="step-text data-v-527ff3b8">插入归还</text></view><view class="step-arrow data-v-527ff3b8"></view><view class="step-item data-v-527ff3b8"><view class="step-icon data-v-527ff3b8"><text class="step-number data-v-527ff3b8">4</text></view><text class="step-text data-v-527ff3b8">结束订单</text></view></view></view><view wx:if="{{d}}" class="phone-auth-popup data-v-527ff3b8"><view class="popup-mask data-v-527ff3b8" catchtap="{{e}}"></view><view class="popup-content data-v-527ff3b8"><view class="popup-header data-v-527ff3b8"><text class="popup-title data-v-527ff3b8">授权获取手机号</text></view><view class="popup-body data-v-527ff3b8"><view class="auth-desc data-v-527ff3b8"><text class="data-v-527ff3b8">为了提供更好的服务和紧急联系，需要授权获取您的手机号</text></view><button class="auth-btn data-v-527ff3b8" open-type="getPhoneNumber" bindgetphonenumber="{{f}}"><text class="data-v-527ff3b8">一键获取手机号</text></button><view class="auth-cancel data-v-527ff3b8" bindtap="{{g}}"><text class="data-v-527ff3b8">暂不授权</text></view></view></view></view></view>
|
<view class="container data-v-cb03dff0"><view class="header data-v-cb03dff0"><view class="header-bg data-v-cb03dff0"><view class="circle-decoration circle-1 data-v-cb03dff0"></view><view class="circle-decoration circle-2 data-v-cb03dff0"></view><view class="wave-decoration data-v-cb03dff0"></view></view><view class="header-content data-v-cb03dff0"><view class="brand-area data-v-cb03dff0"><image class="brand-logo data-v-cb03dff0" src="{{a}}" mode="aspectFit"></image><view class="brand-text data-v-cb03dff0"><text class="title data-v-cb03dff0">共享风扇</text><text class="subtitle data-v-cb03dff0">随时随地，享受清凉</text></view></view><view class="header-info data-v-cb03dff0"><view class="service-tag data-v-cb03dff0"><text class="data-v-cb03dff0">便捷租赁</text><text class="dot data-v-cb03dff0">·</text><text class="data-v-cb03dff0">品质保障</text></view></view></view></view><view class="scan-section data-v-cb03dff0"><view class="scan-card data-v-cb03dff0"><view class="scan-btn data-v-cb03dff0" bindtap="{{c}}"><image class="scan-icon data-v-cb03dff0" src="{{b}}" mode="aspectFit"/><text class="scan-text data-v-cb03dff0">扫码使用</text></view><view class="scan-desc data-v-cb03dff0"><text class="data-v-cb03dff0">扫描设备二维码即可使用或归还</text></view></view></view><view class="price-card data-v-cb03dff0"><view class="card-header data-v-cb03dff0"><text class="card-title data-v-cb03dff0">收费规则</text></view><view class="price-rules data-v-cb03dff0"><view class="price-item data-v-cb03dff0"><view class="price-tag data-v-cb03dff0">5.0<text class="unit data-v-cb03dff0">元/小时</text></view></view><view class="divider data-v-cb03dff0"></view><view class="rule-list data-v-cb03dff0"><view class="rule-item data-v-cb03dff0"><view class="rule-dot data-v-cb03dff0"></view><text class="data-v-cb03dff0">不足1小时按1小时计费</text></view><view class="rule-item data-v-cb03dff0"><view class="rule-dot data-v-cb03dff0"></view><text class="data-v-cb03dff0">封顶99元，计费达99元视为买断</text></view></view></view></view><view class="usage-steps data-v-cb03dff0"><view class="steps-header data-v-cb03dff0"><text class="steps-title data-v-cb03dff0">使用流程</text></view><view class="steps-container data-v-cb03dff0"><view class="step-item data-v-cb03dff0"><view class="step-icon data-v-cb03dff0"><text class="step-number data-v-cb03dff0">1</text></view><text class="step-text data-v-cb03dff0">扫码弹出</text></view><view class="step-arrow data-v-cb03dff0"></view><view class="step-item data-v-cb03dff0"><view class="step-icon data-v-cb03dff0"><text class="step-number data-v-cb03dff0">2</text></view><text class="step-text data-v-cb03dff0">使用风扇</text></view><view class="step-arrow data-v-cb03dff0"></view><view class="step-item data-v-cb03dff0"><view class="step-icon data-v-cb03dff0"><text class="step-number data-v-cb03dff0">3</text></view><text class="step-text data-v-cb03dff0">插入归还</text></view><view class="step-arrow data-v-cb03dff0"></view><view class="step-item data-v-cb03dff0"><view class="step-icon data-v-cb03dff0"><text class="step-number data-v-cb03dff0">4</text></view><text class="step-text data-v-cb03dff0">结束订单</text></view></view></view><view wx:if="{{d}}" class="phone-auth-popup data-v-cb03dff0"><view class="popup-mask data-v-cb03dff0" catchtap="{{e}}"></view><view class="popup-content data-v-cb03dff0"><view class="popup-header data-v-cb03dff0"><text class="popup-title data-v-cb03dff0">授权获取手机号</text></view><view class="popup-body data-v-cb03dff0"><view class="auth-desc data-v-cb03dff0"><text class="data-v-cb03dff0">为了提供更好的服务和紧急联系，需要授权获取您的手机号</text></view><button class="auth-btn data-v-cb03dff0" open-type="getPhoneNumber" bindgetphonenumber="{{f}}"><text class="data-v-cb03dff0">一键获取手机号</text></button><view class="auth-cancel data-v-cb03dff0" bindtap="{{g}}"><text class="data-v-cb03dff0">暂不授权</text></view></view></view></view></view>
|
||||||
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
@@ -6990,7 +6990,7 @@ function isConsoleWritable() {
|
|||||||
function initRuntimeSocketService() {
|
function initRuntimeSocketService() {
|
||||||
const hosts = "192.168.1.109,127.0.0.1";
|
const hosts = "192.168.1.109,127.0.0.1";
|
||||||
const port = "8090";
|
const port = "8090";
|
||||||
const id = "mp-weixin_6dQp-x";
|
const id = "mp-weixin_YQZRXd";
|
||||||
const lazy = typeof swan !== "undefined";
|
const lazy = typeof swan !== "undefined";
|
||||||
let restoreError = lazy ? () => {
|
let restoreError = lazy ? () => {
|
||||||
} : initOnError();
|
} : initOnError();
|
||||||
|
|||||||
+24
-24
@@ -192,32 +192,32 @@ const _sfc_main = {
|
|||||||
throw new Error(rentResult.msg || "设备租借失败");
|
throw new Error(rentResult.msg || "设备租借失败");
|
||||||
}
|
}
|
||||||
const order = rentResult.data;
|
const order = rentResult.data;
|
||||||
|
try {
|
||||||
|
let packageTimeMinutes = 0;
|
||||||
|
if (selectedPkg.time.includes("小时")) {
|
||||||
|
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
||||||
|
} else if (selectedPkg.time.includes("分钟")) {
|
||||||
|
packageTimeMinutes = parseInt(selectedPkg.time);
|
||||||
|
} else {
|
||||||
|
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
||||||
|
}
|
||||||
|
const updateRes = await config_user.updateOrderPackage({
|
||||||
|
orderId: order.orderId,
|
||||||
|
packageTime: packageTimeMinutes,
|
||||||
|
packagePrice: parseFloat(selectedPkg.price)
|
||||||
|
});
|
||||||
|
if (updateRes.code !== 200) {
|
||||||
|
common_vendor.index.__f__("warn", "at pages/device/detail.vue:441", "更新订单套餐信息失败:", updateRes.msg);
|
||||||
|
} else {
|
||||||
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:444", "订单套餐信息已提前更新");
|
||||||
|
}
|
||||||
|
} catch (updateError) {
|
||||||
|
common_vendor.index.__f__("error", "at pages/device/detail.vue:447", "更新订单套餐信息时出错:", updateError);
|
||||||
|
}
|
||||||
if (payWay == "wx-pay") {
|
if (payWay == "wx-pay") {
|
||||||
common_vendor.index.hideLoading();
|
common_vendor.index.hideLoading();
|
||||||
const res = await config_user.getOrderByOrderNo(order.orderNo);
|
const res = await config_user.getOrderByOrderNo(order.orderNo);
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:428", res);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:456", res);
|
||||||
try {
|
|
||||||
let packageTimeMinutes = 0;
|
|
||||||
if (selectedPkg.time.includes("小时")) {
|
|
||||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
|
||||||
} else if (selectedPkg.time.includes("分钟")) {
|
|
||||||
packageTimeMinutes = parseInt(selectedPkg.time);
|
|
||||||
} else {
|
|
||||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
|
||||||
}
|
|
||||||
const updateRes = await config_user.updateOrderPackage({
|
|
||||||
orderId: order.orderId,
|
|
||||||
packageTime: packageTimeMinutes,
|
|
||||||
packagePrice: parseFloat(selectedPkg.price)
|
|
||||||
});
|
|
||||||
if (updateRes.code !== 200) {
|
|
||||||
common_vendor.index.__f__("warn", "at pages/device/detail.vue:445", "更新订单套餐信息失败:", updateRes.msg);
|
|
||||||
} else {
|
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:448", "订单套餐信息已提前更新");
|
|
||||||
}
|
|
||||||
} catch (updateError) {
|
|
||||||
common_vendor.index.__f__("error", "at pages/device/detail.vue:451", "更新订单套餐信息时出错:", updateError);
|
|
||||||
}
|
|
||||||
const deposit = parseFloat(deviceInfo.value.depositAmount);
|
const deposit = parseFloat(deviceInfo.value.depositAmount);
|
||||||
const packagePrice = parseFloat(selectedPkg.price);
|
const packagePrice = parseFloat(selectedPkg.price);
|
||||||
const totalAmount = (deposit + packagePrice).toFixed(2);
|
const totalAmount = (deposit + packagePrice).toFixed(2);
|
||||||
@@ -234,7 +234,7 @@ const _sfc_main = {
|
|||||||
const payResult = await util_index.initiateWeChatScorePayment(res);
|
const payResult = await util_index.initiateWeChatScorePayment(res);
|
||||||
if (payResult.errCode == "0") {
|
if (payResult.errCode == "0") {
|
||||||
const res2 = await config_user.getOrderByOrderNoScorePayStatus(order.orderNo);
|
const res2 = await config_user.getOrderByOrderNoScorePayStatus(order.orderNo);
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:481", res2.data.orderStatus);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:484", res2.data.orderStatus);
|
||||||
if (res2.data.orderStatus == "in_used") {
|
if (res2.data.orderStatus == "in_used") {
|
||||||
common_vendor.index.showToast({
|
common_vendor.index.showToast({
|
||||||
title: "设备租借成功",
|
title: "设备租借成功",
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
<view class="container data-v-d65de3a7"><view class="device-header data-v-d65de3a7"><view class="{{['device-status-card', 'data-v-d65de3a7', b]}}"><view class="status-indicator data-v-d65de3a7"></view><text class="status-text data-v-d65de3a7">{{a}}</text></view><view class="device-title data-v-d65de3a7"><text class="name data-v-d65de3a7">共享风扇</text><view class="device-meta data-v-d65de3a7"><text class="id-label data-v-d65de3a7">设备号：</text><text class="id-value data-v-d65de3a7">{{c}}</text></view></view></view><view class="card device-info-card data-v-d65de3a7"><view class="card-row data-v-d65de3a7"><view class="card-item data-v-d65de3a7"><view class="item-icon location-icon data-v-d65de3a7"><image class="data-v-d65de3a7" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">当前位置</text><text class="item-value data-v-d65de3a7">{{e}}</text></view></view><view class="card-item data-v-d65de3a7"><view class="{{['item-icon', 'battery-icon', 'data-v-d65de3a7', g && 'battery-low']}}"><image class="data-v-d65de3a7" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">电池电量</text><text class="item-value data-v-d65de3a7">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">计费规则</text></view><view class="pricing-banner data-v-d65de3a7"><view class="pricing-main data-v-d65de3a7"><text class="price data-v-d65de3a7">¥5.00</text><text class="unit data-v-d65de3a7">/小时</text></view><text class="cap-price data-v-d65de3a7">封顶 ¥99</text></view><view class="pricing-rules data-v-d65de3a7"><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">前15分钟内归还<text class="highlight data-v-d65de3a7">免费</text></text></view><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">使用须知</text></view><view class="notice-items data-v-d65de3a7"><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在指定区域内使用设备</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-d65de3a7"><button class="{{['rent-button', 'data-v-d65de3a7', j && 'return-button']}}" bindtap="{{k}}"><text class="data-v-d65de3a7">{{i}}</text></button><view class="wechat-credit data-v-d65de3a7"><image src="{{l}}" mode="aspectFit" class="wx-icon data-v-d65de3a7"></image><view class="credit-text data-v-d65de3a7"><text class="data-v-d65de3a7">微信支付分</text><text class="credit-divider data-v-d65de3a7">|</text><text class="credit-score data-v-d65de3a7">550分及以上优享</text></view></view></view><view wx:if="{{m}}" class="phone-auth-popup data-v-d65de3a7"><view class="popup-mask data-v-d65de3a7" catchtap="{{n}}"></view><view class="popup-content data-v-d65de3a7"><view class="popup-header data-v-d65de3a7"><text class="popup-title data-v-d65de3a7">授权获取手机号</text></view><view class="popup-body data-v-d65de3a7"><view class="auth-desc data-v-d65de3a7"><text class="data-v-d65de3a7">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-d65de3a7" open-type="getPhoneNumber" bindgetphonenumber="{{o}}"> 一键获取手机号 </button><view class="auth-cancel data-v-d65de3a7" bindtap="{{p}}"><text class="data-v-d65de3a7">暂不授权</text></view></view></view></view></view>
|
<view class="container data-v-d65de3a7"><view class="device-header data-v-d65de3a7"><view class="{{['device-status-card', 'data-v-d65de3a7', b]}}"><view class="status-indicator data-v-d65de3a7"></view><text class="status-text data-v-d65de3a7">{{a}}</text></view><view class="device-title data-v-d65de3a7"><text class="name data-v-d65de3a7">共享风扇</text><view class="device-meta data-v-d65de3a7"><text class="id-label data-v-d65de3a7">设备号：</text><text class="id-value data-v-d65de3a7">{{c}}</text></view></view></view><view class="card device-info-card data-v-d65de3a7"><view class="card-row data-v-d65de3a7"><view class="card-item data-v-d65de3a7"><view class="item-icon location-icon data-v-d65de3a7"><image class="data-v-d65de3a7" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">当前位置</text><text class="item-value data-v-d65de3a7">{{e}}</text></view></view><view class="card-item data-v-d65de3a7"><view class="{{['item-icon', 'battery-icon', 'data-v-d65de3a7', g && 'battery-low']}}"><image class="data-v-d65de3a7" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">电池电量</text><text class="item-value data-v-d65de3a7">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">计费规则</text></view><view class="pricing-banner data-v-d65de3a7"><view class="pricing-main data-v-d65de3a7"><text class="price data-v-d65de3a7">¥5.00</text><text class="unit data-v-d65de3a7">/小时</text></view><text class="cap-price data-v-d65de3a7">封顶 ¥99</text></view><view class="pricing-rules data-v-d65de3a7"><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">使用须知</text></view><view class="notice-items data-v-d65de3a7"><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在指定区域内使用设备</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-d65de3a7"><button class="{{['rent-button', 'data-v-d65de3a7', j && 'return-button']}}" bindtap="{{k}}"><text class="data-v-d65de3a7">{{i}}</text></button><view class="wechat-credit data-v-d65de3a7"><image src="{{l}}" mode="aspectFit" class="wx-icon data-v-d65de3a7"></image><view class="credit-text data-v-d65de3a7"><text class="data-v-d65de3a7">微信支付分</text><text class="credit-divider data-v-d65de3a7">|</text><text class="credit-score data-v-d65de3a7">550分及以上优享</text></view></view></view><view wx:if="{{m}}" class="phone-auth-popup data-v-d65de3a7"><view class="popup-mask data-v-d65de3a7" catchtap="{{n}}"></view><view class="popup-content data-v-d65de3a7"><view class="popup-header data-v-d65de3a7"><text class="popup-title data-v-d65de3a7">授权获取手机号</text></view><view class="popup-body data-v-d65de3a7"><view class="auth-desc data-v-d65de3a7"><text class="data-v-d65de3a7">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-d65de3a7" open-type="getPhoneNumber" bindgetphonenumber="{{o}}"> 一键获取手机号 </button><view class="auth-cancel data-v-d65de3a7" bindtap="{{p}}"><text class="data-v-d65de3a7">暂不授权</text></view></view></view></view></view>
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
<view class="container data-v-1cf27b2a"><view class="header data-v-1cf27b2a"><view class="header-bg data-v-1cf27b2a"><view class="circle-decoration circle-1 data-v-1cf27b2a"></view><view class="circle-decoration circle-2 data-v-1cf27b2a"></view><view class="wave-decoration data-v-1cf27b2a"></view></view><view class="header-content data-v-1cf27b2a"><view class="brand-area data-v-1cf27b2a"><image class="brand-logo data-v-1cf27b2a" src="{{a}}" mode="aspectFit"></image><view class="brand-text data-v-1cf27b2a"><text class="title data-v-1cf27b2a">共享风扇</text><text class="subtitle data-v-1cf27b2a">随时随地，享受清凉</text></view></view><view class="header-info data-v-1cf27b2a"><view class="service-tag data-v-1cf27b2a"><text class="data-v-1cf27b2a">便捷租赁</text><text class="dot data-v-1cf27b2a">·</text><text class="data-v-1cf27b2a">品质保障</text></view></view></view></view><view class="scan-section data-v-1cf27b2a"><view class="scan-card data-v-1cf27b2a"><view class="scan-btn data-v-1cf27b2a" bindtap="{{c}}"><image class="scan-icon data-v-1cf27b2a" src="{{b}}" mode="aspectFit"/><text class="scan-text data-v-1cf27b2a">扫码使用</text></view><view class="scan-desc data-v-1cf27b2a"><text class="data-v-1cf27b2a">扫描设备二维码即可使用或归还</text></view></view></view><view class="price-card data-v-1cf27b2a"><view class="card-header data-v-1cf27b2a"><text class="card-title data-v-1cf27b2a">收费规则</text></view><view class="price-rules data-v-1cf27b2a"><view class="price-item data-v-1cf27b2a"><view class="price-tag data-v-1cf27b2a">5.0<text class="unit data-v-1cf27b2a">元/小时</text></view></view><view class="divider data-v-1cf27b2a"></view><view class="rule-list data-v-1cf27b2a"><view class="rule-item data-v-1cf27b2a"><view class="rule-dot data-v-1cf27b2a"></view><text class="data-v-1cf27b2a">15分钟内归还免费</text></view><view class="rule-item data-v-1cf27b2a"><view class="rule-dot data-v-1cf27b2a"></view><text class="data-v-1cf27b2a">不足1小时按1小时计费</text></view><view class="rule-item data-v-1cf27b2a"><view class="rule-dot data-v-1cf27b2a"></view><text class="data-v-1cf27b2a">封顶99元，计费达99元视为买断</text></view></view></view></view><view class="usage-steps data-v-1cf27b2a"><view class="steps-header data-v-1cf27b2a"><text class="steps-title data-v-1cf27b2a">使用流程</text></view><view class="steps-container data-v-1cf27b2a"><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">1</text></view><text class="step-text data-v-1cf27b2a">扫码弹出</text></view><view class="step-arrow data-v-1cf27b2a"></view><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">2</text></view><text class="step-text data-v-1cf27b2a">使用风扇</text></view><view class="step-arrow data-v-1cf27b2a"></view><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">3</text></view><text class="step-text data-v-1cf27b2a">插入归还</text></view><view class="step-arrow data-v-1cf27b2a"></view><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">4</text></view><text class="step-text data-v-1cf27b2a">结束订单</text></view></view></view><view wx:if="{{d}}" class="phone-auth-popup data-v-1cf27b2a"><view class="popup-mask data-v-1cf27b2a" catchtap="{{e}}"></view><view class="popup-content data-v-1cf27b2a"><view class="popup-header data-v-1cf27b2a"><text class="popup-title data-v-1cf27b2a">授权获取手机号</text></view><view class="popup-body data-v-1cf27b2a"><view class="auth-desc data-v-1cf27b2a"><text class="data-v-1cf27b2a">为了提供更好的服务和紧急联系，需要授权获取您的手机号</text></view><button class="auth-btn data-v-1cf27b2a" open-type="getPhoneNumber" bindgetphonenumber="{{f}}"><text class="data-v-1cf27b2a">一键获取手机号</text></button><view class="auth-cancel data-v-1cf27b2a" bindtap="{{g}}"><text class="data-v-1cf27b2a">暂不授权</text></view></view></view></view></view>
|
<view class="container data-v-1cf27b2a"><view class="header data-v-1cf27b2a"><view class="header-bg data-v-1cf27b2a"><view class="circle-decoration circle-1 data-v-1cf27b2a"></view><view class="circle-decoration circle-2 data-v-1cf27b2a"></view><view class="wave-decoration data-v-1cf27b2a"></view></view><view class="header-content data-v-1cf27b2a"><view class="brand-area data-v-1cf27b2a"><image class="brand-logo data-v-1cf27b2a" src="{{a}}" mode="aspectFit"></image><view class="brand-text data-v-1cf27b2a"><text class="title data-v-1cf27b2a">共享风扇</text><text class="subtitle data-v-1cf27b2a">随时随地，享受清凉</text></view></view><view class="header-info data-v-1cf27b2a"><view class="service-tag data-v-1cf27b2a"><text class="data-v-1cf27b2a">便捷租赁</text><text class="dot data-v-1cf27b2a">·</text><text class="data-v-1cf27b2a">品质保障</text></view></view></view></view><view class="scan-section data-v-1cf27b2a"><view class="scan-card data-v-1cf27b2a"><view class="scan-btn data-v-1cf27b2a" bindtap="{{c}}"><image class="scan-icon data-v-1cf27b2a" src="{{b}}" mode="aspectFit"/><text class="scan-text data-v-1cf27b2a">扫码使用</text></view><view class="scan-desc data-v-1cf27b2a"><text class="data-v-1cf27b2a">扫描设备二维码即可使用或归还</text></view></view></view><view class="price-card data-v-1cf27b2a"><view class="card-header data-v-1cf27b2a"><text class="card-title data-v-1cf27b2a">收费规则</text></view><view class="price-rules data-v-1cf27b2a"><view class="price-item data-v-1cf27b2a"><view class="price-tag data-v-1cf27b2a">5.0<text class="unit data-v-1cf27b2a">元/小时</text></view></view><view class="divider data-v-1cf27b2a"></view><view class="rule-list data-v-1cf27b2a"><view class="rule-item data-v-1cf27b2a"><view class="rule-dot data-v-1cf27b2a"></view><text class="data-v-1cf27b2a">不足1小时按1小时计费</text></view><view class="rule-item data-v-1cf27b2a"><view class="rule-dot data-v-1cf27b2a"></view><text class="data-v-1cf27b2a">封顶99元，计费达99元视为买断</text></view></view></view></view><view class="usage-steps data-v-1cf27b2a"><view class="steps-header data-v-1cf27b2a"><text class="steps-title data-v-1cf27b2a">使用流程</text></view><view class="steps-container data-v-1cf27b2a"><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">1</text></view><text class="step-text data-v-1cf27b2a">扫码弹出</text></view><view class="step-arrow data-v-1cf27b2a"></view><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">2</text></view><text class="step-text data-v-1cf27b2a">使用风扇</text></view><view class="step-arrow data-v-1cf27b2a"></view><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">3</text></view><text class="step-text data-v-1cf27b2a">插入归还</text></view><view class="step-arrow data-v-1cf27b2a"></view><view class="step-item data-v-1cf27b2a"><view class="step-icon data-v-1cf27b2a"><text class="step-number data-v-1cf27b2a">4</text></view><text class="step-text data-v-1cf27b2a">结束订单</text></view></view></view><view wx:if="{{d}}" class="phone-auth-popup data-v-1cf27b2a"><view class="popup-mask data-v-1cf27b2a" catchtap="{{e}}"></view><view class="popup-content data-v-1cf27b2a"><view class="popup-header data-v-1cf27b2a"><text class="popup-title data-v-1cf27b2a">授权获取手机号</text></view><view class="popup-body data-v-1cf27b2a"><view class="auth-desc data-v-1cf27b2a"><text class="data-v-1cf27b2a">为了提供更好的服务和紧急联系，需要授权获取您的手机号</text></view><button class="auth-btn data-v-1cf27b2a" open-type="getPhoneNumber" bindgetphonenumber="{{f}}"><text class="data-v-1cf27b2a">一键获取手机号</text></button><view class="auth-cancel data-v-1cf27b2a" bindtap="{{g}}"><text class="data-v-1cf27b2a">暂不授权</text></view></view></view></view></view>
|
||||||
Reference in New Issue
Block a user