Selaa lähdekoodia

fix: loading加载函数 加载顺序问题

Pius-X 1 vuosi sitten
vanhempi
commit
60ad081976
2 muutettua tiedostoa jossa 27 lisäystä ja 94 poistoa
  1. 0 1
      application/views/optionalChest/index.php
  2. 27 93
      application/views/welcome_message.php

+ 0 - 1
application/views/optionalChest/index.php

@@ -102,7 +102,6 @@
 
 
 <script>
-    propsJs.initTag('tablePropsRewardsTag')
 
     let CurTrCount = 0;
 

+ 27 - 93
application/views/welcome_message.php

@@ -813,7 +813,6 @@
         };
     </script>
 </head>
-
 <body>
 <header id="page_header" style="text-align: center">
     <div class="logow animated fadeInLeft left_side">SUPERANT</div>
@@ -821,15 +820,6 @@
         <span>疯狂的金币后台管理系统</span>
     </div>
     <div class="right_side">
-        <!--            <div class="pack-style">-->
-        <!--                已选包 : --><?php //echo  $sidNameList ?? '无'?>
-        <!--            </div>-->
-        <!--            <span style="width:100px;" id="package">-->
-        <!--                <i class="fa fa-user">选择包</i>-->
-        <!--            </span>-->
-        <!--            <span style="width:50px;" class="fullScreen_btn J_confirm_modal" data-target="welcome/switchenv" data-tip="切换内外网"><i class="fa fa-repeat">-->
-        <?php //echo $webenv;?><!--</i></span>-->
-
         <span class="logout_btn" onclick="window.location.href='#user/index'" style="display:block;"><i class="fa fa-street-view"></i></span>
         <?php if ($warning != 0)
             echo '<span class="logout_btn" onclick="window.location.href=\'#debug/warning\'" style="display:block;color: red;"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></span>';
@@ -837,8 +827,8 @@
         <span class="logout_btn J_confirm_modal" data-target="login/logout" data-tip="确认退出吗?"><i class="fa fa-sign-out"></i></span>
         <span class="toggleMenu_btn"><i class="fa fa-bars"></i></span>
     </div>
-
 </header>
+
 <div id="loadingMask" style="z-index: 999999999">
     <div class="row" style="height: 100%;display: flex;align-items: center;">
         <div class="col-sm-2 col-lg-offset-6">
@@ -846,6 +836,7 @@
         </div>
     </div>
 </div>
+
 <aside id="left_panel">
     <div class="login_info">
             <span>
@@ -890,8 +881,8 @@
     <span class="minifyBtn"><i class="fa fa-arrow-circle-left"></i></span>
 
 </aside>
-<div id="main">
 
+<div id="main">
     <a href="javaScript:;" class="scrollBottom">Bottom</a>
     <div id="ribbon">
         <ol class="breadcrumb"></ol>
@@ -907,6 +898,7 @@
         <div class="modal-content"></div>
     </div>
 </div>
+
 <div class="modal fade" id="modal_confirm" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-sm">
         <div class="modal-content">
@@ -918,89 +910,9 @@
         </div>
     </div>
 </div>
-
-<!--包选择-->
-<div class="modal" id="packageSelect" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title" id="myModalLabel">选择包</h4>
-            </div>
-            <div class="moday-body" style="margin:15px 0;">
-                <form class="form-horizontal J_ajaxForm" role="form" method="post" action="welcome/actionSid">
-                    <div class="form-group" style="margin:0 0 15px;">
-                        <label class="col-sm-2 control-label" style="line-height: 7px;">包:</label>
-                        <div class="an-checkbox-div col-sm-10 android-package">
-                            <label>
-                                <input type="checkbox" <?php if ($allCheck) {
-                                    echo 'checked';
-                                } ?> id="android-checkall"> 【全选】
-                            </label>
-                            <?php foreach ($packageList as $k => $v) { ?>
-                                <label>
-                                    <input type="checkbox" class="android-check" name="package[]" <?php if (in_array($k, $sidList)) {
-                                        echo 'checked';
-                                    } ?> value="<?php echo $k; ?>"> <?php echo $v; ?>
-                                </label>
-                            <?php } ?>
-                            <!--                                <br/>-->
-                            <!--                                --><?php //foreach ($iosPackageList as $k => $v) { ?>
-                            <!--                                    <label>-->
-                            <!--                                        <input type="checkbox" class="android-check" name="package[]" -->
-                            <?php //if(in_array($k, $sidList)){echo 'checked';}?><!--  value="--><?php //echo $k;?><!--"> --><?php //echo '苹果'.$v;?>
-                            <!--                                    </label>-->
-                            <!--                                --><?php //}?>
-
-                        </div>
-                    </div>
-
-
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                        <button type="button" class="btn btn-primary J_ajaxSubmitBtn">提交</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
 </body>
 
