fix

virgo.wzfrontend/workark/src/assets/css/element-variables.scss

@@ -1,6 +1,6 @@
 /* 改变主题色变量 */
 // 主色系
-$--color-primary: #165dff !default;      // 主色调（蓝）
+$--color-primary: #5A4FCF !default;      // 主色调（蓝）
 $--color-success: #00b42a !default;      // 成功色（绿）
 $--color-warning: #ff7d00 !default;      // 警告色（橙）
 $--color-danger: #f53f3f !default;       // 危险色（红）

virgo.wzfrontend/workark/src/components/work/serve/list/detail.vue

@@ -84,12 +84,21 @@
 								<el-timeline>
 									<el-timeline-item :class="timelineClass(1)"
 										:hide-timestamp="!contractNode.createDate" :timestamp="contractNode.createDate">
-										服务商上传合同
+										<div>服务商上传合同</div>
+										<el-button v-if="!part.contractId && type === 2" size="mini" type="primary"
+											@click="action({id:5,name:'绑定合同'})" style="margin-top: 10px;">
+											绑定合同
+										</el-button>
 									</el-timeline-item>
 									<el-timeline-item :class="timelineClass(2)"
 										:hide-timestamp="!contractNode.confirmDate"
 										:timestamp="contractNode.confirmDate">
 										<div>客户确认</div>
+										<el-button v-if="part.contractId && part.contractStatus === 0 && type === 1"
+											size="mini" type="primary" @click="action({id:8,name:'确认合同'})"
+											style="margin-top: 10px;">
+											确认合同
+										</el-button>
 									</el-timeline-item>
 									<el-timeline-item :class="timelineClass(3)"
 										:hide-timestamp="!contractNode.processDate"
@@ -236,11 +245,6 @@
 					type: 'primary',
 					name: '确认订单'
 				});
-				if (!this.part.contractId) this.activeList.push({
-					id: 5,
-					type: 'primary',
-					name: '绑定合同'
-				});
 				// if (this.part.contractId) this.activeList.push({
 				// 	id: 6,
 				// 	type: 'warning',
@@ -255,13 +259,6 @@
 					type: 'primary',
 					name: '立即支付'
 				})
