Skip to content

S
shareConfig
Commit f1b13326 by 曾经
Options

Merge branch 'feature/停复机1' into dev 

* feature/停复机1:
  暂无已结束活动 空页面
  已完成活动列表
  展示白条问题
  开发环境 域名替换
  update: dist
  update: dist
parents be73f5d4 e50a986f
Showing with 55 additions and 17 deletions
config/proxyList.js
...@@ -9,28 +9,28 @@ ...@@ -9,28 +9,28 @@
module.exports = { module.exports = {
proxyList: { proxyList: {
'/api-auth/': { '/api-auth/': {
target: 'http://gicdev.demogic.com/api-auth/', target: 'http://www.gicdev.com/api-auth/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api-auth': '' '^/api-auth': ''
} }
}, },
'/api-admin/': { '/api-admin/': {
target: 'http://gicdev.demogic.com/api-admin/', target: 'http://www.gicdev.com/api-admin/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api-admin': '' '^/api-admin': ''
} }
}, },
'/api-plug/': { '/api-plug/': {
target: 'http://gicdev.demogic.com/api-plug/', target: 'http://www.gicdev.com/api-plug/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api-plug': '' '^/api-plug': ''
} }
}, },
'/sharing-core-web/': { '/sharing-core-web/': {
target: 'http://gicdev.demogic.com/sharing-core-web/', target: 'http://www.gicdev.com/sharing-core-web/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/sharing-core-web': '' '^/sharing-core-web': ''
......
index.html
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="shortcut icon" href="./favicon.ico" /> <link rel="shortcut icon" href="./favicon.ico" />
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/c/font_3380872_vkgiwdkji6p.css" />
<script src="//at.alicdn.com/t/c/font_3380872_vkgiwdkji6p.js"></script>
<title></title> <title></title>
<!-- <title>分享有礼</title> --> <!-- <title>分享有礼</title> -->
</head> </head>
......
src/App.vue
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
}, },
created() { 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._getUserInfo();
this.changeTab(); this.changeTab();
}, },
......
src/api/api.js
...@@ -8,7 +8,7 @@ import { ...@@ -8,7 +8,7 @@ import {
Vue.axios.defaults.timeout = 25000; Vue.axios.defaults.timeout = 25000;
let local = window.location.origin; let local = window.location.origin;
if (local.indexOf('localhost') != -1) { if (local.indexOf('localhost') != -1) {
local = 'http://gicdev.demogic.com'; local = 'http://www.gicdev.com';
} }
Vue.axios.interceptors.request.use( Vue.axios.interceptors.request.use(
......
src/common/js/error.js
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
errorMsg: function (response) { errorMsg: function (response) {
let local = window.location.origin; let local = window.location.origin;
if (local.indexOf('localhost')) { if (local.indexOf('localhost')) {
local = 'http://gicdev.demogic.com'; local = 'http://www.gicdev.com';
} }
if (response.errorCode != 1) { if (response.errorCode != 1) {
if (response.errorCode == 4) { if (response.errorCode == 4) {
......
src/components/active/finished-active.vue
...@@ -14,8 +14,8 @@ import finishedActive from '@/components/active/finished-active.vue'; ...@@ -14,8 +14,8 @@ import finishedActive from '@/components/active/finished-active.vue';
<template> <template>
<div> <div>
<div v-if="finishedData.length" class="separator-space">- 以下为已结束活动 -</div> <div class="separator-space">- 以下为已结束活动 -</div>
<div class="finished-active border-box"> <div class="finished-active border-box" v-if="finishedData.length">
<ul> <ul>
<template v-for="(item, index) in finishedData"> <template v-for="(item, index) in finishedData">
<li :class="['border-box', selectItem == item.activityId && index != 0 ? 'li-border' : '']" :key="index + 'data'"> <li :class="['border-box', selectItem == item.activityId && index != 0 ? 'li-border' : '']" :key="index + 'data'">
...@@ -44,6 +44,15 @@ import finishedActive from '@/components/active/finished-active.vue'; ...@@ -44,6 +44,15 @@ import finishedActive from '@/components/active/finished-active.vue';
<dm-pagination small :page-size="pageSize" :current-page="currentPage" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"> </dm-pagination> <dm-pagination small :page-size="pageSize" :current-page="currentPage" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"> </dm-pagination>
</div> </div>
</div> </div>
<div class="empty-page" v-else-if="haveLoad">
<div class="empty-box">
<!-- <div class="icon iconfont icon-no-data"></div> -->
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-no-data"></use>
</svg>
<div class="empty-text">暂无已结束活动</div>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -58,6 +67,7 @@ export default { ...@@ -58,6 +67,7 @@ export default {
}, },
data() { data() {
return { return {
haveLoad: false,
funnelData: [], funnelData: [],
barChartData: { barChartData: {
columns: ['日期', '访问用户', '下单用户'], columns: ['日期', '访问用户', '下单用户'],
...@@ -173,11 +183,13 @@ export default { ...@@ -173,11 +183,13 @@ export default {
} */ } */
that.finishedData = resData.result.result || []; that.finishedData = resData.result.result || [];
that.total = resData.result.totalCount; that.total = resData.result.totalCount;
that.haveLoad = true;
return false; return false;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.haveLoad = true;
that.$message.error({ that.$message.error({
duration: 2500, duration: 2500,
message: error.message message: error.message
...@@ -231,4 +243,28 @@ export default { ...@@ -231,4 +243,28 @@ export default {
} }
} }
} }
.empty-page{
position: relative;
height: 300px;
background: white;
.empty-box {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
text-align: center;
.icon {
width: 96px;
height: 96px;
margin: 0 auto;
}
.empty-text{
margin-top: 12px;
color: #606266;
font-size: 14px;
}
}
}
</style> </style>
src/components/post-upload.vue
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
const that = this; const that = this;
let host = window.location.origin; let host = window.location.origin;
if (host.indexOf('localhost') != -1) { if (host.indexOf('localhost') != -1) {
that.baseUrl = 'http://gicdev.demogic.com'; that.baseUrl = 'http://www.gicdev.com';
} else { } else {
that.baseUrl = host; that.baseUrl = host;
} }
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
let host = window.location.origin; let host = window.location.origin;
let baseUrl; let baseUrl;
if (host.indexOf('localhost') != '-1') { if (host.indexOf('localhost') != '-1') {
baseUrl = 'http://gicdev.demogic.com'; baseUrl = 'http://www.gicdev.com';
} else { } else {
baseUrl = host; baseUrl = host;
} }
......
src/components/single-upload-center.vue
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
const that = this; const that = this;
let host = window.location.origin; let host = window.location.origin;
if (host.indexOf('localhost') != -1) { if (host.indexOf('localhost') != -1) {
that.baseUrl = 'http://gicdev.demogic.com'; that.baseUrl = 'http://www.gicdev.com';
} else { } else {
that.baseUrl = host; that.baseUrl = host;
} }
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
let host = window.location.origin; let host = window.location.origin;
let baseUrl; let baseUrl;
if (host.indexOf('localhost') != '-1') { if (host.indexOf('localhost') != '-1') {
baseUrl = 'http://gicdev.demogic.com'; baseUrl = 'http://www.gicdev.com';
} else { } else {
baseUrl = host; baseUrl = host;
} }
......
src/components/single-upload.vue
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
const that = this; const that = this;
let host = window.location.origin; let host = window.location.origin;
if (host.indexOf('localhost') != -1) { if (host.indexOf('localhost') != -1) {
that.baseUrl = 'http://gicdev.demogic.com'; that.baseUrl = 'http://www.gicdev.com';
} else { } else {
that.baseUrl = host; that.baseUrl = host;
} }
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
let host = window.location.origin; let host = window.location.origin;
let baseUrl; let baseUrl;
if (host.indexOf('localhost') != '-1') { if (host.indexOf('localhost') != '-1') {
baseUrl = 'http://gicdev.demogic.com'; baseUrl = 'http://www.gicdev.com';
} else { } else {
baseUrl = host; baseUrl = host;
} }
......
src/config/index.js
const host = window.location.origin; const host = window.location.origin;
// eslint-disable-next-line // 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; export const ERR_OK = 0;
src/request/index.js
...@@ -4,7 +4,7 @@ import { Message } from 'element-ui'; ...@@ -4,7 +4,7 @@ import { Message } from 'element-ui';
const host = window.location.origin; 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({ const server = axios.create({
baseURL: BASEURL, baseURL: BASEURL,
......
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