Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

# Conflicts:
#	src/components/common/service/ServiceDetail.vue

src/components/common/goods/GoodsDetail.vue

@@ -227,6 +227,10 @@ const getHilistInfo = (item: any) => {
   console.log("item", item)
   if (item.hilistCode != null) {
     post("social/directory/getByCode", {code: item.hilistCode}).then((res: any) => {
+      if (!res){
+        hilistInfo.value = {}
+        return
+      }
       hilistInfo.value = res
     })
   }

src/components/common/service/ServiceDetail.vue

@@ -155,13 +155,16 @@ const getTotalPrice = () => {
 const focus = (e: any) => {
   emit('focus', e)
 }
+const popoverRef = ref<any>(null);
 const itemInfo = ref<any>({});
 const show = (item: any) => {
- if(item.itemSocialCode){
-   post('social/directory/getItemByCode', {code: item.itemSocialCode}).then((res: any) => {
-     itemInfo.value = res
-   })
- }
+  post('social/directory/getItemByCode', {code: item.itemSocialCode}).then((res: any) => {
+    if (!res){
+      itemInfo.value = {}
+      return
+    }
+    itemInfo.value = res
+  })
 }
 const hide = () => {
   itemInfo.value = {}