Authored by 梁志锋

Merge remote-tracking branch 'remotes/origin/hotfix/coupon'

@@ -41,7 +41,6 @@ const getUserStatus = (param) => { @@ -41,7 +41,6 @@ const getUserStatus = (param) => {
41 var dest = {}; 41 var dest = {};
42 42
43 dest.code = param.code; 43 dest.code = param.code;
44 - dest.title = param.data.h5Title;  
45 dest.returnCode = param.data.returnCode; 44 dest.returnCode = param.data.returnCode;
46 dest.mobile = param.data.mobile; 45 dest.mobile = param.data.mobile;
47 if (param.data.returnCode === 0) { 46 if (param.data.returnCode === 0) {
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div class="page"> 18 <div class="page">
19 <div class="gain-coupon-centent hidden"> 19 <div class="gain-coupon-centent hidden">
20 <div class="coupon"> 20 <div class="coupon">
21 - <img src={{couponPic}}> 21 + <img src={{image couponPic}}>
22 </div> 22 </div>
23 <p class="phone" id="mobile"></p> 23 <p class="phone" id="mobile"></p>
24 <p>登录Yoho!Buy有货客户端即可使用</p> 24 <p>登录Yoho!Buy有货客户端即可使用</p>
@@ -13,7 +13,7 @@ module.exports = { @@ -13,7 +13,7 @@ module.exports = {
13 port: 6001, 13 port: 6001,
14 siteUrl: '//m.yohobuy.com', 14 siteUrl: '//m.yohobuy.com',
15 domains: { 15 domains: {
16 - api: 'http://testapi.yoho.cn:28078/', 16 + api: 'http://devapi.yoho.cn:58078/',
17 service: 'http://testservice.yoho.cn:28077/' 17 service: 'http://testservice.yoho.cn:28077/'
18 }, 18 },
19 useOneapm: false, 19 useOneapm: false,
@@ -77,7 +77,7 @@ if (isProduction) { @@ -77,7 +77,7 @@ if (isProduction) {
77 Object.assign(module.exports, { 77 Object.assign(module.exports, {
78 appName: 'm.yohobuy.com for test', 78 appName: 'm.yohobuy.com for test',
79 domains: { 79 domains: {
80 - api: 'http://testapi.yoho.cn:28078/', 80 + api: 'http://devapi.yoho.cn:58078/',
81 service: 'http://testservice.yoho.cn:28077/' 81 service: 'http://testservice.yoho.cn:28077/'
82 }, 82 },
83 memcache: { 83 memcache: {
1 -// 获取 UID  
2 -exports.getUid = (req) => {  
3 - var _uid = 0,  
4 - cookie = req.cookies._UID,  
5 - cookieList;  
6 -  
7 - if (req.isApp) {  
8 - return req.query.uid || 0;  
9 - }  
10 -  
11 - if (cookie) {  
12 - cookieList = cookie.split('::');  
13 - if (cookieList[1] && !isNaN(cookieList[1])) {  
14 - _uid = cookieList[1];  
15 - }  
16 - }  
17 -  
18 - return _uid;  
19 -};