04081642lhj

src/components/Login.vue

@@ -287,7 +287,7 @@ export default {
 
 }
 
-.remembers {
+.login-dominant .login-box .login-input .remembers {
     display: flex;
     justify-content: space-between;
     align-items: center;

src/components/Resource/InvitationOfficialActivityData.vue

@@ -64,9 +64,24 @@
                     <el-table-column prop="tel" width="120px" label="手机">
                     </el-table-column>
                     <el-table-column prop="delegationStr" label="关联团组">
-                        <template slot-scope="Str">
-                            <div :title="Str.row.delegationStr" class="title">{{ Str.row.delegationStr }}</div>
+                        <template slot-scope="scope">
+                            <div id="delegationStr">
+                                <el-tooltip v-show="scope.row.delegationStr != ''" class="item" effect="dark"
+                                    :content="scope.row.delegationStr" placement="top">
+                                    <span v-if="scope.row.delegationStr.length > 9">{{ scope.row.delegationStr.slice(0, 9) + "..."
+                                    }}</span>
+                                    <span v-else>{{ scope.row.delegationStr }}</span>
+                                    <div slot="content">
+                                        <div style="width: 300px;">
+                                            {{ scope.row.delegationStr }}
+                                        </div>
+                                    </div>
+                                </el-tooltip>
+                            </div>
                         </template>
+                        <!-- <template slot-scope="Str">
+                            <div :title="Str.row.delegationStr" class="title">{{ Str.row.delegationStr }}</div>
+                        </template> -->
                     </el-table-column>
                     <el-table-column width="80" prop="createUserName" label="录入者">
                     </el-table-column>

src/components/home.vue

@@ -32,7 +32,11 @@
                     <div>发布人: {{item.issuerUser}}</div>
                     <div>发布时间: {{item.releaseTime}}</div>
                   </div>
-                  <div class="news-list-btn" >
+                  <div v-if="type==1020" class="news-list-btn" >
+                    <el-button @click="DeleMsg(index,item)" size="mini" v-if="item.isRead==0" type="primary">前往任务</el-button>
+                    <el-button v-if="item.isRead==1" size="mini" type="info">已读任务</el-button>
+                  </div>
+                  <div v-else class="news-list-btn" >
                     <el-button @click="DeleMsg(index,item)" size="mini" v-if="item.isRead==0" type="primary">确认已读</el-button>
                     <el-button v-if="item.isRead==1" size="mini" type="info">已读</el-button>
                   </div>
@@ -470,8 +474,6 @@ export default {
       this.pageIndex=1;
       this.pageSize=10;
       this.msglist=[];
-      console.log(tab, event);
-      console.log(tab.label);
       this.type=Number(tab.label);
       this.PotsMessagePageList();
     },