-<script src="<?php echo base_url(); ?>static/common/js/func.js?v=<?php echo time(); ?>"></script>
-<script src="<?php echo base_url(); ?>public/js/vendor/jquery.min.js"></script>
-<script src="<?php echo base_url(); ?>static/common/js/jQuery.userPlugin.js?v=<?php echo time(); ?>"></script>
-<script src="<?php echo base_url(); ?>public/js/bootstrap/bootstrap.min.js"></script>
-<script src="<?php echo base_url(); ?>public/js/vendor/catpl.js"></script>
-<script src="<?php echo base_url(); ?>public/js/vendor/ie10-viewport-bug-workaround.js"></script>
-<script src="<?php echo base_url(); ?>public/js/ajaxForm.js"></script>
-<script src="<?php echo base_url(); ?>public/js/basic.js"></script>
-<script src="<?php echo base_url(); ?>public/js/vendor/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
-<script src="<?php echo base_url(); ?>public/js/vendor/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js"></script>
-<script src="<?php echo base_url(); ?>public/js/vendor/bootstrap-switch.min.js"></script>
-<script src="<?php echo base_url(); ?>public/node_modules/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
-<script src="<?php echo base_url(); ?>static/plugin/form2js/form2js.js?v=<?php echo time(); ?>"></script>
-<script src="<?php echo base_url(); ?>static/plugin/form2js/js2form.js"></script>
-<script src="<?php echo base_url(); ?>static/plugin/form2js/jquery.toObject.js"></script>
-<script src="<?php echo base_url(); ?>static/common/propsJs/index.js?v=<?php echo time(); ?>"></script>
-<script src="https://code.highcharts.com.cn/highstock/highstock.js"></script>
-<script src="https://code.highcharts.com/modules/data.js"></script>
-<script src="https://code.highcharts.com/modules/heatmap.js"></script>
-<script src="<?php echo base_url(); ?>public/js/laydate/laydate.js"></script>
 <script type="text/javascript">
-    var rootPath = '<?php echo site_url();?>';
-    $('#package').click(function () {
-        $('#packageSelect').modal();
-    });
-
-    //全选/全不选
-    $('#android-checkall').change(function () {
-        if ($(this).is(':checked')) {//已经是全选的状态
-            $('.android-check').prop('checked', true);
-        } else {
-            $('.android-check').prop('checked', false);
-        }
-    });
 
     //格式化成千分符
     function thoundsFormat(num, str = ',') {
@@ -1021,10 +933,32 @@
 
     function hideLoading() {
         loadingCnt--
-        if(loadingCnt < 1)$('#loadingMask').hide();
+        if (loadingCnt < 1) $('#loadingMask').hide();
         console.log('hideLoading', loadingCnt)
     }
+</script>
 
+<script src="<?php echo base_url(); ?>static/common/js/func.js?v=<?php echo time(); ?>"></script>
+<script src="<?php echo base_url(); ?>public/js/vendor/jquery.min.js"></script>
+<script src="<?php echo base_url(); ?>static/common/js/jQuery.userPlugin.js?v=<?php echo time(); ?>"></script>
+<script src="<?php echo base_url(); ?>public/js/bootstrap/bootstrap.min.js"></script>
+<script src="<?php echo base_url(); ?>public/js/vendor/catpl.js"></script>
+<script src="<?php echo base_url(); ?>public/js/vendor/ie10-viewport-bug-workaround.js"></script>
+<script src="<?php echo base_url(); ?>public/js/ajaxForm.js"></script>
+<script src="<?php echo base_url(); ?>public/js/basic.js"></script>
+<script src="<?php echo base_url(); ?>public/js/vendor/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
+<script src="<?php echo base_url(); ?>public/js/vendor/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js"></script>
+<script src="<?php echo base_url(); ?>public/js/vendor/bootstrap-switch.min.js"></script>
+<script src="<?php echo base_url(); ?>public/node_modules/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
+<script src="<?php echo base_url(); ?>static/plugin/form2js/form2js.js?v=<?php echo time(); ?>"></script>
+<script src="<?php echo base_url(); ?>static/plugin/form2js/js2form.js"></script>
+<script src="<?php echo base_url(); ?>static/plugin/form2js/jquery.toObject.js"></script>
+<script src="<?php echo base_url(); ?>static/common/propsJs/index.js?v=<?php echo time(); ?>"></script>
+<script src="https://code.highcharts.com.cn/highstock/highstock.js"></script>
+<script src="https://code.highcharts.com/modules/data.js"></script>
+<script src="https://code.highcharts.com/modules/heatmap.js"></script>
+<script src="<?php echo base_url(); ?>public/js/laydate/laydate.js"></script>
+<script type="text/javascript">
     $(function () {
         //返回顶部===>出现与消失
         //当屏幕滚动,触生 scroll 事件