图库 即将启用

shop/src/views/goods/category.vue

@@ -75,7 +75,7 @@
 						{{ adForm.img }}
 						<cl-upload v-model="adForm.img"></cl-upload>
 					</el-form-item>
-					<el-form-item label="马上启用" prop="status">
+					<el-form-item label="是否启用" prop="status">
 						<el-switch
 							v-model="adForm.status"
 							active-value="1"

shop/src/views/goods/goods-add.vue

@@ -58,19 +58,16 @@
 				<el-form-item label="图片" prop="shopImg">
 					<div class="list-wrap">
 						<!--<cl-upload v-model="ruleForm.shopImg"  :props="{multiple:true}"></cl-upload>-->
-
 						<elxUpload
 							:limit="4"
 							:fileList.sync="fileList_show"
-							:disabled="ruleForm.categoryIdList.length == 0"
 							:category="ruleForm.categoryIdList"
 							@success="fromToData"
 							@handleRemove="fromToData"
 						></elxUpload>
-						<p style="color: red" v-show="ruleForm.categoryIdList.length == 0">请先选择分类</p>
 					</div>
 					<div>
-						<el-button type="primary" size="small" @click="openStore">从图库选择</el-button>
+						<el-button type="primary" size="small" @click="openStore">图库选择</el-button>
 					</div>
 					<el-dialog :visible.sync="dialogVisible">
 						<img width="100%" :src="dialogImageUrl" alt />
@@ -108,9 +105,7 @@
 							<span>按距离收费</span>
 						</el-radio>
 						<el-popover placement="top" width="100" trigger="hover" v-model="chargePopover">
-							<p>
-								{{ shopInfo.extend.freeDistance }}公里内免运费，超过每增加1公里运费增加{{shopInfo.extend.freight}}元
-							</p>
+							<p>{{ shopInfo.extend.freeDistance }}公里内免运费，超过每增加1公里运费增加{{shopInfo.extend.freight}}元</p>
 							<div style="text-align: right; margin-top: 10px">
 								<el-button size="mini" type="primary" @click="$util.pageTo({url: '/goods/freight'})">修改</el-button>
 							</div>
@@ -169,7 +164,7 @@
 						<div class="list-checkbox" v-for="(item, index) in imgStoreData" :key="index">
 							<el-checkbox :label="item.imgUrl + ''">
 								<div class="list-img">
-									<img :src="item.imgUrl" alt="图库图片" />
+									<img :src="item.imgUrl" />
 								</div>
 							</el-checkbox>
 						</div>
@@ -196,6 +191,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import elxUpload from '@/components/common/elx-upload.vue';
+import imgStore from '@/service/img-store/index';
 
 export default {
 	name: 'goods-add',
@@ -275,7 +271,7 @@ export default {
 			this._getImgStore();
 		},
 		_getImgStore() {
-			return this.$service.imgStore
+			return imgStore
 				.list({
 					page: 1,
 					categoryId: this.imgStoreVal
@@ -284,7 +280,6 @@ export default {
 					this.imgStoreData = res.list;
 				});
 		},
-		// api
 		addFn(type) {
 			let form = JSON.parse(JSON.stringify(this.ruleForm));
 
@@ -440,10 +435,9 @@ export default {
 			this.styleStoreData.push(form);
 		},
 		openStore() {
-			if (this.ruleForm.categoryIdList.length == 0) {
-				return this.$message.error('请先选择分类');
-			}
-			this.imgStoreModal = true;
+			this.$message.success('即将启用')
+			return false
+			this.imgStoreModal = true
 		}
 	}
 };

shop/src/views/home.vue

@@ -199,50 +199,51 @@ export default {
 			],
 			// 快捷入口
 			entryData: [
-				{
-					name: '发货',
-					icon: 'icondingdanguanli',
-					url: ''
-				},
 				{
 					name: '订单管理',
 					icon: 'icondingdanguanli',
 					url: '/order/list'
 				},
 				{
-					name: '添加图库',
+					name: '图库',
 					icon: 'iconshangpinguanli',
-					url: 'goods/img-store'
+					url: '/goods/img-store'
 				},
 				{
 					name: '客户管理',
 					icon: 'iconkehuguanli',
-					url: 'member/list'
+					url: '/member/list'
 				},
 				{
 					name: '添加商品',
 					icon: 'icontupiantianjia',
-					url: 'goods/add'
+					url: '/goods/add'
 				},
 				{
 					name: '商品管理',
 					icon: 'iconshangpinguanli',
-					url: 'goods/list'
+					url: '/goods/list'
 				},
 				{
 					name: '邀请有礼',
 					icon: 'iconyaoqingyouli',
-					url: 'invite/list'
+					url: '/invite/list'
 				},
 				{
 					name: '广告管理',
 					icon: 'iconguanggao',
-					url: 'ad/list'
+					url: '/ad/list'
+				},
+				{
+					name: '客服',
+					icon: 'iconkefu',
+					url: ''
+				},
+				{
+					name: '拼团',
+					icon: 'iconlianjie',
+					url: ''
 				}
-				// {
-				// 	name: '拼团管理',
-				// 	path: ''
-				// }
 			],
 			// 总统计
 			allTotalData: [