供货商pc端

ghs/src/mock/userInfo.js

@@ -159,18 +159,7 @@ let menu = {
 		'sys:log:clear'
 	],
 	menus: [
-		// {
-		// 	id: '48',
-		// 	parentId: '47',
-		// 	name: '文档',
-		// 	type: 1,
-		// 	icon: 'icon-favorfill',
-		// 	orderNum: 0,
-		// 	router: '/tutorial/doc',
-		// 	viewPath: 'https://docs.x-admin.com/#/',
-		// 	keepAlive: 1
-		// },
-		// 工作台
+		//注意如果子菜单有多个，父菜单应设置成type=0 ！！！！
 		{
 			id: '1',
 			parentId: null,
@@ -193,8 +182,7 @@ let menu = {
             viewPath: 'views/home.vue',
             keepAlive: 1
         },
-		// 客户管理
-		//注意如果子菜单有多个，父菜单应设置成type=0
+		// 客户
 		{
 			id: '2',
 			parentId: null,
@@ -218,28 +206,6 @@ let menu = {
             viewPath: 'views/member/list.vue',
             keepAlive: 1
 		},
-        {
-            id: '202',
-            parentId: 2,
-            name: '新客优惠',
-            type: 1,
-            icon: 'iconkehuguanli',
-            orderNum: 2,
-            router: '/setting/coupon',
-            viewPath: 'views/setting/coupon.vue',
-            keepAlive: 1
-		},
-		{
-            id: '203',
-            parentId: 2,
-            name: '客户等级',
-            type: 1,
-            icon: 'iconkehuguanli',
-            orderNum: 2,
-            router: '/setting/level',
-            viewPath: 'views/setting/level.vue',
-            keepAlive: 1
-        },
 		// 订单管理
 		{
 			id: '3',
@@ -287,17 +253,6 @@ let menu = {
 			viewPath: 'views/goods/goods-list.vue',
 			keepAlive: 1
 		},
-		// {
-		// 	id: '402',
-		// 	parentId: '4',
-		// 	name: '图库管理',
-		// 	type: 1,
-		// 	icon: 'icon-user',
-		// 	orderNum: 1,
-		// 	router: '/goods/img-store',
-		// 	viewPath: 'views/goods/img-store.vue',
-		// 	keepAlive: 1
-		// },
 		{
 			id: '403',
 			parentId: '4',
@@ -312,7 +267,7 @@ let menu = {
 		{
 			id: '404',
 			parentId: '4',
-			name: '分类管理',
+			name: '商品分类',
 			type: 1,
 			icon: 'icon-user',
 			orderNum: 4,
@@ -320,61 +275,6 @@ let menu = {
 			viewPath: 'views/goods/category.vue',
 			keepAlive: 1
 		},
-		{
-			id: '405',
-			parentId: '4',
-			name: '运费设置',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/freight',
-			viewPath: 'views/goods/freight-set.vue',
-			keepAlive: 1
-		},
-		{
-			id: '406',
-			parentId: '4',
-			name: '节日涨价',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/auto-price',
-			viewPath: 'views/goods/auto-price.vue',
-			keepAlive: 1
-		},
-		{
-			id: '406',
-			parentId: '4',
-			name: '简要说明',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/summary',
-			viewPath: 'views/goods/summary.vue',
-			keepAlive: 1
-		},
-		{
-			id: '5',
-			parentId: null,
-			name: '图库',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 5,
-			router: '/goods/img-store',
-			viewPath: 'views/goods/img-store.vue',
-			keepAlive: 1
-		},
-        {
-            id: '501',
-            parentId: 5,
-            name: '列表',
-            type: 1,
-            icon: 'iconkehuguanli',
-            orderNum: 5,
-            router: '/goods/img-store',
-            viewPath: 'views/goods/img-store.vue',
-            keepAlive: 1
-        },
 		// 邀请有礼
 		{
 			id: '6',
@@ -432,28 +332,6 @@ let menu = {
             router: '/coupon/list',
             viewPath: 'views/coupon/list.vue',
             keepAlive: 1
-        },
-		{
-			id: '8',
-			parentId: null,
-			name: '广告',
-			type: 1,
-			icon: 'iconguanggao',
-			orderNum: 8,
-			router: '/ad/list',
-			viewPath: 'views/ad/list.vue',
-			keepAlive: 1
-		},
-        {
-            id: '808',
-            parentId: '8',
-            name: '广告列表',
-            type: 1,
-            icon: 'iconguanggao',
-            orderNum: 8,
-            router: '/ad/list',
-            viewPath: 'views/ad/list.vue',
-            keepAlive: 1
         },
 		// 员工管理
 		{
@@ -527,7 +405,7 @@ let menu = {
 		{
 			id: '11',
 			parentId: null,
-			name: '培训',
+			name: '赚钱',
 			type: 1,
 			icon: 'iconyaoqingyouli',
 			orderNum: 11,
@@ -582,12 +460,12 @@ let menu = {
 		{
 			id: '1301',
 			parentId: '13',
-			name: '公众号菜单',
+			name: '修改密码',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,
-			router: '/setting/wx-menu',
-			viewPath: 'views/setting/wx-menu.vue',
+			router: '/setting/set-password',
+			viewPath: 'views/setting/set-password.vue',
 			keepAlive: 1
 		},
 		// ========================================================
@@ -635,17 +513,6 @@ let menu = {
 			viewPath: null,
 			keepAlive: 0
 		},
-		// {
-		// 	id: '27',
-		// 	parentId: null,
-		// 	name: '权限管理',
-		// 	type: 0,
-		// 	icon: 'icon-permission',
-		// 	orderNum: 1,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 0
-		// },
 		{
 			id: '29',
 			parentId: '28',
@@ -668,17 +535,6 @@ let menu = {
 			viewPath: null,
 			keepAlive: 0
 		},
-		// {
-		// 	id: '38',
-		// 	parentId: '8',
-		// 	name: '11111',
-		// 	type: 0,
-		// 	icon: null,
-		// 	orderNum: 1,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
 		{
 			id: '43',
 			parentId: '45',
@@ -690,105 +546,6 @@ let menu = {
 			viewPath: 'views/test/crud.vue',
 			keepAlive: 1
 		},
-		// {
-		// 	id: '53',
-		// 	parentId: '1',
-		// 	name: '组件预览',
-		// 	type: 1,
-		// 	icon: 'icon-activityfill',
-		// 	orderNum: 1,
-		// 	router: '/ui-components',
-		// 	viewPath: 'views/workbench/ui-components',
-		// 	keepAlive: 1
-		// },
-		// {
-		// 	id: '11',
-		// 	parentId: null,
-		// 	name: '系统',
-		// 	type: 0,
-		// 	icon: 'icon-systemfill',
-		// 	orderNum: 2,
-		// 	router: '/sys',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
-		// {
-		// 	id: '8',
-		// 	parentId: '27',
-		// 	name: '菜单列表',
-		// 	type: 1,
-		// 	icon: 'icon-menu',
-		// 	orderNum: 2,
-		// 	router: '/sys/menu',
-		// 	viewPath: 'views/system/menu/index.vue',
-		// 	keepAlive: 1
-		// },
-		// {
-		// 	id: '11',
-		// 	parentId: '8',
-		// 	name: '删除',
-		// 	type: 2,
-		// 	icon: null,
-		// 	orderNum: 2,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 0
-		// },
-		// {
-		// 	id: '19',
-		// 	parentId: '17',
-		// 	name: '删除',
-		// 	type: 2,
-		// 	icon: null,
-		// 	orderNum: 2,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 0
-		// },
-		// {
-		// 	id: '24',
-		// 	parentId: '22',
-		// 	name: '删除',
-		// 	type: 2,
-		// 	icon: null,
-		// 	orderNum: 2,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 0
-		// },
-		// {
-		// 	id: '28',
-		// 	parentId: '11',
-		// 	name: '系统监控',
-		// 	type: 0,
-		// 	icon: 'icon-monitor',
-		// 	orderNum: 2,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 0
-		// },
-		// {
-		// 	id: '45',
-		// 	parentId: '1',
-		// 	name: '组件库',
-		// 	type: 0,
-		// 	icon: 'icon-activityfill',
-		// 	orderNum: 2,
-		// 	router: '/ui-lib',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
-		// {
-		// 	id: '46',
-		// 	parentId: '45',
-		// 	name: 'Froala富文本',
-		// 	type: 1,
-		// 	icon: 'icon-radioboxfill',
-		// 	orderNum: 2,
-		// 	router: '/editor-froala',
-		// 	viewPath: 'views/test/editor-froala.vue',
-		// 	keepAlive: 1
-		// },
 		{
 			id: '12',
 			parentId: '8',
@@ -833,17 +590,6 @@ let menu = {
 			viewPath: null,
 			keepAlive: 0
 		},
-		// {
-		// 	id: '47',
-		// 	parentId: null,
-		// 	name: '教程',
-		// 	type: 0,
-		// 	icon: 'icon-weibiaoti4',
-		// 	orderNum: 3,
-		// 	router: '/tutorial',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
 		{
 			id: '49',
 			parentId: '45',
@@ -888,29 +634,9 @@ let menu = {
 			viewPath: null,
 			keepAlive: 0
 		}
-		// {
-		// 	id: '51',
-		// 	parentId: '10',
-		// 	name: '测试404页面',
-		// 	type: 1,
-		// 	icon: 'icon-newfill',
-		// 	orderNum: 10,
-		// 	router: '/test',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// }
 	]
 };
 
-// Mock.mock(RegExp('/comm/person' + '.*'), 'get', req => {
-// 	// console.table(req);
-// 	return {
-// 		code: 1,
-// 		data: userInfo,
-// 		message: 'success'
-// 	};
-// });
-
 Mock.mock(RegExp('/comm/permmenu' + '.*'), 'get', req => {
 	// console.table(req);
 	return {

ghs/src/views/member/list.vue

@@ -592,4 +592,4 @@ export default {
 		color: #999;
 	}
 }
-</style>
+</style>

ghs/src/views/my-invite/index.vue

@@ -11,7 +11,7 @@
 				</div>
 				<div class="avatar-wrap-right">
 					<div class="app-size-32 avatar-name">{{ shopInfo.merchantName }}</div>
-					<el-tag size="mini">三级代理</el-tag>
+					<el-tag size="mini">普通代理</el-tag>
 				</div>
 			</div>
 			<div class="assets-list-wrap flex-center">
@@ -86,28 +86,21 @@ export default {
 	data() {
 		return {
 			app: null,
-			// top =-=========
 			// 用户数据
 			userData: [
 				{
-					name: '余额(￥)',
-					value: 0,
-					btn: '提现'
-				},
-				{
-					name: '邀请花店',
+					name: '邀请商家',
 					value: 0
 				},
 				{
-					name: '付费花店',
+					name: '付费商家',
 					value: 0
 				},
 				{
-					name: '累计收益(¥)',
-					value: 0
+					name: '累计收益',
+					value: 0.00
 				}
 			],
-			// bottom =-=========
 			tabIndex: '-1',
 			tabsData: [
 				{
@@ -151,10 +144,9 @@ export default {
 			this.$service.single.assetDet().then(res => {
 				if (this.$util.isEmpty(res)) return false;
 				this.data = res;
-				this.userData[0].value = res.balance;
-				this.userData[1].value = res.inviteNum || 0;
-				this.userData[2].value = res.payNum || 0;
-				this.userData[3].value = res.income || 0;
+				this.userData[0].value = res.inviteNum || 0;
+				this.userData[1].value = res.payNum || 0;
+				this.userData[2].value = res.income || 0.00;
 			});
 		},
 		handleClick(tab, e) {

ghs/src/views/setting/set-password.vue

@@ -0,0 +1,320 @@
+<template>
+	<div class="app-list-content">
+		<div class="content-wrap">
+
+		</div>
+	</div>
+</template>
+
+<script>
+	import { mapGetters } from 'vuex';
+	import operateLineModule from '@/components/module/operate-line';
+	export default {
+		name: 'set-password',
+		components: {
+			operateLineModule
+		},
+		data() {
+			return {
+				form: {
+					name: '',
+					menuOption: '0',
+					replyUrl: '',
+					targetId: 0
+				},
+				rule: {},
+				isModifyParents: false,
+				// isAdd: false,
+				addDialog: false,
+				activeIndex: null,
+				subActiveIndex: null,
+				menuData: [],
+				// 常用链接
+				urlIndex: null,
+				commonUrlData: [],
+				// 操作菜单
+				operateShow: [],
+				operateData: null,
+				// 按钮列表
+				btnData: []
+			};
+		},
+		computed: {
+			...mapGetters(['shopInfo', 'userInfo'])
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				this._getDet();
+				this._getUrl();
+			},
+			_getDet() {
+				this.$service.setting.getMenu().then(res => {
+					this.menuData = res.map(e => {
+						if (!e.children) {
+							e.children = [];
+						}
+
+						return e;
+					});
+					res.map(() => {
+						this.operateShow.push(false);
+					});
+				});
+			},
+			_getUrl() {
+				this.$service.single.commonUrl().then(res => {
+					this.commonUrlData = res;
+				});
+			},
+			async submitFn() {
+				console.log(this.menuData);
+				// return false;
+				await this.$service.setting.updateMenu(this.menuData).then(res => {
+					this.$message.success(res.msg || '提交');
+					// this.closeOperate();
+					this.resetForm();
+				});
+			},
+			// operate
+			menuClickFn(item, index) {
+				this.isModifyParents = true;
+				// this.isAdd = false;
+
+				this.closeOperate();
+				this.activeIndex = index;
+				this.operateShow[index] = true;
+				this.operateData = item.children || [];
+				// 修改
+				// this.dialogData = item;
+				// this.form.name = JSON.parse(JSON.stringify(item.name));
+				console.log('江总', item);
+				console.log('江总11', this.commonUrlData);
+				Object.keys(this.form).forEach(i => {
+					this.form[i] = item[i];
+				});
+
+				this.addDialog = true;
+			},
+			// operate
+			operateClickFn(item) {
+				this.isModifyParents = false;
+				// this.isAdd = false;
+				this.subActiveIndex = item.index;
+				console.log('item', item);
+				// this.dialogData = item;
+				item.targetId = item.targetId ? parseInt(item.targetId) : 0;
+
+				Object.keys(this.form).forEach(i => {
+					this.form[i] = item[i];
+				});
+				this.addDialog = true;
+			},
+			operateAddFn(index) {
+				if (this.operateData.length > 4) {
+					this.$message.warning('亲，最多只能设置五个子菜单！')
+					return false
+				}
+				// this.isModifyParents = false;
+
+				let form = {
+					name: '子菜单名',
+					menuOption: '0',
+					replyUrl: '',
+					targetId: 0
+				};
+				
+				this.$set(this.operateShow, this.activeIndex, false);
+				this.operateData.push(form);
+				this.menuData[this.activeIndex].children = JSON.parse(JSON.stringify(this.operateData));
+
+				setTimeout(() => {
+					this.$set(this.operateShow, this.activeIndex, true);
+				});
+				// this.isAdd = true;
+				// this.dialogData = this.menuData[3].children[index];
+				// this.addDialog = true;
+				// if (this.$refs['form']) {
+				// 	console.log('asdf');
+				// 	this.resetForm()
+				// }
+			},
+			operateDelFn(index) {
+				console.log('我点击了删除按钮！', index)
+				// this.closeOperate();
+				this.$set(this.operateShow, this.activeIndex, false);
+				this.operateData.splice(index, 1);
+				
+				this.menuData[this.activeIndex].children = JSON.parse(JSON.stringify(this.operateData));
+
+				setTimeout(() => {
+					this.$set(this.operateShow, this.activeIndex, true);
+				});
+			},
+			closeOperate() {
+				this.activeIndex = null;
+				this.operateShow = this.operateShow.map(e => (e = false));
+				this.addDialog = false;
+				// if (this.addDialog) {
+				// 	this.resetForm();
+				// }
+			},
+			closeOptionFn() {
+				this.closeOperate();
+				this.resetForm();
+			},
+			// modal
+			confirmForm() {
+				let form = JSON.parse(JSON.stringify(this.form));
+
+				if (this.isModifyParents) {
+					Object.keys(form).forEach(i => {
+						this.menuData[this.activeIndex][i] = form[i];
+					});
+					console.log('江总22', this.menuData);
+					// 如果是父菜单操作时
+					// this.menuData[this.activeIndex].name = form.name;
+				} else {
+					// 如果是子菜单操作时
+					// if (this.isAdd) {
+					// } else {
+					this.operateData[this.subActiveIndex] = form;
+					// }
+
+					console.log('this.operateData', this.operateData)
+					
+					this.menuData[this.activeIndex].children = JSON.parse(JSON.stringify(this.operateData));
+				}
+				this.submitFn().then(res => {
+					console.log('this.activeIndex', this.activeIndex);
+					
+					this.addDialog = false;
+					// if (this.isAdd) {
+					// }
+				});
+			},
+			resetForm() {
+				this.form = {
+					name: '',
+					menuOption: '0',
+					replyUrl: '',
+					targetId: 0
+				};
+				this.$refs['form'].resetFields();
+				// this.addDialog = false;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.app-list-content {
+		background-color: #fff;
+	}
+	.content-wrap {
+		display: flex;
+		align-items: center;
+	}
+	// wx 容器
+	.wx-wrap {
+		width: 375px;
+		margin: 0 15px;
+		padding-top: 20px;
+		flex-shrink: 0;
+		// 头部
+		.wx-bar {
+			position: relative;
+			.bar-text {
+				position: absolute;
+				top: 30px;
+				font-size: 17px;
+				font-weight: 500;
+				color: #fff;
+				width: 100%;
+				text-align: center;
+			}
+		}
+		.wx-content {
+			width: 100%;
+			height: 555px;
+			background-color: #ededed;
+		}
+		// 按钮
+		.wx-btn {
+			@include disFlex(center, space-between);
+			background-color: #f7f7f7;
+			padding: 10px;
+			height: 45px;
+			.key-btn {
+				width: 13%;
+				.key-btn-img {
+					width: 40px;
+				}
+			}
+			.menu-btn {
+				width: 29%;
+				height: calc(100% - 30px);
+				@include disFlex(center, center);
+				border-left: 2px solid $borderColor;
+				&.active {
+					/deep/.operate-module-line {
+						.operate-btn {
+							color: $mainColor;
+							.iconfont {
+								color: #09bb07;
+							}
+						}
+					}
+				}
+				.iconfont-blo {
+					margin-right: 6px;
+				}
+				.iconfont {
+					color: $fontColor3;
+					font-size: 24px;
+					transform: scale(0.6);
+				}
+			}
+		}
+	}
+	// 编辑块
+	.ad-modal-content {
+		width: 640px;
+		min-width: 640px;
+		height: 640px;
+		border: 20px solid #f7f7f7;
+		// border-top: 0;
+		margin-top: 20px;
+		display: flex;
+		align-items: center;
+		// padding: 20px;
+		background-color: #f7f7f7;
+
+		.ad-modal-wrap {
+			width: 100%;
+			.content-j-wrap {
+				width: 100%;
+				height: 460px;
+				background-color: #fff;
+				padding-top: 10px;
+			}
+		}
+
+		.dialog-footer {
+			display: flex;
+			align-items: center;
+			// justify-content: center;
+			// padding-left: 100px;
+			margin-top: 10px;
+			.el-button {
+				margin: 0 10px;
+			}
+		}
+	}
+	.prompt-text {
+		padding: 30px 30px 60px 30px;
+		color: $fontColor3;
+	}
+</style>

ghs/vue.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
-const proxyTarget = 'https://api.shop.hzghd.com';
+const proxyTarget = 'http://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);