update

admin-update/src/assets/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1563076 */
-  src: url('https://at.alicdn.com/t/font_1563076_wqx4u48xpg.eot');
-  src: url('https://at.alicdn.com/t/font_1563076_wqx4u48xpg.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_1563076_wqx4u48xpg.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_1563076_wqx4u48xpg.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_1563076_wqx4u48xpg.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_1563076_wqx4u48xpg.svg#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_1563076_9o7osm5m8pk.eot');
+  src: url('https://at.alicdn.com/t/font_1563076_9o7osm5m8pk.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_1563076_9o7osm5m8pk.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_1563076_9o7osm5m8pk.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_1563076_9o7osm5m8pk.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_1563076_9o7osm5m8pk.svg#iconfont') format('svg');
 }
 
 .iconfont {
@@ -16,6 +16,106 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icontriangle-right:before {
+  content: "\e62c";
+}
+
+.iconqian:before {
+  content: "\e662";
+}
+
+.icontuikuan:before {
+  content: "\e619";
+}
+
+.iconchangjianwentixiangguanwenti2:before {
+  content: "\e679";
+}
+
+.icondagou:before {
+  content: "\e607";
+}
+
+.iconlianjie:before {
+  content: "\e627";
+}
+
+.iconico:before {
+  content: "\e646";
+}
+
+.icondaizhifu:before {
+  content: "\e733";
+}
+
+.iconxuanzhong:before {
+  content: "\e744";
+}
+
+.iconxiaochengxu:before {
+  content: "\e747";
+}
+
+.iconzhifubao:before {
+  content: "\e748";
+}
+
+.iconkefu:before {
+  content: "\e749";
+}
+
+.iconguanbi:before {
+  content: "\e74b";
+}
+
+.iconfenxiang1:before {
+  content: "\e74c";
+}
+
+.iconbianji:before {
+  content: "\e74d";
+}
+
+.iconjinyong:before {
+  content: "\e74e";
+}
+
+.iconqiyong:before {
+  content: "\e74f";
+}
+
+.iconshanchu1:before {
+  content: "\e750";
+}
+
+.iconcaozuo:before {
+  content: "\e751";
+}
+
+.iconcaozuojihuo:before {
+  content: "\e755";
+}
+
+.iconzhiding:before {
+  content: "\e753";
+}
+
+.iconcaidanlan:before {
+  content: "\e75c";
+}
+
+.icontupiantianjia:before {
+  content: "\e75f";
+}
+
+.iconweixinlaiyuan:before {
+  content: "\e765";
+}
+
+.iconmorentu:before {
+  content: "\e778";
+}
+
 .icongongzuotai:before {
   content: "\e76c";
 }
@@ -64,3 +164,7 @@
   content: "\e777";
 }
 
+.iconshenheweitongguo:before {
+  content: "\e779";
+}
+

admin-update/src/assets/iconfont/iconfont.json

