Skip to content

M
marketing
Commit 18e37793 by liuchenxi
Options

Merge branch 'dev' of http://git.gicdev.com/marketing-web/marketing into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.6163485a879c0e8a49f0b580c5925b01.css
#	dist/static/css/main.b52ccce72954ce30d55c8c2ca6f02f86.css
#	dist/static/css/main.fe0e6e54c8be6c51f01ad294a6f907c3.css
#	dist/static/js/manifest.0cd2e58cc6c3ed11223f.js
#	dist/static/js/manifest.b4aa68140768e9713eec.js
#	dist/static/js/manifest.e3dd7d000f848f21fdab.js
#	dist/static/js/recharge.0aa36bf9e0c4e43cc20f.js
#	dist/static/js/recharge.556c870b263c7f46fd1a.js
#	dist/static/js/recharge.9747ecf0af69d931aa85.js
parents cbf1a421 1830d31c
Showing with 56 additions and 27 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.fe0e6e54c8be6c51f01ad294a6f907c3.css rel=stylesheet></head><body><div id=app></div><script>(function() {
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.509b157d64a7724500097dc02b1b3681.css rel=stylesheet></head><body><div id=app></div><script>(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.b4aa68140768e9713eec.js></script><script type=text/javascript src=/marketing/static/js/vendor.60b9dda16393a2ab9e6a.js></script><script type=text/javascript src=/marketing/static/js/main.2360c01ece99e441f469.js></script></body></html>
\ No newline at end of file
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.52cd6b7c58e9f51c014f.js></script><script type=text/javascript src=/marketing/static/js/vendor.60b9dda16393a2ab9e6a.js></script><script type=text/javascript src=/marketing/static/js/main.8d290956e6b7c52c4819.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.b4aa68140768e9713eec.js → dist/static/js/manifest.52cd6b7c58e9f51c014f.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,d,u=0,s=[];u<r.length;u++)i=r[u],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)d=a(a.s=c[u]);return d};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"cc53f0b239fd42924ac3",1:"71f958adebe94dc74204",2:"9914d681a608917fed13",3:"80792ee7d57175bf3de1",4:"8b4617944bc71bac247f",5:"040daa00ad74daa6dc50",6:"35fa6907b693bcc905d0",7:"59f8a7ef78bc0d73daf2",8:"0aa36bf9e0c4e43cc20f",9:"c81a068528a0d55d1a15",10:"b42bb545eb553e28af5c",11:"aeb00fcde81507fa4885",12:"091dd7723081a823098f",13:"e058d550c4872f50f70e",14:"04499b9ab4f58848b2a4"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"cc53f0b239fd42924ac3",1:"71f958adebe94dc74204",2:"f508111198bfe260f305",3:"80792ee7d57175bf3de1",4:"8b4617944bc71bac247f",5:"040daa00ad74daa6dc50",6:"35fa6907b693bcc905d0",7:"59f8a7ef78bc0d73daf2",8:"0aa36bf9e0c4e43cc20f",9:"c81a068528a0d55d1a15",10:"b42bb545eb553e28af5c",11:"aeb00fcde81507fa4885",12:"091dd7723081a823098f",13:"e058d550c4872f50f70e",14:"04499b9ab4f58848b2a4"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/wechat.9914d681a608917fed13.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/wechat.f508111198bfe260f305.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/libs/imgTextTemp/index.vue
......@@ -5,6 +5,7 @@
图文消息(共{{ total }}条)
<el-input v-model="listParams.searchName" clearable class="w200 ml10" placeholder="请输入标题/作者" @change="loadImgTextList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox class="vertical-middle ml0" v-if="$store.state.marketing.isShowSelf && showSelf" v-model="listParams.showSelfFlag" :true-label="1" :false-label="0" label="仅看本人" border @change="loadImgTextList" />
<el-checkbox class="vertical-middle ml0" v-model="listParams.wxscType" :true-label="3" :false-label="4" label="仅看历史图文" border @change="loadImgTextList" />
</div>
<div>
<el-button type="primary" v-if="$getButtonLimit($buttonCode.marketingAddImgText)" :limit-code="$buttonCode.marketingAddImgText" @click="add">新建图文</el-button>
......@@ -18,15 +19,16 @@
<div class="label-hidden"><el-radio :label="scope.row"></el-radio></div>
</template>
</el-table-column>
<el-table-column label="图片" align="left">
<template slot-scope="scope">
<el-table-column label="图文信息" align="left">
<div class="media-info" slot-scope="scope">
<img width="100" height="100" :src="scope.row.itemList.length ? scope.row.itemList[0].qcloudImageUrl || '' : ''" alt="" />
</template>
</el-table-column>
<el-table-column label="图文标题" align="left">
<template slot-scope="scope">
<a class="blue" :href="scope.row.itemList.length ? scope.row.itemList[0].mediaUrl || '' : ''" target="_blank">{{ scope.row.itemList.length ? scope.row.itemList[0].titleName || '' : '' }}</a>
</template>
<div class="media-title">
<p>
标题：<a class="blue" :href="scope.row.itemList.length ? scope.row.itemList[0].mediaUrl || '' : ''" target="_blank">{{ scope.row.itemList.length ? scope.row.itemList[0].titleName || '' : '' }}</a>
</p>
<p>图文m_id：{{ scope.row.draftMediaId }}</p>
</div>
</div>
</el-table-column>
<el-table-column label="作者" prop="authorName" align="left">
<template slot-scope="scope">
......@@ -53,7 +55,7 @@
</el-table>
</el-radio-group>
<dm-pagination v-show="textImgList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
<sync-imgtext :show.sync="syncImgTextShow"></sync-imgtext>
<sync-imgtext :wxsc-type="wxscType" :show.sync="syncImgTextShow"></sync-imgtext>
</section>
</template>
......@@ -92,16 +94,24 @@ export default {
}
},
created() {
this.$store.commit(
'mutations_layoutTips',
`<div class="layout--tips">
<i class="el-icon-info"></i>因为在微信公众后台发布的图文会从草稿箱转移到发表记录，若在微信公众后台有发布操作，建议在达摩侧的草稿箱检查同步
</div>`
);
this.loadImgTextList();
},
data() {
return {
wxscType: '4',
textImgList: [],
listParams: {
currentPage: 1,
pageSize: 20,
searchName: '',
showSelfFlag: this.showSelfFlag || ''
showSelfFlag: this.showSelfFlag || '',
wxscType: 4
},
total: 0,
loading: false,
......@@ -166,7 +176,7 @@ export default {
this.$emit('get-data', { imageTextId: row.imageTextId, imageTextWechatId: row.imageTextWechatId });
},
add() {
this.$router.push('/wechat/editor');
this.$router.push(`/wechat/editor?type=${this.wxscType}`);
},
editData(row) {
this.$router.push('/wechat/editor/' + row.imageTextId);
......@@ -198,6 +208,16 @@ export default {
</script>
<style lang="scss" scoped>
.media-info {
display: flex;
align-items: center;
.media-title {
display: flex;
flex-direction: column;
justify-content: space-around;
padding-left: 15px;
}
}
.dm-imgtext_head {
display: flex;
justify-content: space-between;
......
src/components/libs/imgTextTemp/syncImgtext.vue
<template>
<el-dialog class="sync-imgtext__dialog" title="同步微信图文" :visible.sync="show" width="30%" :before-close="close" v-loading="loading">
<div class="gic-modal-bd text-center">
<el-dialog class="sync-imgtext__dialog" title="同步微信草稿箱图文" :visible.sync="show" width="30%" :before-close="close" v-loading="loading">
<div class="gic-modal-bd">
<div class="gic-modal-content">
<p class="fz16" style="margin-bottom:20px">
微信图文共<span> {{ count }} </span>条<span @click="getSyncInfo" class="blue" style="margin-left:10px;">刷新</span>
微信草稿箱里的图文共<span> {{ count }} </span>条<span @click="getSyncInfo" class="blue" style="margin-left:10px;">刷新</span>
</p>
<p class="gray fz12">同步全部图文可能会需要比较久的时间，请耐心等待</p>
<div style="margin-bottom: 10px">
同步条数：
<el-select style="width: 160px" v-if="loadStatus === 1 && count !== 0" v-model="size" placeholder="选择同步条数">
<el-option v-for="item in sizeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<p class="gray fz12">同步全部图文可能会需要比较久的时间，请耐心等待...</p>
</div>
</div>
<div class="text-center pt20">
<el-select class="w100" v-if="loadStatus === 1 && count !== 0" v-model="size" placeholder="选择群发类型">
<el-option v-for="item in sizeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<template slot="footer">
<el-button @click="close">取消</el-button>
<el-button v-if="loadStatus === 1" type="primary" @click="syncWechat()">立即同步</el-button>
<el-button v-if="loadStatus === 0" type="primary" :loading="true">同步中</el-button>
<el-button v-if="loadStatus === 3" icon="el-icon-error" type="danger">同步失败</el-button>
</div>
</template>
</el-dialog>
</template>
<script>
......@@ -25,6 +29,11 @@ export default {
show: {
type: Boolean,
default: false
},
// 4：草稿列表 5：发布列表
wxscType: {
type: [Number, String],
default: ''
}
},
watch: {
......@@ -57,7 +66,7 @@ export default {
async syncWechat() {
this.loadStatus = 0;
const num = this.size === 999999 ? this.count : this.size;
let res = await syncWechatImageText({ num });
let res = await syncWechatImageText({ num, wxscType: this.wxscType });
if (num <= 20 && res.errorCode === 0) {
this.$tips({ type: 'success', message: '同步成功' });
this.loadStatus = 1;
......
src/router/modules/wechat.js
......@@ -87,7 +87,7 @@ export default {
children: [
{
path: 'imgtext',
name: '图文',
name: '图文草稿箱',
component: () => import(/* webpackChunkName: "wechat" */ '../../components/libs/imgTextTemp/index.vue'),
meta: {
path: '/wechat/temp/imgtext'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment