fix

virgo.wzfrontend/workark/public/index.html

@@ -7,7 +7,7 @@
 		<link rel="icon" href="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/f9617c7f80da485cb3cc72b6accc62ed">
 		<title>WorkArk</title>
 		<meta name="keywords" content="workark,企业服务,项目申报,高新技术企业,专精特新,专利申报,营销推广">
-		<meta name="description" content="workark专注且专业的为企业各种申报提供相应的服务">
+		<meta name="description" content="workark-不止于服务，更构建企业服务生态圈——您的需求发布、服务匹配、过程管理、成果交付一体化平台！">
 		<link rel="stylesheet" type="text/css" href="<%= BASE_URL %>reset.css" />
 		<link rel="stylesheet" type="text/css" href="<%= BASE_URL %>font/font.css" />
 		<link rel="stylesheet" href="//at.alicdn.com/t/c/font_4358860_jvinmymekbm.css">

virgo.wzfrontend/workark/src/components/website/createOrder.vue

@@ -16,6 +16,9 @@
 								</template>
 							</el-table-column>
 						</el-table>
+						<div class="contract" v-if="productData.contract">
+							<span class="color-primary" @click="dialogVisibles = true">查看合同</span>
+						</div>
 					</div>
 				</div>
 				<div class="order-box">
@@ -100,6 +103,12 @@
 				<el-button size="small" @click="lookOrder">查看订单</el-button>
 			</pay-order>
 		</el-dialog>
+		<el-dialog :close-on-click-modal="false" title="预览合同" :visible.sync="dialogVisibles" width="900px"
+			:append-to-body="true">
+			<pdf-viewer v-if="dialogVisibles" :list="productData.contract ? JSON.parse(productData.contract) : []"
+				type="preview">
+			</pdf-viewer>
+		</el-dialog>
 	</div>
 </template>
 
@@ -116,6 +125,7 @@
 		getServeDepartmentById
 	} from '@/api/system'
 	const payOrder = () => import('@/components/website/payOrder');
+	const pdfViewer = () => import('@/components/common/pdfViewer');
 	export default {
 		props: ['serveId'],
 		data() {
@@ -133,7 +143,8 @@
 				isCreate: false,
 				isStacking: false,
 				order: {},
-				dialogVisible: false
+				dialogVisible: false,
+				dialogVisibles: false
 			}
 		},
 		mounted() {
@@ -150,7 +161,8 @@
 			}
 		},
 		components: {
-			payOrder
+			payOrder,
+			pdfViewer
 		},
 		methods: {
 			init() {
@@ -221,7 +233,7 @@
 					}
 				})
 			}
-		},
+		}
 	}
 </script>
 
@@ -435,6 +447,15 @@
 				padding: 15px;
 			}
 
+			.contract {
+				text-align: right;
+				padding-top: 10px;
+			}
+
+			.color-primary {
+				cursor: pointer;
+			}
+
 			.contents {
 				background: $--background-color-base;
 				padding: 0;

virgo.wzfrontend/workark/src/components/website/productItem.vue

@@ -58,8 +58,6 @@
 			background-position: center center;
 		}
 
-
-
 		.product-content {
 			padding-top: 15px;
 		}

virgo.wzfrontend/workark/src/components/work/system/serveSet/departForm.vue

@@ -7,12 +7,12 @@
 				</el-form-item>
 				<el-form-item label="服务标识">
 					<el-input type="text" v-model="departmentForm.sign" placeholder="请输入服务名称"></el-input>
-				</el-form-item>
-				<el-form-item label="小程序图标">
-					<el-input type="text" v-model="departmentForm.iconName" placeholder="请输入小程序图标"></el-input>
-				</el-form-item>
-				<el-form-item label="图标颜色">
-					<el-input type="text" v-model="departmentForm.iconColor" placeholder="请输入图标颜色"></el-input>
+				</el-form-item>
+				<el-form-item label="小程序图标">
+					<el-input type="text" v-model="departmentForm.iconName" placeholder="请输入小程序图标"></el-input>
+				</el-form-item>
+				<el-form-item label="图标颜色">
+					<el-input type="text" v-model="departmentForm.iconColor" placeholder="请输入图标颜色"></el-input>
 				</el-form-item>
 				<el-form-item label="服务描述" class="hui-textarea">
 					<el-input type="textarea" v-model="departmentForm.remark" placeholder="请输入服务描述"
