Merge branches 'feature/redpack' and 'release/6.7.9' of http://git.yoho.cn/fe/yo…

…hobuywap-node into feature/redpack

# Conflicts:
#	apps/activity/router.js

@@ -23,7 +23,7 @@ const redbagPage = async(req, res, next) => {
             }
             }
             return res.render('red-envelope/redbag-cs', {
             return res.render('red-envelope/redbag-cs', {
                 pageHeader: headerModel.setNav({
                 pageHeader: headerModel.setNav({
-                    navTitle: '红包-客服'
+                    navTitle: '添加潮流顾问'
                 }),
                 }),
                 isApp,
                 isApp,
                 isGetRedBag,
                 isGetRedBag,
@@ -32,14 +32,14 @@ const redbagPage = async(req, res, next) => {
                 module: 'activity',
                 module: 'activity',
                 page: 'redbag-cs',
                 page: 'redbag-cs',
                 userInfo: userInfo.data,
                 userInfo: userInfo.data,
-                title: '红包-客服'
+                title: '添加潮流顾问'
             });
             });
         } else {
         } else {
             const pageData = await req.ctx(redbagModel).renderByUser(obj);
             const pageData = await req.ctx(redbagModel).renderByUser(obj);
 
 
             return res.render('red-envelope/redbag-user', {
             return res.render('red-envelope/redbag-user', {
                 pageHeader: headerModel.setNav({
                 pageHeader: headerModel.setNav({
-                    navTitle: '红包-用户'
+                    navTitle: '领取现金红包'
                 }),
                 }),
                 isApp,
                 isApp,
                 width750: true,
                 width750: true,
@@ -49,7 +49,7 @@ const redbagPage = async(req, res, next) => {
                 pageData: Object.assign({
                 pageData: Object.assign({
                     shareCode: obj.shareCode
                     shareCode: obj.shareCode
                 }, pageData),
                 }, pageData),
-                title: '红包-用户'
+                title: '领取现金红包'
             });
             });
         }
         }
     } catch (error) {
     } catch (error) {

@@ -12,7 +12,7 @@ $(() => {
 
 
     if ($container.data('received')) {
     if ($container.data('received')) {
         $(document).on('click', '.go-use', () => {
         $(document).on('click', '.go-use', () => {
-            tip.show('请下载App');
+            tip.show('请下载Yoho!Buy有货官方App，查看/使用优惠券');
         });
         });
     } else {
     } else {
         let posting = false;
         let posting = false;