Merge branch 'home3.0' of https://git.nianxx.cn/zoujing/YGChatCS into home3.0

client-configs.json

@@ -5,11 +5,11 @@
     "name": "智念",
     "logo": "https://oss.nianxx.cn/mp/static/version_101/login/dh_logo.png",
     "theme": {
-      "theme-color-800": "#0B7034",
-      "theme-color-700": "#0B5C2D",
-      "theme-color-500": "#0CCD58",
-      "theme-color-100": "#E8FFF1",
-      "theme-color-50": "#F0F8F3"
+      "theme-color-800": "#174BB6",
+      "theme-color-700": "#145EE1",
+      "theme-color-500": "#2D91FF",
+      "theme-color-100": "#D9EEFF",
+      "theme-color-50": "#EEF8FF"
     }
   },
   "nianhelper": {

src/pages/ChatMain/ChatGuide/index.vue

@@ -0,0 +1,83 @@
+<template>
+  <view class="empty-container">
+    <!-- 图片变量 -->
+    <image v-if="!hasMessage" :src="imageSrc" mode="aspectFit" class="main-image"></image>
+
+    <!-- 主标题变量 -->
+    <view v-if="!hasMessage" class="title">{{ mainTitle }}</view>
+
+    <!-- 副标题变量 -->
+    <view v-if="!hasMessage" class="sub-title-wrapper">
+      <text class="dot"></text>
+      <text class="sub-title">{{ subTitle }}</text>
+      <text class="dot"></text>
+    </view>
+  </view>
+</template>
+
+<script setup>
+
+const props = defineProps({
+  hasMessage: {
+    type: Boolean,
+    default: false
+  },
+  // 图片路径
+  imageSrc: {
+    type: String,
+    default: '/static/come_chat_image.png'
+  },
+  // 主标题
+  mainTitle: {
+    type: String,
+    default: '和我聊聊天吧!'
+  },
+  // 副标题
+  subTitle: {
+    type: String,
+    default: '这里什么都没有哦'
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 90px 0;
+  
+  .main-image {
+    width: 160px;
+    height: 180px;
+    margin-bottom: 20px;
+  }
+
+  .title {
+    font-size: 18px;
+    font-weight: bold;
+    color: #2c3e50;
+    margin-bottom: 4px;
+    text-align: center;
+  }
+
+  .sub-title-wrapper {
+    display: flex;
+    align-items: center;
+
+    .sub-title {
+      font-size: 12px;
+      color: #afb9c1;
+      margin: 0 6px;
+    }
+
+    .dot {
+      width: 5px;
+      height: 5px;
+      background-color: #42b983;
+      border-radius: 50%;
+    }
+  }
+}
+</style>

src/pages/ChatMain/ChatMainList/index.vue

@@ -105,20 +105,20 @@
                   item.toolCall.componentName === CompName.mapCard
                 "
               />
-              <!-- <GeneratorPhotoComponent
+              <GeneratorPhotoComponent
                 v-else-if="
                   item.toolCall &&
                   item.toolCall.componentName ===
                     CompName.aigcPhotoGeneratorCard
                 "
                 :toolCall="item.toolCall"
-              /> -->
-              <ZModuleC01
+              />
+              <!-- <ZModuleC01
                 v-else-if="
                   item.toolCall &&
                   item.toolCall.componentName === CompName.aigcPhotoGeneratorCard
                 "
-              />
+              /> -->
 
               <Feedback
                 v-else-if="
@@ -168,6 +168,8 @@
 
         <template v-else>
           <ChatCardOther class="flex flex-justify-center" :text="item.msg">
+            <ChatGuide v-if="chatMsgList.length < 8" :hasMessage="chatMsgList.length > 1" />
+
             <ActivityListComponent
               v-if="
                 mainPageDataModel.activityList &&
@@ -176,8 +178,10 @@
               :activityList="mainPageDataModel.activityList"
             />
 
+            <!-- 先不展示了，等后续有需求再加回来 false -->
             <RecommendPostsComponent
               v-if="
+              false && 
                 mainPageDataModel.recommendTheme &&
                 mainPageDataModel.recommendTheme.length > 0
               "
@@ -223,6 +227,7 @@ import { MessageRole, MessageType, CompName, Command } from "@/model/ChatModel";
 import HomeWelcome from "../HomeWelcome/index.vue";
 import AiTabSwitch from "@/components/AiTabSwitch/index.vue";
 import Discovery from "../../Discovery/index.vue";
+import ChatGuide from "../ChatGuide/index.vue";
 
 import ChatTopNavBar from "../ChatTopNavBar/index.vue";
 import ChatCardAI from "../ChatCardAi/index.vue";

src/pages/ChatMain/ChatQuickAccess/index.vue

@@ -26,8 +26,8 @@ const itemList = ref([
   },
   {
     icon: "",
-    title: "探索发现",
-    type: Command.discovery,
+    title: "我的订单",
+    type: Command.myOrder,
   },
   {
     icon: "",
@@ -56,6 +56,14 @@ const sendReply = (item) => {
     return;
   }
 
+  // 我的订单
+  if (item.type === Command.myOrder) {
+    checkToken().then(() => {
+      uni.navigateTo({ url: "/pages-order/order/list" });
+    });
+    return;
+  }
+
   uni.$emit(SEND_MESSAGE_COMMAND_TYPE, item);
 };
 </script>

src/uni.scss

@@ -13,11 +13,11 @@
  */
 
 /* 主题颜色（由 switch-client 命令自动更新） */
-$theme-color-800: #0B7034;
-$theme-color-700: #0B5C2D;
-$theme-color-500: #0CCD58;
-$theme-color-100: #E8FFF1;
-$theme-color-50: #F0F8F3;
+$theme-color-800: #174BB6;
+$theme-color-700: #145EE1;
+$theme-color-500: #2D91FF;
+$theme-color-100: #D9EEFF;
+$theme-color-50: #EEF8FF;
 
 // text 颜色
 $text-color-900: #181B25;