@@ -42,7 +42,6 @@
 			return {
 				departmentForm: {
 					name: '',
-					sign: '',
 					remark: '',
 					parentId: -1
 				},

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

@@ -1,162 +1,166 @@
-<template>
-	<div class="login-register">
-		<div class="title">
-			<div class="title-logo">
-				<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/f9617c7f80da485cb3cc72b6accc62ed"
-					alt="logo.png">
-				<div class="title-name">WorkArk</div>
-			</div>
-		</div>
-		<div class="content">
-			<div class="content-left">
-				<div class="content-title">
-					<div class="sub-title">WorkArk</div>
-					<div class="small-title">
-						<span>项目申报</span>
-						<span class="line"></span>
-						<span>知识产权</span>
-						<span class="line"></span>
-						<span>网站建设</span>
-						<span class="line"></span>
-						<span>推广宣传</span>
-					</div>
-				</div>
-				<div class="content-image"></div>
-			</div>
-			<div class="content-right">
-				<transition name="slide-fade" mode="out-in">
-					<router-view :key="key" />
-				</transition>
-			</div>
-		</div>
-	</div>
-</template>
-
-
-<script>
-	export default {
-		name: 'loginLayout',
-		data() {
-			return {};
-		},
-		computed: {
-			key() {
-				return this.$route.path;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.login-register {
-		width: 100%;
-		height: 100%;
-		background: url(https://file-node.oss-cn-shanghai.aliyuncs.com/youji/8ead21d2c7464ae99745e93f5a17e4d3) no-repeat;
-		background-size: 100% 100%;
-		overflow: auto;
-		display: flex;
-		flex-direction: column;
-		min-width: 1300px;
-		min-height: 800px;
-
-		.title {
-			height: 64px;
-			background: rgba(255, 255, 255, 0.36);
-			box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.25);
-			padding-left: 46px;
-			display: flex;
-			align-items: center;
-
-			.title-logo {
-				width: 245px;
-				height: 34px;
-				margin-right: 74px;
-				display: flex;
-				align-items: center;
-				color: #484B50;
-			}
-
-			.title-sub-name {
-				font-size: 12px;
-				transform: scale(0.68) translateX(-66px);
-				width: 282px;
-				opacity: 0.75;
-			}
-
-			.title-name {
-				font-family: hanyiyaku;
-				font-size: 16px;
-				line-height: 22px;
-			}
-
-			.title-logo img {
-				width: 34px;
-				height: 34px;
-				margin-right: 10px;
-				border-radius: 5px;
-			}
-		}
-
-		.content {
-			flex: 1;
-			height: 0;
-			width: 100%;
-			overflow: auto;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			.content-image {
-				width: 640px;
-				height: 440px;
-				background: url(https://file-node.oss-cn-shanghai.aliyuncs.com/youji/2fdedc8660e146b7bb003ce85dedea5f) no-repeat;
-				background-size: 100% 100%;
-			}
-
-			.content-left {
-				width: 910px;
-				display: flex;
-				flex-direction: column;
-				padding-left: 90px;
-			}
-
-			.content-right {
-				width: 440px;
-				display: flex;
-				align-items: center;
-			}
-
-			.content-title {
-				margin-bottom: 64px;
-			}
-
-			.sub-title {
-				font-weight: 600;
-				font-size: 31px;
-				color: #484B50;
-				line-height: 44px;
-				text-align: left;
-				font-style: normal;
-				margin-bottom: 10px;
-			}
-
-			.small-title {
-				font-weight: 400;
-				font-size: 16px;
-				color: #333E4D;
-				line-height: 22px;
-				text-align: left;
-				font-style: normal;
-				display: flex;
-				align-items: center;
-
-				.line {
-					margin: 0 20px;
-					width: 1px;
-					height: 16px;
-					background: #CBE0FF;
-				}
-			}
-		}
-	}
+<template>
+	<div class="login-register">
+		<div class="title">
+			<div class="title-logo">
+				<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/f9617c7f80da485cb3cc72b6accc62ed"
+					alt="logo.png">
+				<div class="title-name">WorkArk企业服务平台</div>
+			</div>
+		</div>
+		<div class="content">
+			<div class="content-left">
+				<div class="content-title">
+					<div class="sub-title">WorkArk-企业服务在线交易与交付平台</div>
+					<div class="small-title">
+						<span>知识产权</span>
+						<span class="line"></span>
+						<span>项目申报</span>
+						<span class="line"></span>
+						<span>技术开发</span>
+						<span class="line"></span>
+						<span>营销推广</span>
+						<span class="line"></span>
+						<span>财税审计</span>
+						<span class="line"></span>
+						<span>企业标准</span>
+					</div>
+				</div>
+				<div class="content-image"></div>
+			</div>
+			<div class="content-right">
+				<transition name="slide-fade" mode="out-in">
+					<router-view :key="key" />
+				</transition>
+			</div>
+		</div>
+	</div>
+</template>
+
+
+<script>
+	export default {
+		name: 'loginLayout',
+		data() {
+			return {};
+		},
+		computed: {
+			key() {
+				return this.$route.path;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.login-register {
+		width: 100%;
+		height: 100%;
+		background: url(https://file-node.oss-cn-shanghai.aliyuncs.com/youji/8ead21d2c7464ae99745e93f5a17e4d3) no-repeat;
+		background-size: 100% 100%;
+		overflow: auto;
+		display: flex;
+		flex-direction: column;
+		min-width: 1300px;
+		min-height: 800px;
+
+		.title {
+			height: 64px;
+			background: rgba(255, 255, 255, 0.36);
+			box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.25);
+			padding-left: 46px;
+			display: flex;
+			align-items: center;
+
+			.title-logo {
+				width: 245px;
+				height: 34px;
+				margin-right: 74px;
+				display: flex;
+				align-items: center;
+				color: #484B50;
+			}
+
+			.title-sub-name {
+				font-size: 12px;
+				transform: scale(0.68) translateX(-66px);
+				width: 282px;
+				opacity: 0.75;
+			}
+
+			.title-name {
+				font-family: hanyiyaku;
+				font-size: 16px;
+				line-height: 22px;
+			}
+
+			.title-logo img {
+				width: 34px;
+				height: 34px;
+				margin-right: 10px;
+				border-radius: 5px;
+			}
+		}
+
+		.content {
+			flex: 1;
+			height: 0;
+			width: 100%;
+			overflow: auto;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.content-image {
+				width: 640px;
+				height: 440px;
+				background: url(https://file-node.oss-cn-shanghai.aliyuncs.com/youji/2fdedc8660e146b7bb003ce85dedea5f) no-repeat;
+				background-size: 100% 100%;
+			}
+
+			.content-left {
+				width: 910px;
+				display: flex;
+				flex-direction: column;
+				padding-left: 90px;
+			}
+
+			.content-right {
+				width: 440px;
+				display: flex;
+				align-items: center;
+			}
+
+			.content-title {
+				margin-bottom: 64px;
+			}
+
+			.sub-title {
+				font-weight: 600;
+				font-size: 31px;
+				color: #484B50;
+				line-height: 44px;
+				text-align: left;
+				font-style: normal;
+				margin-bottom: 10px;
+			}
+
+			.small-title {
+				font-weight: 400;
+				font-size: 16px;
+				color: #333E4D;
+				line-height: 22px;
+				text-align: left;
+				font-style: normal;
+				display: flex;
+				align-items: center;
+
+				.line {
+					margin: 0 20px;
+					width: 1px;
+					height: 16px;
+					background: #CBE0FF;
+				}
+			}
+		}
+	}
 </style>

virgo.wzfrontend/workark/src/main.js

@@ -10,8 +10,10 @@ Vue.use(ElementUI);
 Vue.config.productionTip = false
 
 import dayjs from 'dayjs';
-Vue.prototype.$dayjs = dayjs;
+Vue.prototype.$dayjs = dayjs;
 
+//自定义弹窗
+import './uitls/dialogDrag'
 const avatar = () => import('./components/common/avatar');
 Vue.component('avatar', avatar)
 

virgo.wzfrontend/workark/src/uitls/dialogDrag.js

@@ -0,0 +1,74 @@
+import Vue from 'vue'
+//弹窗全局拖动指令
+Vue.directive('dialogDrag', {
+	bind(el, binding, vnode, oldVnode) {
+		const value = binding.value;
+		if (value == false) return;
+		let top, left, maxLeft, maxTop;
+		// 获取拖拽内容头部
+		const dialogHeaderEl = el.querySelector('.el-dialog__header');
+		const dragDom = el.querySelector('.el-dialog');
+		dialogHeaderEl.style.cursor = 'move';
+		// 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+		const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+		dragDom.style.position = 'absolute';
+		dragDom.style.marginTop = 0;
+		let width = dragDom.style.width;
+		if (width.includes('%')) {
+			width = +document.body.clientWidth * (+width.replace(/\%/g, '') / 100);
+		} else {
+			width = +width.replace(/\px/g, '');
+		}
+		dragDom.style.left = `${(document.body.clientWidth - width) / 2}px`;
+		// 鼠标按下事件
+		dialogHeaderEl.onmousedown = (e) => {
+			// 鼠标按下，计算当前元素距离可视区的距离 (鼠标点击位置距离可视窗口的距离)
+			const disX = e.clientX - dialogHeaderEl.offsetLeft;
+			const disY = e.clientY - dialogHeaderEl.offsetTop;
+			if (!top) top = -dragDom.offsetTop;
+			if (!left) left = dragDom.offsetLeft;
+			if (!maxLeft) maxLeft = document.body.clientWidth - dragDom.offsetWidth;
+			if (!maxTop) maxTop = document.body.offsetHeight - dragDom.offsetHeight + top;
+			// 获取到的值带px 正则匹配替换
+			let styL, styT;
+
+			// 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+			if (sty.left.includes('%')) {
+				styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
+				styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
+			} else {
+				styL = +sty.left.replace(/\px/g, '');
+				styT = +sty.top.replace(/\px/g, '');
+			};
+
+			// 鼠标拖拽事件
+			document.onmousemove = function(e) {
+				// 通过事件委托，计算移动的距离 （开始拖拽至结束拖拽的距离）
+				const l = e.clientX - disX;
+				const t = e.clientY - disY;
+				let finallyL = l + styL;
+				let finallyT = t + styT;
+				// 移动当前元素
+				if (finallyL > 0 && finallyL < maxLeft) {
+					dragDom.style.left = `${finallyL}px`;
+				} else if (finallyL < 0) {
+					dragDom.style.left = `0px`;
+				} else if (finallyL > maxLeft) {
+					dragDom.style.left = `${maxLeft}px`;
+				}
+				if (finallyT > top && finallyT < maxTop) {
+					dragDom.style.top = `${finallyT}px`;
+				} else if (finallyT < top) {
+					dragDom.style.top = `${top}px`;
+				} else if (finallyT > maxTop) {
+					dragDom.style.top = `${maxTop}px`;
+				}
+			};
+
+			document.onmouseup = function(e) {
+				document.onmousemove = null;
+				document.onmouseup = null;
+			};
+		}
+	}
+})

virgo.wzfrontend/workark/src/views/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="website-home">
 		<div class="banner">
-			<el-carousel :interval="5000" arrow="always" height="100%">
+			<el-carousel :interval="5000" arrow="hover" height="100%">
 				<el-carousel-item>
 					<img class="banner-img"
 						src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/1eeba102483945589db9fa134581c19c"
@@ -31,6 +31,28 @@
 				<div class="main-sub-title">方便、快捷、精准</div>
 			</div> -->
 			<div class="product-box">
+				<div class="product-iview" id="list-1">
+					<div class="title">产品介绍</div>
+					<div class="product-banner" style="height: 400px;">
+						<el-carousel :interval="5000" arrow="never" height="100%">
+							<el-carousel-item>
+								<div class="project-content">
+									<div class="project-img"></div>
+									<div class="project-article">
+										<div class="article-title">产品介绍</div>
+										<div class="article-content">
+											<div>在复杂多变的商业环境中，精准找到可靠服务商与高效管理服务过程是企业面临的普遍痛点。</div>
+											<div>WorkArk应运而生，突破传统服务模式，打造一个开放、透明、高效的企业级服务平台。</div>
+											<div>在这里，有需求的企业可以便捷发布任务、筛选优质服务商、全程跟踪进度、安全验收成果；专业服务商可以展示实力、精准获客、在线协作、高效交付。
+											</div>
+											<div>我们聚焦知识产权、项目申报、技术开发、营销推广、财税审计、企业标准等核心企业服务领域，赋能整个服务价值链！</div>
+										</div>
+									</div>
+								</div>
+							</el-carousel-item>
+						</el-carousel>
+					</div>
+				</div>
 				<div class="product-iview" v-for="item in list" :key="item.id" :id="`list${item.id}`">
 					<div class="title">{{item.name}}</div>
 					<div class="product-list">
@@ -81,10 +103,10 @@
 					if (res.state) {
 						this.list = res.data;
 						let navList = JSON.parse(JSON.stringify(res.data));
-						// navList.push({
-						// 	name: '产品介绍',
-						// 	id: -1
-						// })
+						navList.unshift({
+							name: '产品介绍',
+							id: -1
+						})
 						this.$emit('navFunc', navList);
 					}
 				})
@@ -173,7 +195,7 @@
 
 		.product-box {
 			margin-top: 80px;
-			padding-bottom: 200px;
+			padding-bottom: 50px;
 
 			.title {
 				font-size: 36px;
@@ -191,5 +213,48 @@
 		.product-iview {
 			margin-bottom: 30px;
 		}
+
+		.project-content {
+			width: 100%;
+			height: 100%;
+			display: flex;
+
+			.project-img {
+				width: 746px;
+				height: 100%;
+				border-radius: 16px;
+				overflow: hidden;
+				margin-right: 30px;
+				background-image: url('https://file-node.oss-cn-shanghai.aliyuncs.com/youji/441be5f8bde647ed8acf12651ca91354');
+				background-repeat: no-repeat;
+				background-size: cover;
+				background-position: center center;
+			}
+
+			.project-article {
+				flex: 1;
+				width: 0;
+			}
+
+			.article-title {
+				font-weight: 600;
+				font-size: 28px;
+				color: #1f2329;
+				line-height: 40px;
+				padding: 15px 0;
+			}
+
+			.article-content {
+				font-size: 16px;
+				color: #5d6c82;
+				line-height: 30px;
+				opacity: .9;
+
+				div {
+					text-indent: 32px;
+					margin-bottom: 10px;
+				}
+			}
+		}
 	}
 </style>

virgo.wzfrontend/workark/src/views/website/serveDetail.vue

@@ -63,7 +63,7 @@
 			</div>
 		</div>
 		<el-dialog :close-on-click-modal="false" :title="dialogType === 1?'创建订单':'预览合同'" :visible.sync="dialogVisible"
-			width="900px" :append-to-body="true">
+			width="900px" :append-to-body="true" v-dialogDrag>
 			<create-order v-if="dialogVisible && dialogType === 1" :serveId="detail.id"
 				@callback="dialogVisible = false">
 			</create-order>