@@ -5,6 +5,181 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "300727",
+      "name": "三角右",
+      "font_class": "triangle-right",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "658035",
+      "name": "钱",
+      "font_class": "qian",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "782008",
+      "name": "退款",
+      "font_class": "tuikuan",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "1071070",
+      "name": "常见问题／相关问题2",
+      "font_class": "changjianwentixiangguanwenti2",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "1287696",
+      "name": "打钩",
+      "font_class": "dagou",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "2154944",
+      "name": "链接",
+      "font_class": "lianjie",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "6364167",
+      "name": "二维码",
+      "font_class": "ico",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "11940320",
+      "name": "待支付",
+      "font_class": "daizhifu",
+      "unicode": "e733",
+      "unicode_decimal": 59187
+    },
+    {
+      "icon_id": "12019828",
+      "name": "选中",
+      "font_class": "xuanzhong",
+      "unicode": "e744",
+      "unicode_decimal": 59204
+    },
+    {
+      "icon_id": "12096682",
+      "name": "小程序",
+      "font_class": "xiaochengxu",
+      "unicode": "e747",
+      "unicode_decimal": 59207
+    },
+    {
+      "icon_id": "12096683",
+      "name": "支付宝",
+      "font_class": "zhifubao",
+      "unicode": "e748",
+      "unicode_decimal": 59208
+    },
+    {
+      "icon_id": "12096731",
+      "name": "客服",
+      "font_class": "kefu",
+      "unicode": "e749",
+      "unicode_decimal": 59209
+    },
+    {
+      "icon_id": "12135232",
+      "name": "关闭",
+      "font_class": "guanbi",
+      "unicode": "e74b",
+      "unicode_decimal": 59211
+    },
+    {
+      "icon_id": "12265828",
+      "name": "分享",
+      "font_class": "fenxiang1",
+      "unicode": "e74c",
+      "unicode_decimal": 59212
+    },
+    {
+      "icon_id": "12265832",
+      "name": "编辑",
+      "font_class": "bianji",
+      "unicode": "e74d",
+      "unicode_decimal": 59213
+    },
+    {
+      "icon_id": "12265833",
+      "name": "禁用",
+      "font_class": "jinyong",
+      "unicode": "e74e",
+      "unicode_decimal": 59214
+    },
+    {
+      "icon_id": "12265853",
+      "name": "启用",
+      "font_class": "qiyong",
+      "unicode": "e74f",
+      "unicode_decimal": 59215
+    },
+    {
+      "icon_id": "12265975",
+      "name": "删除",
+      "font_class": "shanchu1",
+      "unicode": "e750",
+      "unicode_decimal": 59216
+    },
+    {
+      "icon_id": "12265994",
+      "name": "操作",
+      "font_class": "caozuo",
+      "unicode": "e751",
+      "unicode_decimal": 59217
+    },
+    {
+      "icon_id": "12265995",
+      "name": "操作激活",
+      "font_class": "caozuojihuo",
+      "unicode": "e755",
+      "unicode_decimal": 59221
+    },
+    {
+      "icon_id": "12266050",
+      "name": "置顶",
+      "font_class": "zhiding",
+      "unicode": "e753",
+      "unicode_decimal": 59219
+    },
+    {
+      "icon_id": "12266181",
+      "name": "菜单栏",
+      "font_class": "caidanlan",
+      "unicode": "e75c",
+      "unicode_decimal": 59228
+    },
+    {
+      "icon_id": "12266256",
+      "name": "图片添加",
+      "font_class": "tupiantianjia",
+      "unicode": "e75f",
+      "unicode_decimal": 59231
+    },
+    {
+      "icon_id": "12266447",
+      "name": "微信来源",
+      "font_class": "weixinlaiyuan",
+      "unicode": "e765",
+      "unicode_decimal": 59237
+    },
+    {
+      "icon_id": "12266642",
+      "name": "默认图",
+      "font_class": "morentu",
+      "unicode": "e778",
+      "unicode_decimal": 59256
+    },
     {
       "icon_id": "12321926",
       "name": "工作台",
@@ -88,6 +263,13 @@
       "font_class": "tongzhisongda",
       "unicode": "e777",
       "unicode_decimal": 59255
+    },
+    {
+      "icon_id": "12549593",
+      "name": "审核未通过",
+      "font_class": "shenheweitongguo",
+      "unicode": "e779",
+      "unicode_decimal": 59257
     }
   ]
 }

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

@@ -8,16 +8,11 @@
 		trigger="manual"
 	>
 		<div class="operate-wrap">
-			<div
-				class="operate-list"
-				v-for="(item, index) in data.children"
-				:key="index"
-				@click="listClick(item)"
-			>
-				<i class="iconfont iconguanbi"></i>
-				<div class="btn-text">{{ item.name }}</div>
+			<div class="operate-list" v-for="(item, index) in data.children" :key="index">
+				<i class="iconfont iconguanbi" @click.stop="listDel(index)"></i>
+				<div class="btn-text" @click="listClick(item)">{{ item.name }}</div>
 			</div>
-			<div class="operate-list" @click="addFn">
+			<div class="operate-list operate-list-add" @click="addFn">
 				<i class="iconfont icontupiantianjia icon-add"></i>
 			</div>
 		</div>
