Skip to content

M
memberTag-web
Commit 74ac0c3d by caoyanzhi
Options

Merge branch 'bugfix/新建会员分组' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.1cb143ee0cd9f9a812d77dcd3d46bea7.css
#	dist/static/js/0.1a7715361a5b1bb84dd7.js
#	dist/static/js/0.e265b422c31fe3a54837.js
#	dist/static/js/0.f88251e7621c8a9b4a32.js
#	dist/static/js/manifest.d7528eba78990e005445.js
parents 8aff8ce9 46f66d27
Showing with 52 additions and 47 deletions
config/proxyList.js
module.exports = {
proxyList: {
'/api-auth/': {
target: 'http://gicdev.demogic.com/api-auth/',
target: 'http://www.gicdev.com/api-auth/',
changeOrigin: true,
pathRewrite: {
'^/api-auth': ''
}
},
'/api-admin/': {
target: 'http://gicdev.demogic.com/api-admin/',
target: 'http://www.gicdev.com/api-admin/',
changeOrigin: true,
pathRewrite: {
'^/api-admin': ''
}
},
'/api-plug/': {
target: 'http://gicdev.demogic.com/api-plug/',
target: 'http://www.gicdev.com/api-plug/',
changeOrigin: true,
pathRewrite: {
'^/api-plug': ''
}
},
'/api-mall/': {
target: 'http://gicdev.demogic.com/api-mall/',
target: 'http://www.gicdev.com/api-mall/',
changeOrigin: true,
pathRewrite: {
'^/api-mall': ''
......
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.a851f5a79917e8233a2d045752267766.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.1cb143ee0cd9f9a812d77dcd3d46bea7.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() {
>>>>>>> bugfix/新建会员分组
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.4249fe84d23dcbbae02b.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.f57cf1a20e7eb4923a3e.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.4249fe84d23dcbbae02b.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.f57cf1a20e7eb4923a3e.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.d7528eba78990e005445.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>
>>>>>>> bugfix/新建会员分组
dist/static/css/app.1cb143ee0cd9f9a812d77dcd3d46bea7.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.e265b422c31fe3a54837.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.f88251e7621c8a9b4a32.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.d7528eba78990e005445.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,d){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 r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(a&&a(c,r,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)o=n(n.s=d[i]);return o};var c={},f={46:0};function n(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,n),f.l=!0,f.exports}n.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,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,n.nc&&d.setAttribute("nonce",n.nc),d.src=n.p+"static/js/"+e+"."+{0:"e265b422c31fe3a54837",1:"a5b1143fb090193afa6f",2:"80967fc0c5d2e38785ca",3:"01c1b865b6f037f2cc37",4:"d8eb0bf6cc0afb951c78",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(){d.onerror=d.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=b,r.appendChild(d),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/App.vue
......@@ -22,7 +22,7 @@ export default {
},
created() {
this.baseUrl = window.location.origin.indexOf('localhost') > -1 ? 'http://gicdev.demogic.com' : window.location.origin;
this.baseUrl = window.location.origin.indexOf('localhost') > -1 ? 'http://www.gicdev.com' : window.location.origin;
this._getUserInfo();
this.changeTab();
},
......
src/api/api.js
......@@ -7,7 +7,7 @@ Vue.axios.defaults.timeout = 15000;
let local = window.location.origin;
if (local.indexOf('localhost') != -1) {
local = 'http://gicdev.demogic.com';
local = 'http://www.gicdev.com';
}
Vue.axios.interceptors.request.use(
......
src/common/js/error.js
......@@ -7,7 +7,7 @@ export default {
errorMsg: function(response) {
let local = window.location.origin;
if (local.indexOf('localhost')) {
local = 'http://gicdev.demogic.com';
local = 'http://www.gicdev.com';
}
if (response.errorCode != 0) {
if (response.errorCode == 401) {
......
src/components/config/index.js
const host = window.location.origin;
// eslint-disable-next-line
export const baseUrl = host.indexOf('localhost') > '-1' ? 'http://gicdev.demogic.com' : host;
export const baseUrl = host.indexOf('localhost') > '-1' ? 'http://www.gicdev.com' : host;
src/components/groupTransfer.vue
......@@ -423,7 +423,7 @@
var that = this;
var host = window.location.origin;
if (host.indexOf("localhost") != "-1") {
that.baseUrl = "http://gicdev.demogic.com";
that.baseUrl = "http://www.gicdev.com";
} else {
that.baseUrl = host;
}
......
src/components/selector/config.js
const host = window.location.origin;
export const baseUrl = host.('localhost') ? 'http://gicdev.demogic.com' : host;
export const baseUrl = host.('localhost') ? 'http://www.gicdev.com' : host;
src/components/tag/tag-config-options.vue
......@@ -2545,7 +2545,7 @@ export default {
this.templateObj = {};
let host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
this.baseUrl = 'http://gicdev.demogic.com';
this.baseUrl = 'http://www.gicdev.com';
} else {
this.baseUrl = host;
}
......
src/components/tagDetail/mixin/index.js
......@@ -9,7 +9,7 @@ export default {
const that = this;
let host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......
src/config/index.js
const host = window.location.origin;
// eslint-disable-next-line
export const baseUrl = host.indexOf('localhost') > '-1' ? 'http://gicdev.demogic.com' : host;
export const baseUrl = host.indexOf('localhost') > '-1' ? 'http://www.gicdev.com' : host;
export const ERR_OK = 0;
......
src/request/index.js
......@@ -4,7 +4,7 @@ import { Message } from 'element-ui';
const host = window.location.origin;
const BASEURL = host.indexOf('localhost') > -1 ? 'http://gicdev.demogic.com/gic-member-tag-web' : `${host}/gic-member-tag-web`;
const BASEURL = host.indexOf('localhost') > -1 ? 'http://www.gicdev.com/gic-member-tag-web' : `${host}/gic-member-tag-web`;
const server = axios.create({
baseURL: BASEURL,
......
src/view/linktools/linktools.vue
......@@ -515,7 +515,7 @@ export default {
parentId: 'tb-cid-11'
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
let resData = res.data;
let onelevelCategory = '';
......@@ -573,7 +573,7 @@ export default {
let that = this;
let para = {};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -692,7 +692,7 @@ export default {
parentId: parentId
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -823,7 +823,7 @@ export default {
// that.total = 50;
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -981,7 +981,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/list-link-data', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/list-link-data', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -1057,7 +1057,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -1093,7 +1093,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-auth/do-login', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-auth/do-login', qs.stringify(para))
.then(res => {
that.getLinksList(0, 1);
})
......
src/view/linktools/linktoolspage.vue
......@@ -519,7 +519,7 @@ export default {
parentId: 'tb-cid-11'
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
let resData = res.data;
let onelevelCategory = '';
......@@ -578,7 +578,7 @@ export default {
let that = this;
let para = {};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -697,7 +697,7 @@ export default {
parentId: parentId
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -826,7 +826,7 @@ export default {
// that.pageSize = 10;
// that.total = 50;
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -982,7 +982,7 @@ export default {
parentId: parentId
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/list-link-data', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/list-link-data', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -1057,7 +1057,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -1093,7 +1093,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-auth/do-login', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-auth/do-login', qs.stringify(para))
.then(res => {
that.getLinksList(0, 1);
})
......
src/view/manualTag/import-member-dialog.vue
......@@ -94,7 +94,7 @@ export default {
// 导出 excel 模板
downloadExcelTemp() {
let origin = window.location.origin;
origin = origin.indexOf('localhost') >= 0 ? 'http://gicdev.demogic.com/' : origin;
origin = origin.indexOf('localhost') >= 0 ? 'http://www.gicdev.com/' : origin;
window.location.href = `${origin}${this.data.downLoadUrl}`;
},
}
......
src/view/manualTag/manual-tag-value-edit-info.vue
......@@ -632,7 +632,7 @@ export default {
var that = this;
var host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......@@ -641,7 +641,7 @@ export default {
const { tagItemId }=this.$route.query;
let local = window.location.origin;
if (local.indexOf('localhost') != -1) {
local = 'http://gicdev.demogic.com';
local = 'http://www.gicdev.com';
}
this.pageParam.tagItemId=tagItemId;
this.downTagDetailListPop.params.tagItemId = tagItemId;
......
src/view/manualTag/manual-tag-value-edit.vue
......@@ -575,7 +575,7 @@ export default {
exportParams.exportFields = data.toString();
exportParams.tagId = this.tagId;
let origin = window.location.origin;
origin = origin.indexOf('localhost') >= 0 ? 'http://gicdev.demogic.com/' : origin;
origin = origin.indexOf('localhost') >= 0 ? 'http://www.gicdev.com/' : origin;
this.exportMemberData.excelUrl = origin + this.exportMemberData.excelUrl;
},
onDeleteTag(row, index, e) {
......
src/view/manualTag/manualTagDetail.vue
......@@ -889,7 +889,7 @@ export default {
let that = this;
let host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -697,7 +697,7 @@ export default {
var that = this;
var host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......@@ -706,7 +706,7 @@ export default {
let local = window.location.origin;
let memberTagGroupId = this.$route.query.memberTagGroupId;
if (local.indexOf('localhost') != -1) {
local = 'http://gicdev.demogic.com';
local = 'http://www.gicdev.com';
}
this.downMemberListPop.params.memberTagGroupId = memberTagGroupId;
......
src/view/memberGroup/memberGroupEdit.vue
......@@ -353,12 +353,8 @@ export default {
// 更新频率
rateData: [
{
label: '实时更新',
value: 1
},
{
label: '每日一次',
value: 2
value: 1
},
{
label: '生效后更新一次',
......@@ -721,7 +717,7 @@ export default {
this.ruleForm.effectiveDateTmp = tagGroupDto.effectiveDate;
// this.ruleForm.updateType = !!tagGroupDto.updateType ? Number(tagGroupDto.updateType) : '';
// this.ruleForm.updateDay = !!tagGroupDto.updateDay ? Number(tagGroupDto.updateDay) : '';
// this.ruleForm.updateType = 1;
this.ruleForm.updateType = 1;
// this.ruleForm.updateDay = '';
this.ruleForm.fixedType = +tagGroupDto.fixedType ? 1 : 0
this.ruleForm.fixedTime = tagGroupDto.fixedTime || this.ruleForm.fixedTime
......
src/view/memberGroup/memberLevelDetail.vue
......@@ -658,7 +658,7 @@ export default {
var that = this;
var host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......@@ -668,7 +668,7 @@ export default {
let local = window.location.origin;
let memberTagGroupId = this.$route.query.memberTagGroupId;
if (local.indexOf('localhost') != -1) {
local = 'http://gicdev.demogic.com';
local = 'http://www.gicdev.com';
}
const type = this.$route.query.type
this.downMemberListPop.params.gradeId = memberTagGroupId;
......
src/view/platformTag/myTag/myTagDetail.vue
......@@ -790,7 +790,7 @@ export default {
const that = this;
let host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......
src/view/platformTag/platformTagDetail.vue
......@@ -861,7 +861,7 @@ export default {
var that = this;
var host = window.location.origin;
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......
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