Merge branch 'bonus_manager' of 121.43.114.153:/home/git/repositories/shopnc into bonus_manager

data/resource/mobile/invite_friend/css/main.css

@@ -102,6 +102,7 @@ html {
     width: 750px;
     margin: 0 auto;
     overflow: hidden;
+    padding-bottom: 140px;
 }
 .top {
     height: 464px;
@@ -362,3 +363,34 @@ html {
     position: relative;
     height: 200px;
 }
+.fixed_bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 140px;
+    display: -webkit-box;
+    -webkit-box-align: center;
+    background: rgba(255,255,255,0.9);
+    z-index: 999;
+}
+.fixed_bottom .logo {
+    display: block;
+    width: 285px;
+    height: 75px;
+    background: url("../images/logo_fix.png") no-repeat;
+    background-size: 100% 100%;
+    margin: 0 45px;
+}
+
+.fixed_bottom a {
+    display: block;
+    width: 140px;
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+    font-size: 30px;
+    background: #FF4E4E;
+    color: #fff;
+    margin-right: 42px;
+}

data/resource/mobile/push/css/main.css

@@ -115,9 +115,8 @@ html, body {
 }
 .close_btn {
     position: absolute;
-    top: 980px;
-    right: 50%;
-    margin-right: -36px;
+    top: 50px;
+    right: 50px;
     width: 73px;
     height: 73px;
     border-radius: 50px;

data/resource/mobile/ugc/css/main.css

@@ -360,6 +360,7 @@ input, textarea {
   z-index: 1000;
   font-size: 28px; }
 .pop .bonus_page {
+  position: fixed;
   display: none;
   width: 397px;
   height: 659px;

mobile/control/control.php

@@ -300,7 +300,7 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=20171110";
+    return "v=2017111001";
 }
 function shop_version()
 {

mobile/templates/default/invite_friend/invite.php

@@ -53,6 +53,17 @@
             <span class="close_btn" id="close_btn">确定</span>
         </div>
     </div>
+
+
+<!--    下载和logo 开始-->
+    <div class="fixed_bottom">
+        <span class="logo"></span>
+        <a href="#" class="download_app_btn" id="download_app">打开APP</a>
+        <a href="#" class="h5_shop_btn" id="h5_mshop">进入商城</a>
+    </div>
+<!--    下载和logo 结束    -->
+
+
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">
@@ -93,11 +104,19 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/bridge.js?<?php echo bonus_version(); ?>"></script>
 
 <script>
+
+    (function() {
+        $('#h5_mshop').attr('href',document.location.protocol+'//'+document.domain+'/mshop');
+    })();
+    
     if(isMobile.iOS()) {
         init_ios_bridge(function(bridge) { });
+        $('#download_app').attr('href','itms-apps://itunes.apple.com/app/id945609424');
     } else if (isMobile.Android) {
         init_android_bridge();
+        $('#download_app').attr('href','http://p.lrlz.com/data/upload/package/xmmz_release.apk');
     } else {
+        $('#download_app').attr('href','javascript:void(0)');
     }
 
     var url         = "<?php echo $output['tpl']->share_url(); ?>";