代码提交

src/router/index.js

@@ -386,7 +386,7 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
     {
       path: "/main/*",
       redirect: {
-        path: "/main/404",
+        path: "/main/base-community-community",
       },
     },
   ]);

src/views/modules/communityParty/keyEnterprises/dialogForm.vue

@@ -96,7 +96,7 @@
             placeholder="在这里输入文字"
           />
         </el-form-item>
-        <el-form-item label="公司产品" prop="display" label-width="150px">
+        <el-form-item label="企业风采" prop="display" label-width="150px">
           <Tinymce
             class="tinymce_view"
             v-model="formData.display"
@@ -104,6 +104,14 @@
             placeholder="在这里输入文字"
           />
         </el-form-item>
+        <el-form-item label="公司产品" prop="product" label-width="150px">
+          <Tinymce
+            class="tinymce_view"
+            v-model="formData.product"
+            :height="300"
+            placeholder="在这里输入文字"
+          />
+        </el-form-item>
         <el-form-item label="产业监控" prop="monitor" label-width="150px">
           <Tinymce
             class="tinymce_view"

src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue

@@ -26,7 +26,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item
+        <!-- <el-form-item
           label="举办活动时间"
           style="display: block"
           prop="holdTime"
@@ -40,7 +40,7 @@
             placeholder="选择时间"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item
           label="活动主题"
@@ -55,7 +55,7 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="活动地点"
           prop="address"
           label-width="150px"
@@ -165,7 +165,7 @@
           style="display: block"
         >
           <el-checkbox :label="'是'" v-model="isAutoInform"></el-checkbox>
-        </el-form-item>
+        </el-form-item> -->
 
         <!-- <el-form-item
           label="活动介绍"
@@ -345,7 +345,6 @@ export default {
       this.$refs.ref_form.resetFields();
     }
     if (this.defaultTime) {
-      console.log("this.defaultTime", this.defaultTime);
       let year = this.defaultTime.substring(0, 4);
       let month = this.defaultTime.substring(4, 6);
       let day = this.defaultTime.substring(6, 8);
@@ -758,47 +757,47 @@ export default {
         actType: [
           { required: true, message: "活动类型不能为空", trigger: "change" },
         ],
-        attach: [
+        introduce: [
-          { required: true, message: "封面不能为空", trigger: "change" },
+          { required: true, message: "活动介绍不能为空", trigger: "change" },
-        ],
-        holdTime: [
-          {
-            required: true,
-            message: "活动举办时间不能为空",
-            trigger: "change",
-          },
         ],
+        // holdTime: [
+        //   {
+        //     required: true,
+        //     message: "活动举办时间不能为空",
+        //     trigger: "change",
+        //   },
+        // ],
 
         topic: [
           { required: true, message: "活动主题不能为空", trigger: "change" },
         ],
-        address: [
+        // address: [
-          { required: true, message: "活动地点不能为空", trigger: "change" },
+        //   { required: true, message: "活动地点不能为空", trigger: "change" },
-        ],
+        // ],
-        autoPublicType: [
+        // autoPublicType: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "自动发布时间不能为空",
+        //     message: "自动发布时间不能为空",
-            trigger: "change",
+        //     trigger: "change",
-          },
+        //   },
-        ],
+        // ],
-        joinUserType: [
+        // joinUserType: [
-          { required: true, message: "参加人员不能为空", trigger: "change" },
+        //   { required: true, message: "参加人员不能为空", trigger: "change" },
-        ],
+        // ],
-        joinIdArray: [
+        // joinIdArray: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "参加活动党组织不能为空",
+        //     message: "参加活动党组织不能为空",
-            trigger: "change",
+        //     trigger: "change",
-          },
+        //   },
-        ],
+        // ],
-        publichIdArray: [
+        // publichIdArray: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "发布活动党组织不能为空",
+        //     message: "发布活动党组织不能为空",
-            trigger: "change",
+        //     trigger: "change",
-          },
+        //   },
-        ],
+        // ],
       };
     },
   },

src/views/modules/communityParty/townData/index.vue

@@ -37,7 +37,6 @@
             >
             </el-input>
           </el-form-item>
-
           <el-button
             style="margin-left: 10px"
             class="diy-button--search"
@@ -52,7 +51,6 @@
             @click="resetSearch"
             >重置</el-button
           >
-        </div>
       </el-form>
     </div>
     <div class="div_table">

src/views/pages/index.vue

@@ -64,7 +64,8 @@ export default {
   methods: {
     handleClickItem(k) {
       if (k == 1) {
-        this.$router.replace({ name: "main" });
+        console.log('zoule1 ?')
+        this.$router.push({ name: "base-community-community" });
       } else if (k == 2) {
         this.$router.replace({ name: "main-shuju" });
       }