Skip to content

M
memberTag-web
Commit 9b9b2ab0 by huaying
Options

Merge branch 'feature/7月迭代-会员' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.00ab77baf73bc92155124bb1d741cfbd.css
#	dist/static/js/0.18131996731d4b3155b8.js
#	dist/static/js/0.1a7715361a5b1bb84dd7.js
#	dist/static/js/0.665d738a5f739f3a7a74.js
#	dist/static/js/7.15c832d2ab306408c0bd.js
#	dist/static/js/7.4c47ec34587d4554f310.js
#	dist/static/js/7.d85b2cf49c25bd3b3a4b.js
parents 8a00dbeb 03a98a9b
Showing with 36 additions and 6 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_5bjk41qthxj.css><script src=//at.alicdn.com/t/font_3276801_5bjk41qthxj.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.a349d32a171c28b626db7277a16a8267.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_5bjk41qthxj.css><script src=//at.alicdn.com/t/font_3276801_5bjk41qthxj.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.00ab77baf73bc92155124bb1d741cfbd.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> feature/7月迭代-会员
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/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.b77e128894666de0e770.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.2022384cc232a2d26653.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.b77e128894666de0e770.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.2022384cc232a2d26653.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.63021489dabb70ec1237.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.28e6c4639f4dfcfca36b.js></script></body></html>
>>>>>>> feature/7月迭代-会员
dist/static/css/app.00ab77baf73bc92155124bb1d741cfbd.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.18131996731d4b3155b8.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.1a7715361a5b1bb84dd7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.63021489dabb70ec1237.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var t,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var c={},f={46:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"1a7715361a5b1bb84dd7",1:"a5b1143fb090193afa6f",2:"80967fc0c5d2e38785ca",3:"ff305e5dc9d6506945c1",4:"204aedfb0870a329fb96",5:"2b76bfcb34e27514247e",6:"73c4cc952259800eebb9",7:"d85b2cf49c25bd3b3a4b",8:"0ee171376d4ff4853265",9:"6745d9c9726c50323c7f",10:"b3e0655ae069b2914dce",11:"cfa61640d1a3d8d26b48",12:"ed35f742a5cdceb1f843",13:"04f66cbd91ce2ab0d824",14:"8a595aded66caf7ef375",15:"577a3da26a2e906135ac",16:"fd8e0aca022b16e268de",17:"ee4ff30e9c5028d2ab9a",18:"04fef63821c104201b24",19:"4fcd3f0652be046eae2b",20:"2fa96d2046651d4bda7a",21:"1f6367e5dcf6de69a5bd",22:"4985a38ec89a12ab291d",23:"1e9aeacb85a469484d6e",24:"32ea2fce686ff5a02a83",25:"9631a7f7112daff44b57",26:"94037a1d26ca9ff1357c",27:"9da56a144273173dd58d",28:"c08b5446e0d6813e98ab",29:"ac3b9ad2c1fe8c5ea040",30:"4226ba90f06063c51c49",31:"7c02ba89e248eaadf07c",32:"079e1a2a7c4b75892e4d",33:"00364921438ed3f97457",34:"7eff4f62b69145f81c4d",35:"f6c7eb27d91ddb250e6d",36:"9de99ecb4d9b9240a7fb",37:"9963beab4d1e44f7645e",38:"468b3385aaf0fc8f3b55",39:"b59b4162a53300ded7b9",40:"78641cb6ef8afc5d86f9",41:"9a90b7405429e597f965",42:"50661a28c4416e9dd052",43:"a58b09332b3e4b0b022a"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/router/index.js
......@@ -205,11 +205,11 @@ const router = new Router({
})
router.beforeEach((to, from, next) => {
const { keepAlive, componentName, fromPath } = to.meta || {};
if (keepAlive && fromPath.every(el => el != '/')) {
if (keepAlive && Array.isArray(fromPath) && fromPath.every(el => el != '/')) {
fromPath.push('/');
}
// 当前路径的keepAlive为true而且from.path不在fromPath中时，将清除to.path的缓存
if (keepAlive && fromPath.every(el => el != from.path)) {
if (keepAlive && Array.isArray(fromPath) && fromPath.every(el => el != from.path)) {
delCache(router.apps, componentName);
}
next();
......
src/view/manualTag/manual-tag-value-edit.vue
......@@ -197,7 +197,28 @@ export default {
methods: {
// 导出标签值
importTagValue() {
console.log('导出标签值');
window.open(`http://gicdev.demogic.com/gic-member-tag-web/memberTag/exportMemberTag?requestProject=member-tag&tagId=${this.$route.query.tagId}&tagName=${this.$route.query.tagName}`);
// return
// const paras = {
// tagId: this.$route.query.tagId,
// tagName: this.$route.query.tagName
// }
// getRequest('/memberTag/exportMemberTag', paras).then(res=>{
// if(res.status == '200') {
// let blob = new Blob([res.data], {
// type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
// });
// // 3.创建一个临时的url指向blob对象
// let objectUrl = window.URL.createObjectURL(blob);
// // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
// let a = document.createElement("a");
// a.setAttribute("href", objectUrl);
// a.setAttribute("download", `${this.$route.query.tagName}-${new Date().toLocaleDateString()}`);
// a.click();
// // 5.释放这个临时的对象url
// window.URL.revokeObjectURL(objectUrl);
// }
// })
},
// 添加和编辑标签值
......
src/view/platformTag/tag-container.vue
......@@ -131,7 +131,7 @@ export default {
localStorage.setItem('jumpThirdTag', '');
this.$router.push({
path: '/manualTagValueEdit',
query: { tagId: list.tagId, type: 'manual' }
query: { tagId: list.tagId,tagName: list.tagName, type: 'manual' }
});
},
deleteHandTag(list, index, e) {
......
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