update

src/components/hotel.vue

@@ -259,7 +259,7 @@
                         </ul>
                     </el-form-item>
                     <el-form-item label-width="30px">
-                        已经预定：{{item.order}}  &nbsp;&nbsp;剩余：{{item.surplus_number}}
+                        已经预定：{{item.live_count}}  &nbsp;&nbsp;剩余：{{item.surplus_number}}
                         <el-button @click="view(form.id,item.id)" size="big" type="text">查看报名老师</el-button>
                     </el-form-item>
                 </el-col> 

src/views/Home.vue

@@ -9,10 +9,10 @@
 <template>
 	<el-container>
 		<el-header>
-			<!-- <div class="header">
+			<div class="header">
 				<img class="logo" src="../assets/logo.png" alt="">
 				<div class="siteTitle">中科院期刊微信公众号集中管理平台</div>
-			</div>	 -->
+			</div>	
 			<div class="nav">
 				<!-- <router-link :class="act?'active':''" to="/index/index" @click.native='active(1)'>首页</router-link>
 				<router-link to="/journal/journal" @click.native='active(2)'>刊群导览</router-link>

src/views/activity/Activity.vue

@@ -119,9 +119,9 @@ a {
         row-key="id"
         style="width: 100%"
       >
-        <el-table-column prop="img" label="活动海报">
+        <el-table-column prop="img" label="活动海报" width="110">
           <template slot-scope="scope">
-              <img :src="scope.row.img" alt="" height="80" width="60">
+              <img :src="scope.row.img" alt="" width="80">
           </template>
         </el-table-column>
         <el-table-column prop="name" label="活动名称" width="300px"></el-table-column>

src/views/activity/OldActivity.vue

@@ -122,9 +122,9 @@ a {
         row-key="id"
         style="width: 100%"
       >
-        <el-table-column prop="img" label="活动海报">
+        <el-table-column prop="img" label="活动海报" width="110">
           <template slot-scope="scope">
-              <img :src="scope.row.img" alt="" height="80" width="60">
+              <img :src="scope.row.img" alt="" width="80">
           </template>
         </el-table-column>
         <el-table-column prop="name" label="活动名称" width="300px"></el-table-column>

src/views/conference/Apply.vue

@@ -96,12 +96,15 @@
                     </template>
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="user_nickname"  
                     label="昵称">
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="user_avatar"  
                     label="头像">
+                        <template slot-scope="scope">
+                            <img :src="scope.row.user_avatar" alt="" width="80">
+                        </template>
                     </el-table-column>
                     <el-table-column
                     prop=""  
@@ -123,15 +126,15 @@
                     label="单位">
                     </el-table-column>
                     <el-table-column
-                    prop="hotel_id"  
+                    prop="hotel_name"  
                     label="已选酒店">
                     </el-table-column>
                     <el-table-column
-                    prop="room_id"  
+                    prop="room_name"  
                     label="已选房型">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="live_days"  
                     label="入住天数">
                     </el-table-column>
                     <el-table-column
@@ -260,7 +263,7 @@
                     </el-form-item>
            </el-form>
         </el-dialog>
-         <el-dialog class="hotel"
+        <el-dialog class="hotel"
         title="入住凭证" :close-on-click-modal='false'
         :visible.sync="dialogVisible3">
            <img width="100%" :src="proof_img" alt="">

src/views/conference/Hotel.vue

@@ -72,15 +72,15 @@
                     label="本次会议名称">
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="live_count"  
                     label="入住人数">
                     </el-table-column>
                     <el-table-column
-                    prop="username"  
+                    prop="live_rate"  
                     label="入住率">
                     </el-table-column>
                     <el-table-column
-                    prop=""  
+                    prop="conference_count"  
                     label="已举办会议">
                     </el-table-column>
                     <el-table-column
@@ -114,9 +114,12 @@
                     style="width: 100%;margin-top:10px;">
                     <el-table-column prop="name"  label="真实姓名">
                     </el-table-column>
-                    <el-table-column prop="username"    label="昵称">
+                    <el-table-column prop="user_nickname" label="昵称">
                     </el-table-column>
-                    <el-table-column prop=""    label="头像">
+                    <el-table-column prop="user_avatar" label="头像">
+                        <template slot-scope="scope">
+                            <img :src="scope.row.user_avatar" alt="" width="80">
+                        </template>
                     </el-table-column>
                     <el-table-column prop="ctime"    label="性别">
                          <template slot-scope="scope">

src/views/conference/Manage.vue

@@ -219,7 +219,7 @@ export default {
             })
         },
         del(id){
-                this.$confirm('确定删除吗', '提示', {
+                this.$confirm('确定删除吗?关联数据都会被删除!', '提示', {
                         type: 'warning'
                     }).then(() => {
                     this.$api.deleteConference({id:id}).then((res)=>{

src/views/journalQun/Journal.vue

@@ -87,9 +87,9 @@
         row-key="id"
         style="width: 100%"
       >
-        <el-table-column prop="img" label="期刊封面">
+        <el-table-column prop="img" label="期刊封面" width="120">
           <template slot-scope="scope">
-            <img :src="scope.row.img" alt="" height="80" width="60" />
+            <img :src="scope.row.img" alt="" width="80" style="margin:5px;" />
           </template>
         </el-table-column>
         <el-table-column prop="name" width="180" label="期刊名称">
@@ -325,7 +325,7 @@ export default {
       });
     },
     del(id) {
-      this.$confirm("确定删除吗", "提示", {
+      this.$confirm("确定删除吗?关联数据都会被删除!", "提示", {
         type: "warning",
       }).then(() => {
         this.$api.delJournal({ id: id }).then((res) => {

src/views/journalQun/Organizer.vue

@@ -365,7 +365,7 @@ export default {
       this.getData()
     },
     del(id) {
-      this.$confirm("确定删除吗", "提示", {
+      this.$confirm("确定删除吗?关联数据都会被删除!", "提示", {
         type: "warning",
       }).then(() => {
         this.$api.delOrganizer({ id: id }).then((res) => {

src/views/journalQun/Subject.vue

@@ -325,7 +325,7 @@ export default {
       });
     },
     del(id) {
-      this.$confirm("确定删除吗", "提示", {
+      this.$confirm("确定删除吗?关联数据都会被删除!", "提示", {
         type: "warning",
       }).then(() => {
         this.$api.delSubject({ id: id }).then((res) => {