xjc il y a 4 ans
Parent
commit
8753962868
4 fichiers modifiés avec 102 ajouts et 21 suppressions
  1. 18 6
      src/api.js
  2. 1 0
      src/views/activity/Activity.vue
  3. 1 0
      src/views/activity/OldActivity.vue
  4. 82 15
      src/views/article/Article.vue

+ 18 - 6
src/api.js

@@ -391,31 +391,43 @@ export default {
 	},
 	//导出
 	getJournalData: params => {
-		return axios.get(`${baseURL}/api/admin/journal/download`);
+		return axios.get(`${baseURL}/api/admin/journal/download`,{
+			params: params, responseType: "blob"
+		});
 	},
 	upJournalData: params => {
 		return axios.post(`${baseURL}/api/admin/journal/upload`,params);
 	},
 	getOrganizerData: params => {
-		return axios.get(`${baseURL}/api/admin/organizer/download`);
+		return axios.get(`${baseURL}/api/admin/organizer/download`,{
+			params: params, responseType: "blob"
+		});
 	},
 	upOrganizerData: params => {
 		return axios.post(`${baseURL}/api/admin/organizer/upload`,params);
 	},
 	getSubjectData: params => {
-		return axios.get(`${baseURL}/api/admin/subject/download`);
+		return axios.get(`${baseURL}/api/admin/subject/download`,{
+			params: params, responseType: "blob"
+		});
 	},
 	upSubjectData: params => {
 		return axios.post(`${baseURL}/api/admin/subject/upload`,params);
 	},
 	getSignupData: params => {
-		return axios.get(`${baseURL}/api/admin/signup/download`);
+		return axios.get(`${baseURL}/api/admin/signup/download`,{
+			params: params, responseType: "blob"
+		});
 	},
 	getVerifierData: params => {
-		return axios.get(`${baseURL}/api/admin/verifier/download`);
+		return axios.get(`${baseURL}/api/admin/verifier/download`,{
+			params: params, responseType: "blob"
+		});
 	},
 	getHotelData: params => {
-		return axios.get(`${baseURL}/api/admin/hotel/download`);
+		return axios.get(`${baseURL}/api/admin/hotel/download`,{
+			params: params, responseType: "blob"
+		});
 	},
 	// 热词
 	getHotWordList: params => {

+ 1 - 0
src/views/activity/Activity.vue

@@ -198,6 +198,7 @@ export default {
     getData() {
       var parm = this.form;
       this.loading = true;
+      parm.type = 0;
       this.$api.getActivityList(parm).then((res) => {
         this.list = res.data.data.list;
         this.loading = false;

+ 1 - 0
src/views/activity/OldActivity.vue

@@ -198,6 +198,7 @@ export default {
     getData() {
       var parm = this.form;
       this.loading = true;
+      parm.type = 1
       this.$api.getActivityList(parm).then((res) => {
         this.list = res.data.data.list;
         this.loading = false;

+ 82 - 15
src/views/article/Article.vue

@@ -64,15 +64,29 @@ a {
   top: 15px;
   left: 20px;
 }
-.result_dialog .el-dialog{
-    width: 40%;
-    margin-top:20vh!important;
+.result_dialog .el-dialog {
+  width: 40%;
+  margin-top: 20vh !important;
 }
-.result-item{
-    height: 35px;
-    .label{
-        font-weight: 600;
-    }
+.result-item {
+  height: 35px;
+  .label {
+    font-weight: 600;
+  }
+}
+.syncitem{
+  height:72px;
+  line-height:72px;
+  display:flex;
+  justify-content:space-between;
+  border-bottom:1px solid #ccc;
+}
+.syncitem img{
+  margin:10px;
+}
+.syncbtn{
+  margin-top:20px;
+  text-align: center;
 }
 </style>
 <template>
@@ -97,6 +111,9 @@ a {
             <el-button type="primary" @click="search">搜索</el-button>
           </el-form-item>
           <el-form-item style="float: right">
+            <el-button @click="syncToMP" type="primary"
+              >同步到公众号</el-button
+            >
             <el-button @click="addArticle" type="primary">发布文章</el-button>
           </el-form-item>
         </el-form>
@@ -110,8 +127,15 @@ a {
         default-expand-all
         row-key="id"
         style="width: 100%"
+        @selection-change="handleSelectionChange"
       >
-        <el-table-column prop="name" label="文章名称" width="500px"> </el-table-column>
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column prop="name" label="文章名称"> </el-table-column>
+        <el-table-column prop="img" label="封面图"> 
+          <template slot-scope="scope">
+            <img :src="scope.row.img" alt="" width="120" height="80">
+          </template>
+        </el-table-column>
         <el-table-column prop="author" label="作者"></el-table-column>
         <el-table-column prop="journal_name" label="来源"></el-table-column>
         <el-table-column prop="publish_time" label="出版时间"></el-table-column>
@@ -135,16 +159,43 @@ a {
         :total="total"
         @pageChange="gopage"
       />
+      <!-- 同步到微信公众号 -->
+      <el-dialog
+        class="fu-dialog"
+        title="同步到微信公众号" width="375px"
+        :close-on-click-modal="false"
+        :visible.sync="dialogVisible"
+      > 
+        <!-- <div>
+          <img :src="journalLogo" alt="">
+        </div> -->
+        <div>
+          <div v-if="multipleSelection" style="position:relative;">
+            <img :src="multipleSelection[0].img" alt="" width="310px" height="157px">
+            <p style="position:absolute;bottom:20px;left:20px;font-weight:bold;color:#ffffff;">{{multipleSelection[0].name}}</p>
+          </div>
+          <div  v-if="multipleSelection">
+            <div class="syncitem" v-for="(item,index) in multipleSelection" :key="index">
+              <p>{{item.name.substring(0,20)}}</p>
+              <img :src="item.img" alt="" width="48px" height="48px">
+            </div>
+          </div>
+        </div>
+        <div class="syncbtn">
+          <el-button type="normal" size="small" @click="dialogVisible=false">取消</el-button>
+          <el-button type="primary" size="small">确定</el-button>
+        </div>
+      </el-dialog>
     </div>
   </section>
 </template>
 <script>
 import Page from "../../components/Page";
-import fuEditor from '../../components/fuEditor'
+import fuEditor from "../../components/fuEditor";
 export default {
   components: {
     Page,
-    fuEditor
+    fuEditor,
   },
   data() {
     return {
@@ -155,9 +206,22 @@ export default {
       rules: {
         name: [{ required: true, message: "请输入标题", trigger: "blur" }],
       },
+      dialogVisible:false,
+      journalLogo:""
     };
   },
   methods: {
+    syncToMP(){
+      if(!this.multipleSelection){
+        this.$message.error("请勾选需要同步到公众号的文章!")
+        return 
+      }
+      console.log(this.multipleSelection)
+      this.dialogVisible = true;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     search() {
       let parm = this.form;
       this.getData();
@@ -167,8 +231,8 @@ export default {
       this.dialogVisible = true;
       this.dialogTitle = "发送消息";
     },
-    addArticle(){
-          this.$router.push({path:'/article/article/add'})
+    addArticle() {
+      this.$router.push({ path: "/article/article/add" });
     },
     gopage(size) {
       if (size) {
@@ -181,7 +245,7 @@ export default {
       var parm = this.form;
       this.loading = true;
       this.$api.getArticleList(parm).then((res) => {
-        console.log(res)
+        console.log(res);
         this.list = res.data.data.list;
         this.loading = false;
       });
@@ -200,7 +264,10 @@ export default {
       });
     },
     edit(row) {
-      this.$router.push({path:'/article/article/add',query:{id:row.id}})
+      this.$router.push({
+        path: "/article/article/add",
+        query: { id: row.id },
+      });
     },
     save() {
       this.$refs["form1"].validate((valid) => {