按要求调整 海港细节

admin/index.html

@@ -18,7 +18,7 @@
           break
         }
       }
-     // env = 'dev'
+      env = 'dev'
       // env = 'dev'
       const api_url = {
         main: 'https://health.sixinyun.com'

admin/src/components/additional/additional13.vue

@@ -152,7 +152,7 @@
 
 		<n-grid mt-2 x-gap="10" :cols="4">
 			<n-gi v-if="$props.hospital !== 0">
-				<n-card title="套餐列表">
+				<n-card title="项目列表">
 					<n-scrollbar style="height: 550px">
 						<n-list>
 							<n-list-item v-for="(i,k) in combo_show_list" :key="k">

admin/src/pages/hospital/binditem.vue

@@ -0,0 +1,74 @@
+<script setup>
+/**
+ * name：
+ * user：sa0ChunLuyu
+ * date：2023年4月11日 09:32:32
+ */
+import {
+  $response, HospitalInfoAction
+} from '~/api'
+
+import $router from '~/router'
+import {onBeforeRouteUpdate} from "vue-router";
+
+const hospital_info = ref(false)
+const HospitalInfo = async () => {
+  const response = await HospitalInfoAction()
+  $response(response, () => {
+    hospital_info.value = response.data.info
+  })
+}
+
+const default_page_options = {
+  type: 0,
+}
+const page_options = ref(JSON.parse(JSON.stringify(default_page_options)))
+onBeforeRouteUpdate((to) => {
+  routerChange(to.query)
+})
+
+const routerChange = (query) => {
+  page_options.value = {
+    type: Number(query.type) || default_page_options.type,
+  }
+  HospitalInfo()
+}
+
+onMounted(() => {
+  routerChange($router.currentRoute.value.query)
+})
+
+const pagePush = () => {
+  const type = page_options.value.type
+  page_options.value.type = -1
+  $router.push({
+    query: {
+      type
+    }
+  })
+}
+ 
+const tabChange = (e) => {
+  page_options.value.type = e
+  pagePush()
+}
+const hospital_id = ref(0)
+</script>
+<template>
+  <div>
+    <n-card  >
+      <div v-if="!!hospital_info">
+      
+        <Additional13 :hospital="hospital_info.id" v-if="page_options.type === 0"></Additional13>
+    
+      </div>
+    </n-card>
+  </div>
+</template>
+<style scoped>
+
+</style>
+<route>
+{"meta":{"title":"额外配置"}}
+</route>
+

admin/src/pages/hospital/jkxj.vue

@@ -0,0 +1,74 @@
+<script setup>
+/**
+ * name：
+ * user：sa0ChunLuyu
+ * date：2023年4月11日 09:32:32
+ */
+import {
+  $response, HospitalInfoAction
+} from '~/api'
+
+import $router from '~/router'
+import {onBeforeRouteUpdate} from "vue-router";
+
+const hospital_info = ref(false)
+const HospitalInfo = async () => {
+  const response = await HospitalInfoAction()
+  $response(response, () => {
+    hospital_info.value = response.data.info
+  })
+}
+
+const default_page_options = {
+  type: 0,
+}
+const page_options = ref(JSON.parse(JSON.stringify(default_page_options)))
+onBeforeRouteUpdate((to) => {
+  routerChange(to.query)
+})
+
+const routerChange = (query) => {
+  page_options.value = {
+    type: Number(query.type) || default_page_options.type,
+  }
+  HospitalInfo()
+}
+
+onMounted(() => {
+  routerChange($router.currentRoute.value.query)
+})
+
+const pagePush = () => {
+  const type = page_options.value.type
+  page_options.value.type = -1
+  $router.push({
+    query: {
+      type
+    }
+  })
+}
+ 
+const tabChange = (e) => {
+  page_options.value.type = e
+  pagePush()
+}
+const hospital_id = ref(0)
+</script>
+<template>
+  <div>
+    <n-card  >
+      <div v-if="!!hospital_info">
+      
+        <Additional9 :hospital="hospital_info.id" v-if="page_options.type === 0"></Additional9>
+    
+      </div>
+    </n-card>
+  </div>
+</template>
+<style scoped>
+
+</style>
+<route>
+{"meta":{"title":"额外配置"}}
+</route>
+

admin/src/pages/hospital/myddc.vue

@@ -0,0 +1,74 @@
+<script setup>
+/**
+ * name：
+ * user：sa0ChunLuyu
+ * date：2023年4月11日 09:32:32
+ */
+import {
+  $response, HospitalInfoAction
+} from '~/api'
+
+import $router from '~/router'
+import {onBeforeRouteUpdate} from "vue-router";
+
+const hospital_info = ref(false)
+const HospitalInfo = async () => {
+  const response = await HospitalInfoAction()
+  $response(response, () => {
+    hospital_info.value = response.data.info
+  })
+}
+
+const default_page_options = {
+  type: 0,
+}
+const page_options = ref(JSON.parse(JSON.stringify(default_page_options)))
+onBeforeRouteUpdate((to) => {
+  routerChange(to.query)
+})
+
+const routerChange = (query) => {
+  page_options.value = {
+    type: Number(query.type) || default_page_options.type,
+  }
+  HospitalInfo()
+}
+
+onMounted(() => {
+  routerChange($router.currentRoute.value.query)
+})
+
+const pagePush = () => {
+  const type = page_options.value.type
+  page_options.value.type = -1
+  $router.push({
+    query: {
+      type
+    }
+  })
+}
+ 
+const tabChange = (e) => {
+  page_options.value.type = e
+  pagePush()
+}
+const hospital_id = ref(0)
+</script>
+<template>
+  <div>
+    <n-card  >
+      <div v-if="!!hospital_info">
+      
+        <Additional10 :hospital="hospital_info.id" v-if="page_options.type === 0"></Additional10>
+    
+      </div>
+    </n-card>
+  </div>
+</template>
+<style scoped>
+
+</style>
+<route>
+{"meta":{"title":"额外配置"}}
+</route>
+

admin/src/pages/hospital/reportcp.vue

@@ -0,0 +1,79 @@
+<script setup>
+/**
+ * name：
+ * user：sa0ChunLuyu
+ * date：2023年4月11日 09:32:32
+ */
+import {
+  $response, HospitalInfoAction
+} from '~/api'
+
+import $router from '~/router'
+import {onBeforeRouteUpdate} from "vue-router";
+
+const hospital_info = ref(false)
+const HospitalInfo = async () => {
+  const response = await HospitalInfoAction()
+  $response(response, () => {
+    hospital_info.value = response.data.info
+  })
+}
+
+const default_page_options = {
+  type: 0,
+}
+const page_options = ref(JSON.parse(JSON.stringify(default_page_options)))
+onBeforeRouteUpdate((to) => {
+  routerChange(to.query)
+})
+
+const routerChange = (query) => {
+  page_options.value = {
+    type: Number(query.type) || default_page_options.type,
+  }
+  HospitalInfo()
+}
+
+onMounted(() => {
+  routerChange($router.currentRoute.value.query)
+})
+
+const pagePush = () => {
+  const type = page_options.value.type
+  page_options.value.type = -1
+  $router.push({
+    query: {
+      type
+    }
+  })
+}
+const tab_arr = ref([
+  '报告对比',
+  '健康宣传&常见问题管理',
+  '满意度调查管理',
+  '项目绑定'
+])
+const tabChange = (e) => {
+  page_options.value.type = e
+  pagePush()
+}
+const hospital_id = ref(0)
+</script>
+<template>
+  <div>
+    <n-card  >
+      <div v-if="!!hospital_info">
+      
+        <Additional8 :hospital="hospital_info.id" v-if="page_options.type === 0"></Additional8>
+    
+      </div>
+    </n-card>
+  </div>
+</template>
+<style scoped>
+
+</style>
+<route>
+{"meta":{"title":"额外配置"}}
+</route>
+

admin/src/pages/order/order.vue

@@ -99,27 +99,7 @@ const user_order_columns = [{
                       h('b', '姓名: '),
                       row.name,
                     ]),
-                    h(NSpace, {
-                      align: 'center'
-                    }, {
-                      default: () => {
-                        return [
-                          h('b', '性别:'),
-                          h(
-                            NTag,
-                            {
-                              size: 'small',
-                              type: Number(row.sex) === 1 ? 'info' : 'error'
-                            },
-                            {
-                              default: () => {
-                                return Number(row.sex) === 1 ? '男' : '女'
-                              }
-                            }
-                          ),
-                        ]
-                      }
-                    }),
+                     
                   ]
                 }
               }
