diff --git a/manifest.json b/manifest.json index 140f3e6..54392c9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "秦港双控-监管端", + "name" : "秦港安全", "appid" : "__UNI__DB65C6B", "description" : "秦港双控-监管端", - "versionName" : "01.00.59", - "versionCode" : 59, + "versionName" : "2.3.9", + "versionCode" : 249, "transformPx" : false, /* 5+App特有相关 android:value="uni.UN5E8A412|__UNI__DB65C6B|124611200205|common" */ @@ -33,6 +33,8 @@ /* android打包配置 */ "android" : { "permissions" : [ + "", + "", "", "", "", diff --git a/package-lock.json b/package-lock.json index 1e519c0..3779f0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,3 +162,4 @@ } } } + diff --git a/pages/login/login.vue b/pages/login/login.vue index 5feecdf..789b836 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -99,7 +99,14 @@ export default { }); uni.setStorageSync('token', token); uni.setStorageSync('tokenTime', dayjs().format("YYYY-MM-DD HH:mm:ss")); - if (firstLogin === 1) { + const { osName } = await uni.getSystemInfoSync(); + let osInt; + if (osName === "android") { + osInt = "1"; + } else { + osInt = "2"; + } + if (firstLogin === 1 && osInt === "1") { uni.$u.route({ url: '/pages/login/change-password/change-password', type: 'reLaunch' diff --git a/pages/safety-environmental-inspection/initiate/detail.vue b/pages/safety-environmental-inspection/initiate/detail.vue index 8c2affc..1c9a588 100644 --- a/pages/safety-environmental-inspection/initiate/detail.vue +++ b/pages/safety-environmental-inspection/initiate/detail.vue @@ -747,18 +747,21 @@ export default { if (this.form.situationList[i].IMAGE[0]?.imagePath) { imagePath = this.form.situationList[i].IMAGE[0].imagePath } else if (this.form.situationList[i].IMAGE.length) { - const { imgUrl } = await uploadSmd({ + let imgUrl = await uploadSmd({ filePath: this.form.situationList[i].IMAGE[0].url, name: "file", }); - imagePath = imgUrl; + imagePath = imgUrl.imgUrl; } + console.info('imagePath',imagePath) situations.push({ imagePath: imagePath, ...this.form.situationList[i], IMAGE: null }) } + console.info('situations',situations) + for (let i = 0; i < this.form.inspectorList.length; i++) { if (!this.form.inspectorList[i].INSPECTION_USER_NAME) { uni.showToast({ diff --git a/utils/request.js b/utils/request.js index a911796..eb2e2c4 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,19 +1,12 @@ -import store from '../store/index' - -// export var requestPath = 'http://192.168.192.201:8992/qa-regulatory-gwj/'; // 后台请求地址 -export var requestPath = 'https://skqhdg.porthebei.com:9005/regulatory_gwj_2.0/'; // 后台请求地址 -// export var requestPath = 'http://192.168.151.75:8092/'; - -let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址 import dayjs from "dayjs"; import { setRefreshToken } from "@/api"; import {decryptAes} from "@/utils/aes_secret"; -// export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址 +import store from '../store/index' -export var requestPath = 'http://192.168.192.201:8992/regulatory_gwj_2.0/'; +// export var requestPath = 'https://skqhdg.porthebei.com:9005/regulatory_gwj_2.0/'; // 后台请求地址 +export var requestPath = 'https://skqhdg.porthebei.com:9005/regulatory_gwj_2.0/'; let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址 - function logOut(reject,data) { uni.showToast({ title: '登录失效,请重新登录', @@ -115,9 +108,9 @@ function upload(url, data) { 'token': uni.getStorageSync('token') || '' }, success: (res) => { - res.data = decryptAes(res.data); + res.data = decryptAes(JSON.parse(res.data)); uni.hideLoading(); - const data = JSON.parse(res.data) + const data = res.data if (data.result === 'success') { resolve(data) } else { @@ -161,9 +154,9 @@ function uploads(url, data) { 'token': uni.getStorageSync('token') || '' }, success: (res) => { - res.data = decryptAes(res.data); + res.data = decryptAes(JSON.parse(res.data)); uni.hideLoading(); - const data = JSON.parse(res.data) + const data = res.data if (data.result === 'success') { resolve(data) } else {