fix：根据免押分验收条件跳转页面效果
This commit is contained in:
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
// export const URL = "https://my.gxfs123.com/api" //正式服务器
|
// export const URL = "https://my.gxfs123.com/api" //正式服务器
|
||||||
export const URL = "https://unifans.gxfs123.com/api" //测试服务器
|
// export const URL = "https://unifans.gxfs123.com/api" //测试服务器
|
||||||
// export const URL = "http://192.168.10.3:8080" //本地调试
|
export const URL = "http://192.168.10.44:8080" //本地调试
|
||||||
|
|
||||||
export const appid = "wx2165f0be356ae7a9" //小程序appid
|
export const appid = "wx2165f0be356ae7a9" //小程序appid
|
||||||
@@ -109,19 +109,20 @@
|
|||||||
|
|
||||||
<!-- 底部操作区 -->
|
<!-- 底部操作区 -->
|
||||||
<view class="footer">
|
<view class="footer">
|
||||||
|
|
||||||
|
|
||||||
|
<button class="rent-button" :class="{ 'return-button': hasActiveOrder }"
|
||||||
|
@click="handleRent('wx-score-pay')">
|
||||||
|
<text>{{ hasActiveOrder ? '归还设备' : '免押租借' }}</text>
|
||||||
|
</button>
|
||||||
<view class="wechat-credit">
|
<view class="wechat-credit">
|
||||||
<image src="/static/images/wxpayflag.png" mode="aspectFit" class="wx-icon"></image>
|
<image src="/static/images/wxpayflag.png" mode="aspectFit" class="wx-icon"></image>
|
||||||
<view class="credit-text">
|
<view class="credit-text">
|
||||||
<text>微信支付分</text>
|
<text>微信支付分</text>
|
||||||
<text class="credit-divider">|</text>
|
<text class="credit-divider">|</text>
|
||||||
<text class="credit-score">支付分200分及以上优享</text>
|
<text class="credit-score">200分及以上优享</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<button class="rent-button" :class="{ 'return-button': hasActiveOrder }"
|
|
||||||
@click="handleRent('wx-score-pay')">
|
|
||||||
<text>{{ hasActiveOrder ? '归还设备' : '免押金租借' }}</text>
|
|
||||||
</button>
|
|
||||||
<view class="" style="align-items: center;align-content: center;text-align: center;line-height: 50rpx;"
|
<view class="" style="align-items: center;align-content: center;text-align: center;line-height: 50rpx;"
|
||||||
@click="handleRent('wx-pay')">
|
@click="handleRent('wx-pay')">
|
||||||
无法免押点这里></view>
|
无法免押点这里></view>
|
||||||
@@ -854,7 +855,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
margin-bottom: 20rpx;
|
margin-top: 10rpx;
|
||||||
|
|
||||||
.wx-icon {
|
.wx-icon {
|
||||||
width: 50rpx;
|
width: 50rpx;
|
||||||
|
|||||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
|||||||
<view class="container data-v-981f4200"><view class="device-header data-v-981f4200"><view class="{{['device-status-card', 'data-v-981f4200', b]}}"><view class="status-indicator data-v-981f4200"></view><text class="status-text data-v-981f4200">{{a}}</text></view><view class="device-title data-v-981f4200"><text class="name data-v-981f4200">共享风扇</text><view class="device-meta data-v-981f4200"><text class="id-label data-v-981f4200">设备号：</text><text class="id-value data-v-981f4200">{{c}}</text></view></view></view><view class="card device-info-card data-v-981f4200"><view class="card-row data-v-981f4200"><view class="card-item data-v-981f4200"><view class="item-icon location-icon data-v-981f4200"><image class="data-v-981f4200" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-981f4200"><text class="item-label data-v-981f4200">当前位置</text><text class="item-value data-v-981f4200">{{e}}</text></view></view><view class="card-item data-v-981f4200"><view class="{{['item-icon', 'battery-icon', 'data-v-981f4200', g && 'battery-low']}}"><image class="data-v-981f4200" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-981f4200"><text class="item-label data-v-981f4200">电池电量</text><text class="item-value data-v-981f4200">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-981f4200"><view class="card-header data-v-981f4200"><text class="card-title data-v-981f4200">计费规则</text></view><view class="pricing-banner data-v-981f4200"><view class="pricing-main data-v-981f4200"><text class="price data-v-981f4200">¥5.00</text><text class="unit data-v-981f4200">/小时</text></view><text class="cap-price data-v-981f4200">封顶 ¥99</text></view><view class="pricing-rules data-v-981f4200"><view class="rule-item data-v-981f4200"><view class="rule-dot data-v-981f4200"></view><text class="rule-text data-v-981f4200">前15分钟内归还<text class="highlight data-v-981f4200">免费</text></text></view><view class="rule-item data-v-981f4200"><view class="rule-dot data-v-981f4200"></view><text class="rule-text data-v-981f4200">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-981f4200"><view class="rule-dot data-v-981f4200"></view><text class="rule-text data-v-981f4200">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-981f4200"><view class="card-header data-v-981f4200"><text class="card-title data-v-981f4200">使用须知</text></view><view class="notice-items data-v-981f4200"><view class="notice-item data-v-981f4200"><view class="notice-dot data-v-981f4200"></view><text class="notice-text data-v-981f4200">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-981f4200"><view class="notice-dot data-v-981f4200"></view><text class="notice-text data-v-981f4200">请在指定区域内使用设备</text></view><view class="notice-item data-v-981f4200"><view class="notice-dot data-v-981f4200"></view><text class="notice-text data-v-981f4200">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-981f4200"><view class="wechat-credit data-v-981f4200"><image src="{{i}}" mode="aspectFit" class="wx-icon data-v-981f4200"></image><view class="credit-text data-v-981f4200"><text class="data-v-981f4200">微信支付分</text><text class="credit-divider data-v-981f4200">|</text><text class="credit-score data-v-981f4200">支付分200分及以上优享</text></view></view><button class="{{['rent-button', 'data-v-981f4200', k && 'return-button']}}" bindtap="{{l}}"><text class="data-v-981f4200">{{j}}</text></button><view class=" data-v-981f4200" style="align-items:center;align-content:center;text-align:center;line-height:50rpx" bindtap="{{m}}"> 无法免押点这里></view></view><view wx:if="{{n}}" class="phone-auth-popup data-v-981f4200"><view class="popup-mask data-v-981f4200" catchtap="{{o}}"></view><view class="popup-content data-v-981f4200"><view class="popup-header data-v-981f4200"><text class="popup-title data-v-981f4200">授权获取手机号</text></view><view class="popup-body data-v-981f4200"><view class="auth-desc data-v-981f4200"><text class="data-v-981f4200">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-981f4200" open-type="getPhoneNumber" bindgetphonenumber="{{p}}"> 一键获取手机号 </button><view class="auth-cancel data-v-981f4200" bindtap="{{q}}"><text class="data-v-981f4200">暂不授权</text></view></view></view></view></view>
|
<view class="container data-v-622c38e3"><view class="device-header data-v-622c38e3"><view class="{{['device-status-card', 'data-v-622c38e3', b]}}"><view class="status-indicator data-v-622c38e3"></view><text class="status-text data-v-622c38e3">{{a}}</text></view><view class="device-title data-v-622c38e3"><text class="name data-v-622c38e3">共享风扇</text><view class="device-meta data-v-622c38e3"><text class="id-label data-v-622c38e3">设备号：</text><text class="id-value data-v-622c38e3">{{c}}</text></view></view></view><view class="card device-info-card data-v-622c38e3"><view class="card-row data-v-622c38e3"><view class="card-item data-v-622c38e3"><view class="item-icon location-icon data-v-622c38e3"><image class="data-v-622c38e3" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-622c38e3"><text class="item-label data-v-622c38e3">当前位置</text><text class="item-value data-v-622c38e3">{{e}}</text></view></view><view class="card-item data-v-622c38e3"><view class="{{['item-icon', 'battery-icon', 'data-v-622c38e3', g && 'battery-low']}}"><image class="data-v-622c38e3" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-622c38e3"><text class="item-label data-v-622c38e3">电池电量</text><text class="item-value data-v-622c38e3">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-622c38e3"><view class="card-header data-v-622c38e3"><text class="card-title data-v-622c38e3">计费规则</text></view><view class="pricing-banner data-v-622c38e3"><view class="pricing-main data-v-622c38e3"><text class="price data-v-622c38e3">¥5.00</text><text class="unit data-v-622c38e3">/小时</text></view><text class="cap-price data-v-622c38e3">封顶 ¥99</text></view><view class="pricing-rules data-v-622c38e3"><view class="rule-item data-v-622c38e3"><view class="rule-dot data-v-622c38e3"></view><text class="rule-text data-v-622c38e3">前15分钟内归还<text class="highlight data-v-622c38e3">免费</text></text></view><view class="rule-item data-v-622c38e3"><view class="rule-dot data-v-622c38e3"></view><text class="rule-text data-v-622c38e3">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-622c38e3"><view class="rule-dot data-v-622c38e3"></view><text class="rule-text data-v-622c38e3">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-622c38e3"><view class="card-header data-v-622c38e3"><text class="card-title data-v-622c38e3">使用须知</text></view><view class="notice-items data-v-622c38e3"><view class="notice-item data-v-622c38e3"><view class="notice-dot data-v-622c38e3"></view><text class="notice-text data-v-622c38e3">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-622c38e3"><view class="notice-dot data-v-622c38e3"></view><text class="notice-text data-v-622c38e3">请在指定区域内使用设备</text></view><view class="notice-item data-v-622c38e3"><view class="notice-dot data-v-622c38e3"></view><text class="notice-text data-v-622c38e3">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-622c38e3"><button class="{{['rent-button', 'data-v-622c38e3', j && 'return-button']}}" bindtap="{{k}}"><text class="data-v-622c38e3">{{i}}</text></button><view class="wechat-credit data-v-622c38e3"><image src="{{l}}" mode="aspectFit" class="wx-icon data-v-622c38e3"></image><view class="credit-text data-v-622c38e3"><text class="data-v-622c38e3">微信支付分</text><text class="credit-divider data-v-622c38e3">|</text><text class="credit-score data-v-622c38e3">200分及以上优享</text></view></view></view><view wx:if="{{m}}" class="phone-auth-popup data-v-622c38e3"><view class="popup-mask data-v-622c38e3" catchtap="{{n}}"></view><view class="popup-content data-v-622c38e3"><view class="popup-header data-v-622c38e3"><text class="popup-title data-v-622c38e3">授权获取手机号</text></view><view class="popup-body data-v-622c38e3"><view class="auth-desc data-v-622c38e3"><text class="data-v-622c38e3">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-622c38e3" open-type="getPhoneNumber" bindgetphonenumber="{{o}}"> 一键获取手机号 </button><view class="auth-cancel data-v-622c38e3" bindtap="{{p}}"><text class="data-v-622c38e3">暂不授权</text></view></view></view></view></view>
|
||||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["// export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\nexport const URL = \"https://unifans.gxfs123.com/api\" //测试服务器\r\n// export const URL = \"http://192.168.10.3:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AACY,MAAC,MAAM;AAGP,MAAC,QAAQ;;;"}
|
{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["// export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\n// export const URL = \"https://unifans.gxfs123.com/api\" //测试服务器\r\nexport const URL = \"http://192.168.10.44:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AAEY,MAAC,MAAM;AAEP,MAAC,QAAQ;;;"}
|
||||||
File diff suppressed because one or more lines are too long
+2
-2
@@ -6988,9 +6988,9 @@ function isConsoleWritable() {
|
|||||||
return isWritable;
|
return isWritable;
|
||||||
}
|
}
|
||||||
function initRuntimeSocketService() {
|
function initRuntimeSocketService() {
|
||||||
const hosts = "192.168.10.59,127.0.0.1";
|
const hosts = "192.168.10.45,127.0.0.1";
|
||||||
const port = "8090";
|
const port = "8090";
|
||||||
const id = "mp-weixin_eQjgTz";
|
const id = "mp-weixin_wcnPdk";
|
||||||
const lazy = typeof swan !== "undefined";
|
const lazy = typeof swan !== "undefined";
|
||||||
let restoreError = lazy ? () => {
|
let restoreError = lazy ? () => {
|
||||||
} : initOnError();
|
} : initOnError();
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
const URL = "https://unifans.gxfs123.com/api";
|
const URL = "http://192.168.10.44:8080";
|
||||||
const appid = "wx2165f0be356ae7a9";
|
const appid = "wx2165f0be356ae7a9";
|
||||||
exports.URL = URL;
|
exports.URL = URL;
|
||||||
exports.appid = appid;
|
exports.appid = appid;
|
||||||
|
|||||||
+21
-21
@@ -21,7 +21,7 @@ const _sfc_main = {
|
|||||||
common_vendor.onLoad((options) => {
|
common_vendor.onLoad((options) => {
|
||||||
deviceId.value = options.deviceNo;
|
deviceId.value = options.deviceNo;
|
||||||
checkOrderStatus();
|
checkOrderStatus();
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:198", options.deviceNo);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:199", options.deviceNo);
|
||||||
fetchDeviceInfo();
|
fetchDeviceInfo();
|
||||||
});
|
});
|
||||||
common_vendor.onMounted(() => {
|
common_vendor.onMounted(() => {
|
||||||
@@ -30,18 +30,18 @@ const _sfc_main = {
|
|||||||
const checkUserPhone = async () => {
|
const checkUserPhone = async () => {
|
||||||
try {
|
try {
|
||||||
const userInfoRes = await util_index.getUserInfo();
|
const userInfoRes = await util_index.getUserInfo();
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:209", userInfoRes.data.phone, "getUserInfoPhone");
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:210", userInfoRes.data.phone, "getUserInfoPhone");
|
||||||
if (userInfoRes.code == 200 && userInfoRes.data && userInfoRes.data.phone) {
|
if (userInfoRes.code == 200 && userInfoRes.data && userInfoRes.data.phone) {
|
||||||
phoneNumber.value = userInfoRes.data.phone;
|
phoneNumber.value = userInfoRes.data.phone;
|
||||||
} else {
|
} else {
|
||||||
showPhoneAuthPopup.value = true;
|
showPhoneAuthPopup.value = true;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
common_vendor.index.__f__("error", "at pages/device/detail.vue:218", "获取用户信息失败:", error);
|
common_vendor.index.__f__("error", "at pages/device/detail.vue:219", "获取用户信息失败:", error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const onGetPhoneNumber = (e) => {
|
const onGetPhoneNumber = (e) => {
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:224", "getPhoneNumber event:", e.detail);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:225", "getPhoneNumber event:", e.detail);
|
||||||
if (e.detail.errMsg && e.detail.errMsg.includes("deny")) {
|
if (e.detail.errMsg && e.detail.errMsg.includes("deny")) {
|
||||||
common_vendor.index.showToast({
|
common_vendor.index.showToast({
|
||||||
title: "需要授权手机号才能使用设备",
|
title: "需要授权手机号才能使用设备",
|
||||||
@@ -53,13 +53,13 @@ const _sfc_main = {
|
|||||||
common_vendor.index.showLoading({
|
common_vendor.index.showLoading({
|
||||||
title: "获取中..."
|
title: "获取中..."
|
||||||
});
|
});
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:241", "获取到的授权code:", e.detail.code);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:242", "获取到的授权code:", e.detail.code);
|
||||||
try {
|
try {
|
||||||
util_index.getUserPhoneNumber(e.detail.code).then((res) => {
|
util_index.getUserPhoneNumber(e.detail.code).then((res) => {
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:247", "获取手机号API响应原始数据:", JSON.stringify(res));
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:248", "获取手机号API响应原始数据:", JSON.stringify(res));
|
||||||
common_vendor.index.hideLoading();
|
common_vendor.index.hideLoading();
|
||||||
if (!res) {
|
if (!res) {
|
||||||
common_vendor.index.__f__("error", "at pages/device/detail.vue:252", "API返回数据为空");
|
common_vendor.index.__f__("error", "at pages/device/detail.vue:253", "API返回数据为空");
|
||||||
common_vendor.index.showModal({
|
common_vendor.index.showModal({
|
||||||
title: "数据异常",
|
title: "数据异常",
|
||||||
content: "API返回为空",
|
content: "API返回为空",
|
||||||
@@ -67,8 +67,8 @@ const _sfc_main = {
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:262", "响应code:", res.code, "响应类型:", typeof res.code);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:263", "响应code:", res.code, "响应类型:", typeof res.code);
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:263", "是否有data:", !!res.data, "是否有phone:", res.data && !!res.data.phone);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:264", "是否有data:", !!res.data, "是否有phone:", res.data && !!res.data.phone);
|
||||||
if (res.code == 200 && res.data && res.data.phoneNumber) {
|
if (res.code == 200 && res.data && res.data.phoneNumber) {
|
||||||
phoneNumber.value = res.data.phoneNumber;
|
phoneNumber.value = res.data.phoneNumber;
|
||||||
showPhoneAuthPopup.value = false;
|
showPhoneAuthPopup.value = false;
|
||||||
@@ -77,7 +77,7 @@ const _sfc_main = {
|
|||||||
icon: "success"
|
icon: "success"
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
common_vendor.index.__f__("warn", "at pages/device/detail.vue:275", "获取手机号响应异常:", res.msg || "未知错误");
|
common_vendor.index.__f__("warn", "at pages/device/detail.vue:276", "获取手机号响应异常:", res.msg || "未知错误");
|
||||||
common_vendor.index.showModal({
|
common_vendor.index.showModal({
|
||||||
title: "获取手机号异常",
|
title: "获取手机号异常",
|
||||||
content: `状态码: ${res.code}, 消息: ${res.msg || "无"}`,
|
content: `状态码: ${res.code}, 消息: ${res.msg || "无"}`,
|
||||||
@@ -86,7 +86,7 @@ const _sfc_main = {
|
|||||||
}
|
}
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
common_vendor.index.hideLoading();
|
common_vendor.index.hideLoading();
|
||||||
common_vendor.index.__f__("error", "at pages/device/detail.vue:285", "获取手机号码失败(catch):", err);
|
common_vendor.index.__f__("error", "at pages/device/detail.vue:286", "获取手机号码失败(catch):", err);
|
||||||
let errMsg = err.message || err.toString();
|
let errMsg = err.message || err.toString();
|
||||||
common_vendor.index.showModal({
|
common_vendor.index.showModal({
|
||||||
title: "获取手机号失败",
|
title: "获取手机号失败",
|
||||||
@@ -96,7 +96,7 @@ const _sfc_main = {
|
|||||||
});
|
});
|
||||||
} catch (outerError) {
|
} catch (outerError) {
|
||||||
common_vendor.index.hideLoading();
|
common_vendor.index.hideLoading();
|
||||||
common_vendor.index.__f__("error", "at pages/device/detail.vue:297", "获取手机号外部错误:", outerError);
|
common_vendor.index.__f__("error", "at pages/device/detail.vue:298", "获取手机号外部错误:", outerError);
|
||||||
common_vendor.index.showModal({
|
common_vendor.index.showModal({
|
||||||
title: "意外错误",
|
title: "意外错误",
|
||||||
content: "处理过程发生异常: " + (outerError.message || outerError),
|
content: "处理过程发生异常: " + (outerError.message || outerError),
|
||||||
@@ -195,7 +195,7 @@ const _sfc_main = {
|
|||||||
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:427", res);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:428", res);
|
||||||
try {
|
try {
|
||||||
let packageTimeMinutes = 0;
|
let packageTimeMinutes = 0;
|
||||||
if (selectedPkg.time.includes("小时")) {
|
if (selectedPkg.time.includes("小时")) {
|
||||||
@@ -211,12 +211,12 @@ const _sfc_main = {
|
|||||||
packagePrice: parseFloat(selectedPkg.price)
|
packagePrice: parseFloat(selectedPkg.price)
|
||||||
});
|
});
|
||||||
if (updateRes.code !== 200) {
|
if (updateRes.code !== 200) {
|
||||||
common_vendor.index.__f__("warn", "at pages/device/detail.vue:444", "更新订单套餐信息失败:", updateRes.msg);
|
common_vendor.index.__f__("warn", "at pages/device/detail.vue:445", "更新订单套餐信息失败:", updateRes.msg);
|
||||||
} else {
|
} else {
|
||||||
common_vendor.index.__f__("log", "at pages/device/detail.vue:447", "订单套餐信息已提前更新");
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:448", "订单套餐信息已提前更新");
|
||||||
}
|
}
|
||||||
} catch (updateError) {
|
} catch (updateError) {
|
||||||
common_vendor.index.__f__("error", "at pages/device/detail.vue:450", "更新订单套餐信息时出错:", 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);
|
||||||
@@ -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:480", res2.data.orderStatus);
|
common_vendor.index.__f__("log", "at pages/device/detail.vue:481", 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: "设备租借成功",
|
||||||
@@ -291,10 +291,10 @@ const _sfc_main = {
|
|||||||
f: common_assets._imports_1$2,
|
f: common_assets._imports_1$2,
|
||||||
g: batteryLevel.value < 20 ? 1 : "",
|
g: batteryLevel.value < 20 ? 1 : "",
|
||||||
h: common_vendor.t(batteryLevel.value),
|
h: common_vendor.t(batteryLevel.value),
|
||||||
i: common_assets._imports_0$2,
|
i: common_vendor.t(hasActiveOrder.value ? "归还设备" : "免押租借"),
|
||||||
j: common_vendor.t(hasActiveOrder.value ? "归还设备" : "免押金租借"),
|
j: hasActiveOrder.value ? 1 : "",
|
||||||
k: hasActiveOrder.value ? 1 : "",
|
k: common_vendor.o(($event) => handleRent("wx-score-pay")),
|
||||||
l: common_vendor.o(($event) => handleRent("wx-score-pay")),
|
l: common_assets._imports_0$2,
|
||||||
m: common_vendor.o(($event) => handleRent("wx-pay")),
|
m: common_vendor.o(($event) => handleRent("wx-pay")),
|
||||||
n: showPhoneAuthPopup.value
|
n: showPhoneAuthPopup.value
|
||||||
}, showPhoneAuthPopup.value ? {
|
}, showPhoneAuthPopup.value ? {
|
||||||
|
|||||||
+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"><view class="wechat-credit data-v-d65de3a7"><image src="{{i}}" 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">支付分200分及以上优享</text></view></view><button class="{{['rent-button', 'data-v-d65de3a7', k && 'return-button']}}" bindtap="{{l}}"><text class="data-v-d65de3a7">{{j}}</text></button><view class=" data-v-d65de3a7" style="align-items:center;align-content:center;text-align:center;line-height:50rpx" bindtap="{{m}}"> 无法免押点这里></view></view><view wx:if="{{n}}" class="phone-auth-popup data-v-d65de3a7"><view class="popup-mask data-v-d65de3a7" catchtap="{{o}}"></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="{{p}}"> 一键获取手机号 </button><view class="auth-cancel data-v-d65de3a7" bindtap="{{q}}"><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">前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">200分及以上优享</text></view></view><view class=" data-v-d65de3a7" style="align-items:center;align-content:center;text-align:center;line-height:50rpx" bindtap="{{m}}"> 无法免押点这里></view></view><view wx:if="{{n}}" class="phone-auth-popup data-v-d65de3a7"><view class="popup-mask data-v-d65de3a7" catchtap="{{o}}"></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="{{p}}"> 一键获取手机号 </button><view class="auth-cancel data-v-d65de3a7" bindtap="{{q}}"><text class="data-v-d65de3a7">暂不授权</text></view></view></view></view></view>
|
||||||
+1
-1
@@ -263,7 +263,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
margin-bottom: 20rpx;
|
margin-top: 10rpx;
|
||||||
}
|
}
|
||||||
.footer .wechat-credit .wx-icon.data-v-d65de3a7 {
|
.footer .wechat-credit .wx-icon.data-v-d65de3a7 {
|
||||||
width: 50rpx;
|
width: 50rpx;
|
||||||
|
|||||||
Reference in New Issue
Block a user