fix

virgo.wzfrontend/yui_wx/main.js

@@ -14,16 +14,23 @@ Vue.prototype.$toast = msg => {
 	})
 };
 Vue.prototype.$navigateTo = (url) => {
-	if (!uni.getStorageSync('token')) {
+	if (!uni.getStorageSync('token') && url != '/pages/login/login') {
 		uni.showToast({
 			title: '您暂未登录，请先登录～',
 			icon: "none"
 		});
 		url = '/pages/login/login'
+		setTimeout(() => {
+			uni.navigateTo({
+				url: url
+			})
+		}, 400)
+	} else {
+		uni.navigateTo({
+			url: url
+		})
 	}
-	uni.navigateTo({
-		url: url
-	})
+
 }
 Vue.prototype.$navigateBack = uni.navigateBack;
 import field from './config/field.js'

virgo.wzfrontend/yui_wx/pages.json

@@ -140,6 +140,11 @@
 		"style": {
 			"navigationBarTitleText": "选择成员"
 		}
+	}, {
+		"path": "pages/contract/contract",
+		"style": {
+			"navigationBarTitleText": "合同列表"
+		}
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",

virgo.wzfrontend/yui_wx/pages/contract/contract.vue

@@ -0,0 +1,119 @@
+<template>
+	<view>
+		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
+			<view class="common-list">
+				<view class="common-item" v-for="(item,index) in list" :key="item.id">
+					<view class="title">{{item.code}}</view>
+					<view class="date">{{item.startDate}}-{{item.endDate}}</view>
+					<view>
+						<view class="space" v-for="(node,index) in item.roomMap" :key="index">{{node}}</view>
+					</view>
+					<view class="other">
+						<view class="item">
+							<view class="label">关联租客</view>
+							<view class="value">{{item.tenantType === 1 ? item.merchantName: item.clientName}}</view>
+						</view>
+					</view>
+					<view class="state">
+						<view class="create">
+							<uni-icons class="inherit-icons" type="staff-filled" color="#08979c" size="18"></uni-icons>
+							<text class="name hui-ellipsis">{{item.operatorName || '-'}}</text>
+						</view>
+						<view class="tag">
+							<div class="status-tag info" v-if="!item.status">待发送</div>
+							<div class="status-tag warning" v-else-if="item.status === 1">待确认</div>
+							<div class="status-tag success" v-else-if="item.status === 2">已生效</div>
+						</view>
+					</view>
+					<view class="icon">
+						<uni-icons custom-prefix="iconfont" :type="menu.iconClass" color="#08979c" size="30">
+						</uni-icons>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import {
+		getContractListByPage
+	} from '@/request/api/contract.js'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				list: [],
+				type: '',
+				menu: {}
+			}
+		},
+		onLoad(body) {
+			this.type = parseInt(body.type);
+			this.menu = this.title();
+			uni.setNavigationBarTitle({
+				title: this.menu.title
+			});
+			uni.$on('reloadOrder', () => {
+				this.mescroll.resetUpScroll(false);
+			})
+		},
+		methods: {
+			title() {
+				let str = {
+					title: '',
+					iconClass: 'icon-hetongguanli'
+				};
+				switch (this.type) {
+					case 1:
+						str = {
+							title: '合同列表',
+							iconClass: 'icon-hetongguanli'
+						};
+						break;
+					case 2:
+						str = {
+							title: '公司合同',
+							iconClass: 'icon-anli'
+						};
+						break;
+					case 3:
+						str = {
+							title: '个人合同',
+							iconClass: 'icon-gerenhetongchaxun'
+						};
+						break;
+					default:
+						break;
+				}
+				return str;
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				getContractListByPage({
+					currPage: page.num,
+					pageSize: 10,
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id
+				}).then(res => {
+					if (res.code === 200) {
+						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
+						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
+						let data = res.data.dataList;
+						this.list = this.list.concat(data); //追加新数据
+					} else {
+						this.mescroll.endErr();
+					}
+				}).catch(() => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/data/data.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<mescroll-empty :option="{tip:'暂无数据'}">
+		<mescroll-empty :option="option" @emptyclick="$navigateTo('/pages/login/login')" :key="reloadMecroll">
 		</mescroll-empty>
 	</view>
 </template>
@@ -9,10 +9,25 @@
 	export default {
 		data() {
 			return {
-
+				option: {
+					tip: '暂无数据'
+				},
+				reloadMecroll: false
+			}
+		},
+		onShow() {
+			if (!uni.getStorageSync('token')) {
+				this.option = {
+					tip: '暂未登录',
+					btnText: '点击登录'
+				}
+			} else {
+				this.option = {
+					tip: '暂无数据'
+				}
 			}
+			this.reloadMecroll = !this.reloadMecroll;
 		},
-		onShow() {},
 		methods: {
 
 		}

virgo.wzfrontend/yui_wx/pages/index/index.vue

@@ -1,7 +1,9 @@
 <template>
-	<view class="index-container">
-		<mescroll-empty :option="{tip:'暂未有参入的项目'}" v-if="!project.id"></mescroll-empty>
-		<view v-else>
+	<view class="index-box">
+		<mescroll-empty :option="option" v-if="!project.id" @emptyclick="$navigateTo('/pages/login/login')"
+			:key="reloadMecroll">
+		</mescroll-empty>
+		<view class="index-container" v-else>
 			<view class="project">
 				<view class="project-box" @click="$navigateTo('/pages/projectList/projectList')">
 					<uni-icons custom-prefix="iconfont" type="icon-wodegongsi-gaoliang" class="inherit-icons"
@@ -53,7 +55,7 @@
 				<view class="title">合同管理</view>
 				<view class="group-box">
 					<view class="group-item">
-						<view class="group-veiw bg4">
+						<view class="group-veiw bg4" @click="$navigateTo('/pages/contract/contract?type=1')">
 							<text class="label">合同列表</text>
 							<view class="group-icon">
 								<uni-icons custom-prefix="iconfont" type="icon-hetongguanli" color="#fff" size="30">
@@ -63,7 +65,7 @@
 					</view>
 					<view class="small-box">
 						<view class="small">
-							<view class="group-veiw bg5">
+							<view class="group-veiw bg5" @click="$navigateTo('/pages/contract/contract?type=2')">
 								<text class="label">公司合同</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-anli" color="#fff" size="30">
@@ -72,7 +74,7 @@
 							</view>
 						</view>
 						<view class="small">
-							<view class="group-veiw bg6">
+							<view class="group-veiw bg6" @click="$navigateTo('/pages/contract/contract?type=3')">
 								<text class="label">个人合同</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-gerenhetongchaxun" color="#fff"
@@ -148,11 +150,26 @@
 				list: [
 					'https://images.unsplash.com/photo-1592229505726-ca121723b8ef?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wyMDUzMDJ8MHwxfHNlYXJjaHw0Mnx8aG90ZWx8ZW58MXx8fHwxNjg3NzA1MjkwfDA&ixlib=rb-4.0.3&q=80&w=1080'
 				],
-				project: {}
+				project: {},
+				option: {
+					tip: '暂未加入项目'
+				},
+				reloadMecroll: false
 			}
 		},
 		onShow() {
 			this.project = this.$store.getters.project;
+			if (!uni.getStorageSync('token')) {
+				this.option = {
+					tip: '暂未登录',
+					btnText: '点击登录'
+				}
+			} else {
+				this.option = {
+					tip: '暂未加入项目'
+				}
+			}
+			this.reloadMecroll = !this.reloadMecroll;
 		},
 		methods: {}
 	}

virgo.wzfrontend/yui_wx/pages/message/message.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="message">
-		<mescroll-empty :option="{tip:'暂无消息'}" v-if="chatList.length === 0"></mescroll-empty>
+		<mescroll-empty :option="option" v-if="chatList.length === 0" @emptyclick="$navigateTo('/pages/login/login')"
+			:key="reloadMecroll">
+		</mescroll-empty>
 		<view class="message-list" v-else>
 			<!-- 消息提示 -->
 			<view class="message-item" v-for="(item,index) in chatList" :key="index" @click="linkTo(item)">
@@ -31,21 +33,38 @@
 	export default {
 		data() {
 			return {
-				chatList: []
+				chatList: [],
+				option: {
+					tip: '暂无消息'
+				},
+				reloadMecroll: false
 			}
 		},
-		onLoad() {
-			
-			this.$chat.getConversationList(res => {
-				if (res.code == 200) {
-					this.chatList = res.data;
-				}
-			})
+		onLoad() {
+			if (uni.getStorageSync('token')) {
+				this.$chat.getConversationList(res => {
+					if (res.code == 200) {
+						this.chatList = res.data;
+					}
+				})
+			}
 		},
 		onShow() {
-			uni.$on('changeChatList', (res) => {
-				this.chatList = res;
-			})
+			if (!uni.getStorageSync('token')) {
+				this.chatList = [];
+				this.option = {
+					tip: '暂未登录',
+					btnText: '点击登录'
+				}
+			} else {
+				this.option = {
+					tip: '暂无消息'
+				}
+				uni.$on('changeChatList', (res) => {
+					this.chatList = res;
+				})
+			}
+			this.reloadMecroll = !this.reloadMecroll;
 		},
 		methods: {
 			linkTo(item) {

virgo.wzfrontend/yui_wx/pages/my/my.vue

@@ -115,7 +115,7 @@
 				}
 			} else {
 				this.user = this.$store.getters.user;
-				this.user.organizedName = this.$store.getters.organization.name;
+				this.user.organizedName = this.$store.getters.organization && this.$store.getters.organization.name;
 				this.init();
 			}
 		},

virgo.wzfrontend/yui_wx/pages/myDetail/myDetail.vue

@@ -35,7 +35,7 @@
 		},
 		onShow() {
 			this.user = this.$store.getters.user;
-			this.user.organizedName = this.$store.getters.organization.name;
+			this.user.organizedName = this.$store.getters.organization && this.$store.getters.organization.name;
 		},
 		methods: {
 			logout() {
@@ -48,10 +48,14 @@
 							uni.removeStorageSync('token');
 							uni.removeStorageSync('chatToken');
 							uni.removeStorageSync('vuex_state');
-							uni.switchTab({
-								url: '/pages/highseas/highseas'
-							})
+							this.$store.dispatch('app/changeOrganization', {});
+							this.$store.dispatch('app/changeProject', {});
+							this.$store.dispatch('app/changeUser', {});
+							this.$store.dispatch('app/changeIdentity', {});
 							this.$toast('退出成功');
+							setTimeout(() => {
+								this.$navigateBack();
+							}, 400)
 						}
 					}
 				});

