Merge branch 'lijinlong' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/volunteer-pc into dev

src/views/volunteer/components/invite.vue

@@ -7,9 +7,10 @@
         :height="505"
         v-loading="loading"
         tooltip-effect="light"
-        :row-class-name="tableRowClassName"
         :cell-style="cellStyle"
       >
+        
+      <!--:row-class-name="tableRowClassName"  -->
         <el-table-column
           label="序号"
           type="index"

src/views/volunteer/components/recommend.vue

@@ -7,9 +7,10 @@
         :height="505"
         v-loading="loading"
         tooltip-effect="light"
-        :row-class-name="tableRowClassName"
         :cell-style="cellStyle"
       >
+        
+      <!-- :row-class-name="tableRowClassName" -->
         <el-table-column
           label="序号"
           type="index"

src/views/volunteer/hdtj/hdGl/index.vue

@@ -33,10 +33,11 @@
           ref="table"
           v-loading="loading"
           tooltip-effect="light"
-          :row-class-name="tableRowClassName"
+        
           :cell-style="cellStyle"
         >
           <!-- <el-table-column
+            :row-class-name="tableRowClassName"
             label="序号"
             type="index"
             header-align="center"

src/views/volunteer/hdtj/hdtjChild/index.vue

@@ -9,10 +9,10 @@
 <template>
   <div class="plan-management">
     <div class="plan-topBox">
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="活动推荐" name="recommendView"></el-tab-pane>
-        <!-- <el-tab-pane label="活动邀请" name="inviteView"></el-tab-pane> -->
-      </el-tabs>
+        <el-tab-pane label="活动邀请" name="inviteView"></el-tab-pane>
+      </el-tabs> -->
       <my-input @changeInput="changeInput" placeholder="请输入活动内容" @changeValue="changeValue"></my-input>
     </div>
     <div class="plan-bottomBox">

src/views/volunteer/hdtj/hdyq/index.vue

@@ -9,17 +9,17 @@
 <template>
   <div class="plan-management">
     <div class="plan-topBox">
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <!-- <el-tab-pane label="活动推荐" name="recommendView"></el-tab-pane> -->
+      <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="活动推荐" name="recommendView"></el-tab-pane>
         <el-tab-pane label="活动邀请" name="inviteView"></el-tab-pane>
-      </el-tabs>
+      </el-tabs> -->
       <my-input @changeInput="changeInput" placeholder="请输入活动内容" @changeValue="changeValue"></my-input>
     </div>
     <div class="plan-bottomBox">
       <component :is="defaultRouter" :value="input" ref="myComponents"></component>
     </div>
-  </div>
-</template>
+  </div> 
+</template> 
 <script>
 import inviteView from '../../components/invite.vue'
 import recommendView from '../../components/recommend.vue'