fix：修复订单监控总会显示弹窗的bug（采用时间比较形式）
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
"use strict";const e=require("../common/vendor.js"),a=require("./url.js");exports.request=d=>new Promise(((t,o)=>{d.hideLoading||e.index.showLoading({title:d.loadingText||"加载中...",mask:!0}),e.index.request({url:a.URL+d.url,method:d.method,data:d.data,header:{"Content-Type":"application/json",...d.headers,appid:a.appid,Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")},success:e=>200!==e.statusCode?(console.error(`HTTP状态码错误: ${e.statusCode}`,e.data),e.data?void t(e.data):void o({msg:`请求失败，状态码：${e.statusCode}`})):e.data&&200!==e.data.code?(console.warn(`业务状态码错误: ${e.data.code}`,e.data),d.ignoreEmptyError&&500===e.data.code&&e.data.msg&&(e.data.msg.includes("未找到")||e.data.msg.includes("不存在"))?void t({code:200,msg:"操作成功",data:[]}):void t(e.data)):void t(e.data),fail(e){console.error(`请求失败: ${d.url}`,e),o(e)},complete(){d.hideLoading||e.index.hideLoading()}})}));
|
||||
"use strict";const e=require("../common/vendor.js"),d=require("./url.js");exports.request=a=>new Promise(((t,o)=>{a.hideLoading||e.index.showLoading({title:a.loadingText||"加载中...",mask:!0}),e.index.request({url:d.URL+a.url,method:a.method,data:a.data,header:{"Content-Type":"application/x-www-form-urlencoded",...a.headers,appid:d.appid,Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")},success:e=>200!==e.statusCode?(console.error(`HTTP状态码错误: ${e.statusCode}`,e.data),e.data?void t(e.data):void o({msg:`请求失败，状态码：${e.statusCode}`})):e.data&&200!==e.data.code?(console.warn(`业务状态码错误: ${e.data.code}`,e.data),a.ignoreEmptyError&&500===e.data.code&&e.data.msg&&(e.data.msg.includes("未找到")||e.data.msg.includes("不存在"))?void t({code:200,msg:"操作成功",data:[]}):void t(e.data)):void t(e.data),fail(e){console.error(`请求失败: ${a.url}`,e),o(e)},complete(){a.hideLoading||e.index.hideLoading()}})}));
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
||||
<view class="container data-v-23b2f720"><view class="device-header data-v-23b2f720"><view class="{{['device-status-card', 'data-v-23b2f720', b]}}"><view class="status-indicator data-v-23b2f720"></view><text class="status-text data-v-23b2f720">{{a}}</text></view><view class="device-title data-v-23b2f720"><text class="name data-v-23b2f720">共享风扇</text><view class="device-meta data-v-23b2f720"><text class="id-label data-v-23b2f720">设备号：</text><text class="id-value data-v-23b2f720">{{c}}</text></view></view></view><view class="card device-info-card data-v-23b2f720"><view class="card-row data-v-23b2f720"><view class="card-item data-v-23b2f720"><view class="item-icon location-icon data-v-23b2f720"><image class="data-v-23b2f720" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-23b2f720"><text class="item-label data-v-23b2f720">当前位置</text><text class="item-value data-v-23b2f720">{{e}}</text></view></view></view></view><view class="card pricing-card data-v-23b2f720"><view class="card-header data-v-23b2f720"><text class="card-title data-v-23b2f720">计费规则</text></view><view class="pricing-banner data-v-23b2f720"><view class="pricing-main data-v-23b2f720"><text class="price data-v-23b2f720">¥{{f}}</text><text class="unit data-v-23b2f720">/小时</text></view><text class="cap-price data-v-23b2f720">封顶 ¥{{g}}</text></view><view class="pricing-rules data-v-23b2f720"><view class="rule-item data-v-23b2f720"><view class="rule-dot data-v-23b2f720"></view><text class="rule-text data-v-23b2f720">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-23b2f720"><view class="rule-dot data-v-23b2f720"></view><text class="rule-text data-v-23b2f720">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-23b2f720"><view class="card-header data-v-23b2f720"><text class="card-title data-v-23b2f720">使用须知</text></view><view class="notice-items data-v-23b2f720"><view class="notice-item data-v-23b2f720"><view class="notice-dot data-v-23b2f720"></view><text class="notice-text data-v-23b2f720">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-23b2f720"><view class="notice-dot data-v-23b2f720"></view><text class="notice-text data-v-23b2f720">请在指定区域内使用设备</text></view><view class="notice-item data-v-23b2f720"><view class="notice-dot data-v-23b2f720"></view><text class="notice-text data-v-23b2f720">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-23b2f720"><button class="{{['rent-button', 'data-v-23b2f720', i && 'return-button']}}" bindtap="{{j}}"><text class="data-v-23b2f720">{{h}}</text></button><view class="wechat-credit data-v-23b2f720"><image src="{{k}}" mode="aspectFit" class="wx-icon data-v-23b2f720"></image><view class="credit-text data-v-23b2f720"><text class="data-v-23b2f720">微信支付分</text><text class="credit-divider data-v-23b2f720">|</text><text class="credit-score data-v-23b2f720">550分及以上优享</text></view></view></view><view wx:if="{{l}}" class="phone-auth-popup data-v-23b2f720"><view class="popup-mask data-v-23b2f720" catchtap="{{m}}"></view><view class="popup-content data-v-23b2f720"><view class="popup-header data-v-23b2f720"><text class="popup-title data-v-23b2f720">授权获取手机号</text></view><view class="popup-body data-v-23b2f720"><view class="auth-desc data-v-23b2f720"><text class="data-v-23b2f720">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-23b2f720" open-type="getPhoneNumber" bindgetphonenumber="{{n}}"> 一键获取手机号 </button><view class="auth-cancel data-v-23b2f720" bindtap="{{o}}"><text class="data-v-23b2f720">暂不授权</text></view></view></view></view></view>
|
||||
<view class="container data-v-43d897c5"><view class="device-header data-v-43d897c5"><view class="{{['device-status-card', 'data-v-43d897c5', b]}}"><view class="status-indicator data-v-43d897c5"></view><text class="status-text data-v-43d897c5">{{a}}</text></view><view class="device-title data-v-43d897c5"><text class="name data-v-43d897c5">共享风扇</text><view class="device-meta data-v-43d897c5"><text class="id-label data-v-43d897c5">设备号：</text><text class="id-value data-v-43d897c5">{{c}}</text></view></view></view><view class="card device-info-card data-v-43d897c5"><view class="card-row data-v-43d897c5"><view class="card-item data-v-43d897c5"><view class="item-icon location-icon data-v-43d897c5"><image class="data-v-43d897c5" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-43d897c5"><text class="item-label data-v-43d897c5">当前位置</text><text class="item-value data-v-43d897c5">{{e}}</text></view></view></view></view><view class="card pricing-card data-v-43d897c5"><view class="card-header data-v-43d897c5"><text class="card-title data-v-43d897c5">计费规则</text></view><view class="pricing-banner data-v-43d897c5"><view class="pricing-main data-v-43d897c5"><text class="price data-v-43d897c5">¥{{f}}</text><text class="unit data-v-43d897c5">/小时</text></view><text class="cap-price data-v-43d897c5">封顶 ¥{{g}}</text></view><view class="pricing-rules data-v-43d897c5"><view class="rule-item data-v-43d897c5"><view class="rule-dot data-v-43d897c5"></view><text class="rule-text data-v-43d897c5">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-43d897c5"><view class="rule-dot data-v-43d897c5"></view><text class="rule-text data-v-43d897c5">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-43d897c5"><view class="card-header data-v-43d897c5"><text class="card-title data-v-43d897c5">使用须知</text></view><view class="notice-items data-v-43d897c5"><view class="notice-item data-v-43d897c5"><view class="notice-dot data-v-43d897c5"></view><text class="notice-text data-v-43d897c5">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-43d897c5"><view class="notice-dot data-v-43d897c5"></view><text class="notice-text data-v-43d897c5">请在指定区域内使用设备</text></view><view class="notice-item data-v-43d897c5"><view class="notice-dot data-v-43d897c5"></view><text class="notice-text data-v-43d897c5">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-43d897c5"><button class="{{['rent-button', 'data-v-43d897c5', i && 'return-button']}}" bindtap="{{j}}"><text class="data-v-43d897c5">{{h}}</text></button><view class="wechat-credit data-v-43d897c5"><image src="{{k}}" mode="aspectFit" class="wx-icon data-v-43d897c5"></image><view class="credit-text data-v-43d897c5"><text class="data-v-43d897c5">微信支付分</text><text class="credit-divider data-v-43d897c5">|</text><text class="credit-score data-v-43d897c5">550分及以上优享</text></view></view></view><view wx:if="{{l}}" class="phone-auth-popup data-v-43d897c5"><view class="popup-mask data-v-43d897c5" catchtap="{{m}}"></view><view class="popup-content data-v-43d897c5"><view class="popup-header data-v-43d897c5"><text class="popup-title data-v-43d897c5">授权获取手机号</text></view><view class="popup-body data-v-43d897c5"><view class="auth-desc data-v-43d897c5"><text class="data-v-43d897c5">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-43d897c5" open-type="getPhoneNumber" bindgetphonenumber="{{n}}"> 一键获取手机号 </button><view class="auth-cancel data-v-43d897c5" bindtap="{{o}}"><text class="data-v-43d897c5">暂不授权</text></view></view></view></view></view>
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
||||
<view class="container data-v-d45cdca7"><view class="header-section data-v-d45cdca7"><view class="logo-container data-v-d45cdca7"><image class="logo-image data-v-d45cdca7" src="{{a}}" mode="aspectFit"/><text class="app-name data-v-d45cdca7">共享风扇</text></view><uv-notice-bar wx:if="{{b}}" class="data-v-d45cdca7" u-i="d45cdca7-0" bind:__l="__l" u-p="{{b}}"></uv-notice-bar></view><map-component wx:if="{{c}}" class="r data-v-d45cdca7" u-r="mapRef" bindrelocate="{{e}}" bindscan="{{f}}" bindshowList="{{g}}" bindmarkerTap="{{h}}" bindmapCenterChange="{{i}}" u-i="d45cdca7-1" bind:__l="__l" u-p="{{j}}"/><view class="steps-guide data-v-d45cdca7"><view class="guide-header data-v-d45cdca7"><text class="guide-title data-v-d45cdca7">使用指南</text></view><view class="steps-container data-v-d45cdca7"><view wx:for="{{k}}" wx:for-item="step" wx:key="d" class="step-item data-v-d45cdca7"><view class="step-number data-v-d45cdca7">{{step.a}}</view><view class="step-content data-v-d45cdca7"><text class="step-title data-v-d45cdca7">{{step.b}}</text><text class="step-desc data-v-d45cdca7">{{step.c}}</text></view></view></view></view><view wx:if="{{l}}" class="map-loading-placeholder data-v-d45cdca7"><view class="loading-content data-v-d45cdca7"><view class="loading-spinner data-v-d45cdca7"></view><text class="data-v-d45cdca7">正在获取位置信息...</text></view></view><view wx:if="{{m}}" class="location-popup data-v-d45cdca7"><view class="popup-mask data-v-d45cdca7" bindtap="{{n}}"></view><view class="{{['location-sheet', 'data-v-d45cdca7', v && 'expanded']}}"><view class="sheet-header data-v-d45cdca7"><text class="sheet-title data-v-d45cdca7">附近设备场地 ({{o}})</text><view class="close-btn data-v-d45cdca7" bindtap="{{q}}"><uv-icon wx:if="{{p}}" class="data-v-d45cdca7" u-i="d45cdca7-2" bind:__l="__l" u-p="{{p}}"></uv-icon></view></view><scroll-view class="sheet-content data-v-d45cdca7" scroll-y="true"><view wx:for="{{r}}" wx:for-item="item" wx:key="k" class="position-item data-v-d45cdca7" bindtap="{{item.l}}"><view class="position-info data-v-d45cdca7"><view class="position-name data-v-d45cdca7">{{item.a}}</view><view class="{{['status-tag', 'data-v-d45cdca7', item.c]}}"><text class="data-v-d45cdca7">{{item.b}}</text></view><view wx:if="{{item.d}}" class="position-time data-v-d45cdca7"><text class="data-v-d45cdca7">营业时间：{{item.e}}</text></view></view><view class="position-actions data-v-d45cdca7"><view wx:if="{{item.f}}" class="distance-info data-v-d45cdca7"><text class="data-v-d45cdca7">{{item.g}}</text></view><view class="{{['status-tag', 'data-v-d45cdca7', item.i]}}"><text class="data-v-d45cdca7">{{item.h}}</text></view><view class="nav-btn data-v-d45cdca7" catchtap="{{item.j}}"><text class="data-v-d45cdca7">导航</text></view></view></view><view wx:if="{{s}}" class="empty-state data-v-d45cdca7"><image class="empty-icon data-v-d45cdca7" src="{{t}}" mode="aspectFit"/><text class="empty-text data-v-d45cdca7">附近5公里内暂无设备</text></view></scroll-view></view></view><view wx:if="{{w}}" class="loading-overlay data-v-d45cdca7"><view class="loading-content data-v-d45cdca7"><view class="loading-spinner data-v-d45cdca7"></view><text class="data-v-d45cdca7">正在获取场地信息...</text></view></view><view wx:if="{{x}}" class="phone-auth-popup data-v-d45cdca7"><view class="popup-mask data-v-d45cdca7" catchtap="{{y}}"></view><view class="popup-content data-v-d45cdca7"><view class="popup-header data-v-d45cdca7"><text class="popup-title data-v-d45cdca7">授权获取手机号</text></view><view class="popup-body data-v-d45cdca7"><view class="auth-desc data-v-d45cdca7"><text class="data-v-d45cdca7">为了提供更好的服务和紧急联系，需要授权获取您的手机号</text></view><button class="auth-btn data-v-d45cdca7" open-type="getPhoneNumber" bindgetphonenumber="{{z}}"><text class="data-v-d45cdca7">一键获取手机号</text></button><view class="auth-cancel data-v-d45cdca7" bindtap="{{A}}"><text class="data-v-d45cdca7">暂不授权</text></view></view></view></view></view>
|
||||
<view class="container data-v-cfb209b7"><view class="header-section data-v-cfb209b7"><view class="logo-container data-v-cfb209b7"><image class="logo-image data-v-cfb209b7" src="{{a}}" mode="aspectFit"/><text class="app-name data-v-cfb209b7">共享风扇</text></view><uv-notice-bar wx:if="{{b}}" class="data-v-cfb209b7" u-i="cfb209b7-0" bind:__l="__l" u-p="{{b}}"></uv-notice-bar></view><map-component wx:if="{{c}}" class="r data-v-cfb209b7" u-r="mapRef" bindrelocate="{{e}}" bindscan="{{f}}" bindshowList="{{g}}" bindmarkerTap="{{h}}" bindmapCenterChange="{{i}}" u-i="cfb209b7-1" bind:__l="__l" u-p="{{j}}"/><view class="steps-guide data-v-cfb209b7"><view class="guide-header data-v-cfb209b7"><text class="guide-title data-v-cfb209b7">使用指南</text></view><view class="steps-container data-v-cfb209b7"><view wx:for="{{k}}" wx:for-item="step" wx:key="d" class="step-item data-v-cfb209b7"><view class="step-number data-v-cfb209b7">{{step.a}}</view><view class="step-content data-v-cfb209b7"><text class="step-title data-v-cfb209b7">{{step.b}}</text><text class="step-desc data-v-cfb209b7">{{step.c}}</text></view></view></view></view><view wx:if="{{l}}" class="map-loading-placeholder data-v-cfb209b7"><view class="loading-content data-v-cfb209b7"><view class="loading-spinner data-v-cfb209b7"></view><text class="data-v-cfb209b7">正在获取位置信息...</text></view></view><view wx:if="{{m}}" class="location-popup data-v-cfb209b7"><view class="popup-mask data-v-cfb209b7" bindtap="{{n}}"></view><view class="{{['location-sheet', 'data-v-cfb209b7', v && 'expanded']}}"><view class="sheet-header data-v-cfb209b7"><text class="sheet-title data-v-cfb209b7">附近设备场地 ({{o}})</text><view class="close-btn data-v-cfb209b7" bindtap="{{q}}"><uv-icon wx:if="{{p}}" class="data-v-cfb209b7" u-i="cfb209b7-2" bind:__l="__l" u-p="{{p}}"></uv-icon></view></view><scroll-view class="sheet-content data-v-cfb209b7" scroll-y="true"><view wx:for="{{r}}" wx:for-item="item" wx:key="k" class="position-item data-v-cfb209b7" bindtap="{{item.l}}"><view class="position-info data-v-cfb209b7"><view class="position-name data-v-cfb209b7">{{item.a}}</view><view class="{{['status-tag', 'data-v-cfb209b7', item.c]}}"><text class="data-v-cfb209b7">{{item.b}}</text></view><view wx:if="{{item.d}}" class="position-time data-v-cfb209b7"><text class="data-v-cfb209b7">营业时间：{{item.e}}</text></view></view><view class="position-actions data-v-cfb209b7"><view wx:if="{{item.f}}" class="distance-info data-v-cfb209b7"><text class="data-v-cfb209b7">{{item.g}}</text></view><view class="{{['status-tag', 'data-v-cfb209b7', item.i]}}"><text class="data-v-cfb209b7">{{item.h}}</text></view><view class="nav-btn data-v-cfb209b7" catchtap="{{item.j}}"><text class="data-v-cfb209b7">导航</text></view></view></view><view wx:if="{{s}}" class="empty-state data-v-cfb209b7"><image class="empty-icon data-v-cfb209b7" src="{{t}}" mode="aspectFit"/><text class="empty-text data-v-cfb209b7">附近5公里内暂无设备</text></view></scroll-view></view></view><view wx:if="{{w}}" class="loading-overlay data-v-cfb209b7"><view class="loading-content data-v-cfb209b7"><view class="loading-spinner data-v-cfb209b7"></view><text class="data-v-cfb209b7">正在获取场地信息...</text></view></view><view wx:if="{{x}}" class="phone-auth-popup data-v-cfb209b7"><view class="popup-mask data-v-cfb209b7" catchtap="{{y}}"></view><view class="popup-content data-v-cfb209b7"><view class="popup-header data-v-cfb209b7"><text class="popup-title data-v-cfb209b7">授权获取手机号</text></view><view class="popup-body data-v-cfb209b7"><view class="auth-desc data-v-cfb209b7"><text class="data-v-cfb209b7">为了提供更好的服务和紧急联系，需要授权获取您的手机号</text></view><button class="auth-btn data-v-cfb209b7" open-type="getPhoneNumber" bindgetphonenumber="{{z}}"><text class="data-v-cfb209b7">一键获取手机号</text></button><view class="auth-cancel data-v-cfb209b7" bindtap="{{A}}"><text class="data-v-cfb209b7">暂不授权</text></view></view></view></view></view>
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user