Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

app/admin/controller/company/Order.php

@@ -50,14 +50,14 @@ class Order extends AuthController
             'orderCount' => StoreOrderModel::orderCount($this->adminInfo['store_id']),
             'payTypeCount' => StoreOrderModel::payTypeCount($this->adminInfo['store_id']),
         ]);
-        $this->assign('type',$this->adminInfo['type']);
-        if($this->adminInfo['type']==0)
-        {
-            $this->assign('store',SystemStore::where('is_show',1)->where('is_del',0)->field('id,name')->select());
+        $this->assign('type', $this->adminInfo['type']);
+        if ($this->adminInfo['type'] == 0) {
+            $this->assign('store', SystemStore::where('is_show', 1)->where('is_del', 0)->field('id,name')->select());
         }
-        $this->assign('store_id',$this->adminInfo['store_id']);
+        $this->assign('store_id', $this->adminInfo['store_id']);
         return $this->fetch();
     }
+
     /**
      * 获取头部订单金额等信息
      * return json

app/admin/view/company/order/index.php

@@ -99,6 +99,7 @@
                                     </div>
                                 </div>
                                 {eq name="type" value="0"}
+                                {:print_r($store)}
                                 <div class="layui-col-lg12">
                                     <label class="layui-form-label">商户:</label>
                                     <div class="layui-input-block">