update

src/views/Login.vue

@@ -140,8 +140,8 @@ export default {
             this.$api.login(parms).then((res)=>{
                 let data=res.data
                   if(res.data.code == 0){
-                      // window.location.hash='/index/index';
-                      window.location.hash='/message/message';
+                      window.location.hash='/index/index';
+                      // window.location.hash='/message/message';
                   }else{
                       this.$message.error(res.data.message);
                   } 

src/views/activity/AddActivity.vue

@@ -222,7 +222,7 @@
                         <img v-if="form.img" :src="form.img" class="avatar">
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
-                    <span style='font-size:12px;color:#999999;'>建议图片尺寸为：210*160</span>
+                    <span style='font-size:12px;color:#999999;'>建议图片尺寸比例为：210*160,单张图片小于10M,格式要求jpg,jpeg,png</span>
                 </el-form-item>
                 <el-form-item label=''>
                     <el-tabs v-model="activeName" @tab-click="handleClick">

src/views/conference/AddConference.vue

@@ -204,7 +204,7 @@
                         <img v-if="form.img" :src="form.img" class="avatar">
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
-                    <span style='font-size:12px;color:#999999;'>建议图片尺寸为：210*160</span>
+                    <span style='font-size:12px;color:#999999;'>建议图片尺寸比例为：210*160,单张图片小于10M,格式要求jpg,jpeg,png</span>
                 </el-form-item>
                 <el-form-item label=''>
                     <el-tabs v-model="activeName" @tab-click="handleClick">

src/views/conference/Hotel.vue

@@ -68,6 +68,10 @@
                     label="酒店名称">
                     </el-table-column>
                     <el-table-column
+                    prop="conference_name"  
+                    label="本次会议名称">
+                    </el-table-column>
+                    <el-table-column
                     prop="username"  
                     label="入住人数">
                     </el-table-column>

src/views/journalQun/AddJournal.vue

@@ -315,7 +315,7 @@ export default {
       imageUrl: "",
       rules: {
         name: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        wxcode: [{ required: true, message: "请输入微信号", trigger: "blur" }],
+        // wxcode: [{ required: true, message: "请输入微信号", trigger: "blur" }],
         organizer_id: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
         subject_id: [{ required: true, message: "请选择学科", trigger: "change" }],
         img: [{ required: true, message: "封面图", trigger: "blur" }],

src/views/journalQun/Journal.vue

@@ -160,13 +160,14 @@
               <img v-if="form1.qrcode" :src="form1.qrcode" class="avatar" />
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
+            <span class="del" style="position:absolute;top:-8px;left:150px;" @click="delImg">删除</span>
             <span style="font-size: 12px; color: #999999"
               >建议图片尺寸为：210*160</span
             >
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button size="small" type="normal" @click="dialogVisible=false,this.form1={}">取消</el-button>
+          <el-button size="small" type="normal" @click="dialogVisible=false,form1={}">取消</el-button>
           <el-button size="small" type="primary" @click="save">确 定</el-button>
         </span>
       </el-dialog>
@@ -215,6 +216,10 @@ export default {
     };
   },
   methods: {
+    delImg(){
+      this.$set(this.form1,"qrcode",null)
+      this.$forceUpdate()
+    },
     save() {
       this.$refs["form1"].validate((valid) => {
         if (valid) {

src/views/journalQun/Organizer.vue

@@ -163,7 +163,19 @@ a {
         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="desc" label="主办单位简介" width="800px">
+          <template slot-scope="scope">
+            <!-- <el-popover trigger="hover" placement="top">
+              {{scope.row.desc}}
+              <div slot="reference" class="name-wrapper">
+                {{ scope.row.desc|splice}}
+              </div>
+            </el-popover> -->
+            <el-tooltip effect="dark" :content="scope.row.desc" placement="top">
+              <span>{{ scope.row.desc|splice}}</span>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column prop="journal_num" label="期刊数量"></el-table-column>
         <el-table-column prop="zip" width="150" label="操作">
           <template slot-scope="scope">
@@ -274,6 +286,15 @@ export default {
       file:''
     };
   },
+  filters:{
+    splice(value) {
+        if (!value) return ''
+        if (value.length > 50) {
+            return value.slice(0, 50) + '...'
+        }
+        return value
+    }
+  },
   methods: {
      upload(){
       this.$api.upOrganizerData({file:this.file}).then(res=>{
@@ -336,6 +357,7 @@ export default {
       this.$api.getOrganizerList(parm).then((res) => {
         console.log(res)
         this.list = res.data.data.list;
+        this.total = res.data.data.total;
         this.loading = false;
       });
     },
@@ -373,7 +395,7 @@ export default {
                   message: "保存成功!",
                 });
               } else {
-                this.$message.error("保存失败!");
+                this.$message.error(res.data.message);
               }
               this.getData();
               this.dialogVisible = false;
@@ -386,7 +408,7 @@ export default {
                   message: "保存成功!",
                 });
               } else {
-                this.$message.error("保存失败!");
+                this.$message.error(res.data.message);
               }
               this.getData();
               this.dialogVisible = false;

src/views/journalQun/Subject.vue

@@ -355,7 +355,7 @@ export default {
                   message: "保存成功!",
                 });
               } else {
-                this.$message.error("保存失败!");
+                this.$message.error(res.data.message);
               }
               this.getData();
               this.dialogVisible = false;
@@ -368,7 +368,7 @@ export default {
                   message: "保存成功!",
                 });
               } else {
-                this.$message.error("保存失败!");
+                this.$message.error(res.data.message);
               }
               this.getData();
               this.dialogVisible = false;

src/views/system/Account.vue

@@ -141,8 +141,8 @@
                 </el-form-item>
                 <el-form-item label="账户状态" prop='is_active'>
                     <el-radio-group v-model="form1.is_active">
-                        <el-radio :label="1">启用</el-radio>
-                        <el-radio :label="0">禁用</el-radio>
+                        <el-radio label="1">启用</el-radio>
+                        <el-radio label="0">禁用</el-radio>
                     </el-radio-group>
                 </el-form-item>
         </el-form>
@@ -291,10 +291,10 @@ export default {
                                     message:"成功",
                                     type:"success"
                                 })
-                                this.getData()
                             }else{
                                 this.$message.error(res.data.message);
                             }
+                            this.getData()
                             this.dialogVisible = false
                         })
                     }else{
@@ -304,10 +304,10 @@ export default {
                                     message:"成功!",
                                     type:"success"
                                 })
-                                this.getData()
                             }else{
                                 this.$message.error(res.data.message);
                             }
+                            this.getData()
                             this.dialogVisible = false
                         })
                     }

vue.config.js

@@ -3,7 +3,7 @@ module.exports={
         proxy:{
             '/api':{
                 // target:'http://39.107.246.59:81',
-                target:'https://test.scxjc.club',
+                target:'http://caos.scxjc.club',
                 // target:'http://caos.tederen.com',
                 changeOrigin: true,
             }