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

src/views/activity/AddActivity.vue

@@ -102,11 +102,14 @@
             <!-- <div class="title">新增会议</div> -->
             <el-form size="small" label-width="140px" class='over_y'>
               <el-form-item label="发布单位：">
-                    <el-input
-                        disabled
-                        v-model="form.journal_name"
-                        clearable
-                    ></el-input>
+                    <el-select placeholder="请选择发布单位" v-model="form.journal_id" filterable>
+                        <el-option
+                            v-for="(item, index) in journalList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="活动名称：">
                     <el-input
@@ -118,26 +121,20 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="主办方：">
-                            <el-select placeholder="请选择主办方" v-model="form.organizer_id" filterable>
-                                <el-option
-                                    v-for="(item, index) in organizerList"
-                                    :key="index"
-                                    :label="item.name"
-                                    :value="item.id"
-                                ></el-option>
-                            </el-select>
+                            <el-input
+                                placeholder="请输入主办方"
+                                v-model="form.the_host"
+                                clearable
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="承办方：">
-                            <el-select placeholder="请选择承办方" v-model="form.subject_id" filterable>
-                                <el-option
-                                    v-for="(item, index) in organizerList"
-                                    :key="index"
-                                    :label="item.name"
-                                    :value="item.id"
-                                ></el-option>
-                            </el-select>
+                            <el-input
+                                placeholder="请输入承办方"
+                                v-model="form.to_undertake"
+                                clearable
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12" >
@@ -155,7 +152,7 @@
                     <el-col :span="12">
                         <el-form-item label="城市：">
                             <el-cascader style="width:100%;"
-                                v-model="form.citys" :props='props'
+                                v-model="form.city" :props='props'
                                 :options="cityList"
                                 @change="handleChangeCity">
                             </el-cascader>
@@ -179,7 +176,7 @@
                     <el-col :span="8">
                         <el-form-item label='是否热门：'>
                             <el-switch
-                                v-model="form.is_popular"
+                                v-model="form.is_hot"
                                 active-text="热门"
                                 inactive-text="不热门">
                             </el-switch>
@@ -297,7 +294,7 @@ export default {
                 { name: "成都交通", id: "1" },
             ],
             
-            organizerList:[],
+            journalList:[],
             cityList:[],
             activeName:'first',
             imageUrl:"",
@@ -394,8 +391,8 @@ export default {
             });
         },
         getData() {
-            this.$api.getAllOrganizer().then((res) => {
-                this.organizerList = res.data.data;
+            this.$api.searchJournalList().then((res) => {
+                this.journalList = res.data.data;
             });
             this.$api.getCityList().then((res) => {
                 this.cityList = res.data.data;

src/views/message/InnerSurvey.vue

@@ -296,7 +296,7 @@ a {
           <el-input
             v-model="form1.name"
             placeholder="请输入标题"
-            maxlength="50"
+            maxlength="45"
             show-word-limit
           ></el-input>
         </el-form-item>
@@ -304,7 +304,7 @@ a {
           <el-input
             v-model="form1.publisher"
             placeholder="请输入发布单位"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
           ></el-input>
         </el-form-item>

src/views/message/OutSurvey.vue

@@ -279,7 +279,7 @@ a {
           <el-input
             v-model="form1.name"
             placeholder="请输入标题"
-            maxlength="50"
+            maxlength="45"
             show-word-limit
           ></el-input>
         </el-form-item>
@@ -287,7 +287,7 @@ a {
           <el-input
             v-model="form1.publisher"
             placeholder="请输入发布单位"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
           ></el-input>
         </el-form-item>

src/views/message/survey/answer.html

@@ -85,7 +85,7 @@
 <body>
   <div id="app">
     <div class="item-main">
-      <img src="static/survey_logo.png" alt="" class="survey_logo" />
+      <!-- <img src="static/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" v-if="this.form2.status==1">