Commit cabf2e35 authored by songrui's avatar songrui

Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master
parents 495457dc aa4b0636
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
if (!token) { if (!token) {
token = sessionStorage.getItem('token') token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
token = '6ebc3364-2296-4d3d-bd30-51102bcff396' token = 'de42c09b-bcb0-4c21-9c8d-aaca5eff8cbb'
} }
} }
if (token) { if (token) {
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</div> </div>
<div class='img-btn mt-2' @click="toUpload('imgId')"> <div class='img-btn mt-2' @click="toUpload('imgId')">
<input type='file' id='imgId' multiple @change='choiceImg' style='display: none' <input type='file' id='imgId' multiple @change='choiceImg' style='display: none'
:key='new Date().getTime()'> :key='new Date().getTime()' accept="image/*">
<div class='flex items-center justify-center'> <div class='flex items-center justify-center'>
<div> <div>
<doc-icon type='doc-upload' class='doc-up' /> <doc-icon type='doc-upload' class='doc-up' />
......
...@@ -232,11 +232,14 @@ export function isWeiXin() { ...@@ -232,11 +232,14 @@ export function isWeiXin() {
//关闭页面 //关闭页面
export function backHome() { export function backHome() {
if (isIOSWebKit()) { //ios if (isIOSWebKit()) { //ios
console.log('ios')
callMobile("closeWebPage", {}) callMobile("closeWebPage", {})
} else if (isAndroid()) { } else if (isAndroid()) {
console.log('Android')
callMobile("closePage", {}) callMobile("closePage", {})
} }
if (isWeiXin()) { // 微信中 if (isWeiXin()) { // 微信中
console.log('weixin')
WeixinJSBridge.call('closeWindow') WeixinJSBridge.call('closeWindow')
} }
} }
\ No newline at end of file
...@@ -30,11 +30,12 @@ module.exports = defineConfig({ ...@@ -30,11 +30,12 @@ module.exports = defineConfig({
} }
}, },
'/chronic-admin': { '/chronic-admin': {
// target: 'https://beta-tumour.zmnyjk.com', target: 'https://beta-tumour.zmnyjk.com',
target: 'http://192.168.1.131:8900', // target: 'http://192.168.1.131:8900',
changOrigin: true, changOrigin: true,
pathRewrite: { pathRewrite: {
'^/chronic-admin': '/' // '^/chronic-admin': '/'
'^/chronic-admin': '/chronic-admin'
} }
}, },
'/chronic-resident': { '/chronic-resident': {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment