fix

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

@@ -9,7 +9,7 @@ $--color-white:#fff !default;
 
 // 文本颜色
 $--color-text-primary: #1d2129 !default; // 主要文字
-$--color-text-regular: #4e5969 !default; // 常规文字
+$--color-text-regular: #1d2129 !default; // 常规文字
 $--color-text-secondary: #86909c !default;// 次要文字
 $--color-text-placeholder: #86909c !default; // 占位符
 

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

@@ -0,0 +1,246 @@
+<template>
+	<div class="create-order hui-flex">
+		<div class="hui-flex-box">
+			<div class="order-box">
+				<div class="title">订单详情</div>
+				<div class="content">
+					<el-table :data="tableData">
+						<el-table-column label="商品名称" prop="name"></el-table-column>
+						<el-table-column label="数量" width="100">
+							<template>
+								x1
+							</template>
+						</el-table-column>
+						<el-table-column label="价格" prop="price" width="100"></el-table-column>
+					</el-table>
+				</div>
+			</div>
+			<div class="order-box">
+				<div class="title" style="border: none;">优惠券</div>
+				<div class="content contents">
+					<div class="coupon-card" v-for="(item,index) in coupon" :key="index" @click="checkCoupon(item)">
+						<div
+							:class="couponChecked.findIndex(node=>node.id === item.id) > -1 ? 'coupon-card-box active' :'coupon-card-box'">
+							<div class="price">
+								<div v-if="item.type === 1">
+									<span class="symbol">¥</span>
+									<span>{{item.couponAmount}}</span>
+								</div>
+								<div v-else>
+									<span>{{item.discount*100}}</span>
+									<span class="symbol">折</span>
+								</div>
+							</div>
+							<div class="center-describe">
+								<div class="product">{{item.title}}</div>
+								<div class="sub-title">
+									<span>{{item.type === 1?`满${item.threshold}减${item.couponAmount}`:`满${item.threshold}可用，最高抵扣${item.mostConstraint}`}}</span>
+								</div>
+							</div>
+							<div class="icon-check">
+								<i class="el-icon-check"></i>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="create-order-submit">
+			<div class="create-order-price">
+				<div>
+					<span>应付费用：</span><span class="color-red">¥</span><span class="color-red">90.00</span>
+				</div>
+				<div class="discount-num">
+					<span class="color-red">减 ¥ 0.00</span>
+				</div>
+			</div>
+			<el-button type="primary" size="medium">创建订单</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		getServeById
+	} from '@/api/serve'
+	import {
+		getCouponListByQuery
+	} from '@/api/discount'
+	export default {
+		props: ['serveId'],
+		data() {
+			return {
+				tableData: [],
+				coupon: [],
+				couponChecked: []
+			}
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getServeById(this.serveId).then(res => {
+					if (res.state) {
+						this.tableData = [res.data];
+					}
+				})
+				getCouponListByQuery({
+					userId: this.$store.getters.user.userId
+				}).then(res => {
+					if (res.state) {
+						this.coupon = res.data;
+					}
+				})
+			},
+			checkCoupon(item) {
+				let index = this.couponChecked.findIndex(node => node.id === item.id);
+				if (index === -1) {
+					this.couponChecked.push(item);
+				} else {
+					this.couponChecked.splice(index, 1);
+				}
+				console.log(this.couponChecked);
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.create-order {
+		width: 100%;
+		height: 100%;
+		background: $--background-color-base;
+		padding: 15px;
+
+		.create-order-submit {
+			background: #fff;
+			display: flex;
+			align-items: center;
+			justify-content: end;
+			padding: 15px;
+
+			.create-order-price {
+				margin-right: 20px;
+			}
+
+			.discount-num {
+				font-size: 12px;
+			}
+		}
+
+		.coupon-card {
+			width: 50%;
+			margin-top: 10px;
+
+			&:nth-child(2n) {
+				padding-left: 5px;
+			}
+
+			&:nth-child(2n-1) {
+				padding-right: 5px;
+			}
+
+			.coupon-card-box {
+				background: #fff;
+				padding: 15px;
+				align-items: center;
+				display: flex;
+				position: relative;
+				cursor: pointer;
+				border: 1px solid $--border-color-lighter;
+				overflow: hidden;
+
+				&:hover,
+				&.active {
+					border-color: $--color-primary;
+
+					.icon-check {
+						display: flex;
+					}
+				}
+			}
+
+			.price {
+				color: $--color-danger;
+				font-size: 24px;
+				font-weight: 500;
+				line-height: 24px;
+				text-align: center;
+				width: 100px;
+
+				.symbol {
+					margin: 0 3px;
+					font-size: $--font-size-base;
+				}
+			}
+
+			.center-describe {
+				display: inline-block;
+				margin-right: auto;
+				padding-left: 20px;
+				text-align: left;
+
+				.product {
+					color: $--color-text-primary;
+					font-size: $--font-size-large;
+					font-weight: 550;
+					line-height: 14px;
+					padding-bottom: 12px;
+				}
+			}
+
+			.icon-check {
+				color: #fff;
+				white-space: nowrap;
+				transform: rotate(45deg);
+				position: absolute;
+				top: -8px;
+				right: -15px;
+				background: #165dff;
+				width: 40px;
+				text-align: center;
+				height: 26px;
+				display: none;
+				align-items: flex-end;
+				justify-content: center;
+			}
+		}
+
+		.el-table__header {
+
+			th {
+				color: #606266;
+				background: #f4f4f5;
+			}
+
+			.cell {
+				font-weight: 700;
+			}
+		}
+
+		.order-box {
+			background: #fff;
+			margin-bottom: 15px;
+
+			.title {
+				font-weight: 600;
+				line-height: 22px;
+				padding: 12px 24px;
+				border-bottom: 1px solid $--border-color-light;
+			}
+
+			.content {
+				padding: 15px;
+			}
+
+			.contents {
+				background: $--background-color-base;
+				padding: 0;
+				display: flex;
+				flex-wrap: wrap;
+			}
+
+		}
+	}
+</style>

virgo.wzfrontend/workark/src/components/work/discount/coupon/detail.vue

@@ -11,6 +11,10 @@
 						<div class="hui-detail-label">优惠类型</div>
 						<div class="hui-detail-value">{{detail.type === 1?'现金折扣':'打折折扣'}}</div>
 					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">叠加使用</div>
+						<div class="hui-detail-value">{{detail.onverlayUse === 0?'不可叠加':'可叠加'}}</div>
+					</div>
 					<div class="hui-detail-item">
 						<div class="hui-detail-label">门槛金额(元)</div>
 						<div class="hui-detail-value">{{detail.threshold}}元</div>

virgo.wzfrontend/workark/src/components/work/discount/coupon/edit.vue

@@ -11,6 +11,12 @@
 						<el-radio :label="2">打折折扣</el-radio>
 					</el-radio-group>
 				</el-form-item>
+				<el-form-item label="是否可叠加">
+					<el-radio-group v-model="form.overlayUse">
+						<el-radio :label="0">不可叠加</el-radio>
+						<el-radio :label="1">可叠加</el-radio>
+					</el-radio-group>
+				</el-form-item>
 				<el-form-item label="门槛金额(元)">
 					<el-input type="text" v-model="form.threshold" @input="val=>handleInput(val,'threshold')"
 						placeholder="请输入门槛金额">
@@ -82,6 +88,7 @@
 					threshold: '', //门槛金额
 					mostConstraint: '', //最高限制金额
 					description: '', //使用说明
+					overlayUse: 0
 				},
 				loading: false,
 				customList: [],

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

@@ -14,9 +14,6 @@
 						<el-radio :label="1">可添加附件</el-radio>
 					</el-radio-group>
 				</el-form-item>
-				<el-form-item label="可添加附件个数" v-if="departmentForm.attachment === 1">
-					<el-input type="text" v-model="departmentForm.attachmentNumber" placeholder="请输入可添加附件个数"></el-input>
-				</el-form-item>
 				<el-form-item label="可添加附件角色" v-if="departmentForm.attachment === 1">
 					<el-radio-group v-model="departmentForm.roleId">
 						<el-radio :label="1">客户</el-radio>
@@ -77,9 +74,10 @@
 				this.loading = true;
 				let postData = JSON.parse(JSON.stringify(this.departmentForm));
 				if (postData.attachment === 0) {
-					postData['attachmentNumber'] = null;
-					postData['roleId'] = 1;
+					delete postData.attachmentNumber;
+					delete postData.roleId;
 				}
+				if (postData.sequence === 0) delete postData.sequence;
 				if (this.isUpdate) {
 					updateProcessSetData(postData).then(this.successFunc)
 				} else {

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

@@ -36,6 +36,9 @@
 	import {
 		removeToken
 	} from '@/uitls/auth';
+	import {
+		mapGetters
+	} from 'vuex';
 	const login = () => import('./login');
 	export default {
 		data() {
@@ -67,6 +70,14 @@
 				if (type == 'init') this.init();
 			}
 		},
+		computed: {
+			...mapGetters(['loginVisible'])
+		},
+		watch: {
+			loginVisible(val) {
+				this.dialogVisible = true;
+			}
+		},
 		components: {
 			login
 		}

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

@@ -197,7 +197,7 @@
 	}
 
 	.close-icon-box {
-		padding: 10px 10px 20px 10px;
+		padding: 10px 10px 40px 10px;
 		text-align: right;
 	}
 

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

@@ -107,7 +107,7 @@
 			menuData() {
 				this.init();
 			}
-		},
+		}
 	}
 </script>
 