virgo.wzfrontend/yui_wx/request/api/contract.js

@@ -0,0 +1,15 @@
+import {
+	request
+} from '@/request/request.js';
+/* 
+ * 分页获取合同
+ * 
+ * 
+ */
+export function getContractListByPage(data) {
+	return request({
+		url: `/api/contract/${data.currPage}/${data.pageSize}`,
+		method: 'post',
+		data: data
+	})
+}

virgo.wzfrontend/yui_wx/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.vue

@@ -3,114 +3,117 @@
 <mescroll-empty v-if="isShowEmpty" :option="optEmpty" @emptyclick="emptyClick"></mescroll-empty>
 -->
 <template>
-	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }" :style="{ 'z-index': option.zIndex, top: option.top }">
-		<view> <image v-if="icon" class="empty-icon" :src="icon" mode="widthFix" /> </view>
+	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }"
+		:style="{ 'z-index': option.zIndex, top: option.top }">
+		<view>
+			<image v-if="icon" class="empty-icon" :src="icon" mode="widthFix" />
+		</view>
 		<view v-if="tip" class="empty-tip">{{ tip }}</view>
-		<view v-if="btnText" class="empty-btn" @click="emptyClick">{{ btnText }}</view>
+		<view v-if="option.btnText" class="empty-btn" @click="emptyClick">{{ btnText }}</view>
 	</view>
 </template>
 
 <script>
