Skip to content

C
clique-web
Commit bf18bac6 by huaying
Options

Merge branch 'feature/7月-会员积分' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/manifest.8d32760d92c001c91c1f.js.map
#	dist/static/js/manifest.b02394884ed74e79518b.js.map
#	dist/static/js/manifest.cdeb591d1beb41b20702.js.map
parents 28565236 1f2c61c6
Showing with 38 additions and 6 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.d6584bb0d6dbaf95b0bafcb345510392.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script>(function() { <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.d6584bb0d6dbaf95b0bafcb345510392.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.5a38a66cd9ada6a7f9ec599b9e3fc8fd.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script>(function() {
>>>>>>> feature/7月-会员积分
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime(); var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host; var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host; host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>') document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.b02394884ed74e79518b.js></script><script type=text/javascript src=./static/js/vendor.45c914c901c445b900a1.js></script><script type=text/javascript src=./static/js/main.5d8c34d2c1436c5ffc85.js></script></body></html> <<<<<<< HEAD
\ No newline at end of file })()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.b02394884ed74e79518b.js></script><script type=text/javascript src=./static/js/vendor.45c914c901c445b900a1.js></script><script type=text/javascript src=./static/js/main.5d8c34d2c1436c5ffc85.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.8d32760d92c001c91c1f.js></script><script type=text/javascript src=./static/js/vendor.45c914c901c445b900a1.js></script><script type=text/javascript src=./static/js/main.3b872e214441b06b39cd.js></script></body></html>
>>>>>>> feature/7月-会员积分
dist/static/css/main.5a38a66cd9ada6a7f9ec599b9e3fc8fd.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.5a38a66cd9ada6a7f9ec599b9e3fc8fd.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.9309068d60f1a72bf3f4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.9309068d60f1a72bf3f4.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.4fbf1a843acc284481c5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.4fbf1a843acc284481c5.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.18bfa30112c7d8ed4571.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.18bfa30112c7d8ed4571.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.8d32760d92c001c91c1f.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:"88da6cef2a2da8c0ac06",1:"9cecaa6c9806ca9799db",2:"bd54b86536f9ccb82ea1",3:"352b3a449f18f3dc371f",4:"b1dfb176022b0b03a0de",5:"18bfa30112c7d8ed4571",6:"cb35c9668cf721acc599",7:"bbd5e921a2b24764890b",8:"b88326ad14d012ad7898",9:"9e3105c825be19fecbdf",10:"e595220b8f908da126fb",11:"9309068d60f1a72bf3f4",12:"4fbf1a843acc284481c5",13:"27b91aa0ae95700cfa84",14:"bf21f99ec45bc38c3caa",15:"f62c6f37eb70267c9d80",16:"54e18151bb7c6fa78089",17:"214b2699697c8d262547",18:"f7aa00758a5a88cdf277",19:"76c2fa6beb5031af3234",20:"ef938e3378ae39d9aa78",21:"781564129abd9296748d",22:"cbb007cf5f8436efd038",23:"fae356d1c7dfeb020e7f",24:"e6c6d1a06ae42536d947",25:"3b9009a049ef9ad8f5c2",26:"b43ebacd6ce40990eb1c",27:"b2b2594bf42f908f17d1",28:"d30cefac1b83e661b9e8",29:"8f3f018c9b4e85492548",30:"ae878be6f1930d0ef3e6",31:"ec38906347011d5ee323",32:"791aa646b04c6e599ab1",33:"179e5d3ec4a8cd7eb837",34:"fda28a1c54d0d2e301fa",35:"eee174d768d66e948153",36:"220030282f1ddd80d16a",37:"fa399aea4c5a144ef8fb",38:"c87321412b595001a395",39:"bae0c8006d56c96f1965",40:"6e67f0e5fdc095d44edd",41:"d6cef65dd8fa6e92f28d",42:"0f52d0981564c135a4fe",43:"c15d634a3b283251085f"}[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}}([]);
//# sourceMappingURL=manifest.8d32760d92c001c91c1f.js.map
\ No newline at end of file
src/view/companyGroup/membershipSystem/pointSystem.vue
...@@ -332,6 +332,23 @@ export default { ...@@ -332,6 +332,23 @@ export default {
this.pageNum1 = 1; this.pageNum1 = 1;
this.getIntefralInfo(); this.getIntefralInfo();
}, },
handleSizeChange(pageSize) {
if (this.activeName == 'second') {
this.pageSize = pageSize;
} else if (this.activeName == 'third') {
this.pageSize1 = pageSize;
}
this.handleCurrentChange(1);
},
handleCurrentChange(pageNum) {
if (this.activeName == 'second') {
this.pageNum = pageNum;
this.getPointInfo();
} else if (this.activeName == 'third') {
this.pageNum1 = pageNum;
this.getIntefralInfo();
}
},
// 新增 // 新增
handleAdd(flag) { handleAdd(flag) {
if (!this.tpnEditBool) { if (!this.tpnEditBool) {
...@@ -395,6 +412,8 @@ export default { ...@@ -395,6 +412,8 @@ export default {
let param = { let param = {
requestProject: that.projectName, requestProject: that.projectName,
keyword: that.keywords, keyword: that.keywords,
currPage: this.pageNum,
pageSize: this.pageSize,
strategyType: 1 strategyType: 1
}; };
// postRequest('/api-admin/get-member-integral-setting', param) // postRequest('/api-admin/get-member-integral-setting', param)
...@@ -423,8 +442,6 @@ export default { ...@@ -423,8 +442,6 @@ export default {
// 6月迭代抖音修改 // 6月迭代抖音修改
that.totalCount = resData.result.totalCount; that.totalCount = resData.result.totalCount;
that.pageSize = resData.result.pageSize;
that.pageNum = resData.result.pageNum;
that.achieveTableData = resData.result.result; that.achieveTableData = resData.result.result;
that.achieveTableData.forEach((ele,index)=>{ that.achieveTableData.forEach((ele,index)=>{
ele.integralGet = JSON.parse(ele.integralGet); ele.integralGet = JSON.parse(ele.integralGet);
...@@ -444,6 +461,8 @@ export default { ...@@ -444,6 +461,8 @@ export default {
var params = { var params = {
requestProject: that.projectName, requestProject: that.projectName,
keyword: that.keywords1, keyword: that.keywords1,
currPage: this.pageNum1,
pageSize: this.pageSize1,
strategyType: 2 strategyType: 2
} }
postRequest('/api-admin/query-integral-setting',params) postRequest('/api-admin/query-integral-setting',params)
...@@ -453,8 +472,6 @@ export default { ...@@ -453,8 +472,6 @@ export default {
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
// 6月迭代修改 // 6月迭代修改
that.totalCount1 = resData.result.totalCount; that.totalCount1 = resData.result.totalCount;
that.pageSize1 = resData.result.pageSize;
that.pageNum1 = resData.result.pageNum;
that.exchangeTableData = resData.result.result; that.exchangeTableData = resData.result.result;
that.exchangeTableData.forEach((ele,index)=>{ that.exchangeTableData.forEach((ele,index)=>{
ele.integralGet = JSON.parse(ele.integralGet); ele.integralGet = JSON.parse(ele.integralGet);
...@@ -480,6 +497,8 @@ export default { ...@@ -480,6 +497,8 @@ export default {
item.integralGetDiscountControlLower = String(item.integralGetDiscountControlLower); item.integralGetDiscountControlLower = String(item.integralGetDiscountControlLower);
item.integralUseDiscountControlUpper = String(item.integralUseDiscountControlUpper); item.integralUseDiscountControlUpper = String(item.integralUseDiscountControlUpper);
item.integralUseDiscountControlLower = String(item.integralUseDiscountControlLower); item.integralUseDiscountControlLower = String(item.integralUseDiscountControlLower);
item.integralExpireType = String(item.integralExpireType);
item.integralExpireRule = String(item.integralExpireRule);
// item.integralGet = JSON.parse(item.integralGet); // item.integralGet = JSON.parse(item.integralGet);
// item.integralUse = JSON.parse(item.integralUse); // item.integralUse = JSON.parse(item.integralUse);
......
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