合并mas

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -783,11 +783,13 @@ class CompanyStatementPoolController extends ThinkController
                 $this->ajaxReturn(array('status' => 0,"info"=>"重算失败"));
             }
         }
+        M()->commit();
+
         //重新计算
         $stime = $info['statement_end_time']-0+1;
         $type = $info['withdraw_type'];
+        
         A("CompanyStatementSet")->promoteUserPool($type,$stime,true);
-
         M()->commit();
         $this->ajaxReturn(array(
             'status' => 1,

Application/Home/View/default/Home/landingPage.html

@@ -615,9 +615,10 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
           <div class="swiper-slide">
             <div class="swiper-slide-box">
               <div class="slide-img">
-                <img src="__IMG__/20191225/1.png" alt="" style=" height: 4.34rem;">
+                <img src="__IMG__/20191225/1.png" alt="" style=" height: 3.64rem;">
               </div>
-              <div>一、请先安装并打开testflight平台</div>
+              <div style="text-align: left;margin-left: 10px;">一、请先安装并打开testflight平台</div>
+              <div  onclick='$(".mounting").hide();$(".installPop").show();' style="font-size: xx-small;margin-left: 10px;">提示：<a id='install-btn' style="color: cornflowerblue;text-decoration: underline;">由于苹果进行区域限制问题，目前需要用户手动设置dns为114.114.114.114或8.8.8.8</a><img src="__IMG__/next_bg.png" style="width: 25px;margin-left: 8px;"></div>
             </div>
           </div>
           <div class="swiper-slide">
@@ -625,7 +626,7 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
               <div class="slide-img">
                 <img src="__IMG__/20191225/2.png" alt="" style=" height: 4.34rem;">
               </div>
-              <div>二、安装步骤窗口点击按钮，下载游戏</div>
+              <div style="text-align: left;margin-left: 10px;">二、安装步骤窗口点击按钮，下载游戏</div>
             </div>
           </div>
         </div>
@@ -639,6 +640,26 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
   </div>
 </div>
 
+<!-- TestFlight安装提示 -->
+<div class="register installPop" style="display: none;">
+  <div class="register-box" style="height: auto;">
+      <div class="register-heard">
+          TestFlight安装提示
+      </div>
+
+      <div class="content" style="font-size: initial;">
+        <div class="content" style="padding: 30px;">
+          <div style="font-weight: bolder;">具体操作方式：</div>
+          <div style="margin-top: 15px;font-size: small;line-height: 25px;"><span style="color: cornflowerblue;">设置--无限局域网--已连接的那个WIFI右边的蓝色i标签点进去--配置DNS--把自动改成手动--添加服务器</span><div><span style="color: cornflowerblue;">114.114.114.114</span>,把原有的服务器删除</div></div>
+          <div class="mounting-text" style="margin-top: 100px;">
+            <a href="https://itunes.apple.com/cn/app/testflight/id899247664?mt=8" target="_blank" class="mounting-btn">继续安装TestFlight平台</a>
+          </div>
+        </div>
+      </div>
+     
+  </div>
+</div>
+
 </body>
 </html>
 <script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
@@ -731,6 +752,7 @@ function getCurUserId() {
 }
 
   $(function(){
+    // 极速下载
     $(".stabilization").click(function(){
       event.stopPropagation();
       if (isLogin()) {
@@ -741,6 +763,7 @@ function getCurUserId() {
       }
       $(".window").hide();
     });
+
     $(".login .register-heard>a").click(function(){
       $(".login").hide();
       $(".window").show();
@@ -911,10 +934,22 @@ function getCurUserId() {
         lazyLoading:true,//图片延迟加载
         lazyLoadingInPrevNext:true,//前一个和后一个延迟加载
         autoplayDisableOnInteraction : false,
+        preventClicksPropagation : false,
         pagination: {
           el: '.swiper-pagination',
           clickable: true,
         },
+        // on : {
+        //   click : function (e) {
+        //     // var realIdx = this.realIndex
+        //     // //var item = mySwiper.list[realIdx]
+        //     // console.log(realIdx)
+        //     // if (realIdx == 0) {
+        //     //   $(".mounting").hide();
+        //     //   $(".installPop").show();
+        //     // }
+        //   }
+        // },
         autoplay: {
           delay: 2000,
           stopOnLastSlide: false,