修改文件名字，修复因为url长导致页面卡死的问题

h5/pages.json

@@ -60,7 +60,7 @@
 			}
 		},
 		{
-			"path": "pages/main/optionalProject/optionalProject",
+			"path": "pages/main/tj/tjzx",
 			"style": {
 				"navigationBarTitleText": "体检套餐加项",
 				"navigationBarBackgroundColor": "#D8EDF2",
@@ -74,7 +74,7 @@
 			}
 		},
 		{
-			"path": "pages/main/optionalProject/optionalDetails",
+			"path": "pages/main/tj/tjxq",
 			"style": {
 				"navigationBarTitleText": "套餐详情",
 				"navigationBarBackgroundColor": "#239EA3",
@@ -97,14 +97,14 @@
 			}
 		},
 		{
-			"path": "pages/main/optionalProject/choose",
+			"path": "pages/main/tj/choose",
 			"style": {
 				"navigationBarTitleText": "团检预约",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/main/optionalProject/selectType",
+			"path": "pages/main/tj/selectType",
 			"style": {
 				"navigationBarTitleText": "团检预约",
 				"enablePullDownRefresh": false

h5/pages/main/combo/combo.vue

@@ -166,7 +166,7 @@ const buyClick = async (item) => {
 	// 个检只要套餐ID
   // 预约 跳转到个检/团检套餐详情
   uni.navigateTo({
-    url: "/pages/main/optionalProject/optionalDetails" + query,
+    url: "/pages/main/tj/tjxq" + query,
   });
 };
 </script>

h5/pages/main/tj/choose.vue

@@ -67,13 +67,13 @@ const getGroupCombo = async (info) => {
       if (!data.items.length && data.tongshou_xiane > 0) {
         // 跳转到选择类似上 
         uni.navigateTo({
-          url: "/pages/main/optionalProject/selectType"
+          url: "/pages/main/tj/selectType"
         });
       } else {
         // 跳转到团检自选
         uni.navigateTo({
           url:
-            "/pages/main/optionalProject/optionalDetails?groupId=" +
+            "/pages/main/tj/tjxq?groupId=" +
             info.group_id
         });
       }

h5/pages/main/tj/selectType.vue

@@ -36,7 +36,7 @@ const toDetails = (type) => {
   if(type == 1){
     url = "/pages/main/combo/combo?groupId=" + groupInfo.value.group_id;
   }else{
-    url = "/pages/main/optionalProject/optionalProject?groupId=" + groupInfo.value.group_id;
+    url = "/pages/main/tj/tjzx?groupId=" + groupInfo.value.group_id;
   }
   uni.navigateTo({
     url: url,

h5/pages/main/tj/tjxq.vue

@@ -159,7 +159,7 @@ const addCombo = () => {
     query += "&groupId=" + groupId.value;
   }
   uni.navigateTo({
-    url: "/pages/main/optionalProject/optionalProject?" + query,
+    url: "/pages/main/tj/tjzx?" + query,
   });
 };
 

h5/pages/main/tj/tjzx.vue

@@ -199,7 +199,7 @@ const toDetails = (state) => {
         () => {
           clearTimeout(time);
           uni.navigateTo({
-            url: "/pages/main/optionalProject/optionalDetails" + query,
+            url: "/pages/main/tj/tjxq" + query,
           });
         },
         delta == 2 ? 800 : 500
@@ -247,26 +247,20 @@ const mountedAction = async () => {
 
   await getAllItems(); // 获取全部项目
   // await getComboRecommend();
-  getBuyInfo(); // 获取购买信息
+  await getBuyInfo(); // 获取购买信息
 };
 
 const config_ref = ref(null);
 const configRef = (e) => {
   if (!config_ref.value) {
     config_ref.value = e;
-    let time = setTimeout(() => {
-      clearTimeout(time);
-      mountedAction();
-    }, 500);
+    mountedAction();
   }
 };
 
 onShow(() => {
   if (!!config_ref.value) {
-    let time = setTimeout(() => {
-      clearTimeout(time);
-      mountedAction();
-    }, 500);
+    mountedAction();
   }
 });
 </script>

h5/pages/main/tjyy/tjyy.vue

@@ -70,27 +70,30 @@ const comfrimyy = async () => {
   //   uni.$lu.toast("请选择医生");
   //   return;
   // }
-  console.log(yytjInfo.value?.nmr_list);
-  for(let i = 0; i < yytjInfo.value?.nmr_list?.length; i++){
-    if(!yytjInfo.value?.nmr_list[i].time){
-      uni.$lu.toast("请选择预约时间");
-      return;
-    }
-  }
+  // console.log(yytjInfo.value?.nmr_list);
+  // for(let i = 0; i < yytjInfo.value?.nmr_list?.length; i++){
+  //   if(!yytjInfo.value?.nmr_list[i].time){
+  //     uni.$lu.toast("请选择预约时间");
+  //     return;
+  //   }
+  // }
 
-  if(yytjInfo.value?.nmr_list?.length > 1){
-    plan_nmr_id = yytjInfo.value?.nmr_list[0]?.id;
-  }
-  if(yytjInfo.value?.nmr_list?.length > 1){
-    plan_id = yytjInfo.value?.nmr_list[yytjInfo.value?.nmr_list.length - 1]?.id;
-  }
+  // if(yytjInfo.value?.nmr_list?.length > 1){
+  //   plan_nmr_id = yytjInfo.value?.nmr_list[0]?.id;
+  // }
+  // if(yytjInfo.value?.nmr_list?.length > 1){
+  //   plan_id = yytjInfo.value?.nmr_list[yytjInfo.value?.nmr_list.length - 1]?.id;
+  // }
+
+  console.log(groupInfo.value);
 
 
   let obj = {
     person_id: buyInfo.value.person_id,
     type: buyInfo.value.group_id ? 2 : 1,
     hospital: buyInfo.value.hospital,
-    combo_id: buyInfo.value?.combo_id || userInfo.value?.combo_id,
+    group_id: buyInfo.value.group_id,
+    combo_id: buyInfo.value?.combo_id || (groupInfo.value?.combo_id?"":userInfo.value?.combo_id) || "",
     item_ids: buyInfo.value.item_ids,
     plan_id: plan_id,
     $plan_nmr_id: plan_nmr_id,
@@ -98,6 +101,7 @@ const comfrimyy = async () => {
   console.log(obj);
 
   const response = await $api("OrderCreate", obj);
+  // return
   $response(response, () => {
     if(response.status){
       if(response.data.action == "pay"){