浏览代码

同步一些以前的等级

lvhao 3 周之前
父节点
当前提交
35cc4a6efe

+ 1 - 1
core/CoreApp/models/Model_fedexv1.php

@@ -276,7 +276,7 @@ class Model_Fedexv1 extends Lin_Model {
                 "x-customer-transaction-id"=>$order_info['number'],
                 "Content-Type:application/json",
                 "Authorization: Bearer ".$this->getAccessToken(),
-                "x-locale" => "en_US",//这个是语种加国家
+                "x-locale: en_US",//这个是语种加国家
                 "Accept: application/json",
             ];
             // echo "<pre>";

+ 1 - 1
template/erp/fullorder_readonly.html

@@ -793,6 +793,6 @@ function addShouhu(that){
 }
 </script>
 <script type="text/javascript">var addedit="/fullorder/readonly/";var fh="/fullorder";</script>
-<script src="{$theme}js/fullorder-addedit.js?v=202312060001"></script>
+<script src="{$theme}js/fullorder-addedit.js?v={time()}"></script>
 <script type="text/javascript" src="{$theme}js/time.js"></script>
 {Template footer}

+ 1 - 1
template/erp/whlabelbarcode_add.html

@@ -41,7 +41,7 @@
 <option value="57">Natural Black</option>
 {loop typeclassyc(8) as $val}
 {if $val['id'] != 57}
-<option value="{$val['id']}">{$val['title']}</option>
+<option value="{$val['id']}"  data-ysdj="{$val['ysdj']}">{$val['title']}</option>
 {/if}
 {/loop}
 </select>