Skip to content

S
shareConfig
Commit b0e34705 by 无尘
Options

fix: 修改路径排序

parent 3ab5ed19
Showing with 25 additions and 26 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.8ba84bfa2e61c42c30a1f8f1692e952a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.1b765c1790aba68b3972.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.9b885e08e1589881064aa3d5bdc0fb7d.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.00fe5e73c43090b5f0b2.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/2.2160f0e318303298c871.js → dist/static/js/2.ae7b9b94b9157db01808.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.00fe5e73c43090b5f0b2.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;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/"+e+"."+{0:"a6710db96e29b9dc1718",1:"5b546fa38466a0b05e37",2:"ae7b9b94b9157db01808",3:"eb1c71d23d272a02eac0",4:"4c86fa657d5a0ae796ae",5:"e5f29637bed979a22d84",6:"cfe9b80ab51704b08fb2",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[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,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.1b765c1790aba68b3972.js deleted 100644 → 0
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"a6710db96e29b9dc1718",1:"5b546fa38466a0b05e37",2:"2160f0e318303298c871",3:"b76a7a238239050e784b",4:"d2508d7b31d609a6d267",5:"e5f29637bed979a22d84",6:"cfe9b80ab51704b08fb2",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/active-config/base-config.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-18 10:37:02 * @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-04 09:52:10 * @LastEditTime: 2019-12-04 17:04:11
--> -->
<!-- <!--
<base-config @submitNext="submitNext"></base-config> <base-config @submitNext="submitNext"></base-config>
...@@ -244,6 +244,9 @@ export default { ...@@ -244,6 +244,9 @@ export default {
if (resData.result && resData.result.router) { if (resData.result && resData.result.router) {
resData.result.router = JSON.parse(resData.result.router); resData.result.router = JSON.parse(resData.result.router);
} }
resData.result.router.sort(function(a,b){
return (a.transId - b.transId);
})
resData.result.startDate = timeFormat.timeToDateTime(resData.result.startDate); resData.result.startDate = timeFormat.timeToDateTime(resData.result.startDate);
resData.result.endDate = timeFormat.timeToDateTime(resData.result.endDate); resData.result.endDate = timeFormat.timeToDateTime(resData.result.endDate);
resData.result.dateRange = [resData.result.startDate, resData.result.endDate]; resData.result.dateRange = [resData.result.startDate, resData.result.endDate];
......
src/components/active/active-select.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-13 16:37:02 * @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 09:49:06 * @LastEditTime: 2019-12-04 17:03:13
--> -->
<!-- <!--
<active-select></active-select> <active-select></active-select>
...@@ -593,7 +593,7 @@ export default { ...@@ -593,7 +593,7 @@ export default {
} }
}); });
pathArr.sort(function (a, b) { pathArr.sort(function (a, b) {
return (a.transId - b.transId) return (a.transId - b.transId);
}); });
// 判断会员招募 // 判断会员招募
if (that.secondGoal.goalId == 5 && pathArr.length == 1) { if (that.secondGoal.goalId == 5 && pathArr.length == 1) {
......
src/components/export-excel.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-12-01 17:29:53 * @Date: 2019-12-01 17:29:53
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 19:13:18 * @LastEditTime: 2019-12-04 16:46:23
--> -->
<!-- <!--
import exportExcel from '@gic-test/export-excel' import exportExcel from '@gic-test/export-excel'
...@@ -131,7 +131,6 @@ import exportExcel from '@gic-test/export-excel' ...@@ -131,7 +131,6 @@ import exportExcel from '@gic-test/export-excel'
<script> <script>
import { postRequest } from '@/api/api'; import { postRequest } from '@/api/api';
import qs from 'qs';
export default { export default {
name: 'export-excel', name: 'export-excel',
data() { data() {
...@@ -205,7 +204,7 @@ export default { ...@@ -205,7 +204,7 @@ export default {
} }
if (this.isReadyReportBool) { if (this.isReadyReportBool) {
this.isReadyReportBool = false; this.isReadyReportBool = false;
postRequest(this.excelUrl, qs.stringify(this.params)).then(res => { postRequest(this.excelUrl, this.params).then(res => {
let data = res.data; let data = res.data;
if (data.errorCode == 0) { if (data.errorCode == 0) {
this.goReportBool = true; this.goReportBool = true;
...@@ -222,15 +221,7 @@ export default { ...@@ -222,15 +221,7 @@ export default {
}, },
senGoReport() { senGoReport() {
// 脱敏数据 完整数据 去报告中心 // 脱敏数据 完整数据 去报告中心
let url = ''; window.open('/gic-web/reportCenter');
if (this.projectName == 'mall') {
url = '//' + window.location.host + '/mall/#/reportList';
} else if (this.projectName == 'integral-mall') {
url = '//' + window.location.host + '/mall/#/reportList';
} else {
url = '//' + window.location.host + '/gic-web/#/reportCenter';
}
window.location.href = url;
}, },
async allReport() { async allReport() {
// 完整数据 生成报告 需申请 // 完整数据 生成报告 需申请
...@@ -267,16 +258,15 @@ export default { ...@@ -267,16 +258,15 @@ export default {
if (this.type == '2') { if (this.type == '2') {
this.params.dataType = 2; this.params.dataType = 2;
} }
this.axios.post(this.excelUrl, qs.stringify(this.params)).then(res => { postRequest(this.excelUrl,this.params).then(res => {
let data = res.data; let data = res.data;
if (data.errorCode == 0 || (this.projectName==='member-tag' && data.errorCode==1)) { if (data.errorCode == 0 || (this.projectName==='member-tag' && data.errorCode==1)) {
this.downloadReportId = data.result; this.downloadReportId = data.result;
postRequest( postRequest(
'/api-admin/apply-download-report', '/api-admin/apply-download-report',
qs.stringify({ {
requestProject: this.projectName,
downloadReportId: this.downloadReportId downloadReportId: this.downloadReportId
}) }
) )
.then(res => { .then(res => {
let data = res.data; let data = res.data;
......
src/view/dataDetails/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-15 10:10:08 * @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 19:17:45 * @LastEditTime: 2019-12-04 16:40:13
--> -->
<template> <template>
...@@ -30,8 +30,14 @@ ...@@ -30,8 +30,14 @@
</div> </div>
</div> </div>
<div class="data-detail-table"> <div class="data-detail-table">
<invite-table ref="inviteTable" v-if="tabName == 'invite'"></invite-table> <invite-table
<invited-table ref="invitedTable" v-if="tabName == 'invited'"></invited-table> ref="inviteTable"
v-if="tabName == 'invite'"
></invite-table>
<invited-table
ref="invitedTable"
v-if="tabName == 'invited'"
></invited-table>
</div> </div>
</div> </div>
</div> </div>
......
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