diff --git a/jnpf-app/components/visualPortal/components/index.vue b/jnpf-app/components/visualPortal/components/index.vue
index 551d9249..76a523a3 100644
--- a/jnpf-app/components/visualPortal/components/index.vue
+++ b/jnpf-app/components/visualPortal/components/index.vue
@@ -1,192 +1,128 @@
 <template>
-	<view class="">
-		<!-- 卡片 -->
-		<block v-if="item.show && item.jnpfKey === 'card'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<view class="card-inner u-p-l-8 u-p-r-8 u-p-t-8">
-							<Item v-for="(child, index) in item.children" :item="child" :key="index" />
+	<view class="u-page u-page-home">
+			<view class="sty-statistics-top-b">
+				<u-row gutter="16">
+					<u-col span="12" text-align="center">
+						<view class="sty-statistics-top-item">
+							<view><span>济钢城市矿产再生资源智慧管家平台</span></view>
 						</view>
-					</template>
-				</HCard>
+					</u-col>
+				</u-row>
 			</view>
-		</block>
-		<!-- 排行榜 -->
-		<block v-if="item.show && item.jnpfKey === 'rankList'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HRankList :config="item"></HRankList>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 文本 -->
-		<block v-if="item.show && item.jnpfKey === 'text'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HText :config="item"></HText>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 图片 -->
-		<block v-if="item.show && item.jnpfKey === 'image'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HImage :config="item"></HImage>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 轮播图 -->
-		<block v-if="item.show && item.jnpfKey === 'carousel'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HCarousel :config="item"></HCarousel>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 视频 -->
-		<block v-if="item.show && item.jnpfKey === 'video'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HVideo :config="item"></HVideo>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 图表 -->
-		<block v-if="item.show && (item.jnpfKey === 'barChart' || item.jnpfKey === 'lineChart' || item.jnpfKey === 'pieChart'||
-			item.jnpfKey=='radarChart' || item.jnpfKey === 'mapChart')">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HCharts :config="item" :key="key">
-						</HCharts>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 我的待办 -->
-		<block v-if="item.show && item.jnpfKey === 'todo'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HTodo :config="item" :key="key">
-						</HTodo>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 常用功能 -->
-		<block v-if="item.show && item.jnpfKey === 'dataBoard'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HDataBoard :config="item" :key="key">
-						</HDataBoard>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 数据面板 -->
-		<block v-if="item.show && item.jnpfKey === 'commonFunc'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HCommonFunc :config="item" :key="key">
-						</HCommonFunc>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 时间轴 -->
-		<block v-if="item.show && item.jnpfKey === 'timeAxis'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HTimeAxis :config="item"></HTimeAxis>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 表格 -->
-		<block v-if="item.show && item.jnpfKey === 'tableList'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HTable :config="item">
-						</HTable>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 日程 -->
-		<block v-if="item.show && item.jnpfKey === 'schedule'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HSchedule :config="item" />
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 待办事项 -->
-		<block v-if="item.show && item.jnpfKey === 'todoList'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HTodoList :config="item">
-						</HTodoList>
-					</template>
-				</HCard>
-			</view>
-		</block>
-		<!-- 未读邮件 -->
-		<block v-if="item.show && item.jnpfKey === 'email'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HEmail :config="item">
-						</HEmail>
-					</template>
-				</HCard>
+			<view class="sty-statistics-top">
+				<u-row gutter="16">
+					<u-col span="4" text-align="center" class="line-right">
+						<view class="sty-statistics-top-item">
+							<view><span class="fsizeA"></span></view>
+							<view><span class="fsizeA">磅单采购数</span></view>
+						</view>
+					</u-col>
+					<u-col span="4" text-align="center" class="line-right">
+						<view class="sty-statistics-top-item">
+							<view><span class="fsizeA"></span></view>
+							<view><span class="fsizeA">今日采购量</span></view>
+						</view>
+					</u-col>
+					<u-col span="4" text-align="center">
+						<view class="sty-statistics-top-item">
+							<view><span class="fsizeA"></span></view>
+							<view><span class="fsizeA">今日销售量</span></view>
+						</view>
+					</u-col>
+				</u-row>
 			</view>
-		</block>
-		<!-- 公告通知 -->
-		<block v-if="item.show && item.jnpfKey === 'notice'">
-			<view class="u-m-b-20">
-				<HCard :cardData="item">
-					<template slot='content'>
-						<HNotice :config="item">
-						</HNotice>
-					</template>
-				</HCard>
+			<view class="sty-msg">
+				<u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list">
+				</u-notice-bar>
 			</view>
-		</block>
-		<!-- 标签 -->
-		<block v-if="item.show && item.jnpfKey === 'tab'">
-			<view class="u-m-b-20" style="background-color: #ffffff;">
-				<u-tabs :list="item.children" name="title" :is-scroll="item.children.length>3?true:false"
-					:current="tabCurrent" @change="onTabChange" :show-bar="item.type?false:true" :class="tabsClass"
-					:inactive-color="item.type==='border-card'?' #9ea1a6':'#303133'"
-					:active-item-style='activeItemStyle' :bg-color="item.type==='border-card'?'#f5f7fa':'#fff'">
-				</u-tabs>
-				<view v-for="(item,i) in item.children" :key='i' class="tab-inner u-p-l-8 u-p-r-8 u-p-b-8 u-p-t-8">
-					<view v-show="i == tabCurrent">
-						<Item v-for="(child, index) in item.children" :item="child" :key="key" />
-					</view>
-				</view>
+			<view class="sty-statistics">
+				<u-row gutter="22" justify="space-between">
+					<u-col span="12" gutter="0">
+						<u-row gutter="22" justify="space-between">
+							<u-col span="6">
+								<view class="sty-item sty-item-a">
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												<u-icon name="red-packet" color="#ffffff" size="80"></u-icon>
+											</view>
+										</u-col>
+									</u-row>
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												待支付:元
+											</view>
+										</u-col>
+									</u-row>
+								</view>
+							</u-col>
+							<u-col span="6">
+								<view class="sty-item sty-item-b">
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												<u-icon name="car" color="#ffffff" size="80"></u-icon>
+											</view>
+										</u-col>
+									</u-row>
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												今日付款:元
+											</view>
+										</u-col>
+									</u-row>
+								</view>
+							</u-col>
+						</u-row>
+					</u-col>
+				</u-row>
+				<u-row gutter="22" justify="space-between">
+					<u-col span="12" gutter="0">
+						<u-row gutter="22" justify="space-between">
+							<u-col span="6">
+								<view class="sty-item sty-item-c">
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
+											</view>
+										</u-col>
+									</u-row>
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												待回款:元
+											</view>
+										</u-col>
+									</u-row>
+								</view>
+							</u-col>
+							<u-col span="6">
+								<view class="sty-item sty-item-d">
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												<u-icon name="home" color="#ffffff" size="80"></u-icon>
+											</view>
+										</u-col>
+									</u-row>
+									<u-row>
+										<u-col span="12" text-align="center">
+											<view>
+												今日回款:元
+											</view>
+										</u-col>
+									</u-row>
+								</view>
+							</u-col>
+						</u-row>
+					</u-col>
+				</u-row>
 			</view>
-		</block>
-	</view>
+		</view>
+
 </template>
 <script>
 	import Item from './index'
@@ -273,4 +209,122 @@
 </script>
 
 <style lang="scss">
