Merge commit 'db2cea5ac13959efd40a68c750bf0d3e8abb3fe7' into gzb

src/App.vue

@@ -123,6 +123,33 @@ body,
     }
   }
 }
+.modal_detail {
+  .ivu-modal {
+    width: 80% !important;
+    .ivu-modal-content {
+      border-radius: 0;
+      .ivu-modal-header {
+        background: #2d8cf0;
+        padding: 13px 16px !important;
+        .ivu-modal-header-inner {
+          font-size: 18px !important;
+          color: #ffffff;
+        }
+      }
+      .ivu-modal-close {
+        top: 4px;
+        .ivu-icon-ios-close:before {
+          color: #ffffff;
+          font-size: 36px;
+          font-weight: 600;
+        }
+      }
+      .ivu-modal-footer {
+        border-top: none;
+      }
+    }
+  }
+}
 .ivu-table-header thead tr th,
 .ivu-table-cell {
   text-align: center;

src/views/history/index.vue

@@ -66,7 +66,7 @@
         :rules="addFormRules"
         :model="historyAddForm"
       >
-        <FormItem label="语言" prop="date">
+        <FormItem label="语言" prop="ltype">
           <RadioGroup v-model="historyAddForm.ltype">
             <Radio :label="1">中文</Radio>
             <Radio :label="2">英文</Radio>
@@ -108,12 +108,6 @@
         :rules="modifyFormRules"
         :model="historyModifyForm"
       >
-        <FormItem label="语言" prop="date">
-          <RadioGroup v-model="historyModifyForm.ltype">
-            <Radio :label="1">中文</Radio>
-            <Radio :label="2">英文</Radio>
-          </RadioGroup>
-        </FormItem>
         <FormItem label="日期" prop="date">
           <DatePicker
             type="month"
@@ -283,7 +277,7 @@ export default {
         show: true,
         date: new Date(),
         content: "",
-        ltype: 1
+        ltype: this.historySearch.ltype
       };
     },
     toSaveAdd() {

src/views/news/index.vue

@@ -216,7 +216,7 @@
     </Modal>
     <Modal
       v-model="detailInfo.show"
-      class="modal1"
+      class="modal_detail"
       :mask-closable="false"
       title="查看新闻资讯"
     >
@@ -293,7 +293,7 @@ export default {
         {
           title: "封面",
           slot: "newspicSlot",
-          width: 240
+          width: 100
         },
         {
           title: "置顶",
@@ -307,13 +307,12 @@ export default {
         },
         {
           title: "标题",
-          key: "newstitle",
-          width: 240
-        },
-        {
-          title: "摘要",
-          key: "newssummary"
+          key: "newstitle"
         },
+        // {
+        //   title: "摘要",
+        //   key: "newssummary"
+        // },
         {
           title: "创建人",
           key: "createname",
@@ -484,7 +483,7 @@ export default {
     toAdd() {
       this.addForm = {
         show: true,
-        ltype: 1,
+        ltype: this.newsSearch.ltype,
         newspic: "",
         newstitle: "",
         newssummary: "",
@@ -594,7 +593,7 @@ export default {
 .news_pic {
   display: block;
   margin: 10px auto;
-  width: 200px;
+  width: 60px;
   object-fit: cover;
 }
 .foot_page {