update

admin-code/src/mock/userInfo.js

@@ -397,8 +397,8 @@ let menu = {
 			type: 1,
 			icon: 'icon-user',
 			orderNum: 1,
-			router: '/order/list',
-			viewPath: 'views/order/list.vue',
+			router: '/goods/list',
+			viewPath: 'views/goods/list.vue',
 			keepAlive: 1
 		},
 		{

admin-code/src/pages/layout/slider/index.vue

@@ -42,7 +42,7 @@ export default {
 	computed: {
 		...mapGetters(['menuGroup']),
 		subData() {
-			console.log('children', this.menuGroup[this.mainIndex]);
+			// console.log('children', this.menuGroup[this.mainIndex]);
 			let arr = this.menuGroup[this.mainIndex].children;
 			if (this.$util.isEmpty(arr)) {
 				return [];
@@ -51,7 +51,7 @@ export default {
 		}
 	},
 	mounted() {
-		console.log('menuGroup', this.menuGroup);
+		// console.log('menuGroup', this.menuGroup);
 	},
 	methods: {
 		pageMianTo(item, index) {
@@ -59,6 +59,7 @@ export default {
 			if (this.$util.isEmpty(item.children)) {
 				this.$router.push(item.path);
 			} else {
+				this.$router.push(item.children[0].path);
 				this.subIndex = 0;
 			}
 		},

admin-code/src/service/category/index.js

@@ -0,0 +1,6 @@
+import { BaseService, Service } from '@/cool/index';
+
+@Service('category')
+export class CategoryService extends BaseService {}
+
+export default new CategoryService();

admin-code/src/service/goods/index.js

@@ -1,6 +1,14 @@
 import { BaseService, Service } from '@/cool/index';
 
-@Service('user')
-export class GoodsService extends BaseService {}
+@Service('goods')
+export class GoodsService extends BaseService {
+	changeStatus(data) {
+		return this.request({
+			url: '/change-status',
+			method: 'POST',
+			data: data
+		});
+	}
+}
 
 export default new GoodsService();

admin-code/src/service/index.js

@@ -6,6 +6,7 @@ import order from './order/index';
 import member from './member/index';
 import goods from './goods/index';
 import level from './level/index';
+import category from './category/index';
 
 Vue.prototype.$service = {
 	common,
@@ -14,7 +15,8 @@ Vue.prototype.$service = {
 	order,
 	member,
 	goods,
-	level
+	level,
+	category
 };
 
 export default Vue.prototype.$service;

admin-code/src/service/member/index.js

@@ -1,6 +1,28 @@
 import { BaseService, Service } from '@/cool/index';
 
 @Service('user')
-export class MemberService extends BaseService {}
+export class MemberService extends BaseService {
+	/**
+	 * 给客户充值 b
+	 */
+	recharge(data) {
+		return this.request({
+			url: '/recharge',
+			method: 'POST',
+			data: data
+		});
+	}
+
+	/**
+	 * 给客户升级 b
+	 */
+	upgrade(data) {
+		return this.request({
+			url: '/upgrade',
+			method: 'POST',
+			data: data
+		});
+	}
+}
 
 export default new MemberService();

admin-code/src/service/request.js

@@ -5,6 +5,7 @@ import store from '@/store/index';
 import router from '@/router/index';
 import { href } from '@/utils/index';
 import qs from 'qs';
+import { Message } from 'element-ui';
 
 axios.defaults.timeout = 600000;
 // axios.defaults.withCredentials = true;
@@ -80,6 +81,7 @@ axios.interceptors.response.use(
 			case 1:
 				return data;
 			default:
+				Message.error(msg);
 				return Promise.reject(msg);
 		}
 	},

admin-code/src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
 	userInfo: state => state.user.info,
 	permission: state => state.menu.permission,
 	// config
-	level: state => state.config.level
+	level: state => state.config.level,
+	category: state => state.config.category
 };
 export default getters;

admin-code/src/store/modules/config.js

@@ -3,7 +3,8 @@ import service from '@/service/index';
 
 export default {
 	state: {
-		level: store.get('level') || {}
+		level: store.get('level') || {},
+		category: store.get('category') || {}
 	},
 	actions: {
 		getLevel({ commit }) {
@@ -12,9 +13,18 @@ export default {
 				return res;
 			});
 		},
-
 		delLevel({ commit }) {
 			commit('DEL_LEVEL');
+		},
+
+		getCategory({ commit }) {
+			return service.category.list().then(res => {
+				commit('SET_CATEGORY', res);
+				return res;
+			});
+		},
+		delCategory({ commit }) {
+			commit('DEL_CATEGORY');
 		}
 	},
 	mutations: {
@@ -22,10 +32,19 @@ export default {
 			state.info = val;
 			store.set('level', val);
 		},
-
 		DEL_LEVEL(state) {
 			state.info = {};
 			store.remove('level');
+		},
+
+		SET_CATEGORY(state, val) {
+			state.info = val;
+			store.set('category', val);
+		},
+
+		DEL_CATEGORY(state) {
+			state.info = {};
+			store.remove('category');
 		}
 	}
 };

admin-code/src/views/goods/goods-list.vue

@@ -38,7 +38,7 @@
 
 			<!-- 下架 -->
 			<template #slot-takeOff="{scope}">
-				<el-button type="text">下架</el-button>
+				<el-button type="text" @click="downFn(scope.row)">下架</el-button>
 			</template>
 		</cl-crud>
 		<!-- 添加商品 -->
@@ -72,6 +72,30 @@ export default {
 		addFn() {
 			this.$router.push('/goods/add');
 		},
+		downFn(item) {
+			this.$confirm('是否下架该商品?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.$service.goods
+						.changeStatus({
+							id: item.id,
+							status: item.status == 0 ? 1 : 0
+						})
+						.then(res => {
+							item.status = item.status == 0 ? 1 : 0;
+							this.$message.success('操作成功！');
+						});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消删除'
+					});
+				});
+		},
 		// cl-crud 组件
 		onLoad({ ctx, app }) {
 			ctx.service(this.$service.member)

admin-code/src/views/goods/img-store.vue

@@ -2,7 +2,7 @@
 	<div class="app-content">
 		<!-- operate -->
 		<div class="flex-center-between">
-			<div class="operate-left">
+			<div class="operate-left flex-center">
 				<el-select v-model="form.region" placeholder="选择分类" size="mini">
 					<el-option label="花束" value="shanghai"></el-option>
 					<el-option label="区域二" value="beijing"></el-option>

admin-code/src/views/member/list.vue

@@ -36,11 +36,11 @@
 
 			<!-- 充值 -->
 			<template #slot-recharge="{scope}">
-				<el-button type="text" @click="rechageDialog = true">充值</el-button>
+				<el-button type="text" @click="rechargeDialog = true">充值</el-button>
 			</template>
 			<!-- 升级 -->
 			<template #slot-upgrade="{scope}">
-				<el-button type="text" @click="upgradDialog = true">升级</el-button>
+				<el-button type="text" @click="upgradeDialog = true">升级</el-button>
 			</template>
 			<!-- 发货 -->
 			<template #slot-ship="{scope}">
@@ -48,25 +48,26 @@
 			</template>
 		</cl-crud>
 		<!-- 充值 -->
-		<el-dialog title="充值" :visible.sync="rechageDialog" width="400px">
-			<div class="rechage-modal-content">
+		<el-dialog title="充值" :visible.sync="rechargeDialog" width="400px">
+			<div class="recharge-modal-content">
 				<el-form
-					:model="rechageForm"
-					:rules="rechageRules"
-					ref="rechageForm"
+					:model="rechargeForm"
+					:rules="rechargeRules"
+					ref="rechargeForm"
 					label-width="80px"
 					class="demo-form"
 				>
 					<el-form-item label="充值金额">
 						<el-input
-							v-model="rechageForm.rechargeAmount"
+							v-model="rechargeForm.rechargeAmount"
 							placeholder="充值金额"
 							size="small"
 						></el-input>
 					</el-form-item>
 					<el-form-item label="确认密码">
 						<el-input
-							v-model="rechageForm.confirmPassword"
+							v-model="rechargeForm.confirmPassword"
+							type="password"
 							placeholder="确认密码"
 							size="small"
 						></el-input>
@@ -74,24 +75,22 @@
 				</el-form>
 			</div>
 			<div slot="footer" class="dialog-footer">
-				<el-button size="small" @click="rechageDialog = false">取 消</el-button>
-				<el-button type="primary" size="small" @click="rechageDialog = false"
-					>充值</el-button
-				>
+				<el-button size="small" @click="resetForm">取 消</el-button>
+				<el-button type="primary" size="small" @click="rechargeAmount">充值</el-button>
 			</div>
 		</el-dialog>
 		<!-- 升级 -->
-		<el-dialog title="升级" :visible.sync="upgradDialog" width="400px">
-			<div class="rechage-modal-content">
+		<el-dialog title="升级" :visible.sync="upgradeDialog" width="400px">
+			<div class="recharge-modal-content">
 				<el-form
-					:model="upgradForm"
-					:rules="upgradRules"
-					ref="upgradForm"
+					:model="upgradeForm"
+					:rules="upgradeRules"
+					ref="upgradeForm"
 					label-width="100px"
 					class="demo-form"
 				>
 					<el-form-item label="请选择等级">
-						<el-select v-model="upgradForm.member" size="small" placeholder="请选择">
+						<el-select v-model="upgradeForm.member" size="small" placeholder="请选择">
 							<el-option
 								v-for="(item, index) in levelData.list"
 								:key="index"
@@ -103,18 +102,17 @@
 					</el-form-item>
 					<el-form-item label="确认密码">
 						<el-input
-							v-model="upgradForm.confirmPassword"
+							v-model="upgradeForm.confirmPassword"
 							placeholder="确认密码"
+							type="password"
 							size="small"
 						></el-input>
 					</el-form-item>
 				</el-form>
 			</div>
 			<div slot="footer" class="dialog-footer">
-				<el-button size="small" @click="upgradDialog = false">取 消</el-button>
-				<el-button type="primary" size="small" @click="upgradDialog = false"
-					>充值</el-button
-				>
+				<el-button size="small" @click="resetForm">取 消</el-button>
+				<el-button type="primary" size="small" @click="upgradeAmount">充值</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -145,20 +143,20 @@ export default {
 					val: 0
 				}
 			],
-			// rechage
-			rechageDialog: false,
-			rechageForm: {
+			// recharge
+			rechargeDialog: false,
+			rechargeForm: {
 				rechargeAmount: '',
 				confirmPassword: ''
 			},
-			rechageRules: {},
-			// upgrad
-			upgradDialog: false,
-			upgradForm: {
+			rechargeRules: {},
+			// upgrade
+			upgradeDialog: false,
+			upgradeForm: {
 				member: '',
 				confirmPassword: ''
 			},
-			upgradRules: {}
+			upgradeRules: {}
 		};
 	},
 	computed: {
@@ -173,6 +171,31 @@ export default {
 			console.log(tab, e);
 			this.app.refresh({ type: this.tabIndex });
 		},
+		// 充值
+		rechargeAmount() {
+			this.$service.member.recharge(this.rechargeForm).then(res => {
+				console.log(res);
+				this.resetForm();
+			});
+		},
+		// 升级
+		upgradeAmount() {
+			this.$service.member.upgrade(this.upgradeForm).then(res => {
+				console.log(res);
+				this.resetForm();
+			});
+		},
+		resetForm() {
+			try {
+				this.$refs['rechargeForm'].resetFields();
+			} catch (e) {}
+			try {
+				this.$refs['upgradeForm'].resetFields();
+			} catch (e) {}
+
+			this.rechargeDialog = false;
+			this.upgradeDialog = false;
+		},
 		// crud
 		onLoad({ ctx, app }) {
 			this.app = app;

mobile-code/src/store/modules/config.js

@@ -1,6 +1,5 @@
 import store from '@/store'
 import UTIL from '@/utils/util'
-import { getLevel, getCategory } from '@/utils/config'
 import {
 	getList as getLevelList
 } from '@/api/level'