-				if (this.part.contractId && this.part.contractStatus === 0) {
-					this.activeList.push({
-						id: 8,
-						type: 'primary',
-						name: '确认合同'
-					});
-				}
 			},
 			initBindContract() {
 				getBindContract(this.part.contractId).then(res => {

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

@@ -16,22 +16,25 @@
 			</div>
 		</div>
 		<div class="set-process-box">
-			<div>
-				<span class="set-process-title">{{nowTitle.name}}</span>
+			<div class="set-process-title">
+				<div class="icon-font">
+					<i class="el-icon-s-shop"></i>
+				</div>
+				<span class="icon-label">{{nowTitle.name}}</span>
 			</div>
-			<div class="set-process-box">
-				<process-set-item :list="nowTitle.children" :type="operationType" :roleType="roleType"
-					v-if="nowTitle.children.length > 0">
-				</process-set-item>
-				<div v-else>
-					<div v-if="(nowTitle.status === 1 || nowTitle.status === 4) && roleType === 2">
-						<el-button size="mini" type="primary" @click="updateStatus(nowTitle,3)">通过</el-button>
-					</div>
-					<div class="process-set-insert" @click="edits('insert', nowTitle ? nowTitle.id : -1, nowTitle)"
-						v-if="operationType === 'edit'">
-						新增
-					</div>
-				</div>
+			<div class="set-process-box">
+				<process-set-item :list="nowTitle.children" :type="operationType" :roleType="roleType"
+					v-if="nowTitle.children.length > 0">
+				</process-set-item>
+				<div v-else>
+					<div v-if="(nowTitle.status === 1 || nowTitle.status === 4) && roleType === 2">
+						<el-button size="mini" type="primary" @click="updateStatus(nowTitle,3)">通过</el-button>
+					</div>
+					<div class="process-set-insert" @click="edits('insert', nowTitle ? nowTitle.id : -1, nowTitle)"
+						v-if="operationType === 'edit'">
+						新增
+					</div>
+				</div>
 			</div>
 		</div>
 		<el-dialog :close-on-click-modal="false" :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="800px"
@@ -273,22 +276,44 @@
 <style lang="scss">
 	.process-set {
 		padding: 15px;
+		width: 100%;
 
 		.set-process-box {
-			padding-top: 15px;
+			padding-top: 10px;
 		}
 
 		.set-process-title {
 			padding: 5px 10px;
-			background: $--color-primary;
-			color: #fff;
 			border-radius: 4px;
-			margin-bottom: 15px;
+			margin-bottom: 10px;
+			display: flex;
+			align-items: center;
+			border-bottom: 1px solid $--border-color-light;
+
+			.icon-font {
+				background: $--color-primary;
+				color: #fff;
+				width: 30px;
+				height: 30px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 22px;
+				border-radius: 4px;
+			}
+
+			.icon-label {
+				font-weight: bold;
+				margin-left: 10px;
+			}
 		}
 
 		.process-top {
 			display: flex;
 			white-space: nowrap;
+			width: 100%;
+			overflow-x: auto;
+			padding-bottom: 10px;
 
 			.top-item {
 				padding: 0 15px;
@@ -387,15 +412,12 @@
 		}
 
 		&.model {
-			width: 100%;
 			height: 100%;
 			overflow-y: auto;
 		}
 
 		&.product {
-			width: 100%;
 			min-height: 300px;
-			overflow-x: auto;
 		}
 
 		.process-set-item {
@@ -491,55 +513,19 @@
 			}
 
 			&.info {
-				background: rgba(144, 157, 143, 0.4);
-
-				.process-set-state-1 {
-					background: rgba(144, 157, 143, 1);
-				}
-
-				.process-set-state-2 {
-					background: rgba(144, 157, 143, 0.6);
-				}
+				background: rgba(144, 157, 143, 0.6);
 			}
 
 			&.waiting {
-				background: rgba(255, 125, 0, 0.4);
-
-				.process-set-state-1 {
-					background: rgba(255, 125, 0, 1);
-				}
-
-				.process-set-state-2 {
-					background: rgba(255, 125, 0, 0.6);
-				}
-
-				.el-icon-success {
-					color: rgba(255, 125, 0, 1);
-				}
+				background: rgba(255, 125, 0, 0.6);
 			}
 
 			&.success {
-				background: rgba(0, 180, 42, 0.4);
-
-				.process-set-state-1 {
-					background: rgba(0, 180, 42, 1);
-				}
-
-				.process-set-state-2 {
-					background: rgba(0, 180, 42, 0.6);
-				}
+				background: rgba(0, 180, 42, 0.6);
 			}
 
 			&.error {
-				background: rgba(245, 63, 63, 0.4);
-
-				.process-set-state-1 {
-					background: rgba(245, 63, 63, 1);
-				}
-
-				.process-set-state-2 {
-					background: rgba(245, 63, 63, 0.6);
-				}
+				background: rgba(245, 63, 63, 0.6);
 			}
 
 			&.state-last {

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

@@ -2,11 +2,7 @@
 	<div class="set-item-box">
 		<div class="process-set-item" v-for="(item,index) in list" :key="item.id">
 			<!-- 状态 -->
-			<div :class="'process-set-state ' + returnItemClass(item)">
-				<div class="process-set-state-2">
-					<div class="process-set-state-1"></div>
-				</div>
-			</div>
+			<div :class="'process-set-state ' + returnItemClass(item)"></div>
 			<!-- line -->
 			<div :class="'line line-top ' + returnItemClass(item)" v-if="index > 0"></div>
 			<div :class="'line line-bottom ' + returnItemClass(item)" v-if="index < list.length-1 || type === 'edit'">
@@ -24,11 +20,7 @@
 				<div v-if="item.type === 1">
 					<div class="process-set-item" v-for="(node,index) in item.children" :key="node.id">
 						<!-- 状态 -->
-						<div :class="'process-set-state ' + returnItemClass(item,node)">
-							<div class="process-set-state-2">
-								<div class="process-set-state-1"></div>
-							</div>
-						</div>
+						<div :class="'process-set-state ' + returnItemClass(item,node)"></div>
 						<!-- 标题 -->
 						<div class="process-item-title">
 							<span class="label">{{node.name}}</span>
@@ -97,7 +89,7 @@
 						</el-button>
 					</div>
 					<!-- 新增 -->
-					<div class="process-set-insert" @click="edit('insert', item.id)" v-if="type === 'edit'">
+					<div class="process-set-insert" @click="edit('insert', item.id,item)" v-if="type === 'edit'">
 						新增
 					</div>
 				</div>

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

@@ -1,12 +1,12 @@
 <template>
 	<div class="layout-title">
 		<div class="title-box">
-			<div class="title-logo">
-				<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/2f7b4bfaf9e64817bc2cb46f3a632b01"
-					alt="logo.png" @click="$router.push('/')">
-				<div class="title-label" @click="$router.push('/')">
-					<div class="title-name">红链WORKARK</div>
-					<div class="title-sub-name">SMART PARK SYSTEM</div>
+			<div class="title-logo" @click="$router.push('/')">
+				<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/f9617c7f80da485cb3cc72b6accc62ed"
+					alt="logo.png">
+				<div class="title-label">
+					<div class="title-name">WorkArk</div>
+					<div class="title-sub-name">SMART SERVE SYSTEM</div>
 				</div>
 			</div>
 			<div class="login" v-if="user.userId">
@@ -129,7 +129,6 @@
 			img {
 				width: 44px;
 				height: 44px;
-				border-radius: 4px;
 				margin-right: 10px;
 				cursor: pointer;
 			}
@@ -137,7 +136,7 @@
 		}
 
 		.title-label {
-			width: 130px;
+			width: 150px;
 			cursor: pointer;
 		}
 
@@ -149,7 +148,7 @@
 
 		.title-sub-name {
 			font-size: 12px;
-			transform: scale(.68) translateX(-28px);
+			transform: scale(.68) translateX(-32px);
 			opacity: .75;
 		}
 

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

@@ -2,10 +2,10 @@
 	<div class="work-layout-title">
 		<div class="work-layout-left">
 			<div class="work-layout-image">
-				<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/2f7b4bfaf9e64817bc2cb46f3a632b01"
+				<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/f9617c7f80da485cb3cc72b6accc62ed"
 					alt="logo.png" />
 			</div>
-			<div class="work-layout-label" @click="$router.push('/')">WORKARK</div>
+			<div class="work-layout-label" @click="$router.push('/')">WorkArk</div>
 			<div class="work-layout-button" @click="$router.push('/work')">
 				<i class="iconfont huifont-yunweiguanli"></i><span>工作台</span>
 			</div>

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

@@ -1,162 +1,162 @@
-<template>
-	<div class="login-register">
-		<div class="title">
-			<div class="title-logo">
-				<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/2f7b4bfaf9e64817bc2cb46f3a632b01"
-					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>
+					</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>