Kaynağa Gözat

站点管理的bug 修复了

panpp 5 yıl önce
ebeveyn
işleme
1fda008a23

+ 761 - 0
src/main/webapp/WEB-INF/manager/cms/generate/index.ftl

@@ -0,0 +1,761 @@
+<html xmlns="http://www.w3.org/1999/html">
+<head>
+	<title>静态化</title>
+	<#include "../../include/head-file.ftl">
+	<style>
+		[v-cloak]{
+			display: none;
+		}
+        .el-select-dropdown__wrap{
+            overflow: auto !important;
+            height: 200px;
+        }
+
+	</style>
+</head>
+<body class="custom-body">
+<div id="app" v-cloak>
+	<div class="class-1" >
+		<el-alert style="line-height: 22px;padding: 20px;"
+				title=""
+				type="success"
+				  :closable="false"
+				show-icon>
+			更新主页,如果系统存在引导页面可以手动修改主页位置文件名,default.html引导页面index.html主页。<br/>
+			更新栏目列表,推荐使用指定栏目更新。系统提示“更新中”请不要刷新页面或点击其他菜单。<br/>
+			根据时间与栏目类型生成文章
+		</el-alert>
+	</div>
+	<el-form ref="form" label-width="100px" size="mini">
+		<div class="class-2" >
+		<div class="class-3" >
+			<div class="class-4" >
+				<el-form-item  label="主题模板">
+					<el-select ref="select" v-model="template"
+							   :filterable="true"
+							   :clearable="false"
+                               :vertical="true"
+							   placeholder="请选择主题模板">
+						<el-option v-for='item in templateOptions' :key="item" :value="item"
+								   :label="item"></el-option>
+					</el-select>
+				</el-form-item>
+			</div>
+			<div class="class-7" >
+				<el-form-item>
+					<template slot='label'>主页位置
+						<el-popover slot="label" placement="top-start" title="提示" width="200" trigger="hover" content="主页位置htm文件名一般为index.html或default.html">
+							<i class="el-icon-question" slot="reference"></i>
+						</el-popover>
+					</template>
+					<el-input v-model="position"
+							  :disabled="false"
+							  :style="{width:  '100%'}"
+							  :clearable="true"
+							  placeholder="请输入主页位置">
+					</el-input>
+				</el-form-item>
+			</div>
+			<div class="class-10" >
+				<el-form-item>
+					<el-button type="primary" @click="updataIndex" :loading="homeLoading">{{homeLoading?'更新中':'生成主页'}}</el-button>
+					<el-button plain @click="viewIndex">预览主页</el-button>
+				</el-form-item>
+			</div>
+		</div>
+		<div class="class-13" >
+			<div class="class-14" >
+				<el-form-item  label="文章栏目">
+					<tree-select v-model="contentSection"
+								 :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
+								 :options="treeList" :style="{width:'100%'}"
+							   placeholder="请选择文章栏目">
+					</tree-select>
+				</el-form-item>
+			</div>
+			<div class="class-17" >
+				<el-form-item>
+					<template slot='label'>指定时间
+						<el-popover slot="label" placement="top-start" title="提示" width="200" trigger="hover" content="指定时间需要小于生成文章的发布时间">
+							<i class="el-icon-question" slot="reference"></i>
+						</el-popover>
+					</template>
+					<el-date-picker
+							v-model="time"
+							placeholder="请选择指定时间"
+							start-placeholder=""
+							end-placeholder=""
+							:readonly="false"
+							:disabled="false"
+							:editable="false"
+							:clearable="false"
+							format="yyyy-MM-dd"
+							value-format="yyyy-MM-dd"
+							:style="{width:'100%'}"
+							type="date">
+					</el-date-picker>
+				</el-form-item>
+			</div>
+			<div class="class-20" >
+				<el-form-item>
+					<el-button type="primary" @click="updateArticle" :loading="articleLoading">{{articleLoading?'更新中':'生成文章'}}</el-button>
+				</el-form-item>
+			</div>
+		</div>
+		<div class="class-23" >
+			<div class="class-24" >
+				<el-form-item  label="生成栏目">
+					<tree-select v-model="section"
+								 :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
+								 :options="treeList" :style="{width:'100%'}"
+								 placeholder="请选择文章栏目">
+					</tree-select>
+				</el-form-item>
+			</div>
+
+			<div class="class-30" >
+				<el-form-item>
+					<el-button type="primary" @click="updateColumn" :loading="columnLoading">{{columnLoading?'更新中':'生成栏目'}}</el-button>
+				</el-form-item>
+			</div>
+		</div>
+	</div>
+	</el-form>
+</div>
+</body>
+</html>
+<script>
+	"use strict";
+
+	var app = new Vue({
+		el: '#app',
+		watch: {},
+		data: {
+			homeLoading: false,
+			articleLoading: false,
+			columnLoading: false,
+			template: '',
+			//主题模板
+			templateOptions: [],
+			position: 'index',
+			//位置
+			contentSection: '0',
+			//文章栏目
+			section: '0',
+			//栏目
+			time: ms.util.date.fmt(new Date(), "yyyy-MM-dd"),
+			treeList: [{
+				id: '0',
+				categoryTitle: '顶级栏目',
+				children: []
+			}]
+		},
+		methods: {
+			//更新主页
+			updataIndex: function () {
+				var that = this;
+				if (!that.position || that.position == '') {
+					this.$notify({
+						title: '请输入主页位置!',
+						type: 'warning'
+					});
+					return;
+				}
+				that.homeLoading = true;
+				ms.http.post(ms.manager + '/cms/generate//generateIndex.do', {
+					url: that.template,
+					position: that.position
+				}).then(function (data) {
+					if (data.result) {
+						that.$notify({
+							title: '更新成功!',
+							type: 'success'
+						});
+					} else {
+						that.$notify({
+							title: '更新失败!',
+							message: "错误",
+							type: 'error'
+						});
+					}
+				}).catch(function (err) {
+					that.$notify({
+						title: '更新失败!',
+						message: err,
+						type: 'error'
+					});
+					console.log(err);
+				}).finally(function () {
+					that.homeLoading = false;
+				});
+			},
+			//预览主页
+			viewIndex: function () {
+				if (!this.position || this.position == '') {
+					this.$notify({
+						title: '请输入主页位置!',
+						type: 'warning'
+					});
+					return;
+				}
+				window.open(ms.manager + "/cms/generate/" + this.position + "/viewIndex.do");
+			},
+			//更新栏目
+			updateColumn: function () {
+				var that = this;
+				that.columnLoading = true;
+				ms.http.get(ms.manager + '/cms/generate/' + (that.section ? that.section : 0) + '/genernateColumn.do').then(function (data) {
+					if (data.result) {
+						that.$notify({
+							title: '更新成功!',
+							type: 'success'
+						});
+					}
+				}).catch(function (err) {
+					that.$notify({
+						title: '更新失败!',
+						message: err,
+						type: 'error'
+					});
+					console.log(err);
+				}).finally(function () {
+					that.columnLoading = false;
+				});
+			},
+			//生成文章栏目
+			updateArticle: function () {
+				var that = this;
+				that.articleLoading = true;
+				ms.http.post(ms.manager + '/cms/generate/' + (that.contentSection ? that.contentSection : 0) + '/generateArticle.do', {
+					dateTime: that.time
+				}).then(function (data) {
+					if (data.result) {
+						that.$notify({
+							title: '更新成功!',
+							type: 'success'
+						});
+					}
+				}).catch(function (err) {
+					that.$notify({
+						title: '更新失败!',
+						message: err,
+						type: 'error'
+					});
+					console.log(err);
+				}).finally(function () {
+					that.articleLoading = false;
+				});
+			},
+			//获取主题模板数据源
+			templateOptionsGet: function () {
+				var that = this;
+				ms.http.get(ms.manager + '/template/queryTemplateFileForColumn.do', {
+					pageSize: 99999
+				}).then(function (data) {
+					that.templateOptions = data.data; //寻找主页
+
+					var template = that.templateOptions.find(function (x) {
+						return x.indexOf("index") != -1 || x.indexOf("default") != -1;
+					}); //没有就找其他的
+
+					that.template = template || (that.templateOptions.length > 0 ? that.templateOptions[0] : "");
+				}).catch(function (err) {
+					console.log(err);
+				});
+			},
+			getTree: function () {
+				var that = this;
+				ms.http.get(ms.manager + "/cms/category/list.do", {
+					pageSize: 9999
+				}).then(function (res) {
+					if (res.result) {
+						//res.data.rows.push({id:0,categoryId: null,categoryTitle:'顶级栏目管理'});
+						that.treeList[0].children = ms.util.treeData(res.data.rows, 'id', 'categoryId', 'children');
+					}
+				}).catch(function (err) {
+					console.log(err);
+				});
+			}
+		},
+		created: function () {
+			this.getTree();
+			this.templateOptionsGet();
+		}
+	});
+</script>
+<style>
+	input{
+		width: 100%!important;
+	}
+	.class-1
+	{
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		max-width:100%;
+		background-color:#FFFFFF;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		width:100%;
+		background-repeat:no-repeat;
+		padding: 14px;
+	}
+	.class-2
+	{
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		height:500px;
+		max-width:100%;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		width:100%;
+		background-repeat:no-repeat;
+	}
+	.class-3
+	{
+		color:#333333;
+		padding:20px;
+		outline:none;
+		outline-offset:-1px;
+		height:200px;
+		max-width:100%;
+		background-color:#FFFFFF;
+		flex-direction:column;
+		display:flex;
+		justify-content:end;
+		margin: 12px 6px 12px 12px;
+		animation-duration:1s;
+		width:100%;
+		padding-left:20px;
+		background-repeat:no-repeat;
+	}
+	.class-4
+	{
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-5
+	{
+		color:#333333;
+		word-wrap:break-word;
+		display:inline-block;
+		animation-duration:1s;
+		font-size:14px;
+		line-height:1.4;
+	}
+	.class-6
+	{
+		border-color:#EEEEEE;
+		color:#606266;
+		padding-right:15px;
+		box-sizing:boredr-box;
+		outline:none;
+		border-width:1px;
+		border-style:solid;
+		height:40px;
+		margin-left:20px;
+		animation-duration:1s;
+		background:none;
+		width:320px;
+		font-size:12px;
+		line-height:40px;
+		padding-left:15px;
+	}
+	.class-7
+	{
+		border-color:#EEEEEE;
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		border-width:1px;
+		border-style:none;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-8
+	{
+		color:#333333;
+		word-wrap:break-word;
+		display:inline-block;
+		animation-duration:1s;
+		font-size:14px;
+		line-height:1.4;
+	}
+	.class-9
+	{
+		border-color:#EEEEEE;
+		color:#606266;
+		padding-right:15px;
+		box-sizing:boredr-box;
+		outline:none;
+		border-width:1px;
+		border-style:solid;
+		height:40px;
+		margin-left:20px;
+		animation-duration:1s;
+		background:none;
+		width:320px;
+		font-size:12px;
+		line-height:40px;
+		padding-left:15px;
+	}
+	.class-10
+	{
+		border-color:#EEEEEE;
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		border-width:1px;
+		border-style:none;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-11
+	{
+		cursor:pointer;
+		color:#ffffff;
+		box-sizing:border-box;
+		height:34px;
+		background-color:#0099ff;
+		text-align:center;
+		display:inline-block;
+		animation-duration:1s;
+		border-radius:4px;
+		width:98px;
+		line-height:34px;
+		font-size:14px;
+	}
+	.class-12
+	{
+		cursor:pointer;
+		border-color:#0099FF;
+		color:#0099FF;
+		box-sizing:border-box;
+		border-width:1px;
+		border-style:solid;
+		height:34px;
+		background-color:#FFFFFF;
+		text-align:center;
+		display:inline-block;
+		margin-left:10px;
+		animation-duration:1s;
+		border-radius:4px;
+		width:98px;
+		line-height:34px;
+		font-size:14px;
+	}
+	.class-13
+	{
+		color:#333333;
+		padding:20px;
+		outline:none;
+		outline-offset:-1px;
+		height:200px;
+		max-width:100%;
+		background-color:#FFFFFF;
+		flex-direction:column;
+		display:flex;
+		justify-content:end;
+		margin: 12px 6px;
+		animation-duration:1s;
+		width:100%;
+		padding-left:20px;
+		background-repeat:no-repeat;
+	}
+	.class-14
+	{
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-15
+	{
+		color:#333333;
+		word-wrap:break-word;
+		display:inline-block;
+		animation-duration:1s;
+		font-size:14px;
+		line-height:1.4;
+	}
+	.class-16
+	{
+		border-color:#EEEEEE;
+		color:#606266;
+		padding-right:15px;
+		box-sizing:boredr-box;
+		outline:none;
+		border-width:1px;
+		border-style:solid;
+		height:40px;
+		margin-left:20px;
+		animation-duration:1s;
+		background:none;
+		width:320px;
+		font-size:12px;
+		line-height:40px;
+		padding-left:15px;
+	}
+	.class-17
+	{
+		border-color:#EEEEEE;
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		border-width:1px;
+		border-style:none;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-18
+	{
+		color:#333333;
+		word-wrap:break-word;
+		display:inline-block;
+		animation-duration:1s;
+		font-size:14px;
+		line-height:1.4;
+	}
+	.class-19
+	{
+		border-color:#EEEEEE;
+		color:#606266;
+		padding-right:15px;
+		box-sizing:boredr-box;
+		outline:none;
+		border-width:1px;
+		border-style:solid;
+		height:40px;
+		margin-left:20px;
+		animation-duration:1s;
+		background:none;
+		width:320px;
+		font-size:12px;
+		line-height:40px;
+		padding-left:15px;
+	}
+	.class-20
+	{
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-21
+	{
+		cursor:pointer;
+		color:#ffffff;
+		box-sizing:border-box;
+		height:34px;
+		background-color:#0099ff;
+		text-align:center;
+		display:inline-block;
+		animation-duration:1s;
+		border-radius:4px;
+		width:98px;
+		line-height:34px;
+		font-size:14px;
+	}
+	.class-22
+	{
+		cursor:pointer;
+		border-color:#0099FF;
+		color:#0099FF;
+		box-sizing:border-box;
+		border-width:1px;
+		border-style:solid;
+		height:34px;
+		background-color:#FFFFFF;
+		text-align:center;
+		display:inline-block;
+		margin-left:10px;
+		animation-duration:1s;
+		border-radius:4px;
+		width:98px;
+		line-height:34px;
+		font-size:14px;
+	}
+	.class-23
+	{
+		color:#333333;
+		padding:20px;
+		outline:none;
+		outline-offset:-1px;
+		height:200px;
+		max-width:100%;
+		background-color:#FFFFFF;
+		flex-direction:column;
+		display:flex;
+		justify-content:end;
+		margin: 12px 12px 12px 6px;
+		animation-duration:1s;
+		width:100%;
+		padding-left:20px;
+		background-repeat:no-repeat;
+	}
+	.class-24
+	{
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-25
+	{
+		color:#333333;
+		word-wrap:break-word;
+		display:inline-block;
+		animation-duration:1s;
+		font-size:14px;
+		line-height:1.4;
+	}
+	.class-26
+	{
+		border-color:#EEEEEE;
+		color:#606266;
+		padding-right:15px;
+		box-sizing:boredr-box;
+		outline:none;
+		border-width:1px;
+		border-style:solid;
+		height:40px;
+		margin-left:20px;
+		animation-duration:1s;
+		background:none;
+		width:320px;
+		font-size:12px;
+		line-height:40px;
+		padding-left:15px;
+	}
+	.class-27
+	{
+		border-color:#EEEEEE;
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		border-width:1px;
+		border-style:none;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-28
+	{
+		color:#333333;
+		word-wrap:break-word;
+		display:inline-block;
+		animation-duration:1s;
+		font-size:14px;
+		line-height:1.4;
+	}
+	.class-29
+	{
+		border-color:#EEEEEE;
+		color:#606266;
+		padding-right:15px;
+		box-sizing:boredr-box;
+		outline:none;
+		border-width:1px;
+		border-style:solid;
+		height:40px;
+		margin-left:20px;
+		animation-duration:1s;
+		background:none;
+		width:320px;
+		font-size:12px;
+		line-height:40px;
+		padding-left:15px;
+	}
+	.class-30
+	{
+		color:#333333;
+		outline:none;
+		outline-offset:-1px;
+		max-width:100%;
+		align-items:center;
+		flex-direction:row;
+		display:flex;
+		animation-duration:1s;
+		background-repeat:no-repeat;
+	}
+	.class-31
+	{
+		cursor:pointer;
+		color:#ffffff;
+		box-sizing:border-box;
+		height:34px;
+		background-color:#0099ff;
+		text-align:center;
+		display:inline-block;
+		animation-duration:1s;
+		border-radius:4px;
+		width:98px;
+		line-height:34px;
+		font-size:14px;
+	}
+	.class-32
+	{
+		cursor:pointer;
+		border-color:#0099FF;
+		color:#0099FF;
+		box-sizing:border-box;
+		border-width:1px;
+		border-style:solid;
+		height:34px;
+		background-color:#FFFFFF;
+		text-align:center;
+		display:inline-block;
+		margin-left:10px;
+		animation-duration:1s;
+		border-radius:4px;
+		width:98px;
+		line-height:34px;
+		font-size:14px;
+	}
+	.el-select,
+	.el-input,
+	.el-form-item,
+	.el-date-editor{
+		width: 100%;
+	}
+</style>

+ 21 - 60
src/main/webapp/WEB-INF/manager/index.ftl

@@ -52,12 +52,8 @@
             <!--头部-->
             <el-header class="ms-admin-header" v-cloak>
                 <#--展示合并菜单-->
-                <div class="ms-admin-header-menu-shrink" @click="collapseMenu = !collapseMenu">
-                    <i class="iconfont" :class="collapseMenu?'icon-liebiaoxiangyou':'icon-shousuo'"></i>
-                </div>
+                <div class="ms-admin-header-menu-shrink" @click="collapseMenu = !collapseMenu"><i class="iconfont" :class="collapseMenu?'icon-liebiaoxiangyou':'icon-shousuo'"></i></div>
                 <!--头部menu-->
-
-
                 <el-menu menu-trigger="hover" class="ms-admin-header-menu" background-color="rgba(255,255,255,1)"
                          text-color="#333333" active-text-color="#409EFF" :default-active="headMenuActive"
                          mode="horizontal">
@@ -87,16 +83,8 @@
                         </div>
                     </el-submenu>
                 </el-menu>
-
-
                 <!--头部右侧-->
                 <div class="ms-admin-mstore">
-                    <div class="ms-admin-mstore-menu-icon" style="padding-left:20px " @click="handleMessage">
-                        <el-badge :value="unreadTotal>0?unreadTotal:null" type="danger" class="item" style="z-index: 1">
-                            <i class="iconfont icon-lingdang" style="color: #909399;"></i>
-                        </el-badge>
-                    </div>
-
                     <el-menu menu-trigger="hover" class="ms-admin-header-menu" background-color="rgba(255,255,255,1)"
                              text-color="#333333" active-text-color="#409EFF"
                              mode="horizontal">
@@ -116,51 +104,21 @@
                             </el-menu-item>
                         </el-submenu>
                     </el-menu>
-                    <#-- <el-dropdown trigger="hover" class="ms-admin-login" placement="top-start"
-                                  @visible-change="loginDown = !loginDown">
-             <span class="el-dropdown-link">
-               <div class="ms-admin-people-head"
-                                  v-text="peopleInfo.managerNickName && peopleInfo.managerNickName.substr(0, 1)"></div>
-               <span v-text='peopleInfo.managerNickName'></span>
-             </span>
-                         <el-dropdown-menu class="ms-admin-login-down" slot="dropdown">
-                             <el-dropdown-item icon="iconfont icon-suo" @click.native='openModal(true)'>修改密码
-                             </el-dropdown-item>
-                             <el-dropdown-item icon="iconfont icon-tuichu1" @click.native='openModal(false)'>退出
-                             </el-dropdown-item>
-                         </el-dropdown-menu>
-                     </el-dropdown>-->
-                    <el-menu menu-trigger="hover" class="ms-admin-header-menu" background-color="rgba(255,255,255,1)"
-                             text-color="#333333" active-text-color="#409EFF"
-                             mode="horizontal">
-                        <el-submenu style="height: 100%;" popper-class="top-operate-select">
-                            <template slot="title">
-                              <span class="el-dropdown-link" style="display:flex;align-items: center;float: left">
-                                <div class="ms-admin-people-head adminhead"
-                                     v-text="peopleInfo.managerNickName && peopleInfo.managerNickName.substr(0, 1)"></div>
-                                <span v-text='peopleInfo.managerNickName'></span>
-                              </span>
-                            </template>
-                            <el-menu-item @click="openModal(true)" style="display: flex;align-items: center">
-                                <i class="iconfont icon-suo to-ele"></i>
-                                <span>修改密码</span>
-                            </el-menu-item>
-<#--                            <el-menu-item @click="subscribe" style="display: flex;align-items: center">-->
-<#--                                <i class="iconfont icon-erweimadenglu to-ele"></i>-->
-<#--                                <span>微信绑定</span>-->
-<#--                            </el-menu-item>-->
-                            <el-menu-item @click="openModal(false)" style="display: flex;align-items: center">
-                                <i class="iconfont icon-tuichu1 to-ele"></i>
-                                <span>退出</span>
-                            </el-menu-item>
-                        </el-submenu>
-                    </el-menu>
-
-                    <#-- <!--mstore按钮&ndash;&gt;
-                     <div class="ms-admin-mstore-icon" @click="open(mstore)">
-                         <span v-if="mstore.syncNum>0" v-text="mstore.syncNum"></span>
-                         <i style="line-height: 42px !important;font-size: 30px;" class="iconfont icon-fenxiang2"></i>
-                     </div>-->
+                    <el-dropdown trigger="hover" class="ms-admin-login" placement="top-start" @visible-change="loginDown = !loginDown">
+						<span class="el-dropdown-link">
+							<div class="ms-admin-people-head" v-text="peopleInfo.managerName && peopleInfo.managerName.substr(0, 2)"></div>
+							<span v-text='peopleInfo.managerName'></span>
+						</span>
+                        <el-dropdown-menu class="ms-admin-login-down" slot="dropdown" @click.native='openModal'>
+                            <el-dropdown-item icon="iconfont icon-suo">修改密码</el-dropdown-item>
+                            <el-dropdown-item icon="iconfont icon-tuichu1">退出</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <!--mstore按钮-->
+                    <div class="ms-admin-mstore-icon" @click="open(mstore)">
+                        <span v-if="mstore.syncNum>0" v-text="mstore.syncNum"></span>
+                        <i style="line-height: 42px !important;font-size: 30px;" class="iconfont icon-fenxiang2"></i>
+                    </div>
                 </div>
 
             </el-header>
@@ -523,8 +481,8 @@
                 })
             },
             //  打开修改密码,退出的模态框
-            openModal: function (edit) {
-                edit ?
+            openModal: function () {
+                event.target.innerText.indexOf('修改密码') > -1 ?
                     resetPasswordVue.isShow = true : this.exitSystem();
             },
             // 显示图标
@@ -793,4 +751,7 @@
         width: 162px;
         min-width: 162px;
     }
+    .ms-admin-login-down{
+        top:55px !important;
+    }
 </style>