Skip to content

M
marketing
Commit 6326bdb8 by chenxin
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !24
parents 847d5724 aeb0b1d8
Showing with 70 additions and 10 deletions
build/webpack.prod.conf.js
......@@ -35,9 +35,9 @@ const webpackConfig = merge(baseWebpackConfig, {
new UglifyJsPlugin({
uglifyOptions: {
compress: {
warnings: false,
drop_console: true, // console
pure_funcs: ['console.log'] // 移除console
// warnings: false
// drop_console: true // console
// pure_funcs: ['console.log'] // 移除console
}
},
sourceMap: config.build.productionSourceMap,
......
dist.zip
No preview for this file type
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/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.c7bc69db075e8daaa01f3a5f77e3e7a3.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.25.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.d89b85fec97420b1cc3d.js></script><script type=text/javascript src=/marketing/static/js/vendor.4f54dc53154967b3adc7.js></script><script type=text/javascript src=/marketing/static/js/main.8aa5a63aed7000be1a94.js></script></body></html>
\ No newline at end of file
<!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/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.55b33a80cc38edbe81498a9c86570b07.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.25.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.67cc66609dd24b37894a.js></script><script type=text/javascript src=/marketing/static/js/vendor.4f54dc53154967b3adc7.js></script><script type=text/javascript src=/marketing/static/js/main.949fc9b6a672743a453a.js></script></body></html>
\ No newline at end of file
dist/static/js/card.3019f63f20abe9bd6773.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.7abbd5013f824059c0bf.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/ecm.b557a0d0fc31be27a314.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.cead34aff59b0dc95294.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/evaluation.650a38a154a63ff404db.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.895b59997c68fcf1643e.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/game.0ea5eee276916402d464.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.67cc66609dd24b37894a.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var i,u,f,s=0,l=[];s<n.length;s++)u=n[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(n,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var n={},t={11:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"evaluation",4:"message",5:"ecm",6:"recharge",7:"msg",8:"calllog"}[e]||e)+"."+{0:"0ea5eee276916402d464",1:"3019f63f20abe9bd6773",2:"3e6eeb7a957caf4b9922",3:"650a38a154a63ff404db",4:"9ebc76d53481e7de020d",5:"b557a0d0fc31be27a314",6:"727cccae0b80bca129d5",7:"8b5caebf83a79ac810ca",8:"73199fa96bf2a53581b9"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.d89b85fec97420b1cc3d.js deleted 100644 → 0
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(n&&n(r,o,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=a(a.s=c[s]);return f};var r={},t={11: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:"game",1:"card",2:"wechat",3:"evaluation",4:"message",5:"ecm",6:"recharge",7:"msg",8:"calllog"}[e]||e)+"."+{0:"0ea5eee276916402d464",1:"7abbd5013f824059c0bf",2:"a9cafe7aac811d8c8aa1",3:"895b59997c68fcf1643e",4:"9ebc76d53481e7de020d",5:"cead34aff59b0dc95294",6:"727cccae0b80bca129d5",7:"8b5caebf83a79ac810ca",8:"73199fa96bf2a53581b9"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,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 e}}([]);
\ No newline at end of file
dist/static/js/message.9ebc76d53481e7de020d.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/msg.8b5caebf83a79ac810ca.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/recharge.727cccae0b80bca129d5.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/wechat.3e6eeb7a957caf4b9922.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/wechat.a9cafe7aac811d8c8aa1.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/App.vue
......@@ -7,12 +7,61 @@
</template>
<script>
import { getUserLogin, logout } from '@/service/api/commonApi.js';
export default {
name: 'App',
data() {
return {
include: []
};
},
methods: {
// 保存用户id，串号标志
saveUserId() {
getUserLogin().then(res => {
if (res.errorCode === 0) {
const uId = res.result && res.result.userId;
localStorage.setItem('m_uId', uId);
}
});
},
// 浏览器tab切换检查uid是否变化
changeTab() {
document.addEventListener('visibilitychange', () => {
if (document.visibilityState === 'visible') {
getUserLogin().then(res => {
if (res.errorCode === 0) {
const uId = res.result && res.result.userId;
if (localStorage.getItem('m_uId') !== uId) {
// 串号
this.$confirm('当前登录账号已经发生变化，如果您在其他页面已经登录另一个账号，请退出重新登录！', '登录账号变更提示', {
type: 'error',
closeOnClickModal: false,
confirmButtonText: '退出重新登录',
cancelButtonText: '刷新页面',
showClose: false
})
.then(() => {
logout(); // 登出
// if (process.env.NODE_ENV === 'production') { // eslint-disable-line
window.location.href = '/gic-web/#/login';
// }
})
.catch(() => {
window.location.reload();
});
} else {
localStorage.setItem('m_uId', uId);
}
}
});
}
});
}
},
created() {
this.saveUserId();
this.changeTab();
}
};
</script>
......
src/components/ueditorWrap/index.vue
......@@ -184,7 +184,7 @@ export default {
html += '</div>';
html += '</div>';
html += '<p style="border-radius: 0 0 3px 3px; padding: 13px; color: #8d8d8d; text-align: center;">';
html += `<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=${cardticket.appkey}&redirect_uri=${cardticket.fwhHost}/to_coupon?cardId=${cardticket.wechatCardId}&outerId=002&response_type=code&scope=snsapi_base&state=1&component_appid=${cardticket.componentAppid}#wechat_redirect" style="font-size: 14px; border-radius: 3px; padding: 8px 20px; height: 32px; line-height: 14px; color: #fff; border: 1px solid #63b359; background-color: #63b359; text-decoration: none; cursor: pointer;">领取卡券</a>`;
html += `<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=${cardticket.appkey}&redirect_uri=${cardticket.fwhHost}/to_coupon?filaappkey=${cardticket.filaappkey}&cardId=${cardticket.wechatCardId}&outerId=002&response_type=code&scope=snsapi_base&state=1&component_appid=${cardticket.componentAppid}#wechat_redirect" style="font-size: 14px; border-radius: 3px; padding: 8px 20px; height: 32px; line-height: 14px; color: #fff; border: 1px solid #63b359; background-color: #63b359; text-decoration: none; cursor: pointer;">领取卡券</a>`;
html += '</p>';
html += '</div>';
let newNode = new UE.uNode.createElement(html);
......@@ -196,7 +196,8 @@ export default {
if (node.getAttr('class') !== 'coupon-card-type-flag') return;
let cardticketString = node.getAttr('data-cardticket');
let item = cardticketString ? JSON.parse(unescape(cardticketString)) : {};
let html = `<iframe class="cardticket" frameborder="0" scrolling="no" data-is-cardticket data-cardticket="${escape(JSON.stringify(item))}" src="${baseUrl}/gicweb/load_wechat_image_rich_coupon_page?coupCardId=${item.coupCardId}&appkey=${item.appkey}&enterpriseId=${item.enterpriseId}"></iframe>`;
item.filaappkey = sessionStorage.getItem("filaappkey") ;
let html = `<iframe class="cardticket" frameborder="0" scrolling="no" data-is-cardticket data-cardticket="${escape(JSON.stringify(item))}" src="${baseUrl}/gicweb/load_wechat_image_rich_coupon_page?coupCardId=${item.coupCardId}&appkey=${item.filaappkey}&enterpriseId=${item.enterpriseId}"></iframe>`;
// eslint-disable-next-line
let newNode = new UE.uNode.createElement(html);
node.parentNode.replaceChild(newNode, node);
......@@ -211,7 +212,8 @@ export default {
item.logo = enterprise.qcloudImageUrl || '';
item.componentAppid = sessionStorage.getItem('componentAppid') || 'wxa99d363814a5b73b';
item.fwhHost = sessionStorage.getItem('fwhHost') || '';
let html = `<iframe class="cardticket" frameborder="0" scrolling="no" data-is-cardticket data-cardticket="${escape(JSON.stringify(item))}" src="${baseUrl}/gicweb/load_wechat_image_rich_coupon_page?coupCardId=${item.coupCardId}&appkey=${item.appkey}&enterpriseId=${item.enterpriseId}"></iframe>`;
item.filaappkey = sessionStorage.getItem("filaappkey") ;
let html = `<iframe class="cardticket" frameborder="0" scrolling="no" data-is-cardticket data-cardticket="${escape(JSON.stringify(item))}" src="${baseUrl}/gicweb/load_wechat_image_rich_coupon_page?coupCardId=${item.coupCardId}&appkey=${item.filaappkey}&enterpriseId=${item.enterpriseId}"></iframe>`;
this.execCommand('inserthtml', html);
}
}
......
src/service/api/commonApi.js
......@@ -2,6 +2,7 @@ import { requests } from './index';
const MARKET_PREFIX = 'api-marketing/';
const PLUG_PREFIX = 'api-plug/';
const GOODS_PREFIX = 'api-admin/';
const PREFIX = 'api-auth/';
//获取营销场景
export const sceneSettingList = params => requests(MARKET_PREFIX + 'scene-setting-list', params);
......@@ -11,3 +12,9 @@ export const getCardList = params => requests(PLUG_PREFIX + 'get-coupon-list', p
//所有门店分组
export const storeGroupList = params => requests(GOODS_PREFIX + 'store-group-list', params);
// 获取用户登录信息
export const getUserLogin = params => requests(PREFIX + 'get-login-user-info', params);
// 退出登录
export const logout = params => requests(PREFIX + 'do-logout?requestProject=marketing', params);
src/views/wechat/editor.vue
......@@ -280,6 +280,7 @@ export default {
sessionStorage.setItem('enterprise', JSON.stringify(res.result.enterprise));
sessionStorage.setItem('componentAppid', res.result.component_appid || '');
sessionStorage.setItem('fwhHost', res.result.fwh_host || '');
sessionStorage.setItem('filaappkey', res.result.filaappkey || '');
}
console.log(res);
},
......@@ -298,6 +299,7 @@ export default {
//提交卡券到富文本框
cardSubmit(val) {
this.cardShow = false;
console.log(val);
this.editorInstance.execCommand('insertcardticket', val);
},
......
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