Compare commits
No commits in common. "feb649173362b04fb85949b229985442fc449633" and "38cbbd2ed190f99bb81f4ffb7f7da60deb5e7314" have entirely different histories.
feb6491733
...
38cbbd2ed1
4
App.vue
4
App.vue
|
|
@ -183,9 +183,7 @@
|
||||||
// 批量设置开发环境配置
|
// 批量设置开发环境配置
|
||||||
const devConfig = {
|
const devConfig = {
|
||||||
host: "https://flaunt.batiao8.com/",
|
host: "https://flaunt.batiao8.com/",
|
||||||
header: {
|
header: { "x-token": "da884e6e-fbd7-4d8d-ab0e-cb7b07f9f6fa" },
|
||||||
"x-token": "ebe42caa-845a-4cb2-a324-18abe8ced7c0"
|
|
||||||
},
|
|
||||||
decrypt: "e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB",
|
decrypt: "e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB",
|
||||||
encrypt: "xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil"
|
encrypt: "xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
main.js
2
main.js
|
|
@ -29,7 +29,7 @@ export function createApp() {
|
||||||
app.config.globalProperties.$system = plus.os.name;
|
app.config.globalProperties.$system = plus.os.name;
|
||||||
// #endif
|
// #endif
|
||||||
app.config.globalProperties.$systemInfo = systemInfo
|
app.config.globalProperties.$systemInfo = systemInfo
|
||||||
uni.setStorageSync('version', '1.0.4.sp23')
|
uni.setStorageSync('version', '1.0.4.sp21')
|
||||||
app.config.globalProperties.$version = uni.getStorageSync('version')
|
app.config.globalProperties.$version = uni.getStorageSync('version')
|
||||||
app.use(globalMethods);
|
app.use(globalMethods);
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,7 @@
|
||||||
<!-- pages/webview/webview.vue -->
|
<!-- pages/webview/webview.vue -->
|
||||||
<template>
|
<template>
|
||||||
<view class="webview-container">
|
<view class="webview-container">
|
||||||
<navBar class="nav-bar" :title="pageTitle" :bgColor="data.navBar.bgColor" isBack>
|
<navBar class="nav-bar" :title="pageTitle" :bgColor="data.navBar.bgColor" isBack></navBar>
|
||||||
<template v-if="isClose" v-slot:right>
|
|
||||||
<image style="width:22px;height: 22px;" src='/static/image/close.png' @click="onConfirm()"></image>
|
|
||||||
</template>
|
|
||||||
</navBar>
|
|
||||||
<web-view :src="url" :webview-styles="webviewStyles"></web-view>
|
<web-view :src="url" :webview-styles="webviewStyles"></web-view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -14,9 +10,7 @@
|
||||||
// 自定义头部
|
// 自定义头部
|
||||||
// import ZdyNavbar from "@/components/navbar/navbar.vue"
|
// import ZdyNavbar from "@/components/navbar/navbar.vue"
|
||||||
import navBar from '@/components/nav-bar/nav-bar.vue'
|
import navBar from '@/components/nav-bar/nav-bar.vue'
|
||||||
import {
|
import { util } from '@/utils/common.js'
|
||||||
util
|
|
||||||
} from '@/utils/common.js'
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
ref,
|
ref,
|
||||||
|
|
@ -43,21 +37,16 @@
|
||||||
dark: "dark",
|
dark: "dark",
|
||||||
// 状态栏高度
|
// 状态栏高度
|
||||||
systemBarHeight: "0",
|
systemBarHeight: "0",
|
||||||
isClose: false
|
|
||||||
})
|
})
|
||||||
|
|
||||||
let {
|
let {
|
||||||
systemBarHeight,
|
systemBarHeight
|
||||||
isClose
|
|
||||||
} = toRefs(data)
|
} = toRefs(data)
|
||||||
|
|
||||||
const url = ref('')
|
const url = ref('')
|
||||||
const pageTitle = ref('')
|
const pageTitle = ref('')
|
||||||
|
|
||||||
onLoad((options) => {
|
onLoad((options) => {
|
||||||
if (options.isClose) {
|
|
||||||
isClose.value = options.isClose
|
|
||||||
}
|
|
||||||
uni.getSystemInfo({
|
uni.getSystemInfo({
|
||||||
success: res => {
|
success: res => {
|
||||||
systemBarHeight.value = res.statusBarHeight; // 获取状态栏高度
|
systemBarHeight.value = res.statusBarHeight; // 获取状态栏高度
|
||||||
|
|
@ -92,12 +81,6 @@
|
||||||
// #endif
|
// #endif
|
||||||
})
|
})
|
||||||
|
|
||||||
const onConfirm = () => {
|
|
||||||
uni.reLaunch({
|
|
||||||
url: '/pages/index/index'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const goBack = () => {
|
const goBack = () => {
|
||||||
uni.navigateBack()
|
uni.navigateBack()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -529,7 +529,7 @@ const clickNotice = () => {
|
||||||
console.log("点击公告", noticeInfo.value)
|
console.log("点击公告", noticeInfo.value)
|
||||||
if (!noticeInfo.value.url) return
|
if (!noticeInfo.value.url) return
|
||||||
const url = noticeInfo.value.url + `&uni_id=${userInfo.value.user_id}`
|
const url = noticeInfo.value.url + `&uni_id=${userInfo.value.user_id}`
|
||||||
util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}&isClose=${true}`)
|
util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 339 B |
Loading…
Reference in New Issue