From 92f04b41f60662798ff2e37e6794fbaa517b5563 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Tue, 29 Jan 2019 18:27:38 +0800
Subject: [PATCH] Signed-off-by: yinxr <2273460044@qq.com>

---
 .../WEB-INF/manager/include/head-file.ftl     | 13 +++++-----
 src/main/webapp/WEB-INF/manager/login.ftl     |  9 ++++---
 .../WEB-INF/manager/mweixin/metarial/form.ftl | 24 +++++++++++--------
 3 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/WEB-INF/manager/include/head-file.ftl b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
index 67837af2..5b97b069 100644
--- a/src/main/webapp/WEB-INF/manager/include/head-file.ftl
+++ b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
@@ -32,9 +32,9 @@
     <script src="//cdn.jsdelivr.net/npm/sortablejs@1.7.0/Sortable.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/Vue.Draggable/2.17.0/vuedraggable.min.js"></script>
  
-    <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> 
+    <!-- <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> 
     <link rel="stylesheet" href="${base}/static/mweixin/css/custom-menu.css"> 
-    <link rel="stylesheet" href="${base}/static/mweixin/css/message-reply.css">     
+    <link rel="stylesheet" href="${base}/static/mweixin/css/message-reply.css">      -->
     <!-- 
 
     <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
@@ -43,11 +43,12 @@
     -->
    
     <script>
-        ms.base = "${base}";
-        ms.manager = "${managerPath}";
+        // ms.base = "${base}";
+        // ms.manager = "${managerPath}";
 
-        //ms.base = "http://192.168.0.54:82";
-        //ms.manager = "http://192.168.0.54:82/apis/ms";
+        ms.base = "http://192.168.0.54:82";
+        ms.manager = "http://192.168.0.54:82/apis/ms";
+        ms.web = "http://192.168.0.54:82/apis";
         //图片懒加载
 		  Vue.use(VueLazyload, {
 		    error: ms.base + '/images/ic_image_deault.png',
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
index 3d280261..040f2d26 100644
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -3,11 +3,10 @@
 
    <head>
       <title></title>
-      <#include "/include/head-file.ftl"/> 
-      <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css">
-
-      <!--#include virtual="include/head-file.ftl" >
-      <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css"-->
+      <!-- <#include "/include/head-file.ftl"/>  -->
+      <!-- <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> -->
+      <!--#include virtual="include/head-file.ftl"-->
+      <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css"
    </head>
 
    <body>
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl b/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl
index a8462104..776524ca 100644
--- a/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl
@@ -7,7 +7,7 @@
          <el-row>
             <el-button class="ms-fr" size="small" icon="el-icon-arrow-left" @click="menuVue.menuActive = '关键词回复'">返回</el-button>
             <el-button class="ms-fr" size="small" icon="el-icon-refresh">更新</el-button>
-            <el-button class="ms-fr" type="success" size="small" icon="el-icon-tickets" @click="menuVue.menuActive = '关键词回复'">保存</el-button>
+            <el-button class="ms-fr" type="success" size="small" icon="el-icon-tickets" @click="newsSave">保存</el-button>
          </el-row>
       </el-header>
       <el-container class=" ms-container">
@@ -39,10 +39,11 @@
                     :before-upload='beforeBasicPicUpload'
                     :action="ms.web + '/file/upload.do'"
                     :limit='1'
+                    :disabled='uploadDisable'
                     :data={uploadFloderPath:"/mweixin/news"}
                 >
                 <div class="ms-article-mask" v-show='headMask' @mouseover='headMask=true;' @mouseleave='headMask=false'>
-                    <i class="el-icon-delete" @click='delThumbnail'></i>
+                    <i class="el-icon-delete" @click="thumbnailUrl=mainArticle.basicPic='';uploadDisable=thumbnailShow=false"></i>
                 </div>
                 <img v-if="thumbnailShow" :src="thumbnailUrl"
                 class="article-thumbnail" @mouseover='headMask=true;' @mouseleave='headMask=false;'>
@@ -62,8 +63,9 @@
                         <span slot='suffix' v-text="authorWordNumber+'/8'"></span>
                      </el-input>
                   </el-form-item>
+                  <!-- @input="resetWordNum(120)" -->
                   <el-form-item label="摘要" prop="">
-                     <el-input size='small' type='textarea' placeholder="选填，如果不写会默认抓取正文前54个字" :autosize="{ minRows: 2, maxRows: 2}" resize='none' v-model='articleForm.basicDescription' @input="resetWordNum(120)">
+                     <el-input size='small' type='textarea' placeholder="选填，如果不写会默认抓取正文前54个字" :autosize="{ minRows: 2, maxRows: 2}" resize='none' v-model='articleForm.basicDescription'>
                         <span slot='suffix' v-text="descWordNumber+'/54'"></span>
                      </el-input>
                   </el-form-item>
@@ -101,6 +103,7 @@
          thumbnailShow:false,//显示缩略图
          thumbnailUrl:'',//缩略图路径
          headMask:false,//缩略图删除
+         uploadDisable:false,//是否禁止上传
       },
       watch:{
             articleForm:{
@@ -142,7 +145,7 @@
         },
         //   图片上传成功函数
         basicPicSuccess:function(url){
-            this.thumbnailShow = true
+            this.thumbnailShow = this.uploadDisable = true
             this.thumbnailUrl = ms.web + url
             this.mainArticle.basicPic = this.thumbnailUrl
 
@@ -161,17 +164,14 @@
                basicTitle: '新增文章标题',
                basicThumbnailsl: 'https://img03.sogoucdn.com/app/a/100520091/20190125113148'
             })
-         },
-         delThumbnail:function(){
-
          },
          // 计算剩余字数
          resetWordNum: function(type,limit) {
              var result = event.target.value;
              if(type.indexOf('Title') > -1){
-                this.titleWordNumber = this.titleWordNumber - result.length
+                this.titleWordNumber = limit - result.length
              }else{
-                 this.authorWordNumber = this.authorWordNumber - result.length
+                 this.authorWordNumber = limit - result.length
              }
              if(result.length >= limit){
                  this.$message.error('超出字数限制，请输入不超过'+limit+'字符');
@@ -179,7 +179,11 @@
                      this.articleForm[type] = result.slice(0,limit);
                  })
              }
-         }
+         },
+        //  保存微信文章
+        newsSave:function(){
+
+        }
       },
       mounted: function() {
          let that = this;