@@ -54,6 +49,9 @@ export default {
 		listClick(item) {
 			this.$emit('click', item);
 		},
+		listDel(index) {
+			this.$emit('del', index);
+		},
 		addFn() {
 			this.$emit('add');
 		}
@@ -74,13 +72,31 @@ export default {
 			line-height: 50px;
 			flex-shrink: 0;
 			text-align: center;
-			cursor: pointer;
+			position: relative;
 			.iconfont {
-				font-size: 36px;
+				font-size: 16px;
+				cursor: pointer;
+				&:hover {
+					color: $mainColor;
+				}
+			}
+			.iconguanbi {
+				position: absolute;
+				top: -12px;
+				right: 6px;
+				font-size: 12px;
 			}
 			.btn-text {
 				margin-top: 2px;
+				cursor: pointer;
+				&:hover {
+					color: $mainColor;
+					background-color: $backColor;
+				}
 			}
+		}
+		.operate-list-add {
+			cursor: pointer;
 			&:hover {
 				color: $mainColor;
 				background-color: $backColor;

admin-update/src/config/env.js

@@ -21,8 +21,8 @@ const baseUrl = (() => {
 		case 'development':
 			return `/${proxy}`;
 		case 'production':
-			// return `/api/admin`;
-			return `http://api.b.huaml.com`;
+			// return `http://api.b.huaml.com`;
+			return `${window.location.protocol}//api.${window.location.host}`;
 		default:
 			return '';
 	}

admin-update/src/config/s-env.js

@@ -19,7 +19,8 @@ const baseUrl = (function() {
 		case 'development':
 			return `/${proxy}`;
 		case 'production':
-			return `http://api.s.huaml.com`;
+			// return `http://api.s.huaml.com`;
+			return `${window.location.protocol}//api.${window.location.host}`;
 		default:
 			return '';
 	}

admin-update/src/main.js

@@ -14,6 +14,8 @@ import '@/filter/index';
 import '@/assets/css/element-variables.scss';
 import 'viewerjs/dist/viewer.css';
 
+import '@/assets/iconfont/iconfont.css';
+
 import '@/config/config';
 import util from '@/utils/util';
 Vue.prototype.$util = util;

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

@@ -10,8 +10,10 @@
 				@click="pageMianTo(item, index)"
 			>
 				<i class="iconfont" :class="[item.icon]"></i>
-				<div class="list-name">{{ item.name }}</div>
-				<i v-if="!$util.isEmpty(item)" class="iconfont icontriangle-right"></i>
+				<div class="list-name-wrap">
+					<div class="list-name">{{ item.name }}</div>
+					<i v-if="!$util.isEmpty(item.children)" class="iconfont icontriangle-right"></i>
+				</div>
 			</div>
 		</div>
 		<!-- 子菜单 -->
@@ -103,12 +105,14 @@ export default {
 		box-shadow: 6px 6px 20px #ccc;
 		.list {
 			@include disFlex(center, flex-start);
-			padding-left: 10px;
-			padding-top: 16px;
-			padding-bottom: 16px;
+			padding: 16px 10px;
 			color: #fff;
 			font-size: 14px;
 			cursor: pointer;
+			.list-name-wrap {
+				width: calc(100% - 14px);
+				@include disFlex(center, space-between);
+			}
 			.list-name {
 				margin-left: 10px;
 				margin-right: 16px;

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

@@ -35,8 +35,9 @@
 					<operate-line-module
 						:show="operateShow[index]"
 						:data="item"
-						@show="operateChangeFn"
 						@click="operateClickFn"
+						@add="operateAddFn"
+						@del="operateDelFn"
 					/>
 				</div>
 			</div>
@@ -97,7 +98,7 @@
 			</div>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="resetForm">取 消</el-button>
-				<el-button type="primary" @click="confirmForm">确定</el-button>
+				<el-button type="primary" @click="confirmForm">提交生效</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -174,15 +175,34 @@ export default {
 		closeOperate() {
 			this.operateShow = this.operateShow.map(e => (e = false));
 		},
-		operateChangeFn(item) {},
 		operateClickFn(item) {
 			this.dialogData = item;
+			item.targetId = item.targetId ? parseInt(item.targetId) : 0;
+			console.log(item);
+			Object.keys(this.form).forEach(i => {
+				this.form[i] = item[i];
+			});
+			this.addDialog = true;
+		},
+		operateAddFn() {
 			this.addDialog = true;
 		},
+		operateDelFn(index) {
+			this.closeOperate();
+			this.operateData.splice(index, 1);
+			setTimeout(() => {
+				this.$set(this.operateShow, this.activeIndex, true);
+			});
+		},
 		// modal
 		confirmForm() {
 			console.log(this.operateData);
-			this.operateData.push(this.form);
+			this.closeOperate();
+			let form = JSON.parse(JSON.stringify(this.form));
+			this.operateData.push(form);
+			setTimeout(() => {
+				this.$set(this.operateShow, this.activeIndex, true);
+			});
 			this.submitFn();
 		},
 		resetForm() {