virgo.wzfrontend/workark/src/store/getters.js

@@ -4,6 +4,7 @@ const getters = {
 	user: state => state.app.user, //用户基本信息
 	organization: state => state.app.organization, //所属组织信息
 	project: state => state.app.project, //项目
-	processSet: state => state.app.processSet //过程状态管理
+	processSet: state => state.app.processSet, //过程状态管理
+	loginVisible: state => state.app.loginVisible //是否登录
 }
 export default getters;

virgo.wzfrontend/workark/src/store/modules/app.js

@@ -10,7 +10,8 @@ const getDefaultState = () => ({
 	project: {
 		id: -1
 	},
-	processSet: {}
+	processSet: {},
+	loginVisible: 1
 })
 
 const mutations = {
@@ -32,7 +33,10 @@ const mutations = {
 	CHANGE_PROCESS_SET: (state, processSet) => {
 		state.processSet = processSet;
 	},
-	RESET_STATE(state) {
+	CHANGE_LOGIN_VISIBLE: (state, loginVisible) => {
+		state.loginVisible = loginVisible;
+	},
+	RESET_STATE: (state) => {
 		state = Object.assign(state, getDefaultState())
 	}
 }
@@ -62,11 +66,16 @@ const actions = {
 		commit
 	}, project) {
 		commit('CHANGE_PROJECT', project);
-	},
-	changeProcessSet({
-		commit
-	}, processSet) {
-		commit('CHANGE_PROCESS_SET', processSet);
+	},
+	changeProcessSet({
+		commit
+	}, processSet) {
+		commit('CHANGE_PROCESS_SET', processSet);
+	},
+	changeLoginVisible({
+		commit
+	}, loginVisible) {
+		commit('CHANGE_LOGIN_VISIBLE', loginVisible);
 	},
 	resetState({
 		commit

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

@@ -21,9 +21,8 @@
 							<div class="color-red price">
 								<span class="average alibaba">{{detail.price}}</span><span class="unit">元/次</span>
 							</div>
-
 							<div class="button-box">
-								<el-button type="primary" size="small">购买</el-button>
+								<el-button type="primary" size="small" @click="payItem">购买</el-button>
 							</div>
 						</div>
 						<div class="content-detail" v-if="detail.intro">
@@ -45,15 +44,20 @@
 				<el-empty description="暂无服务"></el-empty>
 			</div>
 		</div>
+		<el-dialog :close-on-click-modal="false" title="创建订单" :visible.sync="dialogVisible" width="900px"
+			:append-to-body="true">
+			<create-order v-if="dialogVisible" :serveId="detail.id" @callback="dialogVisible = false">
+			</create-order>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
 	import {
-		getServeListByQuery,
-		getServeById
+		getServeListByQuery
 	} from '@/api/serve'
 	import Crypto from '@/uitls/crypto'
+	const createOrder = () => import('@/components/website/createOrder');
 	export default {
 		data() {
 			return {
@@ -62,7 +66,8 @@
 				detail: {},
 				list: [],
 				rotatingImages: [],
-				detailedImage: []
+				detailedImage: [],
+				dialogVisible: false
 			};
 		},
 		mounted() {
@@ -96,7 +101,6 @@
 				if (this.detail.rotatingImages) {
 					this.rotatingImages = JSON.parse(this.detail.rotatingImages);
 					this.detailedImage = JSON.parse(this.detail.detailedImage);
-
 					this.initSwiper();
 				}
 			},
@@ -110,7 +114,19 @@
 						},
 					})
 				})
+			},
+			payItem() {
+				if (!this.$store.getters.user.userId) {
+					let index = this.$store.getters.loginVisible;
+					index++
+					this.$store.dispatch('app/changeLoginVisible', index);
+					return;
+				}
+				this.dialogVisible = true;
 			}
+		},
+		components: {
+			createOrder
 		}
 	};
 </script>

virgo.wzfrontend/workark/src/views/work/serve/content.vue

@@ -6,7 +6,7 @@
 		<div class="hui-flex-box hui-flex hui-table">
 			<div class="hui-content-insert">
 				<el-button type="primary" size="small" @click="insert">
-					新增服务
+					新增商品
 				</el-button>
 			</div>
 			<div class="hui-flex-box">
@@ -16,7 +16,7 @@
 							<div style="text-align: center;">{{scope.$index + 1}}</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="服务名称" prop="name"></el-table-column>
+					<el-table-column label="商品名称" prop="name"></el-table-column>
 					<el-table-column label="价格" prop="price"></el-table-column>
 					<el-table-column label="创建时间" prop="createTime"></el-table-column>
 					<el-table-column label="创建时间" prop="updateTime"></el-table-column>