@@ -127,6 +107,21 @@ const user_order_columns = [{
           ]
         }
       }),
+	  h('div', null, [
+	   h('b', '性别：'),
+	   h(
+	     NTag,
+	     {
+	       size: 'small',
+	       type: Number(row.sex) === 1 ? 'info' : 'error'
+	     },
+	     {
+	       default: () => {
+	         return Number(row.sex) === 1 ? '男' : '女'
+	       }
+	     }
+	   ),
+	  ]),
       h('div', null, [
         h('b', '手机号: '),
         h('span', row.phone),
@@ -174,13 +169,13 @@ const user_order_columns = [{
       ]),
       h('div', null, [
         h('b', '套餐名称: '),
-        h('span', null, name),
+        h('span',{ onClick: ()=>combo_name_click(row.buy_info) }, null, name),
       ]),
       h('div', {class: ['line_wrapper']}, [
         h('b', '自选项目: '),
         h('div', {class: ['items_content_wrapper']}, !!row.buy_info.items.length ? row.buy_info.items.map((item) => {
-          return item.name
-        }).join('、') : '-'),
+          return item.name+'(￥'+ item.price+')'
+        }).join('、') : '无'),
       ]),
     ]
   }
@@ -188,10 +183,14 @@ const user_order_columns = [{
   title: '支付信息',
   key: 'status',
   render(row) {
+	let zixuan_price=0
     let price = row.price
     if (row.price !== row.true_price) {
-      price = price + '（' + row.true_price + '）'
+      price = price
     }
+	row.buy_info.items.map((item) => {
+		
+		 zixuan_price=Number(zixuan_price) +Number(item.price) })
     let children = [
       h('div', null, [
         h('b', '订单编号: '),
@@ -220,14 +219,21 @@ const user_order_columns = [{
 	     }
 	   }
 	 ),
-      // h('div', null, [
-      //   h('b', '创建时间: '),
-      //   h('span', row.created_at),
-      // ]),
-    
       h('div', null, [
-        h('b', '支付金额: '),
+        h('b', '订单金额: '),
         h('span', price),
+		h('b', !!row.buy_info.combo.id != 0 ? "套餐金额: " : null),
+		h('span', !!row.buy_info.combo.id != 0 ? row.buy_info.combo.price : null),
+		h('span', !!row.buy_info.items.length > 0 ? [
+			h('b',"自选金额: "),
+			h('span',zixuan_price)
+			] : null),
+		 
+      ]),
+    
+      h('div', null, [
+        h('b', '实际支付金额: '),
+        h('span',  row.true_price),
       ]),
       h(
         NSpace,
@@ -382,9 +388,32 @@ const UserOrderCancel = async () => {
     UserOrderList()
   })
 }
+let comboinfo_show=ref(false)
+let comboItemList=ref('')
+const combo_name_click=(combo)=>{
+	console.log(combo.combo);
+	if(combo.combo.name!='自选项目'){
+		comboinfo_show.value=true
+		comboItemList.value=combo.combo.items
+	}
+	
+}
 </script>
 <template>
   <div>
+	  <n-modal v-model:show="comboinfo_show" preset="card" :style="{width: '400px'}"
+	           title="套餐项目" :auto-focus="false"
+	           :bordered="false">
+	    <div>
+			<div v-for="(item,index) in comboItemList" :key="index">
+				{{item.name}} ￥{{item.price}}
+			</div>
+	      <n-space justify="center">
+	       <!-- <n-button @click="UserOrderCancel()" type="info">确定</n-button> -->
+	   <!--     <n-button @click="comboinfo_show = false">确定</n-button> -->
+	      </n-space>
+	    </div>
+	  </n-modal>
     <n-modal v-model:show="cancel_show" preset="card" :style="{width: '400px'}"
              :title="`取消${cancel_show === 2 ? '订单' : '预约'}确认`" :auto-focus="false"
              :bordered="false">

app/Http/Controllers/AnalysisTypeController.php

@@ -48,7 +48,7 @@ class AnalysisTypeController extends Controller
 
   public function create(EditAnalysisTypeInput $request)
   {
-    Login::admin([17]);
+    Login::admin();
     $hospital = $request->post('hospital');
     $name = $request->post('name');
     $range = $request->post('range');