flx:修复工作流返回到主页面问题
This commit is contained in:
parent
6334678224
commit
7cdec9c568
@ -18,9 +18,9 @@
|
||||
// export const BASE_URL = "http://42.180.188.17:9809" // 鞍钢正式环境
|
||||
// export const BASE_URL = "http://42.180.188.17:19098" // 鞍钢线上测试环境
|
||||
// export const BASE_URL = "http://jxj.zhgdyun.com:18004" // 包头线上地址
|
||||
// export const BASE_URL = "http://219.147.96.219:9809" // 包头线上地址(正式)
|
||||
export const BASE_URL = "http://219.147.96.219:9809" // 包头线上地址(正式)
|
||||
|
||||
export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://219.147.96.219:9809" // 包头线上地址(正式)
|
||||
// export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://219.147.96.219:9809" // 包头线上地址(正式)
|
||||
//是否已显示未登录弹窗
|
||||
let showNoLoginTip = false
|
||||
|
||||
|
||||
@ -209,12 +209,16 @@
|
||||
// // (data.height / 100 * window.innerHeight) * 1.48
|
||||
|
||||
// }).exec()
|
||||
|
||||
const userAgent = navigator.userAgent.toLowerCase();
|
||||
console.log("我是",userAgent);
|
||||
if (userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile|WPDesktop/i)) {
|
||||
setTimeout(() => {
|
||||
isSearch.value = true;
|
||||
}, 500)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const pagechange = (val) => {
|
||||
console.log("阿德记录卡结算单", val)
|
||||
}
|
||||
@ -359,6 +363,7 @@
|
||||
}
|
||||
return []
|
||||
}
|
||||
|
||||
</script>
|
||||
<style scoped>
|
||||
.search {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view :class="themeType?'whiteHeaderBox':''">
|
||||
<!-- 手机状态层 -->
|
||||
<view :style="{ height: mobileTopHeight + 'px' }" class="statusBar"></view>
|
||||
<!-- <view :style="{ height: mobileTopHeight + 'px' }" class="statusBar"></view> -->
|
||||
<view class="headerBox">
|
||||
<u-icon v-if="iconType" class="backImg" @click="$emit('select')" v-show="showBack" name="list" size="40"></u-icon>
|
||||
<uni-icons v-else @click="goBackFn" v-show="showBack" class="backImg" type="left" size="24"></uni-icons>
|
||||
@ -41,7 +41,7 @@
|
||||
goBackFn(){
|
||||
let pages = getCurrentPages();
|
||||
// let prevPage = pages[pages.length - 2]
|
||||
console.log('prevPage', pages)
|
||||
|
||||
if(pages.length > 1) {
|
||||
uni.navigateBack({
|
||||
success: function() {
|
||||
@ -83,18 +83,44 @@
|
||||
// // });
|
||||
|
||||
// });
|
||||
const arrListCode = [{
|
||||
code: 'wf66f6451c48b718d0aaf27522',
|
||||
name: '安全检查',
|
||||
path: '/pages/projectEnd/safeSame/index'
|
||||
}, {
|
||||
code: "wf67072b923afc947a1a819313",
|
||||
name: '质量检查',
|
||||
path: '/pages/projectEnd/qualityManage/index'
|
||||
},{
|
||||
code: "wf670a4a6c2384bf3e58f62681",
|
||||
name: '质量监督',
|
||||
path: '/pages/projectEnd/qualitySurveillance/index'
|
||||
},{
|
||||
code: "wf670735f73afc947a1a819314",
|
||||
name: '文明施工',
|
||||
path: '/pages/projectEnd/civilConstruction/constructionProblemRecord/index'
|
||||
}]
|
||||
let pathUrl = "/pages/projectEnd/projectIndex/projectIndex";
|
||||
console.log('pages', pages)
|
||||
|
||||
const find = arrListCode.find(item => pages[0].options.code && pages[0].options.code.includes(item.code));
|
||||
// console.log('prevPage',pages, pages[0].options.code)
|
||||
if(find) {
|
||||
pathUrl = find.path;
|
||||
}
|
||||
console.log('pathUrl', pathUrl)
|
||||
if(window.plus) {
|
||||
webUni.webView.postMessage({
|
||||
data: {
|
||||
type: "路由",
|
||||
url: '/pages/projectEnd/projectIndex/projectIndex'
|
||||
url: pathUrl
|
||||
}
|
||||
});
|
||||
} else {
|
||||
window.parent.postMessage({
|
||||
data: {
|
||||
type: "路由",
|
||||
url: '/pages/projectEnd/projectIndex/projectIndex'
|
||||
url: pathUrl
|
||||
}
|
||||
}, "*");
|
||||
}
|
||||
|
||||
5
main.js
5
main.js
@ -6,7 +6,7 @@ import "/utils/webview.js"
|
||||
import WFormItem from '@/components/WFormItem.vue'
|
||||
import PreviewIframe from '@/components/previewIframe.vue'
|
||||
|
||||
import { Popup, Icon, Badge, Pagination } from 'vant';
|
||||
import { Popup, Icon, Badge, Pagination, Field, Picker, Search } from 'vant';
|
||||
// import VueQuillEditor from "vue-quill-editor";
|
||||
// import "quill/dist/quill.core.css"; // import styles
|
||||
// import "quill/dist/quill.snow.css"; // for snow theme
|
||||
@ -21,6 +21,9 @@ export function createApp() {
|
||||
app.use(Icon);
|
||||
app.use(Badge);
|
||||
app.use(Pagination);
|
||||
app.use(Field);
|
||||
app.use(Picker);
|
||||
app.use(Search);
|
||||
|
||||
return {
|
||||
app
|
||||
|
||||
@ -41,8 +41,9 @@
|
||||
"style": {
|
||||
"enablePullDownRefresh": true,
|
||||
"navigationBarTitleText": "发起流程",
|
||||
"navigationStyle": "custom"
|
||||
// "backgroundColor": "#623FDC"
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarHidden": false,
|
||||
"backgroundColor": "#623FDC"
|
||||
}
|
||||
}, {
|
||||
"path": "pages/contacts/contacts",
|
||||
@ -75,7 +76,7 @@
|
||||
"path": "pages/submit/InitiateProcess",
|
||||
"style": {
|
||||
"navigationBarTitleText": "提交审批",
|
||||
// "navigationStyle": "custom",
|
||||
"navigationStyle": "custom",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
<template>
|
||||
<view class="nav_main">
|
||||
<view class="fixedheader">
|
||||
<headers :showBack="true" :themeType="'white'">
|
||||
<view class="headerName">
|
||||
提交审批
|
||||
</view>
|
||||
</headers>
|
||||
</view>
|
||||
<view class="nav-type">
|
||||
<uni-segmented-control :current="current" :values="['流程表单', '流程步骤']" @clickItem="switchItem"
|
||||
styleType="text" activeColor="#4C87F3"></uni-segmented-control>
|
||||
@ -30,6 +37,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import headers from "@/components/headers/headers.vue";
|
||||
import FormRender from '@/components/FormRender.vue'
|
||||
import ProcessRender from './ProcessRender.vue'
|
||||
import {
|
||||
@ -76,9 +84,9 @@
|
||||
const contentHeight = computed(() => {
|
||||
const h = uni.getSystemInfoSync().windowHeight
|
||||
if(window.plus) {
|
||||
return h - uni.upx2px(88) - uni.upx2px(44) - uni.upx2px(130);
|
||||
return h - uni.upx2px(88) - uni.upx2px(88) - uni.upx2px(130);
|
||||
}
|
||||
return h - uni.upx2px(88) - uni.upx2px(130);
|
||||
return h - uni.upx2px(88) - uni.upx2px(44) - uni.upx2px(130);
|
||||
})
|
||||
|
||||
onLoad((v) => {
|
||||
@ -192,6 +200,9 @@
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.fixedheader {
|
||||
background-color: #4C87F3;
|
||||
}
|
||||
.nav_main {
|
||||
// height: calc(100% - 88rpx - 44rpx - env(safe-area-inset-top));
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -3,8 +3,9 @@
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<title>View</title>
|
||||
<link rel="icon" href="data:,">
|
||||
<link rel="stylesheet" href="app.css" />
|
||||
<script>var __uniConfig = {"globalStyle":{},"darkmode":false}</script>
|
||||
<script>var __uniConfig = {"globalStyle":{"rpxCalcMaxDeviceWidth":768,"rpxCalcBaseDeviceWidth":375},"darkmode":false}</script>
|
||||
<script>
|
||||
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
|
||||
CSS.supports('top: constant(a)'))
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
|
||||
;(function(){
|
||||
let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
|
||||
const __uniConfig = {"pages":[],"globalStyle":{"animationType":"slide-in-right","titleView":false,"statusbar":{"immersed":false},"navigationBar":{"backgroundColor":"#4478F7","type":"default","titleColor":"#ffffff"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"wflow-pro工作流","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.24","entryPagePath":"pages/login/login","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"fallbackLocale":"zh-Hans","locales":{},"darkmode":false,"themeConfig":{}};
|
||||
const __uniRoutes = [{"path":"pages/login/login","meta":{"isQuit":true,"isEntry":true,"backgroundColor":"#623FDC","titleView":false,"navigationBar":{"titleText":"","style":"custom","type":"default"},"isNVue":false}},{"path":"components/form/sub/ProcessSelect","meta":{"enablePullDownRefresh":true,"backgroundColor":"#623FDC","navigationBar":{"titleText":"选择流程","type":"default"},"isNVue":false}},{"path":"pages/workspace/workspace","meta":{"enablePullDownRefresh":true,"backgroundColor":"#623FDC","navigationBarHidden":false,"navigationBar":{"titleText":"工作区","type":"default"},"isNVue":false}},{"path":"pages/submit/submit","meta":{"enablePullDownRefresh":true,"backgroundColor":"#623FDC","navigationBar":{"titleText":"发起流程","type":"default"},"isNVue":false}},{"path":"pages/contacts/contacts","meta":{"enablePullDownRefresh":true,"backgroundColor":"#623FDC","navigationBar":{"titleText":"通讯录","type":"default"},"isNVue":false}},{"path":"pages/my/my","meta":{"backgroundColor":"#623FDC","titleView":false,"navigationBar":{"titleText":"我的","type":"default"},"isNVue":false}},{"path":"pages/instance/instancePreview","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"流程详情","type":"default"},"isNVue":false}},{"path":"pages/submit/InitiateProcess","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"提交审批","type":"default"},"isNVue":false}},{"path":"pages/my/UserAgent","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"用户代理人设置","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
|
||||
const __uniConfig = {"pages":[],"globalStyle":{"animationType":"slide-in-right","rpxCalcMaxDeviceWidth":768,"rpxCalcBaseDeviceWidth":375,"rpxCalcIncludeWidth":750,"titleView":false,"statusbar":{"immersed":false},"navigationBar":{"backgroundColor":"#4478F7","type":"default","titleColor":"#ffffff"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"wflow-pro工作流","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.57","entryPagePath":"pages/login/login","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"fallbackLocale":"zh-Hans","locales":{},"darkmode":false,"themeConfig":{}};
|
||||
const __uniRoutes = [{"path":"pages/login/login","meta":{"isQuit":true,"isEntry":true,"backgroundColor":"#623FDC","titleView":false,"navigationBar":{"titleText":"","style":"custom","type":"default"},"isNVue":false}},{"path":"components/form/sub/ProcessSelect","meta":{"enablePullDownRefresh":true,"backgroundColor":"#623FDC","navigationBar":{"titleText":"选择流程","type":"default"},"isNVue":false}},{"path":"pages/workspace/workspace","meta":{"enablePullDownRefresh":true,"backgroundColor":"#623FDC","navigationBarHidden":false,"navigationBar":{"titleText":"工作区","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/submit/submit","meta":{"enablePullDownRefresh":true,"navigationBarHidden":false,"backgroundColor":"#623FDC","navigationBar":{"titleText":"发起流程","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/contacts/contacts","meta":{"enablePullDownRefresh":true,"backgroundColor":"#623FDC","navigationBar":{"titleText":"通讯录","type":"default"},"isNVue":false}},{"path":"pages/my/my","meta":{"backgroundColor":"#623FDC","titleView":false,"navigationBar":{"titleText":"我的","type":"default"},"isNVue":false}},{"path":"pages/instance/instancePreview","meta":{"backgroundColor":"#623FDC","navigationBarHidden":false,"navigationBar":{"titleText":"流程详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/submit/InitiateProcess","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"提交审批","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/my/UserAgent","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"用户代理人设置","type":"default"},"isNVue":false}},{"path":"pages/workspace/UnFinished","meta":{"navigationBar":{"titleText":"","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
|
||||
__uniConfig.styles=[];//styles
|
||||
__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
|
||||
__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
|
||||
|
||||
148
unpackage/dist/build/app-plus/app-service.js
vendored
148
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
4
unpackage/dist/build/app-plus/app.css
vendored
4
unpackage/dist/build/app-plus/app.css
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
11
unpackage/dist/build/app-plus/manifest.json
vendored
11
unpackage/dist/build/app-plus/manifest.json
vendored
@ -139,7 +139,7 @@
|
||||
"uni-app": {
|
||||
"control": "uni-v3",
|
||||
"vueVersion": "3",
|
||||
"compilerVersion": "4.24",
|
||||
"compilerVersion": "4.57",
|
||||
"nvueCompiler": "uni-app",
|
||||
"renderer": "auto",
|
||||
"nvue": {
|
||||
@ -151,6 +151,15 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"app-harmony": {
|
||||
"useragent": {
|
||||
"value": "uni-app",
|
||||
"concatenate": true
|
||||
},
|
||||
"uniStatistics": {
|
||||
"enable": false
|
||||
}
|
||||
},
|
||||
"locale": "auto",
|
||||
"launch_path": "__uniappview.html"
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,13 +1,13 @@
|
||||
@font-face {
|
||||
font-family: "iconfont"; /* Project id 3538338 */
|
||||
src: url('iconfont.woff2?t=1663221768308') format('woff2'),
|
||||
url('iconfont.woff?t=1663221768308') format('woff'),
|
||||
url('iconfont.ttf?t=1663221768308') format('truetype');
|
||||
font-family: "iconfont";
|
||||
/* Project id 3538338 */
|
||||
src: url('iconfont.woff2?t=1663221768308') format('woff2'), url('iconfont.woff?t=1663221768308') format('woff'), url('iconfont.ttf?t=1663221768308') format('truetype');
|
||||
}
|
||||
|
||||
[class^="iconfont"],[class*="iconfont"]{
|
||||
[class^="iconfont"],
|
||||
[class*="iconfont"] {
|
||||
font-family: "iconfont" !important;
|
||||
font-size: 16px;
|
||||
font-size: 32rpx;
|
||||
font-style: normal;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
@ -328,4 +328,3 @@
|
||||
.icon-a-11Cfenzuzuzhishu:before {
|
||||
content: "\e676";
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user