admin/mobile-workflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flx:修复工作流返回到主页面问题

Browse Source
This commit is contained in:
Rain_ 2025-04-10 14:03:19 +08:00
parent 6334678224
commit 7cdec9c568
23 changed files with 328 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/request.js
View File

@ -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

11
components/form/SelectPlus.vue
View File

@ -209,10 +209,14 @@
// // (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)
}
setTimeout(() => {
isSearch.value = true;
}, 500)
}
const pagechange = (val) => {
@ -359,6 +363,7 @@
}
return []
}
</script>
<style scoped>
.search {

34
components/headers/headers.vue
View File

@ -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
View File

@ -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

7
pages.json
View File

@ -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
}

15
pages/submit/InitiateProcess.vue
View File

@ -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));
}

2
unpackage/dist/build/app-plus/__uniappquillimageresize.js vendored
View File

File diff suppressed because one or more lines are too long

3
unpackage/dist/build/app-plus/__uniappview.html vendored
View File

@ -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)'))

4
unpackage/dist/build/app-plus/app-config-service.js vendored
View File

@ -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
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/build/app-plus/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/components/form/sub/ProcessSelect.css vendored
View File

File diff suppressed because one or more lines are too long

11
unpackage/dist/build/app-plus/manifest.json vendored
View File

@ -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"
}

2
unpackage/dist/build/app-plus/pages/contacts/contacts.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pages/instance/instancePreview.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pages/login/login.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pages/my/UserAgent.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pages/my/my.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pages/submit/InitiateProcess.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pages/submit/submit.css vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/pages/workspace/workspace.css vendored
View File

File diff suppressed because one or more lines are too long

179
unpackage/dist/build/app-plus/static/iconfont/iconfont.css vendored
View File

