合并分支 '1iuzhen' 到 'master'

已提交订单修改



查看合并请求 !75

@@ -251,17 +251,21 @@ class MemberSalesController extends HomeBaseController
         }
         }
         $user_id = cmf_get_current_user_sale_id();
         $user_id = cmf_get_current_user_sale_id();
         $order_where = [
         $order_where = [
-            'o.user_id' => $user_id,
-            'o.is_stop' => 0,
-            'o.delete_time' => 0
+            'user_id' => $user_id,
+            'is_stop' => 0,
+            'delete_time' => 0
         ];
         ];
-        $orderList = $this->order_model
-            ->alias('o')
-            ->field(['o.id,o.order_sn,o.status,o.create_time,o.over_time,os.name'])
-            ->join('__ORDER_SORT__ os','o.sort_id = os.id')
-            ->where($order_where)
-            ->order(['create_time'=>'DESC'])
-            ->select();
+        $orderList = Db::name('OrderView')->where($order_where)->select()->toArray();
+        foreach ($orderList as $k=>$v) {
+            $mobile = '';
+            $v['options'] = json_decode($v['options'],true);
+            foreach ($v['options'] as $ko=>$vo) {
+                if($vo['id'] == 10) {
+                    $mobile = $vo['user_choose'];
+                }
+            }
+            $orderList[$k]['mobile'] = $mobile;
+        }
         $this->assign('sort_id',$id);
         $this->assign('sort_id',$id);
         $this->assign('orderUrl',url('portal/MemberSales/write',['id'=>$id]));
         $this->assign('orderUrl',url('portal/MemberSales/write',['id'=>$id]));
         $this->assign('orderList',$orderList);
         $this->assign('orderList',$orderList);