Merge branch 'fix-109' of https://git.nianxx.cn/zoujing/YGChatCS

# Conflicts:
#	src/pages/index/components/module/MoreService/index.vue

src/pages/index/components/chat/ChatMainList/index.vue

@@ -273,19 +273,7 @@ const handleReplyText = (text) => {
 // 是发送指令消息
 const handleReplyInstruct = async (item) => {
   await checkToken();
-  // 更多服务
-  if (item.type === "Command.more") {
-    uni.$emit("SHOW_MORE_POPUP");
-    return;
-  }
 
-  if (item.type === "Command.myOrder") {
-    // 订单
-    uni.navigateTo({
-      url: "/pages-order/order/list",
-    });
-    return;
-  }
   commonType = item.type;
   // 重置消息状态，准备接收新的AI回复
   resetMessageState();

src/pages/index/components/chat/ChatQuickAccess/index.vue

@@ -47,6 +47,11 @@ const itemList = ref([
 ]);
 
 const sendReply = (item) => {
+  // 更多服务
+  if (item.type === Command.more) {
+    uni.$emit("SHOW_MORE_POPUP");
+    return;
+  }
   uni.$emit(SEND_MESSAGE_COMMAND_TYPE, item);
 };
 </script>

src/pages/index/components/module/DetailCardCompontent/index.vue

@@ -25,6 +25,4 @@ const props = defineProps({
 });
 </script>
 
-<style scoped lang="scss">
-@import "./styles/index.scss";
-</style>
+<style scoped lang="scss"></style>

src/pages/index/components/module/MoreService/index.vue

@@ -5,7 +5,7 @@
         <view class="title flex-full font-size-17 color-000 font-500"
           >更多服务</view
         >
-        <uni-icons type="close" size="20" color="#CACFD8" @click="close" />
+        <uni-icons type="close" size="24" color="#CACFD8" @click="close" />
       </view>
 
       <view class="list bg-white border-box pl-20 pr-20">
@@ -27,6 +27,7 @@
             </view>
             <view
               class="right border-box font-size-12 color-white line-height-16"
+              @click="handleClick(item)"
             >
               {{ item.btnText }}
             </view>
@@ -51,6 +52,7 @@ const list = ref([
     content: "预定门票、房间、餐食",
     btnText: "去预定",
     type: Command.quickBooking,
+    path: "",
   },
   {
     icon: "https://oss.nianxx.cn/mp/static/version_101/home/tsfx.png",
@@ -58,6 +60,7 @@ const list = ref([
     content: "发现景点、活动、特色内容",
     btnText: "去探索",
     type: Command.discovery,
+    path: "",
   },
   {
     icon: "https://oss.nianxx.cn/mp/static/version_101/home/mddd.png",
@@ -65,6 +68,7 @@ const list = ref([
     content: "查看门票、住宿、餐饮等订单",
     btnText: "去查看",
     type: Command.myOrder,
+    path: "/pages-order/order/list",
   },
   {
     icon: "https://oss.nianxx.cn/mp/static/version_101/home/wdgd.png",
@@ -72,6 +76,7 @@ const list = ref([
     content: "查看服务工单、进度与处理情况",
     btnText: "去查看",
     type: Command.myWorkOrder,
+    path: "/pages/myWorkOrder/index",
   },
   {
     icon: "https://oss.nianxx.cn/mp/static/version_101/home/fkyj.png",
@@ -79,6 +84,7 @@ const list = ref([
     content: "提交使用问题、建议与需求",
     btnText: "去反馈",
     type: Command.feedbackCard,
+    path: "",
   },
 ]);
 
@@ -86,15 +92,19 @@ const open = () => {
   popup.value && popup.value.open();
 };
 
-const handleClick = (item) => {
-  uni.$emit(SEND_MESSAGE_COMMAND_TYPE, item);
-  close();
-};
-
 const close = () => {
   popup.value && popup.value.close();
 };
 
+const handleClick = (item) => {
+  close();
+  if (item.path) {
+    uni.navigateTo({ url: item.path });
+    return;
+  }
+  uni.$emit(SEND_MESSAGE_COMMAND_TYPE, item);
+};
+
 // 接收更多服务
 uni.$on("SHOW_MORE_POPUP", () => {
   open();