fix

virgo.wzfrontend/workark/src/api/organization.js

@@ -21,6 +21,17 @@ export function updateOrganization(data) {
 		method: 'post',
 		data: data
 	})
+}
+/* 
+ * 认证企业
+ * 
+ * 
+ */
+export function authenticationOrganizationById(id) {
+	return request({
+		url: `/manager/base/companyCheck/${id}`,
+		method: 'get'
+	})
 }
 /* 
  * 通过code获取组织信息

virgo.wzfrontend/workark/src/components/work/organization/manager/edit.vue

@@ -8,6 +8,12 @@
 				<el-form-item label="组织名称" prop="name">
 					<el-input type="text" v-model="informationForm.name"></el-input>
 				</el-form-item>
+				<el-form-item label="统一社会信用代码" prop="creditNo">
+					<el-input type="text" v-model="informationForm.creditNo"></el-input>
+				</el-form-item>
+				<el-form-item label="法人代表" prop="legalPerson">
+					<el-input type="text" v-model="informationForm.legalPerson"></el-input>
+				</el-form-item>
 				<el-form-item label="联系人" prop="contact">
 					<el-input type="text" v-model="informationForm.contact"></el-input>
 				</el-form-item>
@@ -60,7 +66,9 @@
 					businessLicense: [],
 					logo: [],
 					detailAddress: '',
-					introduction: ''
+					introduction: '',
+					creditNo: '',
+					legalPerson: ''
 				},
 				isUpdate: true,
 				loading: false

virgo.wzfrontend/workark/src/layout/components/setSubMenu.vue

@@ -0,0 +1,33 @@
+<template>
+	<div>
+		<template v-for="(item,index) in menuData.filter(node=>node.isMenu === '1')">
+			<el-submenu :index="String(item.id)"
+				v-if="item.children && item.children.length > 0 && item.children.filter(node=>node.isMenu==='1').length > 0"
+				:key="item.id">
+				<template slot="title">
+					<i v-if="item.iconClass" :class="item.iconClass + ' icon iconfont'"></i>
+					<span slot="title" class="menu-title">{{item.title}}</span>
+				</template>
+				<set-sub-menu :menuData="item.children"></set-sub-menu>
+			</el-submenu>
+			<el-menu-item :index="item.index" v-else :key="item.id" :name="item.index">
+				<i v-if="item.iconClass" :class="item.iconClass + ' icon'"></i>
+				<span slot="title" class="menu-title">{{item.title}}</span>
+			</el-menu-item>
+		</template>
+	</div>
+</template>
+
+<script>
+	import setSubMenu from '@/layout/components/setSubMenu'
+	export default {
+		name: 'set-sub-menu',
+		props: ['menuData'],
+		components: {
+			setSubMenu
+		}
+	}
+</script>
+
+<style>
+</style>

virgo.wzfrontend/workark/src/layout/components/topNav.vue

@@ -11,7 +11,7 @@
 			</div>
 			<div class="work-layout-line"></div>
 			<div class="work-layout-project" @click="userCommand('changeOrganization')">
-				<span>{{organization.name}}</span>
+				<span>{{organizations.name}}</span>
 				<i class="iconfont huifont-xiala-top"></i>
 			</div>
 		</div>
@@ -71,7 +71,7 @@
 
 <script>
 	import {
-		removeToken,
+		removeToken,
 		removeComment
 	} from '@/uitls/auth';
 	import {
@@ -92,7 +92,7 @@
 				systemCountStatus: false,
 				drawer: false,
 				visible: false,
-				organization: {},
+				organizations: {},
 				logTitle: '',
 			}
 		},
@@ -103,7 +103,7 @@
 		methods: {
 			init() {
 				this.users = this.$store.getters.user;
-				this.organization = this.$store.getters.organization;
+				this.organizations = this.$store.getters.organization;
 			},
 			initMessage() {
 				if (!this.$store.getters.user.userId) return;
@@ -146,7 +146,7 @@
 			},
 			logout() {
 				this.$confirm('是否要退出登录?', () => {
-					removeToken();
+					removeToken();
 					removeComment();
 					if (this.$store.getters.chatToken) this.$chat.disConnect();
 					if (this.$store.getters.chatTokens) this.$chats.disConnect();
@@ -160,6 +160,9 @@
 			user() {
 				this.init();
 			},
+			organization() {
+				this.init();
+			},
 			chatList() {
 				this.initMessage();
 			},
@@ -168,7 +171,7 @@
 			}
 		},
 		computed: {
-			...mapGetters(['user', 'chatList', 'reloadMessage'])
+			...mapGetters(['user', 'chatList', 'organization', 'reloadMessage'])
 		},
 		components: {
 			userDetail,

virgo.wzfrontend/workark/src/layout/setLayout.vue

@@ -0,0 +1,115 @@
+<template>
+	<div class="set-Layout">
+		<div class="router-nav">
+			<el-menu router :default-active="key" mode="horizontal">
+				<template v-for="(item,index) in menuList.filter(node=>node.isMenu === '1')">
+					<el-submenu :index="String(item.id)"
+						v-if="item.children && item.children.length > 0 && item.children.filter(node=>node.isMenu==='1').length > 0"
+						:key="item.id">
+						<template slot="title">
+							<i v-if="item.iconClass" :class="item.iconClass + ' icon iconfont'"></i>
+							<span slot="title" class="menu-title">{{item.title}}</span>
+						</template>
+						<set-sub-menu :menuData="item.children"></set-sub-menu>
+					</el-submenu>
+					<el-menu-item :index="item.index" v-else :key="item.id" :name="item.index">
+						<i v-if="item.iconClass" :class="item.iconClass + ' icon'"></i>
+						<span slot="title" class="menu-title">{{item.title}}</span>
+					</el-menu-item>
+				</template>
+			</el-menu>
+		</div>
+		<div class="set-index">
+			<router-view></router-view>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		mapGetters
+	} from 'vuex';
+	import setSubMenu from '@/layout/components/setSubMenu'
+	export default {
+		data() {
+			return {
+				menuList: []
+			}
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			init() {
+				this.menuList = this.$store.getters.menuData.filter(node => node.title === '系统设置' || node.title ===
+					'优惠管理' || node.title === '商品管理');
+				console.log(this.menuList);
+			}
+		},
+		components: {
+			setSubMenu
+		},
+		computed: {
+			key() {
+				return this.$route.path;
+			},
+			...mapGetters(['menuData'])
+		},
+		watch: {
+			menuData() {
+				this.init();
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.set-Layout {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+
+		.set-index {
+			flex: 1;
+			height: 0;
+		}
+
+		.router-nav {
+			background: #fff;
+			margin-bottom: 10px;
+			height: 50px;
+		}
+	}
+
+	.el-menu--horizontal {
+		.el-icon-arrow-down {
+			font-family: "iconfont" !important;
+			font-size: 16px;
+		}
+
+		.el-icon-arrow-down::before {
+			content: "\e72d";
+		}
+
+		i.icon {
+			font-size: 24px;
+			margin-right: 8px;
+			color: $--color-text-primary;
+		}
+
+		.menu-title {
+			color: $--color-text-primary;
+		}
+	}
+
+	.el-menu--horizontal>.el-submenu .el-submenu__title {
+		height: 50px !important;
+		line-height: 50px !important;
+		color: #4B5563;
+	}
+
+	.el-menu-item.is-active .menu-title {
+		color: $--color-primary;
+	}
+</style>

virgo.wzfrontend/workark/src/layout/workLayout.vue

@@ -7,9 +7,12 @@
 					<sub-menu :menuData="menuList" :menuIndex="1"></sub-menu>
 				</el-menu>
 			</div>
-			<div class="app-main-button" @click="isCollapse = !isCollapse">
-				<i :class="isCollapse?'el-icon-s-unfold':'el-icon-s-fold'"></i>
-				<div class="app-main-icon">收起导航</div>
+			<div class="app-main-button" @click="set">
+				<i class="iconfont huifont-shezhi"></i>
+				<div>后台设置</div>
+			</div>
+			<div class="work-layout-main-tag" @click="isCollapse = !isCollapse">
+				<i :class="'iconfont '+ (isCollapse ? 'huifont-xiala-right':'huifont-xiala-left')"></i>
 			</div>
 		</div>
 		<bread-crumb :class="isCollapse ? 'small-crumb':''"></bread-crumb>
@@ -103,7 +106,7 @@
 		},
 		methods: {
 			init() {
-				this.menuList = this.$store.getters.menuData;
+				this.menuList = this.$store.getters.menuData.filter(node => node.title != '系统设置' && node.title != '优惠管理' && node.title != '商品管理');
 				this.$chat.getConversationList(data => {
 					this.countNumber('badge', data.data)
 				});
@@ -148,6 +151,9 @@
 						this.initCoupon();
 					}
 				})
+			},
+			set() {
+
 			}
 		},
 		components: {
@@ -222,6 +228,23 @@
 		height: 100%;
 		background: $--background-color-base;
 
+		.work-layout-main-tag {
+			position: absolute;
+			top: 0;
+			right: -20px;
+			width: 20px;
+			height: 20px;
+			background: $--color-primary;
+			border-radius: 0px 20px 20px 0px;
+			line-height: 20px;
+			font-size: 12px;
+			text-align: center;
+			cursor: pointer;
+			z-index: 99;
+			color: #fff;
+			opacity: 0.6;
+		}
+
 		.chat-box {
 			position: fixed;
 			bottom: 60px;
@@ -399,7 +422,7 @@
 					color: $--color-text-secondary;
 				}
 
-				.app-main-icon {
+				div {
 					flex: 1;
 					width: 0;
 					overflow: hidden;

virgo.wzfrontend/workark/src/router/modules/work/discount.js

@@ -1,10 +1,14 @@
-const discount = [{
-	path: 'discount/coupon',
-	component: () => import('@/views/work/discount/coupon'),
-	name: '优惠券管理',
-	meta: {
-		title: '优惠券管理'
-	}
+const system = [{
+	path: 'discount',
+	component: () => import('@/layout/setLayout'),
+	children: [{
+		path: 'coupon',
+		component: () => import('@/views/work/discount/coupon'),
+		name: '优惠券管理',
+		meta: {
+			title: '优惠券管理'
+		}
+	}]
 }, {
 	path: 'discount/userCoupon',
 	component: () => import('@/views/work/discount/userCoupon'),
@@ -13,4 +17,4 @@ const discount = [{
 		title: '优惠券'
 	}
 }]
-export default discount;
+export default system;

virgo.wzfrontend/workark/src/router/modules/work/serve.js

@@ -1,16 +1,20 @@
 const serve = [{
 	path: 'serve/list/:type',
 	component: () => import('@/views/work/serve/list'),
-	name: '服务列表',
+	name: '订单列表',
 	meta: {
-		title: '服务列表'
-	}
-},{
-	path: 'serve/content/:type',
-	component: () => import('@/views/work/serve/content'),
-	name: '服务商品',
-	meta: {
-		title: '服务商品'
+		title: '订单列表'
 	}
+}, {
+	path: 'serve',
+	component: () => import('@/layout/setLayout'),
+	children: [{
+		path: 'content/:type',
+		component: () => import('@/views/work/serve/content'),
+		name: '服务商品',
+		meta: {
+			title: '服务商品'
+		}
+	}]
 }]
 export default serve;

virgo.wzfrontend/workark/src/router/modules/work/system.js

@@ -1,23 +1,27 @@
 const system = [{
-	path: 'system/main',
-	component: () => import('@/views/work/system/main'),
-	name: '菜单管理',
-	meta: {
-		title: '菜单管理'
-	}
-}, {
-	path: 'system/organization',
-	component: () => import('@/views/work/system/organization'),
-	name: '企业管理',
-	meta: {
-		title: '企业管理'
-	}
-}, {
-	path: 'system/serveSet',
-	component: () => import('@/views/work/system/serveSet'),
-	name: '服务设置',
-	meta: {
-		title: '服务设置'
-	}
+	path: 'system',
+	component: () => import('@/layout/setLayout'),
+	children: [{
+		path: 'main',
+		component: () => import('@/views/work/system/main'),
+		name: '菜单管理',
+		meta: {
+			title: '菜单管理'
+		}
+	}, {
+		path: 'organization',
+		component: () => import('@/views/work/system/organization'),
+		name: '企业管理',
+		meta: {
+			title: '企业管理'
+		}
+	}, {
+		path: 'serveSet',
+		component: () => import('@/views/work/system/serveSet'),
+		name: '服务设置',
+		meta: {
+			title: '服务设置'
+		}
+	}]
 }]
 export default system;

virgo.wzfrontend/workark/src/views/work/organization/manager.vue

@@ -21,28 +21,51 @@
 								</div>
 							</div>
 							<div class="manager-name">{{organization.name}}</div>
+							<div>
+								<span class="hui-tag hui-tag-warning"
+									v-if="!organization.certificationStatus">未认证</span>
+								<span class="hui-tag hui-tag-success" v-else>已认证</span>
+							</div>
 						</div>
 						<div class="manager-box">
 							<div class="manager-item">
-								<div class="manager-label">公司代码</div>
+								<div class="manager-label">
+									<span>统一社会信用代码</span>
+									<span class="color-primary" style="margin-left: 10px;cursor: pointer;"
+										@click="authentication">点击认证</span>
+								</div>
 								<div class="manager-value">
-									{{organization.organizationCode}}
+									<span> {{organization.creditNo || '-'}}</span>
 									<i class="el-icon-copy-document color-primary" title="点击复制"
-										@click="copyText(organization.organizationCode)"></i>
+										@click="copyText(organization.creditNo)">
+									</i>
 								</div>
 							</div>
 							<div class="manager-item">
-								<div class="manager-label">联系人</div>
-								<div class="manager-value">{{organization.contact}}</div>
+								<div class="manager-label">法人代表</div>
+								<div class="manager-value">{{organization.legalPerson || '-'}}</div>
 							</div>
 							<div class="manager-item">
-								<div class="manager-label">公司地址</div>
-								<div class="manager-value">{{address}}</div>
+								<div class="manager-label">联系人</div>
+								<div class="manager-value">{{organization.contact}}</div>
 							</div>
 							<div class="manager-item">
 								<div class="manager-label">联系方式</div>
 								<div class="manager-value">{{organization.contactTel}}</div>
 							</div>
+							<div class="manager-item">
+								<div class="manager-label">公司代码</div>
+								<div class="manager-value">
+									<span> {{organization.organizationCode}}</span>
+									<i class="el-icon-copy-document color-primary" title="点击复制"
+										@click="copyText(organization.organizationCode)">
+									</i>
+								</div>
+							</div>
+							<div class="manager-item">
+								<div class="manager-label">公司地址</div>
+								<div class="manager-value">{{address}}</div>
+							</div>
 							<div class="manager-item" style="width: 100%;">
 								<div class="manager-label">公司简介</div>
 								<div class="manager-value">{{organization.introduction}}</div>
@@ -68,6 +91,10 @@
 </template>
 
 <script>
+	import {
+		getOrganizationDetailById,
+		authenticationOrganizationById
+	} from '@/api/organization'
 	const upload = () => import('@/components/common/upload');
 	const edit = () => import('@/components/work/organization/manager/edit');
 	export default {
@@ -77,6 +104,7 @@
 				logoUrl: '',
 				address: '',
 				visible: false
+
 			}
 		},
 		mounted() {
@@ -85,21 +113,36 @@
 		methods: {
 			init() {
 				if (!this.auth('/work/organization/manager/information')) return;
-				this.organization = this.$store.getters.organization;
-				if (this.organization.address) {
-					let address = JSON.parse(this.organization.address);
-					this.address = address.join('-') + '-' + (this.organization.detailAddress || '');
-				}
-				let logo = !this.organization.logo ? {} : JSON.parse(this.organization.logo);
-				this.logoUrl = logo.url;
-
+				getOrganizationDetailById(this.$store.getters.organization.id).then(res => {
+					if (res.state) {
+						this.organization = res.data;
+						this.$store.dispatch('app/changeOrganization', res.data);
+						if (this.organization.address) {
+							let address = JSON.parse(this.organization.address);
+							this.address = address.join('-') + '-' + (this.organization.detailAddress || '');
+						}
+						let logo = !this.organization.logo ? {} : JSON.parse(this.organization.logo);
+						this.logoUrl = logo.url;
+					}
+				});
+			},
+			authentication() {
+				if (!this.organization.name) return this.$message.warning('请设置企业名称');
+				if (!this.organization.creditNo) return this.$message.warning('请设置统一社会信用代码');
+				if (!this.organization.legalPerson) return this.$message.warning('请设置法人代表');
+				this.$confirm('是否认证企业', () => {
+					authenticationOrganizationById(this.organization.id).then(res => {
+						if (res.state && res.data.result === 1) return this.$message.success('认证成功');
+						this.$message.warning('认证失败，请检查企业信息');
+					})
+				})
 			},
 			async copyText(code) {
 				try {
 					await navigator.clipboard.writeText(code);
-					this.$message.success('复制成功')
+					this.$message.success('复制成功');
 				} catch (error) {
-					this.$message.success('复制失败')
+					this.$message.warning('复制失败');
 				}
 			},
 			callback(type) {
@@ -171,6 +214,7 @@
 
 		.manager-name {
 			font-size: 18px;
+			margin-right: 10px;
 		}
 
 		.manager-box {