Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024 into main

h5/pages/main/tj/tjxq.vue

@@ -15,6 +15,7 @@ const $store = useStore();
 
 let comboInfo = ref({}); // 套餐详情
 let selectIds = ref([]); // 选中自选ID
+let wj = ref(""); //
 let itemsInfo = ref({}); // 自选项目详情
 let comboId = ref(""); // 套餐id
 let personId = ref(""); // 患者id
@@ -65,10 +66,15 @@ const $props = defineProps({
     type: String,
     default: "",
   },
+  wj: {
+    type: String,
+    default: "",
+  },
 });
 
 const mountedAction = async () => {
   selectIds.value = $props.itemIds?.split(",") || [];
+  wj.value = $props.wj || "";
   console.log($store.user);
   comboId.value = $props.comboId || "";
   personId.value = $store.getUser().person_id || "";
@@ -120,6 +126,7 @@ const buy = () => {
       item_ids: selectIds.value,
       hospital: $store.save_info.hospital,
       duo_xuan_yi: $store.getDuoXuanYi(),
+      wj: wj.value,
     });
     $store.setYytjInfo({});
     uni.setStorageSync("yytjInfoS", {});
@@ -138,6 +145,7 @@ const getBuyInfo = async () => {
     person_id: personId.value,
     group_id: groupId.value,
     duo_xuan_yi: $store.getDuoXuanYi(),
+    wj: wj.value,
   };
   const response = await $api("BuyInfo", obj);
   $response(response, () => {

h5/pages/main/tjyy/tjyy.vue

@@ -286,6 +286,7 @@ const comfrimyy = async () => {
     duo_xuan_yi: $store.getDuoXuanYi(),
     jifen: Math.ceil(jifen.value),
     yucunkuan: yucunkuan.value,
+    wj: yytjInfo.value.wj,
   };
   console.log(obj);