修改云途和店铺的

core/CoreApp/controllers/Shop.php

@@ -78,7 +78,7 @@ class Shop extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
             //取得信息列表
-            $info_list = $this->shop->find_all($where,'id,type,shopname,shortname,estimaterate,mustba,shopid,yyid,tb,status,px,remarks',$order_str,$start,$perpage);
+            $info_list = $this->shop->find_all($where,'id,type,program,shopname,shortname,estimaterate,mustba,shopid,yyid,tb,status,px,remarks',$order_str,$start,$perpage);
 			 //格式化数据
             foreach ($info_list as $key=>$value) 
 		    {

core/CoreApp/models/Model_yuntu.php

@@ -163,6 +163,8 @@ class Model_yuntu extends Lin_Model
         ];
         $url ="/v1/order/label/get";
         $res = $this->sendNewGet($url,$query,$token);
+
+        $this->logic_ding->sendToDing($order_number."云途快递报文信息获取电子面单返回参数[".json_encode($res)."]");
         if(isset($res['code'])&&($res['code'] != 1)){
             return [
                 'x'=>'0',

template/erp/shop.html

@@ -78,6 +78,7 @@
 <tr>
 <td><label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label></td>
 <td>店铺类型</td>
+<td>平台类型</td>
 <td>店铺名称</td>
 <td>编码前缀</td>
 <td>到帐金额比</td>
@@ -108,15 +109,16 @@ $(".data tr").each(function() {
     $(this).find('td:eq(0)').css("width","1%");
     $(this).find('td:eq(1)').css("width","6%");
     $(this).find('td:eq(2)').css("width","6%");
-    $(this).find('td:eq(3)').css("width","6%");
+    $(this).find('td:eq(3)').css("width","12%");
     $(this).find('td:eq(4)').css("width","6%");
     $(this).find('td:eq(5)').css("width","6%");
-    $(this).find('td:eq(6)').css("width","12%");
-    $(this).find('td:eq(7)').css("width","6%");
+    $(this).find('td:eq(6)').css("width","6%");
+    $(this).find('td:eq(7)').css("width","12%");
     $(this).find('td:eq(8)').css("width","6%");
     $(this).find('td:eq(9)').css("width","6%");
     $(this).find('td:eq(10)').css("width","6%");
-    $(this).find('td:eq(11)').css("width","30%");
+    $(this).find('td:eq(11)').css("width","6%");
+    $(this).find('td:eq(12)').css("width","30%");
    
 
 // $(this).find('td:eq(11)').css("width","5%");