@ -1,331 +1,330 @@
@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"]{
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
[class^="iconfont"],
[class*="iconfont"] {
font-family: "iconfont" !important;
font-size: 32rpx;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-mn_xiuxi:before {
content: "\e60a";
content: "\e60a";
}
.icon-cooperation-full:before {
content: "\e85d";
content: "\e85d";
}
.icon-yanfa:before {
content: "\e8e9";
content: "\e8e9";
}
.icon-yanfaguanli-yangpinjianyan:before {
content: "\e63f";
content: "\e63f";
}
.icon-tsm_0108:before {
content: "\e621";
content: "\e621";
}
.icon-dengdaishenhe:before {
content: "\e61f";
content: "\e61f";
}
.icon-dengdaizhongbeifen:before {
content: "\e60f";
content: "\e60f";
}
.icon-zhuanyi:before {
content: "\e686";
content: "\e686";
}
.icon-quxiao:before {
content: "\e67a";
content: "\e67a";
}
.icon-yitongguo:before {
content: "\e601";
content: "\e601";
}
.icon-yijujue:before {
content: "\e602";
content: "\e602";
}
.icon-yiquxiao:before {
content: "\e608";
content: "\e608";
}
.icon-yichexiao:before {
content: "\e609";
content: "\e609";
}
.icon-fanhui-chehui-06:before {
content: "\e81d";
content: "\e81d";
}
.icon-zhuanyi-16:before {
content: "\e870";
content: "\e870";
}
.icon-iconfontdianzishu:before {
content: "\e605";
content: "\e605";
}
.icon-iconfontchuzu:before {
content: "\e624";
content: "\e624";
}
.icon-iconfontzhitongche:before {
content: "\e625";
content: "\e625";
}
.icon-iconfontgongjiao:before {
content: "\e626";
content: "\e626";
}
.icon-iconfonttehuijingxuan:before {
content: "\e631";
content: "\e631";
}
.icon-iconfontwifi1:before {
content: "\e632";
content: "\e632";
}
.icon-iconfonterweima:before {
content: "\e60e";
content: "\e60e";
}
.icon-iconfontunie64e:before {
content: "\e617";
content: "\e617";
}
.icon-iconfonticon3:before {
content: "\e61d";
content: "\e61d";
}
.icon-iconfonticonfontsetting:before {
content: "\e735";
content: "\e735";
}
.icon-iconfontbucket:before {
content: "\e618";
content: "\e618";
}
.icon-iconfontyoujian:before {
content: "\e645";
content: "\e645";
}
.icon-iconfontkafei:before {
content: "\e61e";
content: "\e61e";
}
.icon-iconfontihou:before {
content: "\e630";
content: "\e630";
}
.icon-iconfontgift:before {
content: "\e604";
content: "\e604";
}
.icon-iconfontdianying:before {
content: "\e606";
content: "\e606";
}
.icon-iconfontrenmentuijian:before {
content: "\e633";
content: "\e633";
}
.icon-iconfont3:before {
content: "\e607";
content: "\e607";
}
.icon-xiaoxi:before {
content: "\e62b";
content: "\e62b";
}
.icon-fangzi:before {
content: "\e646";
content: "\e646";
}
.icon-BBDanquan:before {
content: "\e656";
content: "\e656";
}
.icon-iconfont-jiaoyi:before {
content: "\e68d";
content: "\e68d";
}
.icon-iconfonticon-dianyu:before {
content: "\e635";
content: "\e635";
}
.icon-iconfonticon-gaojin:before {
content: "\e638";
content: "\e638";
}
.icon-iconfonticon-nengha:before {
content: "\e63c";
content: "\e63c";
}
.icon-iconfonticon-xitong:before {
content: "\e641";
content: "\e641";
}
.icon-iconfontkefu:before {
content: "\e61c";
content: "\e61c";
}
.icon-mima:before {
content: "\e648";
content: "\e648";
}
.icon-renlishebao:before {
content: "\e636";
content: "\e636";
}
.icon-bumen:before {
content: "\e758";
content: "\e758";
}
.icon-charutupian:before {
content: "\ec7f";
content: "\ec7f";
}
.icon-kaoqinguanli:before {
content: "\e610";
content: "\e610";
}
.icon-shenfenzheng:before {
content: "\e614";
content: "\e614";
}
.icon-weizhi:before {
content: "\e64b";
content: "\e64b";
}
.icon-24gf-phoneBubble:before {
content: "\e966";
content: "\e966";
}
.icon-kaoqin:before {
content: "\e643";
content: "\e643";
}
.icon-huiyi:before {
content: "\e61b";
content: "\e61b";
}
.icon-jiaban:before {
content: "\e637";
content: "\e637";
}
.icon-biaoge:before {
content: "\e665";
content: "\e665";
}
.icon-shiyongwendang:before {
content: "\eb66";
content: "\eb66";
}
.icon-duoxuankuang:before {
content: "\e62e";
content: "\e62e";
}
.icon-danxuan:before {
content: "\e751";
content: "\e751";
}
.icon-chuzu:before {
content: "\e600";
content: "\e600";
}
.icon-zhaopin:before {
content: "\e647";
content: "\e647";
}
.icon-caiwu:before {
content: "\e67d";
content: "\e67d";
}
.icon-caigou:before {
content: "\e887";
content: "\e887";
}
.icon-zhufangbutie:before {
content: "\e68e";
content: "\e68e";
}
.icon-wodechanpin:before {
content: "\e679";
content: "\e679";
}
.icon-fapiaoguanli:before {
content: "\e63b";
content: "\e63b";
}
.icon-gongzi:before {
content: "\e7e9";
content: "\e7e9";
}
.icon-zhufangbutiezhanghu:before {
content: "\e60c";
content: "\e60c";
}
.icon-weixiu:before {
content: "\e613";
content: "\e613";
}
.icon-yuangonglizhi:before {
content: "\e615";
content: "\e615";
}
.icon-zhaopinguanli:before {
content: "\e616";
content: "\e616";
}
.icon-caiwu1:before {
content: "\e603";
content: "\e603";
}
.icon-qingjiashenqing:before {
content: "\e60d";
content: "\e60d";
}
.icon-ziyuan207:before {
content: "\e722";
content: "\e722";
}
.icon-yongcanjiucan:before {
content: "\e67e";
content: "\e67e";
}
.icon-map-site:before {
content: "\ea00";
content: "\ea00";
}
.icon-hetong:before {
content: "\e68a";
content: "\e68a";
}
.icon-buka:before {
content: "\e6ca";
content: "\e6ca";
}
.icon-chucha:before {
content: "\e6c7";
content: "\e6c7";
}
.icon-baoxiaoshenqing-feiyongbaoxiaoshenqing-02:before {
content: "\e726";
content: "\e726";
}
.icon-a-11Cfenzuzuzhishu:before {
content: "\e676";
content: "\e676";
}

6
unpackage/dist/build/app-plus/uni-app-view.umd.js vendored
View File

File diff suppressed because one or more lines are too long