Merge branch 'relectric' of 39.97.239.116:gyfl/xyzshop into relectric

admin/templates/default/refill.merchant.channel.cfg.php

@@ -174,11 +174,10 @@
                         <?php } ?>
                     </tr>
                     <tr>
-                        <th class="align-center w120 mw120" style="height:16px">机构</td>
+                        <th class="align-center w120 mw120" style="height:16px"></td>
                         <?php foreach ($output['provider_list'] as $provider) { ?>
                             <th class="batch-td">
                                 <div class="listNum">
-                                    是否支持
                                     <input type="checkbox" name="chbox" value="">
                                 </div>
                             </th>
@@ -224,15 +223,6 @@
 <link href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.Jcrop/jquery.Jcrop.min.css" rel="stylesheet" type="text/css" id="cssfile2" />
 <script type="text/javascript">
     $(function() {
-        // $(window).scroll(function() {
-        //     let toLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
-        //     if (toLeft > 0) {
-        //         let headLeft = toLeft - 20
-        //         $('#tableHread')[0].style.left = '-' + headLeft + 'px'
-        //     } else if (toLeft == 0) {
-        //         $('#tableHread')[0].style.left = 20 + 'px'
-        //     }
-        // });
         let isSubmit = true
         $('.input-one').blur(function() {
             let value = $(this)[0].value

crontab/control/vender.php

@@ -9,7 +9,7 @@ require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 require_once(BASE_CORE_PATH . '/framework/function/http.php');
 require_once(BASE_HELPER_PATH . '/PHPExcel/PHPExcel.php');
 require_once(BASE_HELPER_PATH . '/task/task_helper.php');
-
+require_once(BASE_HELPER_RAPI_PATH . "/gdsinopec/RefillOil.php");
 
 class vendorControl
 {
@@ -36,6 +36,13 @@ class vendorControl
                     sleep(1);
                 }
                 elseif($worker()) {
+                    $provider = new refill\gdsinopec\RefillOil([]);
+                    [$state, $access_token] = $provider->get_access_token();
+                    if($state === false) {
+                        Log::record("get token fail msg:{$access_token}",Log::ERR);
+                    }else{
+
+                    }
                     $next_time = time() + $period;
                 }
                 else {