diff --git a/index.html b/index.html
index 4c9a668..7cb5fb9 100644
--- a/index.html
+++ b/index.html
@@ -20,21 +20,25 @@
'')
- // 修复 iOS 下页面高度异常问题
- function adjustForiOS() {
- var u = navigator.userAgent;
- console.log('🚀 ~ u:', u);
- var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
- console.log('🚀 ~ isiOS:', isiOS);
- if (isiOS) {
- var box = document.getElementById('box');
- if (box) {
- box.style.height = '100px';
+ let origin = window.location.href
+ if (origin.indexOf('ticket') != -1)
+ {
+ // 修复 iOS 下页面高度异常问题
+ function adjustForiOS() {
+ var u = navigator.userAgent;
+ console.log('🚀 ~ u:', u);
+ var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+ console.log('🚀 ~ isiOS:', isiOS);
+ if (isiOS) {
+ var box = document.getElementById('box');
+ if (box) {
+ box.style.height = '100px';
+ }
}
}
- }
- document.addEventListener('DOMContentLoaded', adjustForiOS);
+ document.addEventListener('DOMContentLoaded', adjustForiOS);
+ }
diff --git a/src/pages/agreement/index.vue b/src/pages/agreement/index.vue
index 45f20bb..8a2b901 100644
--- a/src/pages/agreement/index.vue
+++ b/src/pages/agreement/index.vue
@@ -32,6 +32,11 @@ const onClickLeft = () => {
uni.navigateBack()
}
onLoad(async (options) => {
+ console.log('🚀 ~ onLoad ~ options:', options.url)
+ const origin = window.location.href
+ if (origin.indexOf('ticket') != -1) {
+ options.url = 'http://sgwpdm.ah.sgcc.com.cn/iws/ahbns/' + options.url
+ }
pagesType.value = options.type
const response = await fetch(options.url)
const arrayBuffer = await response.arrayBuffer()
diff --git a/src/pages/order-details/index.vue b/src/pages/order-details/index.vue
index c1d785d..3e43c47 100644
--- a/src/pages/order-details/index.vue
+++ b/src/pages/order-details/index.vue
@@ -52,21 +52,16 @@
</van-tag> -->
</view>
<view>装备型号：{{ goods.typeName }}</view>
- <view> 租赁时长： {{ goods.days }}</view>
+ <view> 租赁时长： {{ goods.days }} 天</view>
</view>
</view>
</van-col>
</van-row>
</view>
</view>
- <van-steps :active="currentActive" active-color="#07c160" style="margin-bottom: 20rpx">
- <van-step
- v-for="(step, index) in stepList"
- :key="index"
- :title="step.title"
- :desc="step.description"
- />
- </van-steps>
+ <van-steps :active="currentActive" active-color="#07c160" style="margin-bottom: 20rpx; border-radius: 6px;">
+ <van-step v-for="(step, index) in stepList" :key="index">{{ step.title }}</van-step>
+ </van-steps>
<van-cell-group inset>
<TitleTip :title="`订单信息`" />
<van-cell title="订单编号：" :value="orderDetails.code" />
@@ -89,7 +84,7 @@ import companyBg from '@/static/goods/company-bg.png'
import TitleTip from '@/components/TitleTip/index'
import { ref } from 'vue'
import { editOrderDetailsAPI, getOverhaulAPI } from '@/services/order/index.js'
-import { showImagePreview,Steps, Step } from 'vant'
+import { showImagePreview, Steps, Step } from 'vant'
import { onLoad } from '@dcloudio/uni-app'
const orderDetailsList = ref([])
const orderDetails = ref({})
@@ -276,27 +271,41 @@ const getDescription = (desId) => {
// idTemp.value = String(route.query.idTemp)
// }
-
onLoad(async (options) => {
const { data: res } = await editOrderDetailsAPI({ orderId: options?.orderId })
orderStatus.value = options?.orderStatus
- console.log('xxxxxxxxxxx',orderStatus.value)
+ console.log('xxxxxxxxxxx', orderStatus.value)
- // if (orderStatus.value == 1) {
- // currentActive.value = 0
- // stepList.value = [
- // {
- // title: '待接单',
- // description: '',
- // },
- // {
- // title: '待出库',
- // description: '',
- // }
-
- // ]
- // }
- console.log('xxxxxxxxxxx',stepList.value)
+ if (orderStatus.value == 1) {
+ currentActive.value = 0
+ stepList.value[0].title = '待接单'
+ } else if (orderStatus.value == 2) {
+ currentActive.value = 1
+ stepList.value[0].title = '已接单'
+ // stepList.value[1].title = '已出库'
+ } else if (orderStatus.value == 3) {
+ currentActive.value = 2
+ stepList.value[0].title = '已接单'
+ stepList.value[1].title = '已出库'
+ // stepList.value[2].title = '已收货'
+ } else if (orderStatus.value == 4) {
+ currentActive.value = 3
+ stepList.value[0].title = '已接单'
+ stepList.value[1].title = '已出库'
+ stepList.value[2].title = '已收货'
+ stepList.value[3].title = '租赁中'
+ } else if (orderStatus.value == 20 || orderStatus.value == 5) {
+ stepList.value[0].title = '已接单'
+ stepList.value[1].title = '已出库'
+ stepList.value[2].title = '已收货'
+ stepList.value[3].title = '租赁结束'
+ stepList.value[4].title = '订单完成'
+ currentActive.value = 4
+ } else if (orderStatus.value == 99) {
+ currentActive.value = 0
+ stepList.value[0].title = '已取消'
+ }
+ console.log('xxxxxxxxxxx', stepList.value)
orderDetails.value = res
orderDetailsList.value = res.detailsList
if (res.orderStatus == 20) {
@@ -399,7 +408,7 @@ onLoad(async (options) => {
}
}
.van-step__title {
- color: #333 ; /* 设置文字颜色 */
+ color: #333; /* 设置文字颜色 */
display: block; /* 确保元素显示 */
}
.van-step__desc {
diff --git a/src/pages/order-list/index.vue b/src/pages/order-list/index.vue
index 68872a7..3aa46ae 100644
--- a/src/pages/order-list/index.vue
+++ b/src/pages/order-list/index.vue
@@ -232,7 +232,7 @@
>
费用确认
</van-button>
- <van-button
+ <!-- <van-button
style="margin-right: 6px"
size="small"
type="primary"
@@ -251,7 +251,7 @@
@click.stop="onViewCosts(item)"
>
费用清单
- </van-button>
+ </van-button> -->
<van-button
style="margin-right: 6px"
size="small"
diff --git a/src/utils/http.js b/src/utils/http.js
index 48ab697..cd3c8af 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -12,6 +12,8 @@ export const baseURL = ENV === 'development' ? '/api' : '/iws/proxyApi'; // 宏
* httpInterceptor 分别拦截 request 和 uploadFile 请求
*/
+const origin = window.location.href;
+
// 添加请求拦截
const httpInterceptor = {
invoke(options) {
@@ -60,17 +62,20 @@ export const http = (options) => {
const memberStore = useMemberStore();
memberStore.clearUserInfo();
memberStore.clearToken();
- uni.navigateTo({
- url: '/pages/login/index',
- });
- // 宏源
- // document.addEventListener(
- // "deviceready",
- // () => {
- // navigator.security.closeWindow();
- // },
- // false
- // );
+ if (origin.indexOf('ticket') == -1) {
+ uni.navigateTo({
+ url: '/pages/login/index',
+ });
+ } else {
+ // 宏源
+ document.addEventListener(
+ "deviceready",
+ () => {
+ navigator.security.closeWindow();
+ },
+ false
+ );
+ }
reject(res);
} else if (res.data.code === 500) {
uni.showToast({