团检预约调整1

Laravel/app/Http/Controllers/API/H5/OrderController.php

@@ -374,6 +374,7 @@ public function Create()
           $Nx1_arrInfo[]=[
             'id' => $r_v['item_id'],
             'name' => $r_v['item_name'],
+            'pay_type' => isset($r_v['pay_type']) ? $r_v['pay_type'] : '统收',
           ];
         }
       }
@@ -1314,7 +1315,7 @@ public function Finish($order_number)
     if($order_info->type==2 && !empty($buy_info['group']['items'])){
       $temp_items=[];
       foreach ($buy_info['group']['items'] as $gitem) {
-        if($gitem['pay_type']=='自费'){
+        if(isset($gitem['pay_type']) && $gitem['pay_type']=='自费'){
           $temp_items[]=[
             'Id' => $gitem['id'],
             '已收费' => true,
@@ -1325,7 +1326,10 @@ public function Finish($order_number)
         '预约Id' => $create_appointment['data'][0][0],
         '收费项目列表' => $temp_items,
       ];
-      $peis::Post('团检设置自费项目收费状态', $order_info->hospital_id, $tuan_data);
+      if(count($temp_items)>0){
+        $peis::Post('团检设置自费项目收费状态', $order_info->hospital_id, $tuan_data);
+      }
+
     }
 
     $is_sendMsg = DB::table('configs')->where(['label' => '预约完成短信通知'])->first();

Laravel/app/Http/Controllers/API/H5/PersonController.php

@@ -47,6 +47,11 @@ public function group_info($hospital, $data)
                 $items[] = [
                   'id' => $datum['Id'],
                   'name' => $datum['名称'],
+                  'price'=>$datum['价格'],
+                  'org_price'=>$datum['原价'],
+                  'youhui_type'=>$datum['优惠方式'],
+                  'youhui_value'=>$datum['优惠值'],
+                  'count'=>$datum['数量'],
                   'pay_type'=>$datum['收费方式'],
                 ];
               }
@@ -66,7 +71,12 @@ public function group_info($hospital, $data)
                       [
                         'item_id' =>$v2['Id'],
                         'item_name' => $v2['名称'],
-                        'price'=>$v2['价格']
+                        'price'=>$v2['价格'],
+                        'org_price'=>$v2['原价'],
+                        'youhui_type'=>$v2['优惠方式'],
+                        'youhui_value'=>$v2['优惠值'],
+                        'count'=>$v2['数量'],
+                        'pay_type'=>$v2['收费方式'],
                       ];
 
 

h5/pages/main/tj/choose.vue

@@ -122,6 +122,7 @@ const getGroupCombo = async (info) => {
 		  $store.setDuoXuanYi([]);
 		  itemId.value = "";
 		  multipleList.value = data.duo_xuan_yi;
+		  uni.hideLoading()
 		  return;
 		}
 		 setTimeout(()=>{
@@ -144,14 +145,17 @@ const nextItemClick = () => {
     return;
   }
   let item_name="";
+  let pay_type="统收";
   multipleList.value[multipleIndex.value]['item_list'].forEach((vv,ii)=>{
 	  if(vv.item_id==itemId.value){
 		  item_name=vv.item_name
+		  if(vv.pay_type) pay_type=vv.pay_type
 	  }
   })
   itemIds.value.push({
     item_id: itemId.value,
 	item_name:item_name,
+	pay_type: pay_type,
     zu_name: multipleList.value[multipleIndex.value]["0"]["zu_name"],
   });
   if (multipleIndex.value == multipleList.value.length - 1) {