update

src/views/conference/Apply.vue

@@ -89,19 +89,22 @@
                     <template slot-scope="scope">
                         <span v-if='scope.row.signup_status==0'><el-tag type="danger">待上传凭证</el-tag></span>
                         <span v-if='scope.row.signup_status==1'><el-tag type="warning">待审核</el-tag></span>
-                        <span v-if='scope.row.signup_status==2'><el-tag >待选酒店</el-tag></span>
-                        <span v-if='scope.row.signup_status==3'><el-tag >待核销</el-tag></span>
-                        <span v-if='scope.row.signup_status==4'><el-tag type="success">已核销</el-tag></span>
-                        <span v-if='scope.row.signup_status==-1'><el-tag type="info">已驳回</el-tag></span>
+                        <span v-if='scope.row.signup_status==2&&scope.row.contype=="offline"'><el-tag >待选酒店</el-tag></span>
+                        <span v-if='scope.row.signup_status>=2&&scope.row.contype=="online"'><el-tag >已审核</el-tag></span>
+                        <span v-if='scope.row.signup_status==3&&scope.row.contype=="offline"'><el-tag >待核销</el-tag></span>
+                        <span v-if='scope.row.signup_status==4&&scope.row.contype=="offline"'><el-tag type="success">已核销</el-tag></span>
+                        <span v-if='scope.row.signup_status==-1&&scope.row.contype=="offline"'><el-tag type="info">已驳回</el-tag></span>
                     </template>
                     </el-table-column>
                     <el-table-column
                     prop="user_nickname"  
-                    label="昵称">
+                    label="昵称" width="140">
                     </el-table-column>
                     <el-table-column
                     prop="user_avatar"  
-                    label="头像">
+                    label="头像"
+                    width="120"
+                    >
                         <template slot-scope="scope">
                             <img :src="scope.row.user_avatar" alt="" width="80">
                         </template>

src/views/conference/Manage.vue

@@ -77,8 +77,8 @@
         </el-table-column>
         <el-table-column prop="contype" label="会议类型">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.contype == 'offline'">线下会议</el-tag>
-            <el-tag v-else type="info">线上会议</el-tag>
+            <el-tag v-if="scope.row.contype == 'offline'" size="mini">线下会议</el-tag>
+            <el-tag v-else type="info" size="mini">线上会议</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="organizer_name" label="主办方">
@@ -86,8 +86,9 @@
         <el-table-column prop="speaker_name" label="主讲人"> </el-table-column>
         <el-table-column prop="" width="120" label="状态">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_signup">可报名</el-tag>
-            <el-tag v-else type="info">不可报名</el-tag>
+            <el-tag v-if="scope.row.is_signup&&!scope.row.is_over" size="mini">可报名</el-tag>
+            <el-tag v-if="scope.row.is_over" type="info" size="mini">已结束</el-tag>
+            <el-tag v-if="!scope.row.is_signup&&!scope.row.is_over" size="mini">不可报名</el-tag>
           </template>
         </el-table-column>
         <el-table-column width="220" label="会议时间">

src/views/journalQun/CASCIDetail.vue

@@ -18,14 +18,15 @@
   }
 }
 .journalAnalyse {
-  .countItem:last-child{
-    border:none;
+  .title{
+    margin-bottom:40px;
   }
   .countItem {
     position: relative;
-    margin: 40px 0px 40px 0px;
-    padding: 0px 40px 0px 20px;
+    margin: 0px 0px 0px 0px;
+    padding: 10px 40px 20px 20px;
     border-right: 1px solid #ccc;
+    border-bottom:1px solid #ccc;
     .red {
       background: #f56262;
     }
@@ -65,6 +66,9 @@
       top: 30px;
       right: 20px;
     }
+    .countItem::last-child{
+      border:none;
+    }
   }
 }
 // 图表
@@ -146,26 +150,26 @@
             <div class="countCircle yellow">转发量</div>
             <h4>{{form1.zhuanfa_num}}</h4>
           </el-col>
-          <el-col :span="4" class="countItem">
+          <el-col :span="5" class="countItem" style="border-right:none;">
             <div class="countCircle zi">公众号转发量</div>
             <h4>{{form1.zhuanfa_num_mp}}</h4>
           </el-col>
-          <el-col :span="4" class="countItem">
+          <el-col :span="4" class="countItem" style="border-bottom:none;">
             <div class="countCircle zi">小程序转发量</div>
             <h4>{{form1.zhuanfa_num_xcx}}</h4>
           </el-col>
-          <el-col :span="4" class="countItem">
+          <el-col :span="4" class="countItem" style="border-bottom:none;">
             <div class="countCircle llv">平均阅读量</div>
             <h4>{{form1.rd}}</h4>
           </el-col>
-          <el-col :span="4" class="countItem">
+          <el-col :span="4" class="countItem" style="border-bottom:none;">
             <div class="countCircle llv">平均转发量</div>
             <h4>{{form1.zd}}</h4>
           </el-col>
-          <el-col :span="4" class="countItem">
+          <el-col :span="4" class="countItem" style="border-bottom:none;">
             <div class="countCircle green">CASCI</div>
             <h4>{{form1.casci}}</h4> </el-col
-          ><el-col :span="4" class="countItem">
+          ><el-col :span="5" class="countItem" style="border-right:none;border-bottom:none;">
             <div class="countCircle hlv">排名</div>
             <h4>{{form1.rank}}</h4>
           </el-col>

src/views/journalQun/ShowJournal.vue

@@ -38,6 +38,7 @@
   top:-35px;
   background: #0f1f8c;
   border:1px solid #0f1f8c;
+  margin-top:10px;
 }
 .overActivity {
 }
@@ -85,7 +86,7 @@
             <td>{{ form.desc }}</td>
           </tr>
         </table>
-        <div style="clear: both; height: 0; content: ''">
+        <div style="clear: both; height: 0; content: '';margin-left:30px;">
           <el-button @click="$router.push({path:'/journal/casci/detail',query:{id:form.id}})" type="primary" class="casci" size="mini">查看CASCI</el-button>
         </div>
       </div>

src/views/journalQun/Subject.vue

@@ -162,9 +162,9 @@ a {
         row-key="id"
         style="width: 100%"
       >
-        <el-table-column prop="name" label="学科名称" width="200"> </el-table-column>
-        <el-table-column prop="desc" label="学科简介" width="500"></el-table-column>
-        <el-table-column prop="journal_count" label="期刊数量"></el-table-column>
+        <el-table-column prop="name" label="学科名称"> </el-table-column>
+        <el-table-column prop="desc" label="学科简介"></el-table-column>
+        <el-table-column prop="journal_count" label="期刊数量" width="80"></el-table-column>
         <el-table-column prop="zip" fixed="right" align="center" width="150" label="操作">
           <template slot-scope="scope">
             <el-button  type="text" @click="$router.push({path:'/journal/subject/detail',query:{id:scope.row.id}})"