From b170311e293333c21f0523cbf6002b35c4eb3e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B0=E6=95=A3=E5=9C=A8=E6=97=B6=E5=85=89=E9=87=8C?=
 <954441582@qq.com>
Date: Thu, 9 Jan 2020 15:10:56 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=E9=93=AD=E9=A3=9E=E5=AE=98?=
 =?UTF-8?q?=E7=BD=91=E7=9A=84=E6=B6=88=E6=81=AF=E3=80=81=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=92=8C=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC=202=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=8F=E7=9B=AE=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E3=80=81=E6=A0=8F=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89=E9=93=BE=E6=8E=A5=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=9D=E5=AD=98=E7=A9=BA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mingsoft/cms/dao/ICategoryDao.xml     |  6 ++---
 src/main/webapp/WEB-INF/manager/main.ftl      | 22 +++++++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
index ab92dc73..a5bc84f3 100644
--- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
@@ -96,10 +96,10 @@
 				<if test="categorySort != null">category_sort=#{categorySort},</if>
 				<if test="categoryListUrl != null and categoryListUrl != ''">category_list_url=#{categoryListUrl},</if>
 				<if test="categoryUrl != null and categoryUrl != ''">category_url=#{categoryUrl},</if>
-				<if test="categoryKeyword != null and categoryKeyword != ''">category_keyword=#{categoryKeyword},</if>
-				<if test="categoryDescrip != null and categoryDescrip != ''">category_descrip=#{categoryDescrip},</if>
+				<if test="categoryKeyword != null ">category_keyword=#{categoryKeyword},</if>
+				<if test="categoryDescrip != null ">category_descrip=#{categoryDescrip},</if>
 				<if test="categoryImg != null and categoryImg != ''">category_img=#{categoryImg},</if>
-				<if test="categoryDiyUrl != null and categoryDiyUrl != ''">category_diy_url=#{categoryDiyUrl},</if>
+				<if test="categoryDiyUrl != null">category_diy_url=#{categoryDiyUrl},</if>
 				<if test="mdiyModelId != null and mdiyModelId != ''">mdiy_model_id=#{mdiyModelId},</if>
 				<if test="categoryDatetime != null">category_datetime=#{categoryDatetime},</if>
 				<if test="categoryManagerId != null">category_manager_id=#{categoryManagerId},</if>
diff --git a/src/main/webapp/WEB-INF/manager/main.ftl b/src/main/webapp/WEB-INF/manager/main.ftl
index 5887c228..ad1aa713 100644
--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/main.ftl
@@ -212,12 +212,12 @@
       </div>
     </div>
     <div  class="class-56" >
-      <div  class="class-57" >
+      <div  class="class-57" @click="openMCMSNews">
         <div  class="class-58" >
           <div  class="class-59" >
           </div>
           <div class="class-60">
-            铭飞商城多商户功能现已正式上线试...
+            {{ msNewsLast }}
           </div>
         </div>
       </div>
@@ -432,6 +432,8 @@
     },
     data: {
       base:ms.base,
+      msNewsLast: '',
+      msNewsPath: ''
     },
     methods: {
       jumpArtcleManager(){
@@ -493,8 +495,23 @@
         window.open("http://wpa.qq.com/msgrd?v=3&uin=3336073455&site=qq&menu=yes");
 
       },
+      //打开铭飞消息页面
+      openMCMSNews(){
+        window.open(this.msNewsPath);
+      },
+      getNewsLast(){
+        var that = this;
+        axios.create({
+          withCredentials: true
+        }).get("https://ms.mingsoft.net/cms/content/list.do?contentCategoryId=202").then(function (res){
+          console.log(res.data.data.rows[0]);
+          that.msNewsLast = res.data.data.rows[0].contentTitle.toString();
+          that.msNewsPath = 'https://ms.mingsoft.net/html/1/203/202/'+res.data.data.rows[0].id+'.html'
+        })
+      }
     },
     created(){
+      this.getNewsLast()
     }
   })
 </script>
@@ -1243,6 +1260,7 @@
   }
   .class-57
   {
+    cursor: pointer;
     color:#333333;
     outline:none;
     outline-offset:-1px;