update

admin-update/src/components/module/operate-line.vue

@@ -78,6 +78,10 @@ export default {
 			flex-shrink: 0;
 			text-align: center;
 			position: relative;
+			border-top: 1px solid #f7f7f7;
+			&:first-child {
+				border-top: none;
+			}
 			.iconfont {
 				font-size: 16px;
 				cursor: pointer;
@@ -87,12 +91,12 @@ export default {
 			}
 			.iconcaozuojihuo {
 				position: absolute;
-				top: -14px;
+				top: -12px;
 				right: 6px;
 				font-size: 16px;
 			}
 			.btn-text {
-				margin-top: 2px;
+				// margin-top: 2px;
 				cursor: pointer;
 				&:hover {
 					color: $mainColor;

admin-update/src/views/setting/wx-menu.vue

@@ -30,32 +30,30 @@
 			<template v-if="addDialog">
 				<div class="ad-modal-content">
 					<div class="ad-modal-wrap">
-						<el-form :model="form" :rules="rule" ref="form" label-width="100px" class="demo-form">
+						<el-form :model="form" :rules="rule" ref="form" label-width="50px" class="demo-form">
 							<el-form-item label="名称" prop="name">
 								<el-input v-model="form.name" placeholder="请输入菜单名称" size="small"></el-input>
 							</el-form-item>
-							<template v-if="!isModifyParents">
-								<el-form-item label="选项" prop="menuOption">
-									<el-radio-group v-model="form.menuOption" :disabled="isModifyParents">
-										<el-radio label="0">常用网址</el-radio>
-										<el-radio label="1">自定义网址</el-radio>
+							<el-form-item label="选项" prop="menuOption">
+								<el-radio-group v-model="form.menuOption">
+									<el-radio label="0">常用网址</el-radio>
+									<el-radio label="1">自定义网址</el-radio>
+								</el-radio-group>
+							</el-form-item>
+							<el-form-item label class="content-j-wrap">
+								<template v-if="form.menuOption == 0">
+									<!-- <div> -->
+									<el-radio-group v-model="form.targetId" size="mini">
+										<el-radio v-for="(item, index) in commonUrlData" :key="index" border :label="item.id">{{ item.name }}</el-radio>
 									</el-radio-group>
-								</el-form-item>
-								<el-form-item label>
-									<template v-if="form.menuOption == 0">
-										<!-- <div> -->
-										<el-radio-group v-model="form.targetId" size="mini" :disabled="isModifyParents">
-											<el-radio v-for="(item, index) in commonUrlData" :key="index" border :label="item.id">{{ item.name }}</el-radio>
-										</el-radio-group>
-										<!-- </div> -->
-									</template>
-									<template v-else>
-										<div>
-											<el-input v-model="form.replyUrl" placeholder="请填写链接，留空点图片不跳转" size="small" :disabled="isModifyParents"></el-input>
-										</div>
-									</template>
-								</el-form-item>
-							</template>
+									<!-- </div> -->
+								</template>
+								<template v-else>
+									<div>
+										<el-input v-model="form.replyUrl" placeholder="请填写链接，留空点图片不跳转" size="small"></el-input>
+									</div>
+								</template>
+							</el-form-item>
 						</el-form>
 						<div class="dialog-footer">
 							<el-button @click="resetForm" size="small">取 消</el-button>
@@ -150,7 +148,12 @@
 				this.operateData = item.children || [];
 				// 修改
 				// this.dialogData = item;
-				this.form.name = JSON.parse(JSON.stringify(item.name));
+				// 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;
 			},
@@ -200,8 +203,12 @@
 				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;
+					// this.menuData[this.activeIndex].name = form.name;
 				} else {
 					// 如果是子菜单操作时
 					if (this.isAdd) {
@@ -236,6 +243,7 @@
 		width: 375px;
 		margin: 0 15px;
 		padding-top: 20px;
+		flex-shrink: 0;
 		// 头部
 		.wx-bar {
 			position: relative;
@@ -295,20 +303,35 @@
 	// 编辑块
 	.ad-modal-content {
 		width: 640px;
-		height: 620px;
+		min-width: 640px;
+		height: 640px;
 		border: 20px solid #f7f7f7;
 		// border-top: 0;
-		padding-top: 20px;
+		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;
+			}
+		}
 
-		padding: 20px;
 		.dialog-footer {
 			display: flex;
 			align-items: center;
 			// justify-content: center;
-			padding-left: 70px;
-			margin-top: 30px;
+			// padding-left: 100px;
+			margin-top: 10px;
+			.el-button {
+				margin: 0 10px;
+			}
 		}
 	}
 	.prompt-text {