bug

src/components/hotel.vue

@@ -27,6 +27,7 @@
                 overflow: hidden;
                 img{
                     height: 100%;
+                    width: 100%;
                 }
                 .el-icon-delete{
                     color: red;
@@ -118,7 +119,7 @@
                                     <span style='font-size:12px;color:#999999;'>建议图片尺寸为：210*160</span>
                                 </li>
                             </ul>
-                            
+                            <p style="color:red;">*默认第一张为封面图片</p>
                     </el-form-item>
                 </el-col>     
                 <el-col :span="24" >
@@ -127,11 +128,11 @@
                 <el-col :span="24">
                     <el-row v-for='(item,index) in type' :key='index'>
                         <el-col :span="20" class="hotel_type" >
-                            <el-form :inline='true' label-width="70px" size="small">
-                                <el-form-item label="房型名称">
+                            <el-form :inline='true' label-width="80px" size="small">
+                                <el-form-item label="房型名称" required>
                                     <el-input  v-model="item.name" clearable></el-input>
                                 </el-form-item>
-                                <el-form-item label="可住人数">
+                                <el-form-item label="可住人数" required>
                                     <el-input  v-model="item.enable_number" clearable></el-input>
                                 </el-form-item>
                                 <el-form-item label="房型数量">
@@ -152,7 +153,7 @@
                                 <el-form-item label="窗户">
                                     <el-input   v-model="item.window_condition" clearable></el-input>
                                 </el-form-item>
-                                <el-form-item label="房型">
+                                <el-form-item label="房型" required>
                                     <el-select v-model="item.room_type" clearable>
                                         <el-option
                                             v-for="(i, idx) in hotel_type"
@@ -166,7 +167,7 @@
                                     <el-input   v-model="item.unit_price" clearable></el-input>
                                 </el-form-item>
                                 <br>
-                                <el-form-item label="酒店图片" class="hotel_imgs">
+                                <el-form-item label="房型图片" required class="hotel_imgs">
                                     <ul class="img_list">
                                         <li v-for="(img,i) in item.imgs" :key='"img"+i'>
                                             <img :src="img" alt="">
@@ -264,6 +265,7 @@
             <el-input @keyup.enter.native="localSearch" placeholder="请输入关键字搜索" v-model="keyword">
                 <el-button @click="localSearch" slot="append" icon="el-icon-search"></el-button>
             </el-input>
+            <p style="margin:10px 0;" v-if='form.address'>地址：{{form.address}}</p>
             <p style="margin:10px 0;" v-if='form.longitude'>经纬：{{form.longitude}} , {{form.latitude}}</p>
             <div id="map"></div>
             <span slot="footer" class="dialog-footer">
@@ -426,7 +428,7 @@ export default {
                 })
                 return
             }
