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

用户确认页显示内容修改



查看合并请求 !88

@@ -148,7 +148,7 @@ class OrderController extends HomeBaseController
         $orderInfo['options'] = json_decode($orderInfo['options'],true);
         $orderInfo['options'] = json_decode($orderInfo['options'],true);
         foreach ($orderInfo['options'] as $k=>$v) {
         foreach ($orderInfo['options'] as $k=>$v) {
             $optionsInfo = $this->singleData($this->option_table,['id'=>$v['id']]);
             $optionsInfo = $this->singleData($this->option_table,['id'=>$v['id']]);
-            if($optionsInfo['is_show'] == 1) {
+            if($optionsInfo['is_show'] == 1 && !empty($v['user_choose'])) {
                 $v['name'] = $optionsInfo['name'];
                 $v['name'] = $optionsInfo['name'];
                 $v['html'] = $this->form_model($v);
                 $v['html'] = $this->form_model($v);
                 if($k <= 5) {
                 if($k <= 5) {