Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
commit
c7a49574e3
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name" : "秦港双控-监管端",
|
||||
"appid" : "__UNI__2AFFD9C",
|
||||
"appid" : "__UNI__DB65C6B",
|
||||
"description" : "秦港双控-监管端",
|
||||
"versionName" : "01.00.44",
|
||||
"versionCode" : 42,
|
||||
"versionName" : "01.00.59",
|
||||
"versionCode" : 59,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关
|
||||
android:value="uni.UN5E8A412|__UNI__DB65C6B|124611200205|common" */
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
"version": "1.0.0",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"crypto-js": "^4.2.0",
|
||||
"uview-ui": "^2.0.35",
|
||||
"vue": "^2.6.14",
|
||||
"vuex-persistedstate": "^3.2.1"
|
||||
|
@ -33,6 +34,12 @@
|
|||
"vue": "^2.6.8"
|
||||
}
|
||||
},
|
||||
"node_modules/crypto-js": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://mirrors.huaweicloud.com/repository/npm/crypto-js/-/crypto-js-4.2.0.tgz",
|
||||
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/deepmerge": {
|
||||
"version": "4.2.2",
|
||||
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
|
||||
|
@ -100,6 +107,11 @@
|
|||
"vue": "^2.6.8"
|
||||
}
|
||||
},
|
||||
"crypto-js": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://mirrors.huaweicloud.com/repository/npm/crypto-js/-/crypto-js-4.2.0.tgz",
|
||||
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
|
||||
},
|
||||
"deepmerge": {
|
||||
"version": "4.2.2",
|
||||
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view>
|
||||
<web-view src="https://qgqy.qhdsafety.com/xieyi/users_agreement.html"></web-view>
|
||||
<web-view src="https://skqhdg.porthebei.com:9005/xieyi/users_agreement.html"></web-view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view>
|
||||
<web-view src="https://qgqy.qhdsafety.com/xieyi/privacy.html"></web-view>
|
||||
<web-view src="https://skqhdg.porthebei.com:9005/xieyi/privacy.html"></web-view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
<view v-if="info.SIGNTIME != null" class="respondent">
|
||||
<view class="promiser">
|
||||
<text>
|
||||
{{ info.TYPE === '0' ? '主要负责人签字' : '受状人' }}:
|
||||
{{ info.TYPE === '0' ? '承诺人签字' : '受状人' }}:
|
||||
</text>
|
||||
<u--image :showLoading="true" :src="$store.state.filePath + info.FILEPATH"
|
||||
width="200rpx" height="100px" mode="scaleToFill"></u--image>
|
||||
|
@ -44,7 +44,7 @@
|
|||
<view v-else class="respondent">
|
||||
<view class="promiser">
|
||||
<text>
|
||||
{{ info.TYPE === '0' ? '主要负责人未签字' : '受状人未签字' }}
|
||||
{{ info.TYPE === '0' ? '承诺人签字未签字' : '受状人未签字' }}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
@ -31,8 +31,8 @@ const store = new Vuex.Store({
|
|||
state.userInfo = userInfo
|
||||
} ,
|
||||
setfilePath(state, filePath) {
|
||||
// state.filePath = 'https://skqhdg.porthebei.com:9004/file/'
|
||||
state.filePath = 'https://wwag.qhdsafety.com/file/'
|
||||
state.filePath = 'https://skqhdg.porthebei.com:9004/file/'
|
||||
// state.filePath = 'https://wwag.qhdsafety.com/file/'
|
||||
}
|
||||
},
|
||||
actions: {
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
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";
|
||||
// export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址
|
||||
|
|
|
@ -22,8 +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) {
|
||||
return ('00' + str).substr(str.length)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue