lalala 6 лет назад
Родитель
Сommit
f3590c0414

+ 2 - 8
admin-code/src/assets/css/base.scss

@@ -80,14 +80,8 @@ $backColor: #f5f5f5;
     text-decoration: underline;
 }
 
-.separate_line {
-    color: #999;
-    margin: 0 16px;
-}
-
-.text_sub_com {
-    color: #999;
-    font-size: 12px;
+.app-margin-left-10 {
+    margin-left: 10px !important;
 }
 
 .flex {

+ 11 - 0
admin-code/src/mock/userInfo.js

@@ -214,6 +214,17 @@ let menu = {
 			viewPath: 'views/goods/goods-add.vue',
 			keepAlive: 1
 		},
+		{
+			id: '205',
+			parentId: '27',
+			name: '图库管理',
+			type: 1,
+			icon: 'icon-user',
+			orderNum: 1,
+			router: '/goods/img-store',
+			viewPath: 'views/goods/img-store.vue',
+			keepAlive: 1
+		},
 		{
 			id: '200',
 			parentId: '27',

+ 5 - 4
admin-code/src/views/goods/goods-add.vue

@@ -232,13 +232,13 @@ export default {
 			// 距离收费
 			chargePopover: false,
 			// 从图库中选择
-			imgStoreModal: false,
+			imgStoreModal: true,
 			imgStoreVal: '',
 			imgStoreOpt: [],
 			imgStoreArr: [],
 			currentPage: 1,
 			// 款式选择
-			styleStoreModal: true,
+			styleStoreModal: false,
 			styleForm: {
 				styleName: '',
 				price: '',
@@ -279,7 +279,8 @@ export default {
 			console.log(`当前页: ${val}`);
 		},
 		// 款式选择弹窗
-		styleSubmit() {}
+		styleSubmit() {},
+		styleFormAddFn() {}
 	}
 };
 </script>
@@ -289,7 +290,7 @@ export default {
 	// width: 60%;
 	.question-btn {
 		position: relative;
-		right: 26px;
+		right: 28px;
 	}
 }
 .cl-editor-quill {

+ 102 - 0
admin-code/src/views/goods/img-store.vue

@@ -0,0 +1,102 @@
+<template>
+	<div class="app-content">
+		<!-- operate -->
+		<div class="flex-center-between">
+			<div class="operate-left">
+				<el-select v-model="form.region" placeholder="选择分类" size="mini">
+					<el-option label="花束" value="shanghai"></el-option>
+					<el-option label="区域二" value="beijing"></el-option>
+				</el-select>
+				<el-button type="primary" @click="onSubmit" size="mini" class="app-margin-left-10"
+					>查询</el-button
+				>
+			</div>
+			<div class="operate-right">
+				<el-button @click="onSubmit" size="mini">查看分类</el-button>
+				<el-button type="primary" @click="onSubmit" size="mini">新增</el-button>
+			</div>
+		</div>
+		<!-- list -->
+		<div class="list-wrap">
+			<div class="list" v-for="(item, index) in 10" :key="index">
+				<div class="list-img">
+					<img src="https://pic.qqtn.com/up/2019-11/2019110209212070747.jpg" alt="" />
+				</div>
+				<div class="flex-center-between">
+					<div>天使美人</div>
+					<div class="app-price">¥389.50</div>
+				</div>
+				<!--  -->
+				<div class="operate-btn-wrap">
+					<el-popover
+						placement="top-start"
+						title="标题"
+						width="200"
+						trigger="hover"
+						content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。"
+					>
+						<el-button
+							type="text"
+							icon="el-icon-s-operation"
+							slot="reference"
+							class="operate-btn"
+						></el-button>
+						<!-- <el-button slot="reference">hover 激活</el-button> -->
+					</el-popover>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			form: {
+				user: '',
+				region: ''
+			}
+		};
+	},
+	methods: {
+		onSubmit() {
+			console.log('submit!');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.list-wrap {
+	margin-top: 20px;
+	@include disFlex(center, flex-start);
+	flex-wrap: wrap;
+	.list {
+		position: relative;
+		margin-right: 20px;
+		margin-bottom: 20px;
+		box-shadow: 2px 2px 3px 0 #f5f5f5;
+		.list-img {
+			width: 200px;
+			margin-bottom: 6px;
+		}
+		.flex-center-between {
+			padding: 0 4px;
+			margin-bottom: 6px;
+		}
+		.operate-btn-wrap {
+			position: absolute;
+			top: 0;
+			right: 10px;
+			.operate-btn {
+				color: #fff;
+				font-size: 24px;
+				&:hover {
+					color: $mainColor;
+				}
+			}
+		}
+	}
+}
+</style>