联调修改

@@ -7,7 +7,7 @@ exports.promotion = (req, res, next) => {
     let uid = req.user.uid,
         isApp = req.yoho.isApp;
 
-    req.ctx(expandModel).promotionData(uid).then(result => {
+    req.ctx(expandModel).promotionData(uid, isApp).then(result => {
         res.render('expand-new/my-promotion', {
             pageHeader: headerModel.setNav({
                 navTitle: '我的邀请码'
@@ -24,7 +24,7 @@ exports.promotion = (req, res, next) => {
 
 exports.myReward = (req, res, next) => {
     let isApp = req.yoho.isApp,
-        uid = 5000167,
+        uid = req.user.uid,
         page = 1,
         limit = 20;
 

@@ -10,7 +10,7 @@ module.exports = class extends global.yoho.BaseModel {
     /**
      * 我的邀请码页
      */
-    promotionData(uid) {
+    promotionData(uid, isApp) {
         return api.get('', {
             method: 'app.invitecode.my',
             uid: uid
@@ -19,6 +19,9 @@ module.exports = class extends global.yoho.BaseModel {
         }).then((result) => {
 
             if (result && result.code === 200 && result.data) {
+
+                result.data.isApp = isApp;
+
                 return result.data;
             } else {
                 return {};

@@ -32,9 +32,9 @@
             </div>
             <p class="link-info">
                 <span class="info">1.复制您的邀请链接 2.选择您的社交平台 3.粘贴给您的朋友</span>
-                {{# isApp}}
+                {{#if isApp}}
                 <span class="share">分享</span>
-                {{/ isApp}}
+                {{/if}}
             </p>
         </div>
     </div>

@@ -11,9 +11,12 @@ const isProduction = process.env.NODE_ENV === 'production';
 const isTest = process.env.NODE_ENV === 'test';
 
 const domains = {
-    api: 'http://192.168.103.59:8080/gateway',
-    service: 'http://192.168.103.59:8080/gateway',
-    singleApi: 'http://api-test3.yohops.com:9999/',
+    // api: 'http://192.168.103.59:8080/gateway',
+    // service: 'http://192.168.103.59:8080/gateway',
+
+    api: 'http://api-test2.yohops.com:9999/',
+    service: 'http://service-test2.yohops.com:9999/',
+    singleApi: 'http://api-test2.yohops.com:9999/',
     global: 'http://global-test-soa.yohops.com:9999',
     liveApi: 'http://testapi.live.yohops.com:9999/',
     imSocket: 'ws://socket.yohobuy.com:10240',

@@ -24,7 +24,7 @@ setTimeout(function() {
         render: 'canvas', // 显示方式，canvas，image和div
         text: text, // 二维码的内容
         size: parseInt(width, 10),  // 大小
-        ecLevel: 'H',   // 纠错级别
+        ecLevel: 'L',   // 纠错级别
         background: '#fff'
     });
 }, 0);

@@ -28,7 +28,7 @@ if (yoho.isApp) {
 // 未开启状态跳转APP设置
 $('.state').click(function() {
     if ($(this).hasClass('gosetting')) {
-        yoho.invokeMethod('get.usernotificationstatus');
+        yoho.invokeMethod('go.appsetting');
     }
 });