-            if(!form.telphone){
+            if(!form.telephone){
                 this.$message({
                     message: '请输入酒店电话',
                     type: 'error'
@@ -529,6 +531,7 @@ export default {
         initMap(){
             setTimeout(()=>{
                 var map = new BMapGL.Map('map');
+                this.keyword=this.form.name
                 if(this.form.longitude){
                     map.centerAndZoom(new BMapGL.Point(this.form.longitude, this.form.latitude), 15);
                 }else{
@@ -539,10 +542,19 @@ export default {
                     renderOptions:{map: map}
                 });
                 map.enableScrollWheelZoom(true);
+                if(this.keyword){this.local.search(this.keyword);}
                 map.addEventListener('click', e=> {
                     this.$set(this.form,'longitude',e.latlng.lng)
                     this.$set(this.form,'latitude',e.latlng.lat)
                     let marker = new BMapGL.Marker(new BMapGL.Point(e.latlng.lng, e.latlng.lat));
+                    var point = new BMapGL.Point(e.latlng.lng, e.latlng.lat);
+                    var gc = new BMapGL.Geocoder();
+                    gc.getLocation(point, rs=>{
+                        // debugger;
+                        var addComp = rs.addressComponents;
+                        var address=addComp.province +  addComp.city +  addComp.district  + addComp.street   + addComp.streetNumber;
+                        this.$set(this.form,'address',address)
+                    });
                     // 在地图上添加点标记
                     map.clearOverlays()
                     map.addOverlay(marker);

src/router.js

@@ -105,6 +105,10 @@ export default new Router({
         path: '/journal/organizer',
         component: () => import('./views/journalQun/Organizer.vue'),
         name: '主办单位'
+      },{
+        path: '/journal/organizer/detail',
+        component: () => import('./views/journalQun/SubjectDetail.vue'),
+        name: '主办单位详情'
       }, ]
     },
     {
@@ -118,8 +122,13 @@ export default new Router({
         path: '/journal/subject',
         component: () => import('./views/journalQun/Subject.vue'),
         name: '学科'
-      }, ]
+      }, {
+        path: '/journal/subject/detail',
+        component: () => import('./views/journalQun/SubjectDetail.vue'),
+        name: '学科详情'
+      },]
     },
+    
     {
       path: '/learning/activity',
       name: '活动预告',

src/style/home.scss

@@ -249,4 +249,9 @@ tbody{
 }
 .el-table__fixed-right::before, .el-table__fixed::before{
 	background: none;
+}
+
+
+.el-dialog{
+	margin-top: 5vh !important;
 }

src/views/Index.vue

@@ -97,7 +97,7 @@
             </div>
             <div class="con2" v-for="(item, index) in form.article_readnum_top5" :key="index">
               <span>{{ index + 1 }}</span>
-              <span>{{ item.name }}</span>
+              <span class="a_title">{{ item.name }}</span>
               <span>{{ item.read_num }}</span>
             </div>
             <div></div>
@@ -886,6 +886,7 @@ section {
           color: #999999;
           height: 40px;
           line-height: 40px;
+          width: 80%;
           span:nth-of-type(2) {
             margin-left: 20px;
           }
@@ -902,6 +903,8 @@ section {
           border-radius: 7px;
           margin-bottom: 8px;
           padding: 0 10px;
+          display: flex;
+          width: 80%;
           &:nth-of-type(2) {
             color: #ef3d3d;
           }
@@ -917,6 +920,12 @@ section {
           span:last-child {
             float: right;
           }
+          .a_title{
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            width: 80%;
+          }
         }
       }
       .c2 {

src/views/activity/AddActivity.vue

@@ -204,13 +204,17 @@
                                 active-text="推荐"
                                 inactive-text="不推荐">
                             </el-switch>
-                            <!-- <el-radio-group v-model='form.is_recommend'>
-                                <el-radio :label='0'>不推荐</el-radio>
-                                <el-radio :label='1'>推荐</el-radio>
-                            </el-radio-group> -->
                         </el-form-item>
                     </el-col>
-     
+                    <el-col :span="8" v-if='!old'>
+                        <el-form-item label='是否可报名：'>
+                            <el-switch
+                                v-model="form.is_signup"
+                                active-text="是"
+                                inactive-text="否">
+                            </el-switch>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <el-form-item label='封面图：'  prop='img' >
                     <el-upload
@@ -357,6 +361,7 @@ export default {
                 address: [{ required: true, message: "请输入地址", trigger: "blur" }],
                 img: [{ required: true, message: "请上传封面图", trigger: "blur" }],
             },
+            old:0,  //是否为回顾
         };
     },
     methods: {
@@ -382,7 +387,6 @@ export default {
             let type = this.$route.query.type;
             form.type = type?type:0;
             // form.organizer_name=this.organizerList.filter(item=>item.id==form.organizer_id)[0].name
-            console.log(form)
             this.$refs["form"].validate((valid) => {
                 
                 if (valid) {
@@ -451,7 +455,7 @@ export default {
             this.form.hotel.type.push({})
         },
         handleChangeCity(value){
-            console.log(value,222222222)
+            // console.log(value,222222222)
         },
         gopage(size) {
             if (size) {
@@ -476,7 +480,10 @@ export default {
     },
     created() {
         this.getData()
-        console.log(this.$route)
+        // console.log(this.$route)
+        if(this.$route.path.indexOf('old')>=0){
+            this.old=1
+        }
         if(this.$route.query.id){
             this.id=this.$route.query.id;
             this.$api.getActivity({id:this.id}).then(res=>{
@@ -490,6 +497,7 @@ export default {
                 this.form=res.data.data
                 this.form.is_popular=Boolean(this.form.is_popular)
                 this.form.is_recommend=Boolean(this.form.is_recommend)
+                this.form.is_signup=Boolean(this.form.is_signup)
                 this.form.citys=this.form.city.split(' ')
                 this.form.time=[this.form.begin_time,this.form.end_time]
                 if(!this.form.speaker){

src/views/conference/AddConference.vue

@@ -154,6 +154,9 @@
                 <el-form-item label='会议简介：'>
                     <el-input type='textarea' v-model="form.desc" :rows="3" placeholder="请输入会议介绍"></el-input>
                 </el-form-item>
+                <el-form-item label='报名须知：'>
+                    <el-input type='textarea' v-model="form.sign_note" :rows="3" placeholder="请输入报名须知"></el-input>
+                </el-form-item>
                 <el-row>
                   <el-col :span="8">
                       <el-form-item label='是否报名：'>

src/views/conference/Hotel.vue

@@ -211,9 +211,12 @@ export default {
             var parm=this.form;        
             this.loading=true
             this.$api.getHotelList(parm).then(res=>{
+                this.loading = false;
+                if(res.data.code != 0){
+                return
+                }
                 this.list=res.data.data.list;
                 this.total=res.data.data.total
-                this.loading=false
             })
         },
     },

src/views/journalQun/AddJournal.vue

@@ -1,11 +1,26 @@
 <style lang="scss" scoped>
 .preview {
-  .el-form-item {
-    margin-bottom: 15px;
+  .aname{
+    text-align: center;
+    margin-bottom: 20px;
+    color: #333;
+    font-size: 16px;
+  }
+  .ainfo{
+    display: flex;
+    margin-bottom: 10px;
+    p{
+      width: 60%;
+      margin-left: 15px;
+      line-height: 26px;
+    }
+  }
+  b{
+    color: #333;
   }
-  label,
-  p {
-    line-height: 25px !important;
+  div{
+    line-height: 26px;
+    margin-bottom: 10px;
   }
 }
 .content .title {
@@ -97,7 +112,7 @@
 <template>
   <section>
     <p><span>刊群导览></span>新增期刊</p>
-    <div class="content">
+    <div class="content"  v-loading='loading' element-loading-background="rgba(0, 0, 0, 0)">
       <!-- <div class="title">新增会议</div> -->
       <el-form
         ref="form"
@@ -178,19 +193,19 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="语种：" prop="languages">
-              <el-input v-model="form.languages" placeholder=""> </el-input>
+              <el-input placeholder="请输入语种" v-model="form.languages"> </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="出版时间：" prop="publishingTime">
-              <el-input v-model="form.publishingTime" placeholder=""> </el-input>
+              <el-input v-model="form.publishingTime" placeholder="请输入出版时间"> </el-input>
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
               <el-form-item label="主编：" prop="editor">
                 <el-input
-                  placeholder="请输入期刊名称"
+                  placeholder="请输入主编"
                   v-model="form.editor"
                   clearable
                 ></el-input>
@@ -208,7 +223,7 @@
           <el-col :span="6">
               <el-form-item label="办刊单位：" prop="publishingUnit">
                 <el-input
-                  placeholder="请输入期刊名称"
+                  placeholder="请输入办刊单位"
                   v-model="form.publishingUnit"
                   clearable
                 ></el-input>
@@ -217,7 +232,7 @@
           <el-col :span="6">
               <el-form-item label="创刊时间：" prop="">
                 <el-input
-                  placeholder="请输入期刊名称"
+                  placeholder="请输入创刊时间"
                   v-model="form.publishingTime"
                   clearable
                 ></el-input>
@@ -269,12 +284,12 @@
               </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="文章简介：">
+        <el-form-item label="期刊简介：">
           <el-input
             type="textarea"
             v-model="form.desc"
             :rows="3"
-            placeholder="请输入文章简介"
+            placeholder="请输入期刊简介："
           ></el-input>
         </el-form-item>
         <el-form-item label="封面图：" prop="img">
@@ -282,6 +297,7 @@
             class="avatar-uploader"
             action="/api/admin/uploadfile"
             :show-file-list="false"
+            :on-progress='handleAvatarProgress'
             :on-success="handleAvatarSuccess"
           >
             <img v-if="form.img" :src="form.img" class="avatar" />
@@ -292,13 +308,49 @@
           >
         </el-form-item>
         <el-form-item style="position: fixed; bottom: 20px; right: 60px">
-          <el-button type="primary">预览</el-button>
-          <el-button type="success">发布</el-button>
-          <el-button type="default" @click="save">保存</el-button>
+          <el-button type="primary" @click="view">预览</el-button>
+          <el-button type="success" @click="save">发布</el-button>
+          <!-- <el-button type="default" @click="save">保存</el-button> -->
           <!-- <el-button type="danger" plain>删除</el-button> -->
         </el-form-item>
       </el-form>
     </div>
+    <el-dialog
+      title=""
+      :visible.sync="open"
+      width="414px">
+      <div class="preview">
+        <div class="ainfo">
+          <img width="100" :src="form.img" alt="">
+          <p>
+            <b>{{form.name}}</b> <br>
+            微信号：{{form.wxcode}} <br>
+            主编：{{form.editor}} <br>
+            主办单位：{{organizer_name}}
+          </p>
+        </div>
+        <b>期刊简介</b>
+        <div class="adesc">{{form.desc}}</div>
+        <b>基本信息</b>
+        <div>
+          中文名称：{{form.name}} <br>
+          外文名称：{{form.ename}} <br>
+          语种：{{form.languages}} <br>
+          主编：{{form.editor}} <br>
+          主管单位：{{form.corganizers}} <br>
+          办刊单位：{{form.publishingUnit}} <br>
+          创刊时间：{{form.publishingTime}} <br>
+          出版周期：{{form.publishingCycle}} <br>
+          国内刊号：{{form.domestic}} <br>
+          国际刊号：{{form.issn}} <br>
+          期刊官网：{{form.website}} <br>
+          编辑部地址：{{form.editorialAddress}} <br>
+        </div>
+      </div>
+      <!-- <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="open = false">确 定</el-button>
+      </span> -->
+    </el-dialog>
   </section>
 </template>
 <script>
@@ -309,6 +361,8 @@ export default {
   },
   data() {
     return {
+      loading:false,
+      open:false,
       form: {},
       subjectList: [],
       organizerList:[],
@@ -320,13 +374,17 @@ export default {
         subject_id: [{ required: true, message: "请选择学科", trigger: "change" }],
         img: [{ required: true, message: "封面图", trigger: "blur" }],
       },
+      organizer_name:''
     };
   },
   methods: {
     //封面
+    handleAvatarProgress(){
+        this.loading=true
+    },
     handleAvatarSuccess(res, file) {
-      this.form.img = file.response.data;
-      console.log(this.form.img);
+      this.$set(this.form,'img',file.response.data)
+      this.loading=false
     },
     //主讲人
     handleAvatarSuccess1(index, res, file) {
@@ -348,7 +406,7 @@ export default {
       this.getData();
     },
     getData() {
-      this.loading = true;
+      
       this.$api.searchSubjectList().then((res) => {
         this.subjectList = res.data.data;
       });
@@ -363,6 +421,14 @@ export default {
         });
       }
     },
+    /**预览 */
+    view(){
+      let org=this.organizerList.filter(item=>item.id == this.form.organizer_id)
+      if(org.length>0){
+        this.organizer_name=org[0].name
+      }
+      this.open=true;
+    },
     save() {
       let id = this.$route.query.id;
       let parm = this.form;

src/views/journalQun/Journal.vue

@@ -80,7 +80,7 @@
       <el-table
         class="table"
         :data="list"
-        height="50vh"
+        height="57vh"
         border
         v-loading="loading"
         default-expand-all
@@ -113,7 +113,7 @@
         <el-table-column prop="website" label="期刊官网"> </el-table-column>
         <el-table-column prop="editorialAddress" label="编辑部地址">
         </el-table-column>
-        <el-table-column prop="zip" width="150" label="操作" fixed="right">
+        <el-table-column prop="zip" width="150" align="center"  label="操作" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="showQrcode(scope.row)"
               >二维码上传</el-button

src/views/journalQun/Organizer.vue

@@ -155,15 +155,15 @@ a {
       <el-table
         class="table"
         :data="list"
-        height="50vh"
+        height="57vh"
         border
         v-loading="loading"
         default-expand-all
         row-key="id"
         style="width: 100%"
       >
-        <el-table-column prop="name" label="单位名称"> </el-table-column>
-        <el-table-column prop="desc" label="主办单位简介" width="800px">
+        <el-table-column prop="name" label="单位名称" > </el-table-column>
+        <el-table-column prop="desc" label="主办单位简介" width="500">
           <template slot-scope="scope">
             <!-- <el-popover trigger="hover" placement="top">
               {{scope.row.desc}}
@@ -176,15 +176,15 @@ a {
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="journal_num" label="期刊数量"></el-table-column>
-        <el-table-column prop="zip" width="150" label="操作">
+        <el-table-column prop="journal_num" width="120" label="期刊数量"></el-table-column>
+        <el-table-column prop="zip" width="150" fixed="right" align="center" label="操作">
           <template slot-scope="scope">
+            <el-button  type="text" @click="$router.push({path:'/journal/organizer/detail',query:{id:scope.row.id}})"
+              >查看</el-button>
             <el-button class="edit" type="text" @click="edit(scope.row)"
-              >编辑</el-button
-            >
+              >编辑</el-button>
             <el-button class="del" @click="del(scope.row.id)" type="text"
-              >删除</el-button
-            >
+              >删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/journalQun/ShowJournal.vue

@@ -34,10 +34,13 @@
 }
 .overActivity {
 }
+.more{
+  cursor: pointer;
+}
 </style>
 <template>
   <section>
-    <p><span>刊群导览></span>期刊详情</p>
+    <p><span @click="$router.go(-1)">中科院全刊 > </span>期刊详情</p>
     <div class="content">
       <div class="jDetail">
         <img
@@ -80,8 +83,8 @@
       <!-- 活动回顾 -->
       <div class="journalItem overActivity">
         <div class="title">活动回顾</div>
-        <div class="title more">查看更多>></div>
-        <el-button type="primary" class="add" size="mini">发布活动回顾</el-button>
+        <div @click="$router.push({path:'/learning/oldactivity'})" class="title more">查看更多>></div>
+        <el-button @click="$router.push({path:'/learning/oldactivity/add',query:{type:1}})" type="primary" class="add" size="mini">发布活动回顾</el-button>
       </div>
       <div>
         <el-table
@@ -104,10 +107,10 @@
           <el-table-column label="活动人数" prop="assembly_number"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button class="edit" type="text" @click="edit(scope.row)"
+              <el-button class="edit" type="text" @click="$router.push({path:'/learning/oldactivity/add',query:{id:scope.row.id}})"
                 >编辑</el-button
               >
-              <el-button class="del" @click="del" type="text">删除</el-button>
+              <el-button class="del" @click="del(scope.row.id,1)" type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -115,8 +118,8 @@
       <!-- 活动预告 -->
       <div class="journalItem preActivity">
         <div class="title">活动预告</div>
-        <div class="title more">查看更多>></div>
-        <el-button type="primary" class="add" size="mini">发布活动预告</el-button>
+        <div @click="$router.push({path:'/learning/activity'})" class="title more">查看更多>></div>
+        <el-button @click="$router.push({path:'/learning/activity/add'})" type="primary" class="add" size="mini">发布活动预告</el-button>
       </div>
       <div>
         <el-table
@@ -139,10 +142,10 @@
           <el-table-column label="活动人数" prop="assembly_number"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button class="edit" type="text" @click="edit(scope.row)"
+              <el-button class="edit" type="text" @click="$router.push({path:'/learning/activity/add',query:{id:scope.row.id}})"
                 >编辑</el-button
               >
-              <el-button class="del" @click="del" type="text">删除</el-button>
+              <el-button class="del" @click="del(scope.row.id,1)" type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -150,8 +153,8 @@
       <!-- 精品文章 -->
       <div class="journalItem preActivity">
         <div class="title">精品文章</div>
-        <div class="title more">查看更多>></div>
-        <el-button type="primary" class="add" size="mini">发布精品文章</el-button>
+        <div @click="$router.push({path:'/article/article'})" class="title more">查看更多>></div>
+        <el-button @click="$router.push({path:'/article/article/add'})" type="primary" class="add" size="mini">发布精品文章</el-button>
       </div>
       <div>
         <el-table
@@ -159,14 +162,14 @@
         >
           <el-table-column label="文章名称" prop="name"></el-table-column>
           <el-table-column label="作者" prop="author"></el-table-column>
-          <el-table-column label="发布时间" prop="ctime" width="500"></el-table-column>
+          <el-table-column label="发布时间" prop="ctime" ></el-table-column>
           <el-table-column label="出版时间" prop="publish_time"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button class="edit" type="text" @click="edit(scope.row)"
+              <el-button class="edit" type="text" @click="$router.push({path:'/article/article/add',query:{id:scope.row.id}})"
                 >编辑</el-button
               >
-              <el-button class="del" @click="del" type="text">删除</el-button>
+              <el-button class="del" @click="del(scope.row.id,2)" type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -223,17 +226,30 @@ export default {
         });
       }
     },
-    del(id) {
+    del(id,type) {
       this.$confirm("确定删除吗", "提示", {
         type: "warning",
       }).then(() => {
-        this.$api.delJournal({ id: id }).then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-          this.getData();
-        });
+        /**删除活动 */
+        if(type == 1){
+            this.$api.delActivity({ id: id }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.getData();
+            });
+        }
+        /**删除文章 */
+        if(type == 2){
+            this.$api.delArticle({ id: id }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.getData();
+            });
+        }
       });
     },
   },

src/views/journalQun/Subject.vue

@@ -155,24 +155,24 @@ a {
       <el-table
         class="table"
         :data="list"
-        height="50vh"
+        height="57vh"
         border
         v-loading="loading"
         default-expand-all
         row-key="id"
         style="width: 100%"
       >
-        <el-table-column prop="name" label="学科名称"> </el-table-column>
-        <el-table-column prop="desc" label="学科简介" width="1200px"></el-table-column>
-        <el-table-column prop="journal_name" label="期刊数量"></el-table-column>
-        <el-table-column prop="zip" width="150" label="操作">
+        <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="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}})"
+              >查看</el-button>
             <el-button class="edit" type="text" @click="edit(scope.row)"
-              >编辑</el-button
-            >
+              >编辑</el-button>
             <el-button class="del" @click="del(scope.row.id)" type="text"
-              >删除</el-button
-            >
+              >删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/journalQun/SubjectDetail.vue

@@ -0,0 +1,159 @@
+<style lang="scss">
+    .sub_detail{
+        h1{
+            display: inline-block;
+            margin-bottom: 10px;
+            vertical-align: top;
+            .name{
+                font-size: 16px;
+                color: #333;
+                margin-bottom: 10px;
+            }
+            .desc{
+                color: #666;
+                font-size: 14px;
+                line-height: 26px;
+            }
+        }
+        
+    }
+</style>
+<template>
+    <section class="sub_detail">
+        <p v-if='type==2'><span>刊群导览 > </span><span @click="$router.go(-1)">学科 > </span>学科详情</p>
+        <p v-if='type==1'><span>刊群导览 > </span><span @click="$router.go(-1)">主办单位 > </span>单位详情</p>
+        <div class="content">
+             
+            <img style="margin-right:20px;" v-if='type==1' :src="form.img" width="100" alt="">
+            <h1> 
+                <p class="name">{{form.name}}</p>
+                 <p class="desc">{{form.desc}}</p>
+            </h1>
+           <el-button @click='$router.push({ path: "/journal/journal/add" })' style="float:right;margin-bottom:10px;" type='primary' size="small">添加期刊</el-button>
+            <el-table
+                class="table"
+                :data="list"
+                border
+                style="width: 100%"
+            >
+                <el-table-column prop="img" label="期刊封面">
+                <template slot-scope="scope">
+                    <img :src="scope.row.img" alt="" height="80" width="60" />
+                </template>
+                </el-table-column>
+                <el-table-column prop="name" width="180" label="期刊名称">
+                </el-table-column>
+                <el-table-column prop="wxcode" label="微信号"> </el-table-column>
+                <el-table-column prop="article_count" label="文章数"> </el-table-column>
+                <el-table-column prop="desc" width="500" label="简介">
+                </el-table-column>
+                <el-table-column prop="zip" width="150" align="center"  label="操作" fixed="right">
+                <template slot-scope="scope">
+                    <el-button class="edit" type="text" @click="edit(scope.row)">编辑</el-button>
+                    <el-button class="del" @click="del" type="text">删除</el-button>
+                </template>
+                </el-table-column>
+            </el-table>
+            <Page
+                ref="pageButton"
+                :current="query.page"
+                :page_size="query.page_size"
+                :total="total"
+                @pageChange="gopage"
+            />
+        </div>
+    </section>
+</template>
+<script>
+import Page from "../../components/Page";
+export default {
+    components: {
+        Page,
+    },
+    data() {
+        return {
+            query: {page: 1, page_size: 20 },
+            total: 1,
+            list:[],
+            form:{},
+            id:'',
+            type:''
+        };
+    },
+    methods: {
+       gopage(size) {
+            if (size) {
+                this.query.page_size = size;
+            }
+            this.query.page = this.$refs.pageButton.page;
+            this.getData();
+        },
+        getData() {
+            let parm=this.query
+            if(this.type == 1){
+                parm.organizer_id=this.id
+            }else{
+                parm.subject_id=this.id
+            }
+            this.$api.getJournalList(parm).then((res) => {
+                this.list = res.data.data.list;
+                this.total = res.data.data.total;
+            });
+        },
+        edit(row) {
+            this.$router.push({
+                path: "/journal/journal/add",
+                query: { id: row.id },
+            });
+        },
+        del(id) {
+            this.$confirm("确定删除吗", "提示", {
+                type: "warning",
+            }).then(() => {
+                this.$api.deleteEnterprise({ id: id }).then((res) => {
+                this.$message({
+                    message: "删除成功",
+                    type: "success",
+                });
+                this.getData();
+                });
+            });
+        },
+    },
+    created() {
+        if(this.$route.path.indexOf('organizer')>=0){
+            this.type=1    //主办单位
+        }else{
+            this.type=2    //学科
+        }
+        if(this.$route.query.id){
+            this.id=this.$route.query.id;
+            this.getData()
+            if(this.type == 1){
+                this.$api.getOrganizer({id:this.id}).then(res=>{
+                    if(res.data.code != 0){
+                        this.$message({
+                                message: res.data.message,
+                                type: 'error'
+                        })
+                        return
+                    }
+                    this.form=res.data.data
+                })
+            }else{
+                this.$api.getSubject({id:this.id}).then(res=>{
+                    if(res.data.code != 0){
+                        this.$message({
+                                message: res.data.message,
+                                type: 'error'
+                        })
+                        return
+                    }
+                    this.form=res.data.data
+                })
+            }
+            
+        }
+    },
+};
+</script>

src/views/system/Account.vue

@@ -56,7 +56,7 @@
                     label="姓名">
                     </el-table-column>
                     <el-table-column
-                    prop="phone" 
+                    prop="phone"  width="120"
                     label="手机号">
                     </el-table-column>
                     <el-table-column
@@ -80,15 +80,15 @@
                     label="创建人">
                     </el-table-column>
                     <el-table-column
-                    prop="ctime" 
+                    prop="ctime"  
                     label="创建时间">
                     </el-table-column>
-                    <el-table-column
+                    <el-table-column width="180"
                     prop="last_login_time" 
                     label="最后一次登录">
                     </el-table-column>
                     <el-table-column  
-                    prop="zip"
+                    prop="zip" 
                     label="操作">
                     <template slot-scope="scope">
                         <!-- <el-button type="text" @click="dialogVisible=true,edit=1">查看</el-button> -->