-</style>
\ No newline at end of file
+	@import "@/static/iconfont.css";
+
+	.u-page {
+		.fsizeA {
+			font-size: 18px;
+		}
+
+		a {
+			text-decoration: none
+		}
+	}
+
+	.page-home {}
+
+	.sty-statistics-top {
+		// background-color: #2DA9FA;
+		background-color: #66B3FF;
+		padding: 0px;
+		//padding: 5px 0px 15px 0px;
+		color: #ffffff;
+
+		.sty-statistics-top-item {
+			padding: 5px 0px;
+		}
+
+		.line-right {
+			border-right: solid 1px #ffffff;
+		}
+	}
+	.sty-statistics-top-b {
+		background-color: #97CBFF;
+		padding: 0px;
+		//padding: 5px 0px 15px 0px;
+		color: #ffffff;
+
+		.sty-statistics-top-item {
+			padding: 5px 0px;
+		}
+
+		.line-right {
+			border-right: solid 1px #ffffff;
+		}
+	}
+
+	.sty-statistics {
+		.sty-item {
+			margin-top: 11px;
+			padding: 8px 0px;
+			color: #ffffff;
+			border-radius: 10px;
+		}
+
+		.sty-item-a {
+			background-color: #81CBFC;
+		}
+
+		.sty-item-b {
+			background-color: #1EC695;
+		}
+
+		.sty-item-c {
+			background-color: #FF9800;
+		}
+
+		.sty-item-d {
+			background-color: #2DA9FA;
+		}
+	}
+
+	.sty-sch-box {
+		margin-top: 11px;
+	}
+
+	.sty-nav-list {
+		background-color: #f0f2f6;
+
+		.sty-navg-item {
+			background-color: #ffffff;
+			border-bottom: solid 3px #f0f2f6;
+			padding: 11px 0px 0px 0px;
+
+			.title {
+				font-size: 16px;
+				line-height: 16px;
+				font-weight: bold;
+			}
+
+			.item-list {
+				font-size: 12px;
+				display: flex;
+				align-content: flex-start;
+				flex-wrap: wrap;
+				margin-top: 11px;
+
+				.item {
+					width: 25%;
+					margin-bottom: 12px;
+				}
+			}
+		}
+	}
+
+	.item-icon {
+		width: 80px;
+		height: 80px;
+		line-height: 48px;
+		text-align: center;
+		border-radius: 5px;
+		padding: 5px;
+		color: #fff;
+		font-size: 30px;
+
+		&.more {
+			background: #ECECEC;
+			color: #666666;
+			font-size: 30px;
+		}
+	}
+</style>
diff --git a/jnpf-app/components/visualPortal/components/index1.vue b/jnpf-app/components/visualPortal/components/index1.vue
new file mode 100644
index 00000000..58409c34
--- /dev/null
+++ b/jnpf-app/components/visualPortal/components/index1.vue
@@ -0,0 +1,701 @@
+<template>
+	<view class="u-page u-page-home">
+		<view class="sty-statistics-top-b">
+			<u-row gutter="16">
+				<u-col span="12" text-align="center">
+					<view class="sty-statistics-top-item">
+						<view><span>济钢城市矿产再生资源智慧管家平台</span></view>
+					</view>
+				</u-col>
+			</u-row>
+		</view>
+		<view class="sty-statistics-top">
+			<u-row gutter="16">
+				<u-col span="4" text-align="center" class="line-right">
+					<view class="sty-statistics-top-item">
+						<view><span class="fsizeA">{{homeInfo.avgPurchasePrice}}</span></view>
+						<view><span class="fsizeA">磅单采购数</span></view>
+					</view>
+				</u-col>
+				<u-col span="4" text-align="center" class="line-right">
+					<view class="sty-statistics-top-item">
+						<view><span class="fsizeA">{{homeInfo.todayPurchasePrice}}</span></view>
+						<view><span class="fsizeA">今日采购量</span></view>
+					</view>
+				</u-col>
+				<u-col span="4" text-align="center">
+					<view class="sty-statistics-top-item">
+						<view><span class="fsizeA">{{homeInfo.salesVolumeToday}}</span></view>
+						<view><span class="fsizeA">今日销售量</span></view>
+					</view>
+				</u-col>
+			</u-row>
+		</view>
+		<view class="sty-msg">
+			<u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list">
+			</u-notice-bar>
+		</view>
+		<view class="sty-statistics">
+			<u-row gutter="22" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-row gutter="22" justify="space-between">
+						<u-col span="6">
+							<view class="sty-item sty-item-a">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="red-packet" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											待支付:{{homeInfo.unpaid}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="sty-item sty-item-b">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="car" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											今日付款:{{homeInfo.todayPay}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+					</u-row>
+				</u-col>
+			</u-row>
+			<u-row gutter="22" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-row gutter="22" justify="space-between">
+						<u-col span="6">
+							<view class="sty-item sty-item-c">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											待回款:{{homeInfo.moneyCollected}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="sty-item sty-item-d">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="home" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											今日回款:{{homeInfo.todayPayment}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+					</u-row>
+				</u-col>
+			</u-row>
+		</view>
+	</view>
+</template>
+
+<script>
+	var _ = require('lodash');
+	import request from '@/utils/request'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import IndexMixin from "./mixin.js";
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		getIMReply
+	} from "@/api/message.js";
+	import {
+		FlowLaunchList
+	} from '@/api/workFlow/flowLaunch'
+	import {
+		FlowBeforeList
+	} from '@/api/workFlow/flowBefore'
+
+	import {
+		versionUpgrade
+	} from '@/api/common.js'
+	import {
+		getAppVersion
+	} from '@/components/updataApp.js'
+
+	export default {
+		mixins: [MescrollMixin, IndexMixin],
+		data() {
+			return {
+				todayInfo: {
+					"purchasingGuidePrice": 2700,
+					"purchaseVolumeToday": 2800,
+					"salesVolumeToday": 2900,
+				},
+				homeInfo: {},
+				list: [],
+				listInfo: [],
+				upOption: {
+					use: false,
+				},
+				msgCountAll: 0,
+				btnGroupListO: [],
+				btnGroupList: [],
+				mapIcon: {
+					"jgdatamanagement": {
+						'text': '贸易',
+						'type': 'icon-maoyi',
+						'color': '#FFCC33',
+					},
+					"jgdatamanagementexamine": {
+						'text': '磅单审核',
+						'type': 'icon-jiesuan',
+						'color': '#66CCFF',
+					},
+					"jgpoundlist": {
+						'text': '磅单列表',
+						'type': 'icon-bangdan',
+						'color': '#0000CC',
+					},
+					"jgpurchaseorder": {
+						'text': '采购订单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgpurchasereturn": {
+						'text': '采购退货',
+						'type': 'icon-caigoutuihuo',
+						'color': '#66CCFF',
+					},
+					"jgsaleorder": {
+						'text': '销售订单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgsaleback": {
+						'text': '销售退货',
+						'type': 'icon-caigoutuihuo',
+						'color': '#66CCFF',
+					},
+					"jgpaymentrequest": {
+						'text': '付款申请单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgpayment": {
+						'text': '付款单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgcollection": {
+						'text': '收款单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgsupplyprocessanalysis": {
+						'text': '供应进程分析',
+						'type': 'icon-jindu',
+						'color': '#FFCC33',
+					},
+					"jgcustomerprofit": {
+						'text': '客户利润统计',
+						'type': 'icon-lirunfenxi',
+						'color': '#66CCFF',
+					},
+					"jgcustomer": {
+						'text': '客户档案',
+						'type': 'icon-kehuda',
+						'color': '#33CC33',
+					},
+					"jgsupplier": {
+						'text': '供应商档案',
+						'type': 'icon-gongyingshang',
+						'color': '#0000CC',
+					},
+					"jgmaterialarchive": {
+						'text': '物料档案',
+						'type': 'icon-wuliaoda',
+						'color': '#FF0033',
+					},
+					"jgvehicle": {
+						'text': '车辆档案',
+						'type': 'icon-huocheda',
+						'color': '#FFCC33',
+					},
+					"jgwarehousemanage": {
+						'text': '仓库管理',
+						'type': 'icon-cangku',
+						'color': '#FFCC33',
+					},
+					"jgareamanage": {
+						'text': '库区管理',
+						'type': 'icon-kuweiguanli',
+						'color': '#66CCFF',
+					},
+					"jgcontract": {
+						'text': '合同档案',
+						'type': 'icon-hetong',
+						'color': '#0000CC',
+					},
+					"jgnatural": {
+						'text': '业务员2',
+						'type': 'icon-renqun',
+						'color': '#FFCC33',
+					},
+					"jgproductionMonitoring": {
+						'text': '生产监控',
+						'type': 'icon-jiankong',
+						'color': '#FFCC33',
+					},
+				},
+			};
+		},
+		watch: {
+			badgeNum(val) {
+				this.setTabBarBadge();
+			},
+		},
+		computed: {
+			...mapGetters(["msgInfo"]),
+			baseURL() {
+				return this.define.baseURL;
+			},
+			report() {
+				return this.define.report;
+			},
+			token() {
+				return this.$store.getters.token;
+			},
+		},
+		onShow() {
+			console.log('2222')
+			this.getBtnGroupList()
+			// this.btnGroupList = this.btnGroupListO;
+			this.getHomeInfo()
+			this.getMsgList()
+			this.getMsgCount()
+		},
+		onLoad() {
+		console.log('1111')
+			let javaApk = 'http://221.214.32.166:8000/api/file/Image/annex/scApp.apk';
+			versionUpgrade().then(res => {
+				let resVersion = res.data.appVersion;
+				let forceUpdates = res.data.forceUpdates;
+				let updatesDescription = res.data.updatesDescription;
+				resVersion = Number(resVersion.replace(/[^0-9]/ig, ""));
+				getAppVersion(true, resVersion, javaApk, forceUpdates, updatesDescription)
+			})
+
+			this.$store.dispatch('user/getCurrentUser');
+		},
+		onUnload() {
+			uni.$off("updateList");
+			uni.$off("updateMsgNum");
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index == 0) {
+				uni.scanCode({
+					success: (res) => {
+						if (this.isJSON(res.result)) {
+							const result = JSON.parse(res.result);
+							if (result.t === "ADP") {
+								uni.navigateTo({
+									url: "/pages/apply/dynamicModel/index?isPreview=1&id=" + result.id,
+									fail: (err) => {
+										this.$u.toast("暂无此页面");
+									},
+								});
+							}
+							if (result.t === "DFD") {
+								let config = JSON.stringify(result);
+								uni.navigateTo({
+									url: "/pages/apply/dynamicModel/scanForm?config=" + config,
+									fail: (err) => {
+										this.$u.toast("暂无此页面");
+									},
+								});
+							}
+							if (result.t === "report") {
+								let url =
+									`${this.report}/preview.html?id=${result.id}&token=${this.token}&page=1&from=menu`;
+								uni.navigateTo({
+									url: "/pages/apply/externalLink/index?url=" +
+										encodeURIComponent(url),
+									fail: (err) => {
+										this.$u.toast("暂无");
+									},
+								});
+							}
+						} else {
+							uni.navigateTo({
+								url: "/pages/my/scanResult/index?result=" + res.result,
+								fail: (err) => {
+									this.$u.toast("暂无此页面");
+								},
+							});
+						}
+					},
+				});
+			}
+		},
+		methods: {
+			getBtnGroupList() {
+				request({
+					url: '/api/oauth/CurrentUser?type=app',
+					method: 'get'
+				}).then(res => {
+
+					let _menuList = res.data.menuList;
+					_menuList = _.map(_menuList, (o1) => {
+						o1.children = _.map(o1.children, (o2) => {
+							if (_.has(this.mapIcon, o2.enCode)) {
+								o2.iconCus = this.mapIcon[o2.enCode];
+							} else {
+								o2.iconCus = null;
+							}
+							return o2;
+						})
+						return o1;
+					})
+					this.btnGroupListO = _menuList;
+					this.btnGroupList = this.btnGroupListO;
+				}).catch(() => {})
+			},
+			getHomeInfo() {
+				request({
+					url: '/api/messageCenter/MessageCenter/getHomePage',
+					method: 'get'
+				}).then(res => {
+					let _info = res.data[0];
+					this.homeInfo = _info;
+				}).catch(() => {})
+			},
+			getMsgList() {
+				const query = {
+					currentPage: 1,
+					pageSize: 20,
+					menuId: '',
+				}
+				request({
+					url: '/api/messageCenter/MessageCenter/getMobileList',
+					method: 'post',
+					data: query,
+				}).then(res => {
+					let _list = this.dataList(res.data);
+					let _listA = _.map(_list, (o1) => {
+						return o1.head;
+					})
+					this.list = _listA;
+					this.listInfo = _list;
+					this.mescroll.endSuccess(_list.length);
+				}).catch(() => {})
+			},
+			goMsg(idx) {
+				let _info = this.listInfo[idx];
+				let query = {
+					id: [_info.id]
+				};
+				request({
+					url: '/api/messageCenter/MessageCenter/isRead',
+					method: 'post',
+					data: query,
+				}).then(res => {
+					uni.navigateTo({
+						url: _info.skipUrl
+					})
+				}).catch(() => {})
+			},
+			schNav(val) {
+				let listO = _.cloneDeep(this.btnGroupListO);
+				listO = _.map(listO, (o1) => {
+					o1.children = _.filter(o1.children, (o2) => {
+						return _.includes(o2.fullName, val);
+					})
+					return o1;
+				})
+				listO = _.filter(listO, (o1) => {
+					return o1.children.length > 0;
+				})
+				this.btnGroupList = listO;
+			},
+			isJSON(str) {
+				try {
+					var obj = JSON.parse(str);
+					if (typeof obj == "object" && obj) {
+						return true;
+					} else {
+						return false;
+					}
+				} catch (e) {
+					return false;
+				}
+			},
+			downCallback(page) {
+				getIMReply()
+					.then((res) => {
+						this.list = res.data.list || [];
+						this.mescroll.endSuccess(res.data.list.length, false);
+						uni.hideLoading();
+					})
+					.catch(() => {
+						this.mescroll.endErr();
+					});
+			},
+			search() {
+				return;
+				this.searchTimer && clearTimeout(this.searchTimer);
+				this.searchTimer = setTimeout(() => {
+					this.list = [];
+					this.mescroll.resetUpScroll();
+				}, 300);
+			},
+			updateReply(data) {
+				let boo = false;
+				const len = this.list.length;
+				for (let i = 0; i < len; i++) {
+					if (data.id === this.list[i].id) {
+						this.list[i].unreadMessage += data.unreadMessage;
+						this.list[i].latestMessage = data.latestMessage;
+						this.list[i].messageType = data.messageType;
+						this.list[i].latestDate = data.latestDate;
+						boo = true;
+						break;
+					}
+				}
+				if (boo) return;
+				data.unreadMessage = data.unreadMessage;
+				this.list.unshift(data);
+			},
+			updateMsgNum(id) {
+				const len = this.list.length;
+				for (let i = 0; i < len; i++) {
+					if (id === this.list[i].id) {
+						const num = this.list[i].unreadMessage;
+						this.$store.commit("chat/REDUCE_BADGE_NUM", num);
+						this.list[i].unreadMessage = 0;
+						break;
+					}
+				}
+			},
+			getMsgText(text, type) {
+				let message = "";
+				switch (type) {
+					case "voice":
+						message = "[语音]";
+						break;
+					case "image":
+						message = "[图片]";
+						break;
+					default:
+						message = text;
+						break;
+				}
+				return message;
+			},
+			openPage(path) {
+				if (!path) return;
+				uni.navigateTo({
+					url: path,
+				});
+			},
+			toIm(item) {
+				const name = item.realName + "/" + item.account;
+				if (item.unreadMessage) {
+					this.$store.commit("chat/REDUCE_BADGE_NUM", item.unreadMessage);
+					item.unreadMessage = 0;
+				}
+				uni.navigateTo({
+					url: "/pages/message/im/index?name=" +
+						name +
+						"&formUserId=" +
+						item.id +
+						"&headIcon=" +
+						item.headIcon,
+				});
+			},
+			dataList(data) {
+				let _list = []
+				for (let i = 0; i < data.list.length; i++) {
+					let _data = data.list[i]
+					_list.push(_data)
+				}
+				return _list;
+			},
+			getMsgCount() {
+				let query = {
+					currentPage: 1,
+					pageSize: 1,
+					keyword: ""
+				}
+				this.msgCountAll = 0;
+				FlowBeforeList(1, query, {
+					load: true
+				}).then(res => {
+					this.msgCountAll = this.msgCountAll + res.data.pagination.total;
+					FlowBeforeList(3, query, {
+						load: true
+					}).then(res => {
+						this.msgCountAll = this.msgCountAll + res.data.pagination.total;
+						if (this.msgCountAll > 0) {
+							uni.setTabBarBadge({
+								index: 3,
+								text: "" + this.msgCountAll + ""
+							})
+						} else {
+							uni.removeTabBarBadge({
+								index: 3
+							})
+						}
+					})
+				})
+			},
+		},
+	};
+</script>
+
+<style lang="scss">
+	@import "@/static/iconfont.css";
+
+	.u-page {
+		.fsizeA {
+			font-size: 18px;
+		}
+
+		a {
+			text-decoration: none
+		}
+	}
+
+	.page-home {}
+
+	.sty-statistics-top {
+		// background-color: #2DA9FA;
+		background-color: #66B3FF;
+		padding: 0px;
+		//padding: 5px 0px 15px 0px;
+		color: #ffffff;
+
+		.sty-statistics-top-item {
+			padding: 5px 0px;
+		}
+
+		.line-right {
+			border-right: solid 1px #ffffff;
+		}
+	}
+	.sty-statistics-top-b {
+		background-color: #97CBFF;
+		padding: 0px;
+		//padding: 5px 0px 15px 0px;
+		color: #ffffff;
+
+		.sty-statistics-top-item {
+			padding: 5px 0px;
+		}
+
+		.line-right {
+			border-right: solid 1px #ffffff;
+		}
+	}
+
+	.sty-statistics {
+		.sty-item {
+			margin-top: 11px;
+			padding: 8px 0px;
+			color: #ffffff;
+			border-radius: 10px;
+		}
+
+		.sty-item-a {
+			background-color: #81CBFC;
+		}
+
+		.sty-item-b {
+			background-color: #1EC695;
+		}
+
+		.sty-item-c {
+			background-color: #FF9800;
+		}
+
+		.sty-item-d {
+			background-color: #2DA9FA;
+		}
+	}
+
+	.sty-sch-box {
+		margin-top: 11px;
+	}
+
+	.sty-nav-list {
+		background-color: #f0f2f6;
+
+		.sty-navg-item {
+			background-color: #ffffff;
+			border-bottom: solid 3px #f0f2f6;
+			padding: 11px 0px 0px 0px;
+
+			.title {
+				font-size: 16px;
+				line-height: 16px;
+				font-weight: bold;
+			}
+
+			.item-list {
+				font-size: 12px;
+				display: flex;
+				align-content: flex-start;
+				flex-wrap: wrap;
+				margin-top: 11px;
+
+				.item {
+					width: 25%;
+					margin-bottom: 12px;
+				}
+			}
+		}
+	}
+
+	.item-icon {
+		width: 80px;
+		height: 80px;
+		line-height: 48px;
+		text-align: center;
+		border-radius: 5px;
+		padding: 5px;
+		color: #fff;
+		font-size: 30px;
+
+		&.more {
+			background: #ECECEC;
+			color: #666666;
+			font-size: 30px;
+		}
+	}
+</style>
diff --git a/jnpf-app/components/visualPortal/components/index2.vue b/jnpf-app/components/visualPortal/components/index2.vue
new file mode 100644
index 00000000..d5f53327
--- /dev/null
+++ b/jnpf-app/components/visualPortal/components/index2.vue
@@ -0,0 +1,278 @@
+<template>
+	<view class="">
+		
+		
+		<!-- 卡片 -->
+	<!-- 	<block v-if="item.show && item.jnpfKey === 'card'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<view class="card-inner u-p-l-8 u-p-r-8 u-p-t-8">
+							<Item v-for="(child, index) in item.children" :item="child" :key="index" />
+						</view>
+					</template>
+				</HCard>
+			</view>
+		</block> -->
+		<!-- 排行榜 -->
+		<!-- <block v-if="item.show && item.jnpfKey === 'rankList'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HRankList :config="item"></HRankList>
+					</template>
+				</HCard>
+			</view>
+		</block> -->
+		<!-- 文本 -->
+		<block v-if="item.show && item.jnpfKey === 'text'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HText :config="item"></HText>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 图片 -->
+		<block v-if="item.show && item.jnpfKey === 'image'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HImage :config="item"></HImage>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 轮播图 -->
+		<!-- <block v-if="item.show && item.jnpfKey === 'carousel'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HCarousel :config="item"></HCarousel>
+					</template>
+				</HCard>
+			</view>
+		</block> -->
+		<!-- 视频 -->
+		<block v-if="item.show && item.jnpfKey === 'video'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HVideo :config="item"></HVideo>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 图表 -->
+		<!-- <block v-if="item.show && (item.jnpfKey === 'barChart' || item.jnpfKey === 'lineChart' || item.jnpfKey === 'pieChart'||
+			item.jnpfKey=='radarChart' || item.jnpfKey === 'mapChart')">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HCharts :config="item" :key="key">
+						</HCharts>
+					</template>
+				</HCard>
+			</view>
+		</block> -->
+		<!-- 我的待办 -->
+		<block v-if="item.show && item.jnpfKey === 'todo'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HTodo :config="item" :key="key">
+						</HTodo>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 常用功能 -->
+		<!-- <block v-if="item.show && item.jnpfKey === 'dataBoard'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HDataBoard :config="item" :key="key">
+						</HDataBoard>
+					</template>
+				</HCard>
+			</view>
+		</block> -->
+		<!-- 数据面板 -->
+		<!-- <block v-if="item.show && item.jnpfKey === 'commonFunc'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HCommonFunc :config="item" :key="key">
+						</HCommonFunc>
+					</template>
+				</HCard>
+			</view>
+		</block> -->
+		<!-- 时间轴 -->
+		<!-- <block v-if="item.show && item.jnpfKey === 'timeAxis'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HTimeAxis :config="item"></HTimeAxis>
+					</template>
+				</HCard>
+			</view>
+		</block> -->
+		<!-- 表格 -->
+		<block v-if="item.show && item.jnpfKey === 'tableList'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HTable :config="item">
+						</HTable>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 日程 -->
+		<block v-if="item.show && item.jnpfKey === 'schedule'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HSchedule :config="item" />
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 待办事项 -->
+		<block v-if="item.show && item.jnpfKey === 'todoList'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HTodoList :config="item">
+						</HTodoList>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 未读邮件 -->
+		<block v-if="item.show && item.jnpfKey === 'email'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HEmail :config="item">
+						</HEmail>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 公告通知 -->
+		<block v-if="item.show && item.jnpfKey === 'notice'">
+			<view class="u-m-b-20">
+				<HCard :cardData="item">
+					<template slot='content'>
+						<HNotice :config="item">
+						</HNotice>
+					</template>
+				</HCard>
+			</view>
+		</block>
+		<!-- 标签 -->
+		<block v-if="item.show && item.jnpfKey === 'tab'">
+			<view class="u-m-b-20" style="background-color: #ffffff;">
+				<u-tabs :list="item.children" name="title" :is-scroll="item.children.length>3?true:false"
+					:current="tabCurrent" @change="onTabChange" :show-bar="item.type?false:true" :class="tabsClass"
+					:inactive-color="item.type==='border-card'?' #9ea1a6':'#303133'"
+					:active-item-style='activeItemStyle' :bg-color="item.type==='border-card'?'#f5f7fa':'#fff'">
+				</u-tabs>
+				<view v-for="(item,i) in item.children" :key='i' class="tab-inner u-p-l-8 u-p-r-8 u-p-b-8 u-p-t-8">
+					<view v-show="i == tabCurrent">
+						<Item v-for="(child, index) in item.children" :item="child" :key="key" />
+					</view>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+<script>
+	import Item from './index'
+	import HCard from './HCard'
+	import HDataBoard from './HDataBoard'
+	import HTable from './HTable'
+	import HNotice from './HNotice'
+	import HEmail from './HEmail'
+	import HTodoList from './HTodoList'
+	import HCharts from './HCharts'
+	import HRankList from './HRankList'
+	import HSchedule from './HSchedule'
+	import HImage from './HImage'
+	import HCarousel from './HCarousel'
+	import HText from './HText'
+	import HVideo from './HVideo'
+	import HTodo from './HTodo'
+	import HCommonFunc from './HCommonFunc'
+	import HTimeAxis from './HTimeAxis'
+	export default {
+		name: 'Item',
+		props: {
+			item: {
+				type: Object,
+				default: () => ({})
+			}
+		},
+		components: {
+			Item,
+			HCard,
+			HDataBoard,
+			HTable,
+			HNotice,
+			HEmail,
+			HTodoList,
+			HCharts,
+			HRankList,
+			HSchedule,
+			HImage,
+			HCarousel,
+			HText,
+			HVideo,
+			HTodo,
+			HCommonFunc,
+			HTimeAxis
+		},
+		data() {
+			return {
+				cardData: {},
+				current: 0,
+				tabCurrent: 0,
+				key: +new Date(),
+				tabsClass: '',
+				activeItemStyle: {
+					'background-color': '#fff',
+				}
+			}
+		},
+		created() {
+			if (this.item.jnpfKey === 'tab') {
+				const list = this.item.children
+				for (var i = 0; i < list.length; i++) {
+					if (this.item.active == list[i].name) {
+						this.tabCurrent = i
+						break
+					}
+				}
+				if (this.item.type === "border-card" || this.item.type === "card") {
+					this.tabsClass = 'htabs'
+				}
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+			},
+			onTabChange(index) {
+				if (this.tabCurrent === index) return
+				this.tabCurrent = index;
+				this.key = +new Date()
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 8f6069c9..1befbdd1 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -1164,17 +1164,18 @@
 		"backgroundColor": "#ffffff",
 		"list": [
 			{
-				"pagePath": "pages/index/home",
-				"text": "首页",
-				"iconPath": "static/image/tabbar/home.png",
-				"selectedIconPath": "static/image/tabbar/homeHL.png"
-			},
-			/*{
 				"pagePath": "pages/index/portal",
 				"text": "首页",
 				"iconPath": "static/image/tabbar/home.png",
 				"selectedIconPath": "static/image/tabbar/homeHL.png"
-			},*/
+			},
+			{
+				"pagePath": "pages/index/home",
+				"text": "协同",
+				"iconPath": "static/image/tabbar/workFlow.png",
+				"selectedIconPath": "static/image/tabbar/workFlowHL.png"
+			},
+
 			// {
 			// 	"pagePath": "pages/index/workFlow",
 			// 	"text": "协同",
diff --git a/jnpf-app/pages/index/index1.vue b/jnpf-app/pages/index/index1.vue
new file mode 100644
index 00000000..83a3d142
--- /dev/null
+++ b/jnpf-app/pages/index/index1.vue
@@ -0,0 +1,741 @@
+<template>
+	<view class="u-page u-page-home">
+		<view class="sty-statistics-top-b">
+			<u-row gutter="16">
+				<u-col span="12" text-align="center">
+					<view class="sty-statistics-top-item">
+						<view><span>济钢城市矿产再生资源智慧管家平台</span></view>
+					</view>
+				</u-col>
+			</u-row>
+		</view>
+		<view class="sty-statistics-top">
+			<u-row gutter="16">
+				<u-col span="4" text-align="center" class="line-right">
+					<view class="sty-statistics-top-item">
+						<view><span class="fsizeA">{{homeInfo.avgPurchasePrice}}</span></view>
+						<view><span class="fsizeA">磅单采购数</span></view>
+					</view>
+				</u-col>
+				<u-col span="4" text-align="center" class="line-right">
+					<view class="sty-statistics-top-item">
+						<view><span class="fsizeA">{{homeInfo.todayPurchasePrice}}</span></view>
+						<view><span class="fsizeA">今日采购量</span></view>
+					</view>
+				</u-col>
+				<u-col span="4" text-align="center">
+					<view class="sty-statistics-top-item">
+						<view><span class="fsizeA">{{homeInfo.salesVolumeToday}}</span></view>
+						<view><span class="fsizeA">今日销售量</span></view>
+					</view>
+				</u-col>
+			</u-row>
+		</view>
+		<view class="sty-msg">
+			<u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list">
+			</u-notice-bar>
+		</view>
+		<view class="sty-statistics">
+			<u-row gutter="22" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-row gutter="22" justify="space-between">
+						<u-col span="6">
+							<view class="sty-item sty-item-a">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="red-packet" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											待支付:{{homeInfo.unpaid}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="sty-item sty-item-b">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="car" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											今日付款:{{homeInfo.todayPay}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+					</u-row>
+				</u-col>
+			</u-row>
+			<u-row gutter="22" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-row gutter="22" justify="space-between">
+						<u-col span="6">
+							<view class="sty-item sty-item-c">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											待回款:{{homeInfo.moneyCollected}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="sty-item sty-item-d">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="home" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											今日回款:{{homeInfo.todayPayment}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+					</u-row>
+				</u-col>
+			</u-row>
+		</view>
+		<view class="sty-sch-box">
+			<u-row gutter="44" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-search placeholder="搜索" @search="schNav" :show-action="false"></u-search>
+				</u-col>
+			</u-row>
+		</view>
+		<view class="sty-nav-list">
+			<u-row v-for="(item,index) in btnGroupList" :key="index" gutter="44" justify="space-between"
+				class="sty-navg-item">
+				<u-col span="12" gutter="0">
+					<view class="title">
+						<u-icon name="list" :label="item.fullName"></u-icon>
+					</view>
+					<view class="item-list">
+						<view class="item" v-for="(itemB,i) in item.children" :key="i">
+							<navigator :url="itemB.urlAddress+'?menuId='+itemB.id" hover-class="navigator-hover">
+								<u-row gutter="12">
+									<u-col span="12" text-align="center">
+										<template v-if="itemB.iconCus">
+											<uni-icons :color="itemB.iconCus.color" custom-prefix="iconfont"
+												:type="itemB.iconCus.type" size="36"></uni-icons>
+										</template>
+										<template v-else>
+											<text class="u-font-40 item-icon" :class="itemB.icon"
+												:style="{'background':itemB.iconBackground||'#008cff'}" />
+										</template>
+									</u-col>
+								</u-row>
+								<u-row gutter="5">
+									<u-col span="12" text-align="center">
+										<view class="grid-text">{{itemB.fullName}}</view>
+									</u-col>
+								</u-row>
+							</navigator>
+						</view>
+					</view>
+				</u-col>
+			</u-row>
+		</view>
+	</view>
+</template>
+
+<script>
+	var _ = require('lodash');
+	import request from '@/utils/request'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import IndexMixin from "./mixin.js";
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		getIMReply
+	} from "@/api/message.js";
+	import {
+		FlowLaunchList
+	} from '@/api/workFlow/flowLaunch'
+	import {
+		FlowBeforeList
+	} from '@/api/workFlow/flowBefore'
+
+	import {
+		versionUpgrade
+	} from '@/api/common.js'
+	import {
+		getAppVersion
+	} from '@/components/updataApp.js'
+
+	export default {
+		mixins: [MescrollMixin, IndexMixin],
+		data() {
+			return {
+				todayInfo: {
+					"purchasingGuidePrice": 2700,
+					"purchaseVolumeToday": 2800,
+					"salesVolumeToday": 2900,
+				},
+				homeInfo: {},
+				list: [],
+				listInfo: [],
+				upOption: {
+					use: false,
+				},
+				msgCountAll: 0,
+				btnGroupListO: [],
+				btnGroupList: [],
+				mapIcon: {
+					"jgdatamanagement": {
+						'text': '贸易',
+						'type': 'icon-maoyi',
+						'color': '#FFCC33',
+					},
+					"jgdatamanagementexamine": {
+						'text': '磅单审核',
+						'type': 'icon-jiesuan',
+						'color': '#66CCFF',
+					},
+					"jgpoundlist": {
+						'text': '磅单列表',
+						'type': 'icon-bangdan',
+						'color': '#0000CC',
+					},
+					"jgpurchaseorder": {
+						'text': '采购订单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgpurchasereturn": {
+						'text': '采购退货',
+						'type': 'icon-caigoutuihuo',
+						'color': '#66CCFF',
+					},
+					"jgsaleorder": {
+						'text': '销售订单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgsaleback": {
+						'text': '销售退货',
+						'type': 'icon-caigoutuihuo',
+						'color': '#66CCFF',
+					},
+					"jgpaymentrequest": {
+						'text': '付款申请单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgpayment": {
+						'text': '付款单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgcollection": {
+						'text': '收款单',
+						'type': 'icon-hetong',
+						'color': '#FFCC33',
+					},
+					"jgsupplyprocessanalysis": {
+						'text': '供应进程分析',
+						'type': 'icon-jindu',
+						'color': '#FFCC33',
+					},
+					"jgcustomerprofit": {
+						'text': '客户利润统计',
+						'type': 'icon-lirunfenxi',
+						'color': '#66CCFF',
+					},
+					"jgcustomer": {
+						'text': '客户档案',
+						'type': 'icon-kehuda',
+						'color': '#33CC33',
+					},
+					"jgsupplier": {
+						'text': '供应商档案',
+						'type': 'icon-gongyingshang',
+						'color': '#0000CC',
+					},
+					"jgmaterialarchive": {
+						'text': '物料档案',
+						'type': 'icon-wuliaoda',
+						'color': '#FF0033',
+					},
+					"jgvehicle": {
+						'text': '车辆档案',
+						'type': 'icon-huocheda',
+						'color': '#FFCC33',
+					},
+					"jgwarehousemanage": {
+						'text': '仓库管理',
+						'type': 'icon-cangku',
+						'color': '#FFCC33',
+					},
+					"jgareamanage": {
+						'text': '库区管理',
+						'type': 'icon-kuweiguanli',
+						'color': '#66CCFF',
+					},
+					"jgcontract": {
+						'text': '合同档案',
+						'type': 'icon-hetong',
+						'color': '#0000CC',
+					},
+					"jgnatural": {
+						'text': '业务员2',
+						'type': 'icon-renqun',
+						'color': '#FFCC33',
+					},
+					"jgproductionMonitoring": {
+						'text': '生产监控',
+						'type': 'icon-jiankong',
+						'color': '#FFCC33',
+					},
+				},
+			};
+		},
+		watch: {
+			badgeNum(val) {
+				this.setTabBarBadge();
+			},
+		},
+		computed: {
+			...mapGetters(["msgInfo"]),
+			baseURL() {
+				return this.define.baseURL;
+			},
+			report() {
+				return this.define.report;
+			},
+			token() {
+				return this.$store.getters.token;
+			},
+		},
+		onShow() {
+			console.log('2222')
+			this.getBtnGroupList()
+			// this.btnGroupList = this.btnGroupListO;
+			this.getHomeInfo()
+			this.getMsgList()
+			this.getMsgCount()
+		},
+		onLoad() {
+		console.log('1111')
+			let javaApk = 'http://221.214.32.166:8000/api/file/Image/annex/scApp.apk';
+			versionUpgrade().then(res => {
+				let resVersion = res.data.appVersion;
+				let forceUpdates = res.data.forceUpdates;
+				let updatesDescription = res.data.updatesDescription;
+				resVersion = Number(resVersion.replace(/[^0-9]/ig, ""));
+				getAppVersion(true, resVersion, javaApk, forceUpdates, updatesDescription)
+			})
+
+			this.$store.dispatch('user/getCurrentUser');
+		},
+		onUnload() {
+			uni.$off("updateList");
+			uni.$off("updateMsgNum");
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index == 0) {
+				uni.scanCode({
+					success: (res) => {
+						if (this.isJSON(res.result)) {
+							const result = JSON.parse(res.result);
+							if (result.t === "ADP") {
+								uni.navigateTo({
+									url: "/pages/apply/dynamicModel/index?isPreview=1&id=" + result.id,
+									fail: (err) => {
+										this.$u.toast("暂无此页面");
+									},
+								});
+							}
+							if (result.t === "DFD") {
+								let config = JSON.stringify(result);
+								uni.navigateTo({
+									url: "/pages/apply/dynamicModel/scanForm?config=" + config,
+									fail: (err) => {
+										this.$u.toast("暂无此页面");
+									},
+								});
+							}
+							if (result.t === "report") {
+								let url =
+									`${this.report}/preview.html?id=${result.id}&token=${this.token}&page=1&from=menu`;
+								uni.navigateTo({
+									url: "/pages/apply/externalLink/index?url=" +
+										encodeURIComponent(url),
+									fail: (err) => {
+										this.$u.toast("暂无");
+									},
+								});
+							}
+						} else {
+							uni.navigateTo({
+								url: "/pages/my/scanResult/index?result=" + res.result,
+								fail: (err) => {
+									this.$u.toast("暂无此页面");
+								},
+							});
+						}
+					},
+				});
+			}
+		},
+		methods: {
+			getBtnGroupList() {
+				request({
+					url: '/api/oauth/CurrentUser?type=app',
+					method: 'get'
+				}).then(res => {
+
+					let _menuList = res.data.menuList;
+					_menuList = _.map(_menuList, (o1) => {
+						o1.children = _.map(o1.children, (o2) => {
+							if (_.has(this.mapIcon, o2.enCode)) {
+								o2.iconCus = this.mapIcon[o2.enCode];
+							} else {
+								o2.iconCus = null;
+							}
+							return o2;
+						})
+						return o1;
+					})
+					this.btnGroupListO = _menuList;
+					this.btnGroupList = this.btnGroupListO;
+				}).catch(() => {})
+			},
+			getHomeInfo() {
+				request({
+					url: '/api/messageCenter/MessageCenter/getHomePage',
+					method: 'get'
+				}).then(res => {
+					let _info = res.data[0];
+					this.homeInfo = _info;
+				}).catch(() => {})
+			},
+			getMsgList() {
+				const query = {
+					currentPage: 1,
+					pageSize: 20,
+					menuId: '',
+				}
+				request({
+					url: '/api/messageCenter/MessageCenter/getMobileList',
+					method: 'post',
+					data: query,
+				}).then(res => {
+					let _list = this.dataList(res.data);
+					let _listA = _.map(_list, (o1) => {
+						return o1.head;
+					})
+					this.list = _listA;
+					this.listInfo = _list;
+					this.mescroll.endSuccess(_list.length);
+				}).catch(() => {})
+			},
+			goMsg(idx) {
+				let _info = this.listInfo[idx];
+				let query = {
+					id: [_info.id]
+				};
+				request({
+					url: '/api/messageCenter/MessageCenter/isRead',
+					method: 'post',
+					data: query,
+				}).then(res => {
+					uni.navigateTo({
+						url: _info.skipUrl
+					})
+				}).catch(() => {})
+			},
+			schNav(val) {
+				let listO = _.cloneDeep(this.btnGroupListO);
+				listO = _.map(listO, (o1) => {
+					o1.children = _.filter(o1.children, (o2) => {
+						return _.includes(o2.fullName, val);
+					})
+					return o1;
+				})
+				listO = _.filter(listO, (o1) => {
+					return o1.children.length > 0;
+				})
+				this.btnGroupList = listO;
+			},
+			isJSON(str) {
+				try {
+					var obj = JSON.parse(str);
+					if (typeof obj == "object" && obj) {
+						return true;
+					} else {
+						return false;
+					}
+				} catch (e) {
+					return false;
+				}
+			},
+			downCallback(page) {
+				getIMReply()
+					.then((res) => {
+						this.list = res.data.list || [];
+						this.mescroll.endSuccess(res.data.list.length, false);
+						uni.hideLoading();
+					})
+					.catch(() => {
+						this.mescroll.endErr();
+					});
+			},
+			search() {
+				return;
+				this.searchTimer && clearTimeout(this.searchTimer);
+				this.searchTimer = setTimeout(() => {
+					this.list = [];
+					this.mescroll.resetUpScroll();
+				}, 300);
+			},
+			updateReply(data) {
+				let boo = false;
+				const len = this.list.length;
+				for (let i = 0; i < len; i++) {
+					if (data.id === this.list[i].id) {
+						this.list[i].unreadMessage += data.unreadMessage;
+						this.list[i].latestMessage = data.latestMessage;
+						this.list[i].messageType = data.messageType;
+						this.list[i].latestDate = data.latestDate;
+						boo = true;
+						break;
+					}
+				}
+				if (boo) return;
+				data.unreadMessage = data.unreadMessage;
+				this.list.unshift(data);
+			},
+			updateMsgNum(id) {
+				const len = this.list.length;
+				for (let i = 0; i < len; i++) {
+					if (id === this.list[i].id) {
+						const num = this.list[i].unreadMessage;
+						this.$store.commit("chat/REDUCE_BADGE_NUM", num);
+						this.list[i].unreadMessage = 0;
+						break;
+					}
+				}
+			},
+			getMsgText(text, type) {
+				let message = "";
+				switch (type) {
+					case "voice":
+						message = "[语音]";
+						break;
+					case "image":
+						message = "[图片]";
+						break;
+					default:
+						message = text;
+						break;
+				}
+				return message;
+			},
+			openPage(path) {
+				if (!path) return;
+				uni.navigateTo({
+					url: path,
+				});
+			},
+			toIm(item) {
+				const name = item.realName + "/" + item.account;
+				if (item.unreadMessage) {
+					this.$store.commit("chat/REDUCE_BADGE_NUM", item.unreadMessage);
+					item.unreadMessage = 0;
+				}
+				uni.navigateTo({
+					url: "/pages/message/im/index?name=" +
+						name +
+						"&formUserId=" +
+						item.id +
+						"&headIcon=" +
+						item.headIcon,
+				});
+			},
+			dataList(data) {
+				let _list = []
+				for (let i = 0; i < data.list.length; i++) {
+					let _data = data.list[i]
+					_list.push(_data)
+				}
+				return _list;
+			},
+			getMsgCount() {
+				let query = {
+					currentPage: 1,
+					pageSize: 1,
+					keyword: ""
+				}
+				this.msgCountAll = 0;
+				FlowBeforeList(1, query, {
+					load: true
+				}).then(res => {
+					this.msgCountAll = this.msgCountAll + res.data.pagination.total;
+					FlowBeforeList(3, query, {
+						load: true
+					}).then(res => {
+						this.msgCountAll = this.msgCountAll + res.data.pagination.total;
+						if (this.msgCountAll > 0) {
+							uni.setTabBarBadge({
+								index: 3,
+								text: "" + this.msgCountAll + ""
+							})
+						} else {
+							uni.removeTabBarBadge({
+								index: 3
+							})
+						}
+					})
+				})
+			},
+		},
+	};
+</script>
+
+<style lang="scss">
+	@import "@/static/iconfont.css";
+
+	.u-page {
+		.fsizeA {
+			font-size: 18px;
+		}
+
+		a {
+			text-decoration: none
+		}
+	}
+
+	.page-home {}
+
+	.sty-statistics-top {
+		// background-color: #2DA9FA;
+		background-color: #66B3FF;
+		padding: 0px;
+		//padding: 5px 0px 15px 0px;
+		color: #ffffff;
+
+		.sty-statistics-top-item {
+			padding: 5px 0px;
+		}
+
+		.line-right {
+			border-right: solid 1px #ffffff;
+		}
+	}
+	.sty-statistics-top-b {
+		background-color: #97CBFF;
+		padding: 0px;
+		//padding: 5px 0px 15px 0px;
+		color: #ffffff;
+
+		.sty-statistics-top-item {
+			padding: 5px 0px;
+		}
+
+		.line-right {
+			border-right: solid 1px #ffffff;
+		}
+	}
+
+	.sty-statistics {
+		.sty-item {
+			margin-top: 11px;
+			padding: 8px 0px;
+			color: #ffffff;
+			border-radius: 10px;
+		}
+
+		.sty-item-a {
+			background-color: #81CBFC;
+		}
+
+		.sty-item-b {
+			background-color: #1EC695;
+		}
+
+		.sty-item-c {
+			background-color: #FF9800;
+		}
+
+		.sty-item-d {
+			background-color: #2DA9FA;
+		}
+	}
+
+	.sty-sch-box {
+		margin-top: 11px;
+	}
+
+	.sty-nav-list {
+		background-color: #f0f2f6;
+
+		.sty-navg-item {
+			background-color: #ffffff;
+			border-bottom: solid 3px #f0f2f6;
+			padding: 11px 0px 0px 0px;
+
+			.title {
+				font-size: 16px;
+				line-height: 16px;
+				font-weight: bold;
+			}
+
+			.item-list {
+				font-size: 12px;
+				display: flex;
+				align-content: flex-start;
+				flex-wrap: wrap;
+				margin-top: 11px;
+
+				.item {
+					width: 25%;
+					margin-bottom: 12px;
+				}
+			}
+		}
+	}
+
+	.item-icon {
+		width: 80px;
+		height: 80px;
+		line-height: 48px;
+		text-align: center;
+		border-radius: 5px;
+		padding: 5px;
+		color: #fff;
+		font-size: 30px;
+
+		&.more {
+			background: #ECECEC;
+			color: #666666;
+			font-size: 30px;
+		}
+	}
+</style>
diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue
index 9d294e4d..6cbd51a2 100644
--- a/jnpf-app/pages/index/portal.vue
+++ b/jnpf-app/pages/index/portal.vue
@@ -1,7 +1,7 @@
-<template>
+	<template>
 	<view class="menhu-v">
 		<!-- #ifndef MP -->
-		<uni-nav-bar class='nav' :fixed="true" :statusBar="true" :border="false" :right-icon="rightIcon"
+<!-- 		<uni-nav-bar class='nav' :fixed="true" :statusBar="true" :border="false" :right-icon="rightIcon"
 			@clickRight="scan">
 			<block slot="default">
 				<view class="nav-left" @click="showSelectBox">
@@ -12,11 +12,13 @@
 						v-if="portalList.length>0 &&userInfo.appPortalId" :class="{'select-right-icons':showSelect}" />
 				</view>
 			</block>
-		</uni-nav-bar>
+		</uni-nav-bar> -->
+		
 		<template>
 			<template v-if="userInfo.appPortalId">
 				<mescroll-body ref="mescrollRef" @down="downCallback" :down="downOption" :sticky="true" @up="upCallback"
 					:up="upOption" :bottombar="false" style="min-height: 100%" @init="mescrollInit">
+					<!-- 常规门户 -->
 					<view class="portal-v" v-if="authConfig.type==0">
 						<template v-if="formData.length">
 							<view class="portal-box" v-for="(item,index) in formData" :key="index">
@@ -31,6 +33,7 @@
 							</view>
 						</view>
 					</view>
+					<!-- 设计门户 -->
 					<template v-if="authConfig.type==1">
 						<!-- #ifdef APP-PLUS -->
 						<view v-if="authConfig.linkType==1 && showWebView">
@@ -92,6 +95,8 @@
 	import IndexMixin from './mixin.js'
 	import chat from '@/libs/chat.js'
 	import portalItem from '@/components/visualPortal/components/index.vue'
+	// import portalItem from '@/components/visualPortal/components/index1.vue'
+
 	import defaultPortal from '@/components/visualPortal/components/defaultPortal.vue'
 	import {
 		auth
diff --git a/jnpf-app/pages/my/settings/index.vue b/jnpf-app/pages/my/settings/index.vue
index d4013a44..f4b4be60 100644
--- a/jnpf-app/pages/my/settings/index.vue
+++ b/jnpf-app/pages/my/settings/index.vue
@@ -7,11 +7,11 @@
 			<!-- #endif -->
 			<u-cell-item title="修改密码" @click="modifyPsd('/pages/my/modifyPsd/index')" :title-style="titleStyle">
 			</u-cell-item>
-			<u-cell-item title="联系我们" @click="modifyPsd('/pages/my/contactUs/index')" :title-style="titleStyle">
-			</u-cell-item>
-			<u-cell-item title="关于平台" @click="modifyPsd('/pages/my/abouts/index')" :title-style="titleStyle"
+			<!-- <u-cell-item title="联系我们" @click="modifyPsd('/pages/my/contactUs/index')" :title-style="titleStyle">
+			</u-cell-item> -->
+		<!-- 	<u-cell-item title="关于平台" @click="modifyPsd('/pages/my/abouts/index')" :title-style="titleStyle"
 				:border-bottom="false">
-			</u-cell-item>
+			</u-cell-item> -->
 		</u-cell-group>
 	</view>
 </template>
diff --git a/jnpf-app/static/iconfont.css b/jnpf-app/static/iconfont.css
new file mode 100644
index 00000000..ccfca9a0
--- /dev/null
+++ b/jnpf-app/static/iconfont.css
@@ -0,0 +1,105 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3928422 */
+  src: 
+       url('@/static/iconfont.ttf') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-jiankong:before {
+  content: "\e616";
+}
+
+.icon-jiesuan:before {
+  content: "\e600";
+}
+
+.icon-hetong:before {
+  content: "\e601";
+}
+
+.icon-caigoutuihuo:before {
+  content: "\e602";
+}
+
+.icon-bangdan:before {
+  content: "\e603";
+}
+
+.icon-maoyi:before {
+  content: "\e604";
+}
+
+.icon-cheliangda:before {
+  content: "\e605";
+}
+
+.icon-huocheda:before {
+  content: "\e606";
+}
+
+.icon-wuliaoda:before {
+  content: "\e607";
+}
+
+.icon-jindu:before {
+  content: "\e608";
+}
+
+.icon-renwu:before {
+  content: "\e609";
+}
+
+.icon-gongyingshang:before {
+  content: "\e60a";
+}
+
+.icon-kehuda:before {
+  content: "\e60b";
+}
+
+.icon-kuweiguanli:before {
+  content: "\e60c";
+}
+
+.icon-renqun:before {
+  content: "\e60d";
+}
+
+.icon-kehu:before {
+  content: "\e60e";
+}
+
+.icon-lilunbb:before {
+  content: "\e60f";
+}
+
+.icon-lirunfenxi:before {
+  content: "\e610";
+}
+
+.icon-cangku:before {
+  content: "\e611";
+}
+
+.icon-gongyingshang1:before {
+  content: "\e612";
+}
+
+.icon-renyuan:before {
+  content: "\e613";
+}
+
+.icon-jincheng:before {
+  content: "\e614";
+}
+
+.icon-zuzhi:before {
+  content: "\e615";
+}
\ No newline at end of file