Ver código fonte

win ip update and successful mchid update

ayHaru 3 anos atrás
pai
commit
28c659c6fd

+ 1 - 1
admin/control/refill_successful.php

@@ -82,7 +82,7 @@ class refill_successfulControl extends SystemControl
                 $merchant_name = $merchants[$mchid]['company_name'] == '' ? $merchants[$mchid]['name'] : $merchants[$mchid]['company_name'];
                 $mchname[$mchid] = "{$mchid}-{$merchant_name}";
             }
-            sort($mchname);
+            asort($mchname);
             $result['chname'] = $mchname;
         }
         $amountData = array_unique($amount);

+ 5 - 2
admin/templates/default/provider.successful.php

@@ -19,6 +19,7 @@
                 <td>
                     <select name="time_stamp" id="timeSelect">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="1621440000">2021-05-20</option>
                         <?php foreach ($output['days'] as $day => $txt) {?>
                             <option value="<?php echo $day; ?>"><?php echo $txt; ?></option>
                         <?php }?>
@@ -87,8 +88,9 @@
         </table>
     </form>
     <div>
-        <iframe
-            src="" scrolling="no" id="Iframe" frameborder="0"></iframe>
+        <!-- <iframe
+            src="" scrolling="no" id="Iframe" frameborder="0"></iframe> -->
+        <img src="https://www.xyzshops.cn/plot/index?time_stamp=1621472640&interval=60" alt="" id="Iframe">
     </div>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
@@ -102,6 +104,7 @@
     $(function () {
 
         $("#Iframe").load(function(){
+            console.log(111);
             $(this).css("min-height", '900px')
             $(this).css("min-width", '1650px')
             // var iframeHeight = $(this).contents().find("html").height();

+ 2 - 2
data/config/win/base.ini.php

@@ -10,11 +10,11 @@ define('BONUS_EXPIRY_DATE',true);
 define('USE_BONUS_RATE',false);
 define('SERVER_TYPE','panda');
 define('CROSS_DOAMIN',true);
-define('COOKIE_DOMAIN','192.168.1.195');
+define('COOKIE_DOMAIN','192.168.1.232');
 define('COMPANY_NAME', 'XYZ_COMPANY');
 define('NET_IP','125.33.203.108');
 
-$SRV_HOST = 'http://192.168.1.195';
+$SRV_HOST = 'http://192.168.1.232';
 $REMOTE_IMG_HOST = $SRV_HOST;
 
 $config = [];

+ 1 - 1
docker/conf/nginx/nginx-win-http.conf

@@ -29,7 +29,7 @@ http
     {
     	listen       80;
         set  $folder_name /var/www/html;
-        server_name 192.168.1.195 www.xyxy.com;
+        server_name 192.168.1.232 www.xyxy.com;
         root $folder_name;
         index index.html index.php; 
     	client_max_body_size 100m;