Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomReservationsDetails.vue

@@ -76,7 +76,7 @@
                       <th>{{$t('hotel.table_hotelname')}}</th>
                     </tr>
                     <template v-for="(lItem,lIndex) in dataList">
-                      <tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="subIndex+lIndex">
+                      <tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="`s_`+subIndex+`l_`+lIndex">
                         <td style="width:120px;">
                           {{lItem.UseTimeStr}}
                         </td>

src/components/commonPage/customerService/index.vue

@@ -53,7 +53,7 @@ import { compressToBase64 } from '@/utils/compression';
         const userInfo = this.getLocalStorage();
         const difyUserId = `${userInfo.EmployeeId}-${userInfo.emName}`;
         const compressedUserId = await compressToBase64(difyUserId);
-        this.Url=`http://dify.oytour.com/chatbot/RrfZrrXKACVg4HpB??sys.user_id=${encodeURIComponent(compressedUserId)}`
+        this.Url=`http://dify.oytour.com/chatbot/55br88eantvyG032??sys.user_id=${encodeURIComponent(compressedUserId)}`
       }
     }
   }