2.0.0 修复h5证书问题
This commit is contained in:
parent
12a80014a0
commit
d5e6a4dd26
3
env/.env.production
vendored
3
env/.env.production
vendored
@ -4,5 +4,4 @@ NODE_ENV = 'development'
|
||||
VITE_DELETE_CONSOLE = true
|
||||
# 是否开启sourcemap
|
||||
VITE_SHOW_SOURCEMAP = false
|
||||
|
||||
VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
|
||||
VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
|
||||
|
@ -18,7 +18,7 @@ export default defineManifestConfig({
|
||||
appid: VITE_UNI_APPID,
|
||||
description: '',
|
||||
versionName: '2.0.0',
|
||||
versionCode: '20250529',
|
||||
versionCode: '20250603',
|
||||
transformPx: false,
|
||||
locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
|
||||
/* 5+App特有相关 */
|
||||
|
@ -3,7 +3,7 @@
|
||||
"appid": "__UNI__9F097F0",
|
||||
"description": "",
|
||||
"versionName": "2.0.0",
|
||||
"versionCode": "20250529",
|
||||
"versionCode": "20250603",
|
||||
"transformPx": false,
|
||||
"app-plus": {
|
||||
"usingComponents": true,
|
||||
|
@ -86,7 +86,6 @@
|
||||
let loading = false
|
||||
|
||||
const queryLeave = (e) => {
|
||||
console.log('----', range.value)
|
||||
let param = {
|
||||
sysOrgCode: orgCode.value,
|
||||
begin: range.value[0],
|
||||
|
@ -34,7 +34,6 @@
|
||||
|
||||
const appStore = useAppStore()
|
||||
const dataSource = ref({})
|
||||
var ifH5 = false;
|
||||
|
||||
const onlinePreview = (url) => {
|
||||
uni.navigateTo({
|
||||
@ -50,9 +49,6 @@
|
||||
|
||||
onLoad((options) => {
|
||||
getData(options.data)
|
||||
//#ifdef H5 || MP-WEIXIN
|
||||
ifH5 = true;
|
||||
//#endif
|
||||
})
|
||||
</script>
|
||||
|
||||
|
@ -54,7 +54,6 @@
|
||||
const list = ref([]) //文件列表
|
||||
const keyword = ref('') //查询绑定值
|
||||
const type = ref('') //绑定查询文件种类
|
||||
var ifH5 = false;
|
||||
|
||||
const getList = (e) => {
|
||||
loading = true;
|
||||
@ -198,9 +197,6 @@
|
||||
onLoad((options) => {
|
||||
type.value = options.title
|
||||
getList(1)
|
||||
//#ifdef H5 || MP-WEIXIN
|
||||
ifH5 = true;
|
||||
//#endif
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@ -1063,7 +1063,6 @@ export function disposeGridLayout(compName, chartOption, config, chartData) {
|
||||
chartOption.grid.bottom = 30;
|
||||
// #endif
|
||||
}
|
||||
console.log('---chartOption--',chartOption);
|
||||
return chartOption;
|
||||
}
|
||||
/**
|
||||
|
@ -9,7 +9,7 @@
|
||||
</route>
|
||||
<template>
|
||||
<PageLayout :navbarShow="false">
|
||||
<view class="nav">
|
||||
<view class="nav" v-if="!isH5">
|
||||
<view class="nav_box">
|
||||
<view class="weather_calender">
|
||||
<view class="position position-left">
|
||||
@ -103,6 +103,8 @@
|
||||
import {
|
||||
taskListApi
|
||||
} from '@/api/process'
|
||||
import { isH5 } from '@/utils/platform'
|
||||
|
||||
defineOptions({
|
||||
name: 'index',
|
||||
options: {
|
||||
@ -127,6 +129,7 @@
|
||||
const res = wx.getSystemInfoSync();
|
||||
const statusHeight = res.statusBarHeight; //状态栏高度
|
||||
const cusnavbarheight = (statusHeight + 30) + "px";
|
||||
|
||||
const goPage = (item) => {
|
||||
uni.navigateTo({
|
||||
url: `${item.path}?title=${item.text}`
|
||||
@ -138,7 +141,7 @@
|
||||
url: '/pages-process/approvalTabbar'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const goToMyApplyProcess = () => {
|
||||
uni.navigateTo({
|
||||
url: '/pages-process/myApplyProcess'
|
||||
@ -287,6 +290,7 @@
|
||||
}
|
||||
|
||||
.scrollView {
|
||||
height: 110%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 0;
|
||||
|
@ -58,7 +58,6 @@ const init = () => {
|
||||
}
|
||||
const goPage = (item) => {
|
||||
let page = item.routeIndex
|
||||
console.log('-----------page------------', page)
|
||||
if (!page) {
|
||||
toast.info('该功能暂未实现')
|
||||
} else {
|
||||
|
@ -14,7 +14,7 @@
|
||||
<view class="dot"></view>
|
||||
<wd-text text="文件预览"></wd-text>
|
||||
</view>
|
||||
<view v-if="ifH5">
|
||||
<view v-if="isH5">
|
||||
<!-- 在线预览 by 闵 -->
|
||||
<wd-text color="#1890ff" :lines='1' style="font-size: 40rpx;padding-left: 25rpx;padding-top: 25rpx;"
|
||||
decoration="underline"
|
||||
@ -35,16 +35,9 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref
|
||||
} from 'vue'
|
||||
import {
|
||||
onLoad
|
||||
} from '@dcloudio/uni-app';
|
||||
import { isH5 } from '@/utils/platform'
|
||||
const detail = ref({})
|
||||
const detailArr = ref([])
|
||||
//判断是否h5 by 闵
|
||||
var ifH5 = false;
|
||||
const onlinePreview = (url) => { //在线预览文件 by 闵
|
||||
uni.navigateTo({
|
||||
url: url
|
||||
@ -59,13 +52,10 @@
|
||||
onLoad((options) => {
|
||||
detail.value = options.data
|
||||
detailArr.value = options.data.split(",");
|
||||
//#ifdef H5 || MP-WEIXIN
|
||||
ifH5 = true;
|
||||
//#endif
|
||||
//判断是否只有一个文件
|
||||
if (detailArr.value && detailArr.value.length == 1) {
|
||||
let url = '/pages/onlinePreview/onlinePreview';
|
||||
if (ifH5) url = '/pages/onlinePreview/onlinePreviewH5'
|
||||
if (isH5) url = '/pages/onlinePreview/onlinePreviewH5'
|
||||
onlinePreview(url + `?data=${JSON.stringify(options.data)}`);
|
||||
}
|
||||
})
|
||||
|
@ -27909,7 +27909,6 @@ echartsProto._onframe = function () {
|
||||
// frame is executed immedietely after task reset.
|
||||
// this._coordSysMgr.update(ecModel, api);
|
||||
|
||||
// console.log('--- ec frame visual ---', remainTime);
|
||||
scheduler.performVisualTasks(ecModel);
|
||||
|
||||
renderSeries(this, this._model, api, 'remain');
|
||||
|
Loading…
Reference in New Issue
Block a user