-// 引入全局配置
-import GlobalOption from '../mescroll-uni/mescroll-uni-option.js';
-// 引入国际化工具类
-import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
-export default {
-	props: {
-		// empty的配置项: 默认为GlobalOption.up.empty
-		option: {
-			type: Object,
-			default() {
-				return {};
-			}
-		}
-	},
-	// 使用computed获取配置,用于支持option的动态配置
-	computed: {
-		// 图标
-		icon() {
-			if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
-				return this.option.icon
-			} else{
-				let i18nType = mescrollI18n.getType() // 国际化配置
-				if (this.option.i18n) {
-					return this.option.i18n[i18nType].icon
-				} else{
-					return GlobalOption.i18n[i18nType].up.empty.icon || GlobalOption.up.empty.icon
+	// 引入全局配置
+	import GlobalOption from '../mescroll-uni/mescroll-uni-option.js';
+	// 引入国际化工具类
+	import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
+	export default {
+		props: {
+			// empty的配置项: 默认为GlobalOption.up.empty
+			option: {
+				type: Object,
+				default () {
+					return {};
 				}
 			}
 		},
-		// 文本提示
-		tip() {
-			if (this.option.tip != null) { // 支持传空串不显示文本提示
-				return this.option.tip
-			} else{
-				let i18nType = mescrollI18n.getType() // 国际化配置
+		// 使用computed获取配置,用于支持option的动态配置
+		computed: {
+			// 图标
+			icon() {
+				if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
+					return this.option.icon
+				} else {
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					if (this.option.i18n) {
+						return this.option.i18n[i18nType].icon
+					} else {
+						return GlobalOption.i18n[i18nType].up.empty.icon || GlobalOption.up.empty.icon
+					}
+				}
+			},
+			// 文本提示
+			tip() {
+				if (this.option.tip != null) { // 支持传空串不显示文本提示
+					return this.option.tip
+				} else {
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					if (this.option.i18n) {
+						return this.option.i18n[i18nType].tip
+					} else {
+						return GlobalOption.i18n[i18nType].up.empty.tip || GlobalOption.up.empty.tip
+					}
+				}
+			},
+			// 按钮文本
+			btnText() {
 				if (this.option.i18n) {
-					return this.option.i18n[i18nType].tip
-				} else{
-					return GlobalOption.i18n[i18nType].up.empty.tip || GlobalOption.up.empty.tip
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					return this.option.i18n[i18nType].btnText
+				} else {
+					return this.option.btnText
 				}
 			}
 		},
-		// 按钮文本
-		btnText() {
-			if (this.option.i18n) {
-				let i18nType = mescrollI18n.getType() // 国际化配置
-				return this.option.i18n[i18nType].btnText
-			} else{
-				return this.option.btnText
+		methods: {
+			// 点击按钮
+			emptyClick() {
+				this.$emit('emptyclick');
 			}
 		}
-	},
-	methods: {
-		// 点击按钮
-		emptyClick() {
-			this.$emit('emptyclick');
-		}
-	}
-};
+	};
 </script>
 
-<style>
-/* 无任何数据的空布局 */
-.mescroll-empty {
-	box-sizing: border-box;
-	width: 100%;
-	padding: 100rpx 50rpx;
-	text-align: center;
-}
+<style lang="scss">
+	/* 无任何数据的空布局 */
+	.mescroll-empty {
+		box-sizing: border-box;
+		width: 100%;
+		padding: 100rpx 50rpx;
+		text-align: center;
+	}
 
-.mescroll-empty.empty-fixed {
-	z-index: 99;
-	position: absolute; /*transform会使fixed失效,最终会降级为absolute */
-	top: 100rpx;
-	left: 0;
-}
+	.mescroll-empty.empty-fixed {
+		z-index: 99;
+		position: absolute;
+		/*transform会使fixed失效,最终会降级为absolute */
+		top: 100rpx;
+		left: 0;
+	}
 
-.mescroll-empty .empty-icon {
-	width: 280rpx;
-	height: 280rpx;
-}
+	.mescroll-empty .empty-icon {
+		width: 280rpx;
+		height: 280rpx;
+	}
 
-.mescroll-empty .empty-tip {
-	margin-top: 20rpx;
-	font-size: 24rpx;
-	color: gray;
-}
+	.mescroll-empty .empty-tip {
+		margin-top: 20rpx;
+		font-size: 24rpx;
+		color: gray;
+	}
 
-.mescroll-empty .empty-btn {
-	display: inline-block;
-	margin-top: 40rpx;
-	min-width: 200rpx;
-	padding: 18rpx;
-	font-size: 28rpx;
-	border: 1rpx solid #e04b28;
-	border-radius: 60rpx;
-	color: #e04b28;
-}
+	.mescroll-empty .empty-btn {
+		display: inline-block;
+		margin-top: 40rpx;
+		padding: 10rpx 30rpx;
+		font-size: 24rpx;
+		border: 1rpx solid $uni-primary;
+		border-radius: 60rpx;
+		color: $uni-primary;
+	}
 
-.mescroll-empty .empty-btn:active {
-	opacity: 0.75;
-}
-</style>
+	.mescroll-empty .empty-btn:active {
+		opacity: 0.75;
+	}
+</style>

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

@@ -20,10 +20,15 @@
     "pages/attention/attention",
     "pages/collect/collect",
     "pages/clientDetail/clientDetail",
-    "pages/client/client",
     "pages/organization/organization",
+    "pages/client/client",
     "pages/search/search",
-    "pages/projectList/projectList"
+    "pages/projectList/projectList",
+    "pages/order/order",
+    "pages/orderHandle/orderHandle",
+    "pages/orderDetail/orderDetail",
+    "pages/selectUser/selectUser",
+    "pages/contract/contract"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/navbar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/process.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "upload": "/components/common/upload"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/upload.json

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

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/upload.wxml

@@ -0,0 +1 @@
+<view class="upload-index"><uv-upload vue-id="00863568-1" fileList="{{fileList}}" name="1" multiple="{{true}}" maxCount="{{type==='insert'?5:$root.g0}}" deletable="{{type==='insert'}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" bind:__l="__l"></uv-upload></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/pinapp-empty-page/pinapp-empty-page.wxml

@@ -1 +0,0 @@
-<view class="empty-box"><image src="/static/images/pinapp-empty-box.png"></image><view class="txt">{{title}}</view></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/pinapp-empty-page/pinapp-empty-page.wxss

@@ -1 +0,0 @@
-.empty-box{display:flex;flex-direction:column;justify-content:center;align-items:center;padding-top:200rpx}.empty-box image{width:414rpx;height:240rpx}.empty-box .txt{font-size:26rpx;color:#999}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/uni-mall-list/uni-mall-list.json

@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "uni-mall-head": "/components/uni-mall-head/uni-mall-head",
-    "pinapp-empty-page": "/components/pinapp-empty-page/pinapp-empty-page",
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contract/contract.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "合同列表",
+  "usingComponents": {
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/data/data.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "数据",
-  "usingComponents": {}
+  "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty"
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/data/data.wxml

@@ -1 +1 @@
-<view></view>
+<view><mescroll-empty vue-id="4d3acb00-1" option="{{option}}" data-event-opts="{{[['^emptyclick',[['$navigateTo',['/pages/login/login']]]]]}}" bind:emptyclick="__e" bind:__l="__l"></mescroll-empty></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/highseas/highseas.json

@@ -1,7 +1,6 @@
 {
   "navigationStyle": "custom",
   "navigationBarTitleText": "",
-  "disableScroll": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "工作台",
   "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uv-swiper": "/uni_modules/uv-swiper/components/uv-swiper/uv-swiper"
   }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/message/message.json

@@ -1,7 +1,7 @@
 {
   "navigationBarTitleText": "消息",
   "usingComponents": {
-    "pinapp-empty-page": "/components/pinapp-empty-page/pinapp-empty-page",
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge",
     "uni-dateformat": "/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat"
   }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/order/order.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/orderDetail/orderDetail.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "工单详情",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "upload": "/components/common/upload",
+    "process": "/components/common/process"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/orderDetail/orderDetail.wxss

@@ -0,0 +1 @@
+.client-detail{padding-bottom:100rpx}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/orderHandle/orderHandle.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "处理工单",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "upload": "/components/common/upload"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/orderHandle/orderHandle.wxss

@@ -0,0 +1 @@
+.order-handle{padding:30rpx}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/organization/organization.wxml

@@ -1 +1 @@
-<view><uni-mall-list vue-id="64336a40-1" dataList="{{dataList}}" defaultHeadList="{{defaultHeadList}}" data-event-opts="{{[['^change',[['handleChange']]]]}}" bind:change="__e" bind:__l="__l"></uni-mall-list></view>
+<view><uni-mall-list vue-id="64336a40-1" dataList="{{dataList}}" defaultHeadList="{{defaultHeadList}}" type="preview" data-event-opts="{{[['^change',[['handleChange']]]]}}" bind:change="__e" bind:__l="__l"></uni-mall-list></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/projectList/projectList.wxss

@@ -1 +1 @@
-.project-select{padding:30rpx 0}.project-select .project-item{height:140rpx;background-color:#fff;border-radius:16rpx;box-shadow:0 2px 8px rgba(0,0,0,.12)}
+.project-select{padding:30rpx 0}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/selectUser/selectUser.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "选择成员",
+  "usingComponents": {
+    "uni-mall-list": "/components/uni-mall-list/uni-mall-list"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/selectUser/selectUser.wxml

@@ -0,0 +1 @@
+<view><uni-mall-list vue-id="2f17f640-1" dataList="{{dataList}}" defaultHeadList="{{defaultHeadList}}" type="select" data-event-opts="{{[['^change',[['handleChange']]]]}}" bind:change="__e" bind:__l="__l"></uni-mall-list></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/project.config.json

@@ -5,7 +5,7 @@
     "include": []
   },
   "setting": {
-    "urlCheck": true,
+    "urlCheck": false,
     "es6": false,
     "postcss": true,
     "minified": true,

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/project.private.config.json

@@ -1,4 +0,0 @@
-{
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "setting": {}
-}

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

@@ -22,9 +22,12 @@
 		}
 
 		.uni-easyinput__content {
-			border-radius: 84rpx;
-		}
-
+			border-radius: 84rpx;
+			&.is-textarea{
+				border-radius: 16rpx;
+			}
+		}
+		
 		.uni-easyinput__content-input {
 			height: 80rpx;
 		}
@@ -253,3 +256,134 @@ button[type=primary]{
 		}
 	}
 }
+//通用列表
+.hui-tag {
+	height: 44rpx;
+	border-radius: 44rpx;
+	line-height: 44rpx;
+	padding: 0 20rpx;
+	font-size: 20rpx;
+	color: #fff;
+
+	&.success {
+		background-color: $uni-success;
+	}
+
+	&.primary {
+		background-color: $uni-primary;
+	}
+	
+	&.info {
+		background-color: $uni-info;
+	}
+	
+	&.warning {
+		background-color: $uni-warning;
+	}
+	
+	&.error {
+		background-color: $uni-error;
+	}
+}
+//详情
+.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;
+
+		.title-icon {
+			width: 70rpx;
+			height: 70rpx;
+			text-align: center;
+			line-height: 70rpx;
+			background: $uni-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: $uni-secondary-color;
+		}
+	}
+
+	.other {
+		margin-top: 20rpx;
+
+		.item {
+			margin-top: 16rpx;
+		}
+
+		.label {
+			color: $uni-secondary-color;
+			font-size: 24rpx;
+		}
+
+		.value {
+			margin-top: 10rpx;
+			font-weight: 400;
+		}
+	}
+
+	.state {
+		margin-top: 20rpx;
+		display: flex;
+		justify-content: space-between;
+
+		.create {
+			height: 48rpx;
+			border-radius: 48rpx;
+			border: 1px solid $uni-primary;
+			display: flex;
+			align-items: center;
+			color: $uni-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;
+			}
+		}
+	}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.wxml

@@ -1 +1 @@
-<view class="{{['mescroll-empty',(option.fixed)?'empty-fixed':'']}}" style="{{'z-index:'+(option.zIndex)+';'+('top:'+(option.top)+';')}}"><view><block wx:if="{{icon}}"><image class="empty-icon" src="{{icon}}" mode="widthFix"></image></block></view><block wx:if="{{tip}}"><view class="empty-tip">{{tip}}</view></block><block wx:if="{{btnText}}"><view data-event-opts="{{[['tap',[['emptyClick',['$event']]]]]}}" class="empty-btn" bindtap="__e">{{btnText}}</view></block></view>
+<view class="{{['mescroll-empty',(option.fixed)?'empty-fixed':'']}}" style="{{'z-index:'+(option.zIndex)+';'+('top:'+(option.top)+';')}}"><view><block wx:if="{{icon}}"><image class="empty-icon" src="{{icon}}" mode="widthFix"></image></block></view><block wx:if="{{tip}}"><view class="empty-tip">{{tip}}</view></block><block wx:if="{{option.btnText}}"><view data-event-opts="{{[['tap',[['emptyClick',['$event']]]]]}}" class="empty-btn" bindtap="__e">{{btnText}}</view></block></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.json

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

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.wxml

@@ -0,0 +1 @@
+<uv-transition vue-id="d9912a8c-1" show="{{show}}" mode="fade" custom-class="uv-overlay" duration="{{duration}}" custom-style="{{overlayStyle}}" data-event-opts="{{[['^click',[['clickHandler']]],['^touchmove',[['clear',['$event']]]]]}}" bind:click="__e" catch:touchmove="__e" class="data-v-19c9b517" bind:__l="__l" vue-slots="{{['default']}}"><slot></slot></uv-transition>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.wxss

@@ -0,0 +1 @@
+.uv-overlay.data-v-19c9b517{position:fixed;top:0;left:0;width:100%;height:100%;background-color:rgba(0,0,0,.7)}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.json

@@ -0,0 +1,10 @@
+{
+  "usingComponents": {
+    "uv-overlay": "/uni_modules/uv-overlay/components/uv-overlay/uv-overlay",
+    "uv-transition": "/uni_modules/uv-transition/components/uv-transition/uv-transition",
+    "uv-status-bar": "/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar",
+    "uv-safe-bottom": "/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  },
+  "component": true
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.wxml

@@ -0,0 +1 @@
+<view class="{{['uv-safe-bottom','data-v-722aa140',!isNvue&&'uv-safe-area-inset-bottom']}}" style="{{$root.s0}}"></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.wxml

@@ -0,0 +1 @@
+<view class="uv-status-bar data-v-c36c36f4" style="{{$root.s0}}"><slot></slot></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.wxss

@@ -0,0 +1 @@
+.uv-status-bar.data-v-c36c36f4{width:100%}