Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zky-admin

src/views/journalQun/AddJournal.vue

@@ -315,13 +315,9 @@ export default {
       imageUrl: "",
       rules: {
         name: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        journal_id: [
-          { required: true, message: "请选择来源", trigger: "change" },
-        ],
-        author: [{ required: true, message: "请选择模板", trigger: "blur" }],
-        publish_time: [
-          { required: true, message: "发布时间", trigger: "blur" },
-        ],
+        wxcode: [{ required: true, message: "请输入微信号", trigger: "blur" }],
+        organizer_id: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
+        subject_id: [{ required: true, message: "请选择学科", trigger: "change" }],
         img: [{ required: true, message: "封面图", trigger: "blur" }],
       },
     };

src/views/journalQun/Organizer.vue

@@ -158,7 +158,7 @@ a {
       >
         <el-table-column prop="name" label="单位名称"> </el-table-column>
         <el-table-column prop="desc" label="主办单位简介" width="1200px"></el-table-column>
-        <el-table-column prop="journal_name" label="期刊数量"></el-table-column>
+        <el-table-column prop="journal_num" label="期刊数量"></el-table-column>
         <el-table-column prop="zip" width="150" label="操作">
           <template slot-scope="scope">
             <el-button class="edit" type="text" @click="edit(scope.row)"

src/views/message/InnerSurvey.vue

@@ -59,7 +59,9 @@ a {
 }
 .tpl_title {
   font-size: 18px;
-  margin: 20px 0;
+  // margin: 20px 0;
+  width:80%;
+  margin:20px auto;
 }
 .tpl_form {
   margin: 20px;
@@ -298,6 +300,14 @@ a {
             show-word-limit
           ></el-input>
         </el-form-item>
+        <el-form-item label="发布单位" prop="publisher">
+          <el-input
+            v-model="form1.publisher"
+            placeholder="请输入发布单位"
+            maxlength="50"
+            show-word-limit
+          ></el-input>
+        </el-form-item>
         <el-form-item label="问卷描述">
           <el-input
             type="textarea"
@@ -354,7 +364,7 @@ a {
       width="400px"
     >
       <div class="item-main">
-        <img src="../../assets/survey_logo.png" alt="" class="survey_logo" />
+        <!-- <img src="../../assets/survey_logo.png" alt="" class="survey_logo" /> -->
         <h5 align="center" class="tpl_title">{{ title }}</h5>
         <div class="message_desc">{{messageData.desc}}</div>
         <el-form

src/views/message/OutSurvey.vue

@@ -63,7 +63,9 @@ a {
 }
 .tpl_title {
   font-size: 18px;
-  margin: 20px 0;
+  // margin: 20px 0;
+  width:80%;
+  margin:20px auto;
 }
 .tpl_form {
   margin: 20px;
@@ -281,6 +283,14 @@ a {
             show-word-limit
           ></el-input>
         </el-form-item>
+        <el-form-item label="发布单位" prop="publisher">
+          <el-input
+            v-model="form1.publisher"
+            placeholder="请输入发布单位"
+            maxlength="50"
+            show-word-limit
+          ></el-input>
+        </el-form-item>
         <el-form-item label="问卷描述">
           <el-input
             type="textarea"
@@ -322,7 +332,7 @@ a {
       class="survey_dialog" width="400px" 
     >
       <div class="item-main">
-        <img src="../../assets/survey_logo.png" alt="" class="survey_logo" />
+        <!-- <img src="../../assets/survey_logo.png" alt="" class="survey_logo" /> -->
         <h5 align="center" class="tpl_title">{{ title }}</h5>
         <div class="message_desc">{{messageData.desc}}</div>
         <el-form ref="form2" :model="form2" class="tpl_form over_y" :rules="rules1.rules">

src/views/message/modelForm.vue

@@ -370,7 +370,7 @@
                 <div class='item-title'>效果预览</div>
                 <div class="phone">
                     <div class='item-main'>
-                        <img src="../../assets/survey_logo.png" alt="" class="survey_logo">
+                        <!-- <img src="../../assets/survey_logo.png" alt="" class="survey_logo"> -->
                         <h5 align='center' class="tpl_title">{{title}}</h5>
                         <el-form ref="form" :model="form" class="tpl_form over_y">
                             <template v-for="(item,index) in widgetList">