合并分支 'li' 到 'master'

物流跟踪&确认收货



查看合并请求 !204

@@ -273,7 +273,7 @@ class CenterController extends HomeBaseController
     {
         $oid = request()->param('oid');
         $info = Db::name('zj_order')->alias('o')
-            ->field('k.code,o.order_num,o.kd_num')
+            ->field('k.code,o.order_num,o.kd_num,k.name')
             ->join('zj_kd k', 'o.kid=k.id')
             ->where(['o.id' => $oid])
             ->find();
@@ -284,8 +284,8 @@ class CenterController extends HomeBaseController
             "LogisticCode" => $info['kd_num']
         ];
         $logisticResult = json_decode(orderTracesSubByJson(json_encode($requestData)), true);
-        print_r($logisticResult);
         return $this->fetch('', [
+            'kd_name' => $info['name'],
             'tracking' => $logisticResult
         ]);
     }

@@ -10,7 +10,7 @@
 // [ 入口文件 ]
 
 // 调试模式开关
-define("APP_DEBUG", true);
+define("APP_DEBUG", false);
 
 
 // 定义CMF根目录,可更改此目录

@@ -123,48 +123,38 @@
     <div class="head">
         <div class="bill">
             <p class="bill_name">运单号:</p>
-            <p class="bill_num">2468165498736</p>
+            <p class="bill_num">{tracking.LogisticCode}</p>
         </div>
 
         <div class="bill_info">
             <p class="bill_info_from">信息来源：</p>
-            <p class="bill_info_name">某某快递</p>
+            <p class="bill_info_name">{$kd_name}</p>
         </div>
     </div>
     <div class="line"></div>
     <div class="body">
         <div class="body_left">
-            <div class="circle_ying">
-                <div class="circle_transportation">
+            <volist name="tracking.Traces" id="vo">
+                <div class="circle_ying">
+                    <div class="circle_transportation">
 
-                </div>
-
-                <div class="circle_line"></div>
-            </div>
-            <div class="circle_ying">
-                <div class="circle_transportation">
+                    </div>
 
+                    <div class="circle_line"></div>
                 </div>
-
-                <div class="circle_line"></div>
-            </div>
+            </volist>
 
         </div>
         <div class="body_right">
-            <div class="transportation_bill">
-                <div class="transportation_bill_name">
-                    [无锡市]离开无锡市 发往天津市[无锡市][无锡市]
-
-                </div>
-                <div class="transportation_bill_date">2018-09-29 13:08:19</div>
-            </div>
-            <div class="transportation_bill">
-                <div class="transportation_bill_name">
-                    [无锡市]离开无锡市 发往天津市[无锡市][无锡市]
+            <volist name="tracking.Traces" id="vo">
+                <div class="transportation_bill">
+                    <div class="transportation_bill_name">
+                        {$vo.AcceptStation}
 
+                    </div>
+                    <div class="transportation_bill_date">{$vo.AcceptTime}</div>
                 </div>
-                <div class="transportation_bill_date">2018-09-29 13:08:19</div>
-            </div>
+            </volist>
         </div>
 
     </div>