Authored by zhangxiaoru

editorial

... ... @@ -84,8 +84,8 @@
{{/ relatedGroup}}
</div>
</div>
<span class="btn-left iconfont hide">&#xe62c;</span>
<span class="btn-right iconfont">&#xe629;</span>
<span class="btn-left iconfont hide">&#xe64e;</span>
<span class="btn-right iconfont">&#xe64c;</span>
</div>
{{/ related}}
{{/ content}}
... ...
... ... @@ -97,9 +97,9 @@ const yohoCoinTotal = (uid)=> {
uid: uid
}).then(result => {
if(!result.data.yohocoin_num || result.data.yohocoin_num === '') {
result.data.yohocoin_num = 0
}
if (!result.data.yohocoin_num || result.data.yohocoin_num === '') {
result.data.yohocoin_num = 0;
}
return result;
});
};
... ...
... ... @@ -719,6 +719,7 @@ const getExchangeDetailData = (id, uid) => {
returnsAPI.getExchangeDetail(id, uid),
returnsAPI.getExpressCompanyAsync()
]).then(result => {
console.log(result)
let exchangeData = {};
Object.assign(exchangeData, _setSideMenu('我的退/换货'));
... ...
... ... @@ -8,7 +8,6 @@
const isProduction = process.env.NODE_ENV === 'production';
const isTest = process.env.NODE_ENV === 'test';
const isUseOneapm = process.env.USE_ONEAPM === 'true';
module.exports = {
app: 'web',
... ... @@ -23,10 +22,10 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api-test1.yohops.com:9999/',
service: 'http://service-test1.yohops.com:9999/',
search: 'http://192.168.102.216:8080/yohosearch/'
singleApi: 'http://single.yoho.cn/',
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
search: 'http://search.yohoops.org/yohosearch/'
},
useOneapm: false,
useCache: false,
... ... @@ -48,8 +47,7 @@ module.exports = {
name: 'error',
level: 'error',
filename: 'logs/error.log',
handleExceptions: true,
maxFiles: 7
handleExceptions: true
},
udp: { // send by udp
measurement: 'yohoblk_pc_log',
... ... @@ -101,7 +99,7 @@ if (isProduction) {
session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
timeout: 3000
},
useOneapm: isUseOneapm,
useOneapm: true,
useCache: true,
pay: {
serviceNotify: 'http://service.yoho.cn/'
... ... @@ -111,10 +109,10 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'www.yohoblk.com for test',
domains: {
singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/',
api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
singleApi: 'http://192.168.102.31:8092/brower',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: true,
useCache: true,
... ...
... ... @@ -123,7 +123,7 @@
height: 60px;
line-height: 60px;
text-align: center;
font-size: 16px;
font-size: 14px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
... ...
... ... @@ -46,7 +46,7 @@
.cancel {
display: block;
width: 220px;
width: 240px;
height: 50px;
line-height: 50px;
font-size: 12px;
... ...