fix

virgo.wzfrontend/workark_wx/pages.json

@@ -93,6 +93,11 @@
 			"style": {
 				"navigationBarTitleText": "发票详情"
 			}
+		}, {
+			"path": "noPermission/noPermission",
+			"style": {
+				"navigationBarTitleText": "暂无权限"
+			}
 		}]
 	}, {
 		"root": "subPages/myPage",
@@ -111,6 +116,11 @@
 			"style": {
 				"navigationBarTitleText": "我的下载"
 			}
+		}, {
+			"path": "changeOrganization/changeOrganization",
+			"style": {
+				"navigationBarTitleText": "切换组织"
+			}
 		}]
 	}],
 	"tabBar": {
@@ -118,8 +128,8 @@
 		"selectedColor": "#3c9cff",
 		"list": [{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/images/tabbar/index.png",
-			"selectedIconPath": "static/images/tabbar/index-active.png",
+			"iconPath": "static/images/tabbar/home.png",
+			"selectedIconPath": "static/images/tabbar/home-active.png",
 			"text": "首页"
 		}, {
 			"pagePath": "pages/message/message",
@@ -128,14 +138,14 @@
 			"text": "消息"
 		}, {
 			"pagePath": "pages/workark/workark",
-			"iconPath": "static/images/tabbar/highseas.png",
-			"selectedIconPath": "static/images/tabbar/highseas-active.png",
+			"iconPath": "/static/images/tabbar/workark.png",
+			"selectedIconPath": "/static/images/tabbar/workark-active.png",
 			"text": "workark"
 		}, {
-			"pagePath": "pages/shopping/shopping",
-			"iconPath": "static/images/tabbar/data.png",
-			"selectedIconPath": "static/images/tabbar/data-active.png",
-			"text": "商城"
+			"pagePath": "pages/model/model",
+			"iconPath": "/static/images/tabbar/shop.png",
+			"selectedIconPath": "/static/images/tabbar/shop-active.png",
+			"text": "模型"
 		}, {
 			"pagePath": "pages/my/my",
 			"iconPath": "static/images/tabbar/my.png",

virgo.wzfrontend/workark_wx/pages/index/index.vue

@@ -62,14 +62,28 @@
 		methods: {
 			async init() {
 				let productData = await getServeProductList(-1);
-				if (productData.state) this.list = productData.data.concat(this.arguments);
+				if (productData.state) {
+					this.list = productData.data.concat(this.arguments);
+				}
 			},
 			clickItem(serve) {
-				let url = '';
-				if (serve.id > 0) url = '/subPages/indexPage/orderList/orderList?productLevelId=' + serve.id +
-					'&productLevelName=' + serve.name + '&iconName=' + serve.iconName + '&iconColor=' + serve.iconColor;
-				if (serve.id === -2) url = '/subPages/indexPage/contractList/contractList';
-				if (serve.id === -3) url = '/subPages/indexPage/invoiceList/invoiceList';
+				let url = '',
+					signUrl = '';
+				if (serve.id > 0) {
+					url = '/subPages/indexPage/orderList/orderList?productLevelId=' + serve.id + '&productLevelName=' +
+						serve.name + '&iconName=' + serve.iconName + '&iconColor=' + serve.iconColor;
+					signUrl = '/work/serve/list/' + serve.sign + '/list';
+				}
+				if (serve.id === -2) {
+					url = '/subPages/indexPage/contractList/contractList';
+				}
+				if (serve.id === -3) {
+					url = '/subPages/indexPage/invoiceList/invoiceList';
+				}
+				if (signUrl) {
+					let isRole = JSON.parse(this.$store.getters.user.workarkMenu).filter(node => node === signUrl);
+					if (isRole.length === 0) url = '/subPages/indexPage/noPermission/noPermission'
+				}
 				this.$navigateTo(url);
 			}
 		}

virgo.wzfrontend/workark_wx/pages/model/model.vue

@@ -1,22 +1,40 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>
+<template>
+	<view>
+		<web-view v-if="webViewUrl" :src="webViewUrl"></web-view>
+	</view>
+</template>
+
+<script>
+	import config from "@/config";
+	import {
+		getBimViewToken
+	} from '@/request/api/bim.js'
+	export default {
+		data() {
+			return {
+				webViewUrl: null,
+				option: {
+					type: 'model',
+					fileId: 10000898047083,
+					showType: '1',
+					title: '模型'
+				}
+			}
+		},
+		onLoad(body) {
+			this.initModel();
+		},
+		methods: {
+			initModel() {
+				getBimViewToken(this.option.fileId).then(res => {
+					this.webViewUrl =
+						`${config.baseUrl}/webview/bim/preview.html?viewToken=${res.data}&title=${this.option.title}&showType=${this.option.showType}`;
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/workark_wx/pages/my/my.vue

@@ -2,19 +2,24 @@
 	<view class="my-box">
 		<view class="my-content">
 			<view class="my-top"></view>
-			<image class="my-avatar" @tap="$navigateTo('/subPages/myPage/myDetail/myDetail')" :src="user.portrait" mode="aspectFill"></image>
-			<view class="name" @tap="$navigateTo('/subPages/myPage/myDetail/myDetail')">{{user.userName || '登录/注册'}}</view>
-			<view class="organization" v-if="user.organizedName">{{user.organizedName}}</view>
+			<image class="my-avatar" @tap="$navigateTo('/subPages/myPage/myDetail/myDetail')" :src="user.portrait"
+				mode="aspectFill"></image>
+			<view class="name" @tap="$navigateTo('/subPages/myPage/myDetail/myDetail')">{{user.userName || '登录/注册'}}
+			</view>
+			<view class="organization" v-if="user.organizedName"
+				@tap="$navigateTo('/subPages/myPage/changeOrganization/changeOrganization')">
+				{{user.organizedName}}
+			</view>
 			<view class="my-list">
 				<view class="my-list-box">
 					<view class="my-item" @tap="$navigateTo('/subPages/myPage/organization/organization')">
-						<view class="my-icon bg3">
+						<view class="my-icon bg3">
 							<uv-icon name="home-fill" color="#fff" size="56"></uv-icon>
 						</view>
 						<view class="item-content">
 							我的公司
 						</view>
-						<view class="my-forward">
+						<view class="my-forward">
 							<uv-icon name="arrow-right" color="#c1c0c8" size="32"></uv-icon>
 						</view>
 					</view>
@@ -39,43 +44,27 @@
 	export default {
 		data() {
 			return {
-				fansCount: {
-					attentionCount: 0,
-					fansCount: 0,
-					roomCount: 0
-				},
 				user: {}
 			}
 		},
 		onShow() {
 			if (!uni.getStorageSync('token')) {
 				this.user = {};
-				this.fansCount = {
-					attentionCount: 0,
-					fansCount: 0,
-					roomCount: 0
-				}
 			} else {
 				this.user = this.$store.getters.user;
 				this.user.organizedName = this.$store.getters.organization && this.$store.getters.organization.name;
 			}
 		},
 		methods: {
-			init() {
-				getMyCount().then(res => {
-					if (res.code === 200) {
-						this.fansCount = res.data;
-					}
-				})
-				getUserInfoById(this.user.userId).then(res => {
-					if (res.code === 200) {
-						this.user = res.data;
-						this.user['userName'] = res.data.name;
-						this.user['userId'] = res.data.id;
-						this.user.organizedName = res.data.mgrOrganization && res.data.mgrOrganization.name;
-						this.$store.dispatch('app/changeUser', res.data);
-					}
-				})
+			async init() {
+				let userInfo = await getUserInfoById(this.user.userId);
+				if (userInfo.state) {
+					this.user = userInfo;
+					this.user['userName'] = userInfo.name;
+					this.user['userId'] = userInfo.id;
+					this.user.organizedName = userInfo.mgrOrganization && userInfo.mgrOrganization.name;
+					this.$store.dispatch('app/changeUser', userInfo);
+				}
 			}
 		}
 	}

virgo.wzfrontend/workark_wx/request/api/bim.js

@@ -0,0 +1,36 @@
+import {
+	request
+} from '@/request/request.js';
+/*
+ * 获取项目模型列表
+ * 
+ * 
+ */
+export function getBimList(id) {
+	return request({
+		url: `/api/project/bimList/${id}`,
+		method: 'get',
+	})
+}
+/* 
+ * 获取模型viewToken
+ * 
+ * 
+ */
+export function getBimViewToken(fileId) {
+	return request({
+		url: `/bim/bim/viewToken/${fileId}`,
+		method: 'get',
+	});
+}
+/* 
+ * 获取集成模型viewToken
+ * 
+ * 
+ */
+export function getIntegrateViewToken(fileId) {
+	return request({
+		url: `/bim/bim/viewToken/integrate/${fileId}`,
+		method: 'get',
+	});
+}

virgo.wzfrontend/workark_wx/request/api/my.js

@@ -35,4 +35,25 @@ export function getPartList(organizationId, projectId) {
 		url: `/manager/role/${organizationId}/${projectId}`,
 		method: 'get'
 	})
+}
+/* 
+ * 切换work组织
+ * @param null 
+ */
+export function selectWorkarkOrangaized(data) {
+	return request({
+		url: `/manager/userContext/workark/organization`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 获取work组织
+ * @param null 
+ */
+export function getWorkarkOrangaized(data) {
+	return request({
+		url: `/manager/userContext/workark/organization`,
+		method: 'get'
+	})
 }

virgo.wzfrontend/workark_wx/request/request.js

@@ -1,13 +1,28 @@
 import config from "@/config";
 import store from "../store";
+import chat from '@/uitls/chat.js'
 const logout = () => {
-
+	chat.disConnect();
+	uni.removeStorageSync('token');
+	uni.removeStorageSync('chatToken');
+	uni.removeStorageSync('vuex_state');
+	store.dispatch('app/changeOrganization', {});
+	store.dispatch('app/changeUser', {});
+	uni.removeTabBarBadge({
+		index: 1
+	})
+	setTimeout(() => {
+		uni.switchTab({
+			url: '/pages/workark/workark'
+		});
+	}, 400)
 }
 /* 消息提示 */
 const tip = (msg) => {
 	let types = 'warning';
 	if (msg == 'RET_INVALID_PASSWORD') msg = '账号密码有误'
 	if (msg == 'RET_INVALID_CODE') msg = '短信验证码有误'
+	if (msg == 'RET_AUTH_FAILED') msg = '登录已过期，请重新登录'
 	uni.showToast({
 		title: msg,
 		icon: 'none'
@@ -40,6 +55,7 @@ export function request(options) {
 					let data = res.data;
 					if (data.code != '200') {
 						tip(data.message || data.msg);
+						if (data.code == '20005') logout();
 						uni.hideLoading();
 					}
 					resolve({

virgo.wzfrontend/workark_wx/subPages/indexPage/noPermission/noPermission.vue

@@ -0,0 +1,26 @@
+<template>
+	<view class="no-permission">
+		<uv-empty icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
+			:isImg="true" textSize="28" width="360" text="暂无权限访问">
+		</uv-empty>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.no-permission {
+		padding-top: 80rpx;
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/myPage/changeOrganization/changeOrganization.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="organization-select">
+		<view class="common-list">
+			<view class="common-item" v-for="(item,index) in list" :key="item.id" @tap="select(item)">
+				<view class="title">{{item.name}}</view>
+				<view class="date">{{item.contact || '-'}}</view>
+				<view class="space">{{!!item.address ? JSON.parse(item.address).join('-'):'-'}}</view>
+				<view class="icon" v-if="organization.id === item.id">
+					<uv-icon name="checkbox-mark" color="primary" size="60"></uv-icon>
+				</view>
+			</view>
+		</view>
+		<uv-modal ref="modal" title="WORKARK提示" :content='`是否切换至<${selectOrganization.name}>组织？`' :asyncClose="true"
+			@confirm="confirm" :showCancelButton="true">
+		</uv-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		selectWorkarkOrangaized,
+		getWorkarkOrangaized
+	} from '@/request/api/my.js'
+	import {
+		getUserInfo
+	} from '@/request/api/login.js'
+	export default {
+		data() {
+			return {
+				list: [],
+				organization: {},
+				selectOrganization: {}
+			}
+		},
+		onShow() {
+			this.organization = this.$store.getters.organization;
+		},
+		onLoad() {
+			this.init();
+		},
+		methods: {
+			async init() {
+				uni.showLoading();
+				let organizationData = await getWorkarkOrangaized()
+				if (organizationData.state) this.list = organizationData.data;
+				uni.hideLoading();
+			},
+			async confirm() {
+				uni.showLoading();
+				let work = await selectWorkarkOrangaized(this.selectOrganization);
+				if (!work.state) return this.$refs.modal.close();
+				let userData = await getUserInfo();
+				if (!userData.state) return this.$refs.modal.close();
+				this.$store.dispatch('app/changeOrganization', userData.data.workarkOrganization);
+				this.$store.dispatch('app/changeUser', userData.data);
+				uni.setStorageSync('vuex_state', this.$store.state);
+				uni.hideLoading();
+				this.$toast('切换成功');
+				this.$refs.modal.close();
+				uni.navigateBack();
+			},
+			select(item) {
+				if (this.organization.id === item.id) return;
+				this.selectOrganization = item;
+				this.$refs.modal.open();
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.organization-select {
+		padding: 30rpx 0;
+
+		.tag {
+			display: flex;
+
+			.status-tag {
+				margin-left: 5px;
+			}
+		}
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/myPage/myDetail/myDetail.vue

@@ -62,12 +62,12 @@
 									uni.hideLoading();
 									return this.$toast('上传失败');
 								}
-								let data = JSON.parse(res.data);
+								let data = JSON.parse(userInfo);
 								if (data.code != 200) {
 									uni.hideLoading();
 									return this.$toast('上传失败');
 								}
-								let url = JSON.parse(res.data).data.node.url;
+								let url = JSON.parse(userInfo).data.node.url;
 								updateUserDetails({
 									id: this.$store.getters.user.userId,
 									portrait: url
@@ -89,16 +89,15 @@
 					}
 				});
 			},
-			init() {
-				getUserInfoById(this.user.userId).then(res => {
-					if (res.code == 200) {
-						this.user = res.data;
-						this.user['userName'] = res.data.name;
-						this.user['userId'] = res.data.id;
-						this.user.organizedName = res.data.mgrOrganization && res.data.mgrOrganization.name;
-						this.$store.dispatch('app/changeUser', res.data);
-					}
-				})
+			async init() {
+				let userInfo = await getUserInfoById(this.user.userId);
+				if (userInfo.state) {
+					this.user = userInfo;
+					this.user['userName'] = userInfo.name;
+					this.user['userId'] = userInfo.id;
+					this.user.organizedName = userInfo.mgrOrganization && userInfo.mgrOrganization.name;
+					this.$store.dispatch('app/changeUser', userInfo);
+				}
 			},
 			logout() {
 				uni.showModal({
@@ -111,15 +110,13 @@
 							uni.removeStorageSync('chatToken');
 							uni.removeStorageSync('vuex_state');
 							this.$store.dispatch('app/changeOrganization', {});
-							this.$store.dispatch('app/changeProject', {});
 							this.$store.dispatch('app/changeUser', {});
-							this.$store.dispatch('app/changeIdentity', {});
 							uni.removeTabBarBadge({
 								index: 1
 							})
 							this.$toast('退出成功');
 							setTimeout(() => {
-								this.$navigateBack();
+								uni.navigateBack();
 							}, 400)
 						}
 					}

virgo.wzfrontend/workark_wx/uitls/chat.js

@@ -172,7 +172,8 @@ const $chat = {
 		});
 	},
 	disConnect() {
-		YeIMUniSDK.getInstance().disConnect();
+		let code = YeIMUniSDK.getInstance().readyState();
+		if (code === 1) YeIMUniSDK.getInstance().disConnect();
 	},
 	listenerList() {
 		if (isListenerChatList) return;

virgo.wzfrontend/workark_wx/uni_modules/uv-loading-icon/components/uv-loading-icon/props.js

@@ -28,7 +28,7 @@ export default {
 		// 图标大小，单位默认px
 		size: {
 			type: [String, Number],
-			default: 24
+			default: 48
 		},
 		// 文字大小
 		textSize: {

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/app.json

@@ -6,7 +6,8 @@
     "pages/shopping/shopping",
     "pages/my/my",
     "pages/login/login",
-    "pages/message/message"
+    "pages/message/message",
+    "pages/pdf/pdf"
   ],
   "subPackages": [
     {
@@ -27,7 +28,20 @@
       "root": "subPages/indexPage",
       "pages": [
         "orderList/orderList",
-        "orderDetail/orderDetail"
+        "orderDetail/orderDetail",
+        "contractList/contractList",
+        "invoiceList/invoiceList",
+        "invoiceDetail/invoiceDetail",
+        "noPermission/noPermission"
+      ]
+    },
+    {
+      "root": "subPages/myPage",
+      "pages": [
+        "myDetail/myDetail",
+        "organization/organization",
+        "download/download",
+        "changeOrganization/changeOrganization"
       ]
     }
   ],
@@ -42,8 +56,8 @@
     "list": [
       {
         "pagePath": "pages/index/index",
-        "iconPath": "static/images/tabbar/index.png",
-        "selectedIconPath": "static/images/tabbar/index-active.png",
+        "iconPath": "static/images/tabbar/home.png",
+        "selectedIconPath": "static/images/tabbar/home-active.png",
         "text": "首页"
       },
       {
@@ -54,15 +68,15 @@
       },
       {
         "pagePath": "pages/workark/workark",
-        "iconPath": "static/images/tabbar/highseas.png",
-        "selectedIconPath": "static/images/tabbar/highseas-active.png",
+        "iconPath": "/static/images/tabbar/workark.png",
+        "selectedIconPath": "/static/images/tabbar/workark-active.png",
         "text": "workark"
       },
       {
-        "pagePath": "pages/shopping/shopping",
-        "iconPath": "static/images/tabbar/data.png",
-        "selectedIconPath": "static/images/tabbar/data-active.png",
-        "text": "商城"
+        "pagePath": "pages/model/model",
+        "iconPath": "/static/images/tabbar/shop.png",
+        "selectedIconPath": "/static/images/tabbar/shop-active.png",
+        "text": "模型"
       },
       {
         "pagePath": "pages/my/my",

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/model/model.wxml

@@ -1 +1 @@
-<view></view>
+<view><block wx:if="{{webViewUrl}}"><web-view src="{{webViewUrl}}"></web-view></block></view>

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/my/my.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "我的",
-  "usingComponents": {}
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/pdf/pdf.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {}
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/pdf/pdf.wxml

@@ -0,0 +1 @@
+<view><block wx:if="{{fileUrl}}"><web-view src="{{fileUrl}}"></web-view></block></view>

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/static/scss/common.scss

@@ -1,21 +1,3 @@
-//底部按钮
-.hui-button-box {
-	background-color: #ffffff;
-	box-shadow: 0px 2px 10px rgba(3, 3, 3, 0.1);
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	height: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	padding-bottom: 0;
-	padding-bottom: constant(safe-area-inset-bottom);  
-	padding-bottom: env(safe-area-inset-bottom);
-	padding-right: 40rpx;
-	padding-left: 40rpx;
-}
 
 .text-flex {
 	display: flex;
@@ -67,6 +49,310 @@
 		background-color: $uv-error;
 	}
 }
+
+.common-list {
+	padding: 30rpx;
+	box-sizing: border-box;
+
+	.common-item {
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+		padding: 30rpx;
+		position: relative;
+		margin-bottom: 30rpx;
+
+		.icon {
+			position: absolute;
+			top: 30rpx;
+			right: 30rpx;
+			width: 60rpx;
+			height: 60rpx;
+			border-radius: 16rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+		}
+
+		.date {
+			font-size: 24rpx;
+			color: $uv-content-color;
+			margin: 10rpx 0;
+		}
+
+		.space {
+			font-size: 24rpx;
+		}
+
+		.other {
+			margin-top: 20rpx;
+
+			.item {
+				margin-top: 16rpx;
+			}
+
+			.label {
+				color: $uv-content-color;
+				font-size: 24rpx;
+			}
+
+			.value {
+				margin-top: 6rpx;
+				font-weight: 400;
+			}
+		}
+
+		.state {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.create {
+				height: 48rpx;
+				border-radius: 48rpx;
+				border: 1px solid $uv-primary;
+				display: flex;
+				align-items: center;
+				color: $uv-primary;
+				padding: 0 10rpx;
+
+				.name {
+					font-size: 24rpx;
+					flex: 1;
+					max-width: 150rpx;
+					min-width: 70rpx;
+					overflow: hidden;
+					margin-left: 10rpx;
+					line-height: 36rpx;
+					padding-right: 10rpx;
+				}
+			}
+		}
+	}
+}
+
+//底部按钮
+.hui-button-box {
+	background-color: #ffffff;
+	box-shadow: 0px 2px 10px rgba(3, 3, 3, 0.1);
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	height: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	padding-bottom: 0;
+	padding-bottom: constant(safe-area-inset-bottom);  
+	padding-bottom: env(safe-area-inset-bottom);
+	padding-right: 40rpx;
+	padding-left: 40rpx;
+	
+	.hui-button-view{
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+	}
+	
+	.hui-button {
+		height: 68rpx;
+		border-radius: 68rpx;
+		color: #ffffff;
+		background: $uv-primary;
+		border: 1px solid  $uv-primary;
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 0 30rpx;
+		&.hui-button-light{
+			color: $uv-primary;
+			background: #fff;
+		}
+	}
+	
+	.hui-button-icon{
+		margin-right: 10rpx;
+	}
+}
+
+//详情
+.hui-detail {
+	padding: 30rpx;
+
+	.detail-box {
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+		padding: 30rpx;
+		position: relative;
+		margin-bottom: 30rpx;
+
+		&.file-box {
+			padding-bottom: 20rpx;
+		}
+	}
+
+	.sub-title {
+		display: flex;
+		align-items: center;
+		margin-left: -8rpx;
+
+		.sub-label {
+			font-size: 32rpx;
+			font-weight: 600;
+			margin-left: 14rpx;
+		}
+	}
+
+	.title-box {
+		padding-left: 90rpx;
+		position: relative;
+		min-height: 88rpx;
+
+		.title-icon {
+			width: 70rpx;
+			height: 70rpx;
+			text-align: center;
+			line-height: 70rpx;
+			background: $uv-primary;
+			border-radius: 70rpx;
+			position: absolute;
+			left: 0;
+			top: 50%;
+			margin-top: -35rpx;
+		}
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+			margin-bottom: 8rpx;
+		}
+
+		.date {
+			font-size: 24rpx;
+			color: $uv-content-color;
+		}
+	}
+
+	.other {
+		margin-top: 20rpx;
+
+		.item {
+			margin-top: 16rpx;
+		}
+
+		.label {
+			color: $uv-content-color;
+			font-size: 24rpx;
+		}
+
+		.value {
+			margin-top: 10rpx;
+			font-weight: 400;
+		}
+
+		.file-item {
+			background-color: #ededed;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+			border-radius: 12rpx;
+			padding: 0 14rpx;
+		}
+
+		.file-name {
+			flex: 1;
+			width: 0;
+			margin-left: 10rpx;
+		}
+
+		.contarct-item {
+			background-color: #ededed;
+			border-radius: 12rpx;
+			padding: 20rpx;
+			margin-bottom: 20rpx;
+		}
+
+		.contarct-content {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 16rpx;
+
+			&.last {
+				margin-bottom: 0rpx;
+
+				.content-item {
+					flex: 1;
+					width: 0;
+				}
+			}
+
+			.content-title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+
+			.content-label {
+				color: $uv-content-color;
+				font-size: 24rpx;
+			}
+
+			.content-value {
+				font-weight: 400;
+				margin-left: 6rpx;
+				flex: 1;
+				width: 0;
+			}
+
+			.content-item {
+				overflow: hidden;
+				display: flex;
+				align-items: center;
+
+				&.content-title {
+					flex: 1;
+					width: 0;
+				}
+			}
+		}
+	}
+
+	.state {
+		margin-top: 20rpx;
+		display: flex;
+		justify-content: space-between;
+
+		.create {
+			height: 48rpx;
+			border-radius: 48rpx;
+			border: 1px solid $uv-primary;
+			display: flex;
+			align-items: center;
+			color: $uv-primary;
+			padding: 0 10rpx;
+
+			.name {
+				font-size: 24rpx;
+				flex: 1;
+				max-width: 150rpx;
+				min-width: 70rpx;
+				overflow: hidden;
+				margin-left: 10rpx;
+				line-height: 36rpx;
+				padding-right: 10rpx;
+			}
+		}
+	}
+}
+	
 .process-box{
 	
 	.process-set-item {

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/contractList/contractList.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "合同列表",
+  "usingComponents": {
+    "z-paging": "/uni_modules/z-paging/components/z-paging/z-paging"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/invoiceDetail/invoiceDetail.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "发票详情",
+  "usingComponents": {
+    "upload": "/components/common/upload"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/invoiceList/invoiceList.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "发票列表",
+  "usingComponents": {
+    "z-paging": "/uni_modules/z-paging/components/z-paging/z-paging"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/noPermission/noPermission.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "暂无权限",
+  "usingComponents": {
+    "uv-empty": "/uni_modules/uv-empty/components/uv-empty/uv-empty"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/noPermission/noPermission.wxml

@@ -0,0 +1 @@
+<view class="no-permission data-v-51eea7c5"><uv-empty vue-id="fad420fc-1" icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb" isImg="{{true}}" textSize="28" width="360" text="暂无权限访问" class="data-v-51eea7c5" bind:__l="__l"></uv-empty></view>

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/noPermission/noPermission.wxss

@@ -0,0 +1 @@
+.no-permission.data-v-51eea7c5{padding-top:80rpx}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/indexPage/orderList/orderList.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "订单列表",
   "usingComponents": {
-    "z-paging": "/uni_modules/z-paging/components/z-paging/z-paging"
+    "z-paging": "/uni_modules/z-paging/components/z-paging/z-paging",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
   }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/myPage/changeOrganization/changeOrganization.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "切换组织",
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
+    "uv-modal": "/uni_modules/uv-modal/components/uv-modal/uv-modal"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/myPage/changeOrganization/changeOrganization.wxss

@@ -0,0 +1 @@
+.organization-select{padding:30rpx 0}.organization-select .tag{display:flex}.organization-select .tag .status-tag{margin-left:5px}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/myPage/components/uni-mall-head/uni-mall-head.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  },
+  "component": true
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/myPage/components/uni-mall-list/uni-mall-list.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
+    "uni-mall-head": "/subPages/myPage/components/uni-mall-head/uni-mall-head"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/myPage/download/download.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "我的下载",
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  }
+}