代码优化
This commit is contained in:
BianLzhaoMin
parent
aeeae819bc
commit
65a8d947a9
35
index.html
35
index.html
|
|
@ -20,8 +20,7 @@
|
|||
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
|
||||
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
|
||||
</script>
|
||||
<script type="module" src="./src/static/cordova/cordova.js"></script>
|
||||
|
||||
</script>
|
||||
<title>
|
||||
安徽租赁商城
|
||||
</title>
|
||||
|
|
@ -31,39 +30,9 @@
|
|||
|
||||
<body>
|
||||
<div id="app"><!--app-html--></div>
|
||||
<!-- <script type="module" src="./src/static/cordova/cordova.js"></script> -->
|
||||
<script type="module" src="/src/main.js"></script>
|
||||
|
||||
<script>
|
||||
|
||||
document.addEventListener('deviceready', onDeviceReady, false)
|
||||
function onDeviceReady() {
|
||||
|
||||
navigator.splashscreen.hide()
|
||||
// 执行与 Cordova 相关的逻辑
|
||||
navigator.security.signST(
|
||||
(res) => {
|
||||
console.log('ticket=' + res.data)
|
||||
alert('ticket=' + res.data)
|
||||
|
||||
// testData.value = res.data
|
||||
showToast({
|
||||
message: 'ticket=' + res.data,
|
||||
duration: 0,
|
||||
})
|
||||
},
|
||||
(err) => {
|
||||
if (err.code === 401) {
|
||||
navigator.security.redirectToLogin()
|
||||
} else {
|
||||
showToast({
|
||||
message: err,
|
||||
duration: 0,
|
||||
})
|
||||
}
|
||||
},
|
||||
'f90905f4ba4482e14830c761c5cc21b2',
|
||||
)
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
|
|
|
|||
27
src/main.js
27
src/main.js
|
|
@ -11,30 +11,3 @@ export function createApp() {
|
|||
app,
|
||||
}
|
||||
}
|
||||
|
||||
// const script = document.createElement('script')
|
||||
|
||||
// // 设置 script 标签的 src 属性
|
||||
// script.src = './static/cordova/cordova.js'
|
||||
|
||||
// // 设置 onload 事件，确保脚本加载完成后执行操作
|
||||
// script.onload = () => {
|
||||
// console.log('Script loaded successfully')
|
||||
// }
|
||||
|
||||
// // 设置 onerror 事件，确保捕获加载失败的情况
|
||||
// script.onerror = (error) => {
|
||||
// console.error('Script loading failed', error)
|
||||
// }
|
||||
|
||||
// 将 script 标签添加到页面的 head 中
|
||||
// document.head.appendChild(script)
|
||||
|
||||
// showToast({
|
||||
// message: '99999999',
|
||||
// duration: 0,
|
||||
// })
|
||||
|
||||
// if (window.cordova) {
|
||||
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -176,13 +176,21 @@ const getOrderStatusCountData = async () => {
|
|||
|
||||
const onViewMyOrder = (order) => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/order-list/index?type=${activeUser.value}&status=${order.order_status}`,
|
||||
url: `/pages/order-list/index?type=2&status=${order.order_status}`,
|
||||
})
|
||||
}
|
||||
|
||||
const onViewMore = (item) => {
|
||||
let rolesType = ''
|
||||
|
||||
if (['3', '15'].includes(item.taskStatus)) {
|
||||
rolesType = 2
|
||||
}
|
||||
if (['1', '2', '4', '5', '10'].includes(item.taskStatus)) {
|
||||
rolesType = 1
|
||||
}
|
||||
uni.navigateTo({
|
||||
url: `/pages/order-list/index?code=${item.taskCode}`,
|
||||
url: `/pages/order-list/index?code=${item.taskCode}&type=${rolesType}`,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,12 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, reactive } from 'vue'
|
||||
import { useMemberStore } from '@/stores/index.js'
|
||||
import { appLoginAPI, getUserInfoAPI, getCompanyListAPI } from '@/services/login/index.js'
|
||||
import {
|
||||
appLoginAPI,
|
||||
getUserInfoAPI,
|
||||
getCompanyListAPI,
|
||||
iwsLoginAPI,
|
||||
} from '@/services/login/index.js'
|
||||
|
||||
const memberStore = useMemberStore()
|
||||
const loginForm = reactive({
|
||||
|
|
@ -69,7 +74,7 @@ const onSubmitLogin = async () => {
|
|||
|
||||
const navBarHeight = ref(0)
|
||||
|
||||
onMounted(() => {
|
||||
onMounted(async () => {
|
||||
uni.getSystemInfo({
|
||||
success: (res) => {
|
||||
// 获取状态栏高度
|
||||
|
|
@ -78,6 +83,24 @@ onMounted(() => {
|
|||
// navBarHeight.value = statusBarHeight
|
||||
},
|
||||
})
|
||||
|
||||
const origin = window.location.href
|
||||
if (origin.indexOf('ticket') != -1) {
|
||||
// console.log('origin.split爱玩送ticket')
|
||||
const { data: result } = await iwsLoginAPI({
|
||||
ticket: origin.split('ticket=')[1].split('#/')[0],
|
||||
sysType: 1,
|
||||
})
|
||||
|
||||
memberStore.setToken(result.access_token)
|
||||
const userResult = await getUserInfoAPI()
|
||||
const { data: comResult } = await getCompanyListAPI()
|
||||
const userCompanyList = comResult.filter((e) => e.companyId == userResult.user.companyId)
|
||||
memberStore.setUserInfo(userResult.user)
|
||||
memberStore.setCompanyList(comResult)
|
||||
memberStore.setCompanyName(userCompanyList[0].companyName)
|
||||
uni.switchTab({ url: '/pages/index/index' })
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<van-cell-group inset style="flex: 1">
|
||||
<van-cell is-link title="个人资料" @click="onJumpToMyInfo" />
|
||||
<van-cell is-link title="账户与安全" @click="onJumpToMyAccount" />
|
||||
<van-cell is-link title="退出登录" @click="onLogOut" />
|
||||
<!-- <van-cell is-link title="退出登录" @click="onLogOut" /> -->
|
||||
</van-cell-group>
|
||||
</view>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ export const http = (options) => {
|
|||
fail(err) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '请求失败',
|
||||
title: '请求失败' + err,
|
||||
})
|
||||
console.log(err, '请求失败')
|
||||
reject(err)
|
||||
|
|
|
|||
Loading…
Reference in New Issue