Merge remote-tracking branch 'origin/12_4_dangyunlong' into dev

.env.dev

@@ -3,5 +3,10 @@ ENV = 'dev'
 
 # base api
 VUE_APP_BASE_API = 'http://admindev.bjzxtw.org.cn:9501'
+#http://admindev.bjzxtw.org.cn:9501
+#ws://admindev.bjzxtw.org.cn:9506
+
+#http://183.131.25.186:9501
+#ws://183.131.25.186:9506
 # base websocket
 VUE_APP_BASE_WEBSOCKET = 'ws://admindev.bjzxtw.org.cn:9506'

.env.development

@@ -1,9 +1,16 @@
 # just a flag
 ENV = 'development'
 
-VUE_APP_BASE_WEBSOCKET = 'ws://admindev.bjzxtw.org.cn:9506 '
-# ws://183.131.25.186:9506
-# http://183.131.25.186:9501
+VUE_APP_BASE_WEBSOCKET = 'ws://admindev.bjzxtw.org.cn:9506'
+#ws://183.131.25.186:9506
+#http://183.131.25.186:9501
+
+#http://admindev.bjzxtw.org.cn:9501
+#ws://admindev.bjzxtw.org.cn:9506
+
 # base api
 VUE_APP_BASE_API = 'http://admindev.bjzxtw.org.cn:9501'
-'
+'
+
+
+

src/views/login/index.vue

@@ -282,13 +282,15 @@ export default {
       const backurl = hashParams.get('backurl');
       // 获取backurl参数的值
       const userurl = hashParams.get('userurl');
-      
+      // 获取可能出现的内部值
+      const system = hashParams.get('redirect');
+
       // 解码backurl
       const decodedBackurl = decodeURIComponent(backurl);
       const decodedUserurl = decodeURIComponent(userurl);
       
       // 第一种情况， 不含有backUrl或者userUrl 说明登录者是超级管理员
-      if(hashParams.size==0){
+      if(hashParams.size==0||system=='/dashboard'){
         console.log("执行超级管理员登录！")
         this.login(1)
       }else{

src/views/website/editNavigation.vue

@@ -85,6 +85,10 @@
         <div class="formDiv">
           <el-form-item label="导航名称：" :label-width="formLabelWidth" prop="alias" class="custom-align-right">
             <el-input v-model="form.alias" autocomplete="off"></el-input>
+            <input type="hidden" v-model="form.alias">
+          </el-form-item>
+          <el-form-item label="导航标题：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
+            <el-input v-model="form.seo_title" autocomplete="off"></el-input>
             <input type="hidden" v-model="form.seo_title">
           </el-form-item>
           <!-- <el-form-item label="导航名称：" :label-width="formLabelWidth" prop="seo_title" class="custom-align-right">
@@ -120,6 +124,7 @@
 import '@/styles/global.less';
 //表格标题
 import tableTitle from './components/tableTitle';
+import { title } from '@/settings';
 
 export default {
   components: {
@@ -229,7 +234,8 @@ export default {
         alias:"",//导航名称
         seo_title:"",//导航seo名称
         seo_keywords:"",//导航关键词
-        seo_description:""//导航描述
+        seo_description:"",//导航描述
+        seo_title:""//导航标题
       },
       //3.2表单验证规则
       formRules: {
@@ -239,6 +245,7 @@ export default {
         //seo_title:[{required:true,trigger:'blur',validator:validateEmpty}],
         seo_keywords:[{required:true,trigger:'blur',validator:validateEmpty}],
         seo_description:[{required:true,trigger:'blur',validator:validateEmpty}],
+        seo_title:[{required:true,trigger:'blur',validator:validateEmpty}],
       },
       //弹出框中的表单设置 end ------------------------------------------------------------>
     }