Merge remote-tracking branch 'origin/pet' into pet

dev
shanao 2024-12-17 15:36:26 +08:00
commit f51bbd6c41
6 changed files with 17 additions and 18 deletions

View File

@ -3,6 +3,7 @@ export default {
onLaunch: function () { onLaunch: function () {
console.log('App Launch') console.log('App Launch')
this.isLogin() this.isLogin()
this.$store.dispatch('setfilePath', 'https://skqhdg.porthebei.com:9004/file/');
}, },
onShow: function () { onShow: function () {
console.log('App Show') console.log('App Show')

View File

@ -1,9 +1,9 @@
{ {
"name" : "秦港双控-监管端", "name" : "秦港双控-监管端",
"appid" : "__UNI__2AFFD9C", "appid" : "__UNI__DB65C6B",
"description" : "秦港双控-监管端", "description" : "秦港双控-监管端",
"versionName" : "01.00.44", "versionName" : "01.00.55",
"versionCode" : 42, "versionCode" : 55,
"transformPx" : false, "transformPx" : false,
/* 5+App /* 5+App
android:value="uni.UN5E8A412|__UNI__DB65C6B|124611200205|common" */ android:value="uni.UN5E8A412|__UNI__DB65C6B|124611200205|common" */
@ -33,21 +33,20 @@
/* android */ /* android */
"android" : { "android" : {
"permissions" : [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"minSdkVersion" : 21, "minSdkVersion" : 21,

View File

@ -96,7 +96,7 @@ export default {
const keydataVal = jsencrypt.encrypt('qdkjchina' + this.form.userName + ',qd,' + this.form.userPwd) const keydataVal = jsencrypt.encrypt('qdkjchina' + this.form.userName + ',qd,' + this.form.userPwd)
let resData = await submitLogin({'KEYDATA':keydataVal}); let resData = await submitLogin({'KEYDATA':keydataVal});
await this.$store.dispatch('setUserInfo', resData); await this.$store.dispatch('setUserInfo', resData);
await this.$store.dispatch('setfilePath', ''); // await this.$store.dispatch('setfilePath', '');
uni.$u.route({ uni.$u.route({
url: '/pages/index/index', url: '/pages/index/index',
type: 'reLaunch' type: 'reLaunch'

View File

@ -32,7 +32,7 @@ const store = new Vuex.Store({
} , } ,
setfilePath(state, filePath) { setfilePath(state, filePath) {
// state.filePath = 'https://skqhdg.porthebei.com:9004/file/' // state.filePath = 'https://skqhdg.porthebei.com:9004/file/'
state.filePath = 'https://wwag.qhdsafety.com/file/' state.filePath = filePath
} }
}, },
actions: { actions: {

View File

@ -1,7 +1,6 @@
// export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址 export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址
export var requestPath = 'http://192.168.0.100:8092/'; // export var requestPath = 'http://192.168.0.100:8092/';
let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址 let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址
import store from '../store/index' import store from '../store/index'
function post(url, data) { function post(url, data) {

View File

@ -22,7 +22,7 @@ export function formatDate(date, fmt) {
} }
} }
export const filePath = 'https://wwag.qhdsafety.com/file/' export const filePath = 'https://skqhdg.porthebei.com:9004/file/'
function padLeftZero(str) { function padLeftZero(str) {
return ('00' + str).substr(str.length) return ('00' + str).substr(str.length)