Merge branch 'master' of http://47.92.161.104:10080/shuzhan/enterprise-portal

src/views/base/activityInfo-detail.vue

@@ -51,8 +51,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="yyyy-MM-dd HH:mm"
-                            @blur="changePackageTime"
-
+            @blur="changePackageTime"
           >
           </el-date-picker>
         </el-form-item>
@@ -106,7 +105,7 @@ export default {
       formModel: {},
       ruleValidate: {
         picUrl: [
-          { required: false, message: "图片地址不能为空", trigger: "blur" },
+          { required: true, message: "图片地址不能为空", trigger: "blur" },
         ],
         title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
         content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
@@ -169,8 +168,8 @@ export default {
       return isLt2M;
     },
     changePackageTime() {
-      this.form.startTime = this.form.activityTime[0];
-      this.form.endTime = this.form.activityTime[1];
+      this.formModel.startTime = this.activityTime[0];
+      this.formModel.endTime = this.activityTime[1];
     },
     handleSubmit() {
       var self = this;
@@ -223,7 +222,6 @@ export default {
         self.loading = false;
         if (jsonData.result) {
           self.formModel = jsonData.data;
-          alert(self.formModel.content);
 
           if (self.formModel.content != null) {
             self.$refs.editor.setContent(self.formModel.content);
@@ -242,7 +240,9 @@ export default {
           //   self.activityTime[1] = new Date(endTime);
           // }
 
-          self.activityTime = [new Date(startTime), new Date(endTime)];
+          if (startTime != null) {
+            self.activityTime = [new Date(startTime), new Date(endTime)];
+          }
 
           let status = self.formModel.status;
           if (status == null) {

src/views/base/cooperationInfo-list.vue

@@ -111,11 +111,12 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="status"
-        label="是否上架"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="status" label="是否上架" width="180">
+        <template slot-scope="{ row }">
+          <span v-if="row.status">已上架</span>
+          <span v-else>未上架</span>
+        </template></el-table-column
+      >
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"

src/views/base/whisperingWall-detail.vue

@@ -39,7 +39,7 @@
             placeholder="请输入回答"
             type="textarea"
             :autosize="{ minRows: 10}"
-            style="width: 700px"
+            style="width: 500px"
           ></el-input>
         </el-form-item>
       </el-form>

src/views/base/whisperingWall-list.vue

@@ -73,6 +73,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="typeName" label="类型" width="180"></el-table-column>
       <el-table-column
         prop="question"
         label="提问"
@@ -99,7 +100,6 @@
         label="回答时间"
         width="180"
       ></el-table-column>
-      <el-table-column prop="type" label="类型" width="180"></el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"