feat: 按配置获取主体信息

constant/base.js

@@ -1,28 +1,42 @@
+import DH from "@/pages/login/images/dh.png";
+import DHWQ from "@/pages/login/images/dhwq.png";
+import TM from "@/pages/login/images/tm.png";
+import WSMM from "@/pages/login/images/wsmm.png";
+
 // 小程序特有相关: 同时更改manifest.json和 project.config.json文件中的appid；
 // 所有用户端的配置
 export const CLIENT_CONFIGS = {
   // 智念用户端
   zhinian: {
-    clientId: '2',
+    clientId: "2",
-    appId: 'wx5e79df5996572539'
+    appId: "wx5e79df5996572539",
+    placeholder: "快告诉智念您再想什么~",
+    loginDesc: "您好，欢迎来到智念科技",
+    logo: DH,
+    subLogo: DHWQ,
   },
   // 朵花用户端
   duohua: {
-    clientId: '2',
+    clientId: "2",
-    appId: 'wx23f86d809ae80259'
+    appId: "wx23f86d809ae80259",
+    placeholder: "快告诉朵朵您再想什么~",
+    loginDesc: "您好，欢迎来到朵花温泉",
+    logo: DH,
+    subLogo: DHWQ,
   },
   // 天沐用户端
   tianmu: {
-    clientId: '4',
+    clientId: "4",
-    appId: 'wx0be424e1d22065a9'
+    appId: "wx0be424e1d22065a9",
-  }
+    placeholder: "快告诉沐沐您再想什么~",
+    loginDesc: "您好，欢迎来到天沐温泉",
+    logo: TM,
+    subLogo: WSMM,
+  },
 };
 
 // 获取当前用户端配置
-const getCurrentConfig = () => {
+export const getCurrentConfig = () => CLIENT_CONFIGS.tianmu;
-  return CLIENT_CONFIGS.zhinian;
-};
 
 export const clientId = getCurrentConfig().clientId;
 export const appId = getCurrentConfig().appId;
-

manifest.json

@@ -1,105 +1,105 @@
 {
-  "name": "YGTianmuCS",
+    "name" : "YGTianmuCS",
-  "appid": "__UNI__BB03E8A",
+    "appid" : "__UNI__BB03E8A",
-  "description": "",
+    "description" : "",
-  "versionName": "1.0.0",
+    "versionName" : "1.0.0",
-  "versionCode": "100",
+    "versionCode" : "100",
-  "transformPx": false,
+    "transformPx" : false,
-  /* 5+App特有相关 */
+    /* 5+App特有相关 */
-  "app-plus": {
+    "app-plus" : {
-    "usingComponents": true,
+        "usingComponents" : true,
-    "nvueStyleCompiler": "uni-app",
+        "nvueStyleCompiler" : "uni-app",
-    "compilerVersion": 3,
+        "compilerVersion" : 3,
-    "splashscreen": {
+        "splashscreen" : {
-      "alwaysShowBeforeRender": true,
+            "alwaysShowBeforeRender" : true,
-      "waiting": true,
+            "waiting" : true,
-      "autoclose": true,
+            "autoclose" : true,
-      "delay": 0
+            "delay" : 0
+        },
+        "safearea" : {
+            "bottom" : {
+                "offset" : "auto" // 自动适配安全区域
+            }
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "oauth" : {}
+            }
+        }
     },
-    "safearea": {
+    /* 快应用特有相关 */
-      "bottom": {
+    "quickapp" : {},
-        "offset": "auto" // 自动适配安全区域
+    /* 小程序特有相关 同时更改 project.config.json文件
-      }
-    },
-    /* 模块配置 */
-    "modules": {},
-    /* 应用发布信息 */
-    "distribute": {
-      /* android打包配置 */
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      /* ios打包配置 */
-      "ios": {},
-      /* SDK配置 */
-      "sdkConfigs": {
-        "oauth": {}
-      }
-    }
-  },
-  /* 快应用特有相关 */
-  "quickapp": {},
-  /* 小程序特有相关 同时更改 project.config.json文件
   智念：wx5e79df5996572539
   朵花：wx23f86d809ae80259
   */
-  "mp-weixin": {
+    "mp-weixin" : {
-    "appid": "wx5e79df5996572539",
+        "appid" : "wx0be424e1d22065a9",
-    "setting": {
+        "setting" : {
-      "urlCheck": false
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "requiredPrivateInfos" : [ "getLocation" ],
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "用于获取当前所在城市信息"
+            }
+        },
+        "plugins" : {
+            "WechatSI" : {
+                "version" : "0.3.6",
+                "provider" : "wx069ba97219f66d99"
+            }
+        },
+        "__usePrivacyCheck__" : true
     },
-    "usingComponents": true,
+    "mp-alipay" : {
-    "requiredPrivateInfos": ["getLocation"],
+        "usingComponents" : true
-    "permission": {
-      "scope.userLocation": {
-        "desc": "用于获取当前所在城市信息"
-      }
     },
-    "plugins": {
+    "mp-baidu" : {
-      "WechatSI": {
+        "usingComponents" : true
-        "version": "0.3.6",
-        "provider": "wx069ba97219f66d99"
-      }
     },
-    "__usePrivacyCheck__": true
+    "mp-toutiao" : {
-  },
+        "usingComponents" : true,
-  "mp-alipay": {
+        "usePrivacyCheck" : true
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true,
-    "usePrivacyCheck": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "3",
-  "h5": {
-    "router": {
-      "base": "./",
-      "mode": "hash"
     },
-    "devServer": {
+    "uniStatistics" : {
-      "https": false
+        "enable" : false
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "https" : false
+        }
     }
-  }
 }

pages/chat/ChatInputArea.vue

@@ -60,8 +60,9 @@
 </template>
 
 <script setup>
-import { ref, watch, nextTick, onMounted, defineExpose } from "vue";
+import { ref, computed, watch, nextTick, onMounted, defineExpose } from "vue";
 import RecordingWaveBtn from "@/components/Speech/RecordingWaveBtn.vue";
+import { getCurrentConfig } from "@/constant/base";
 
 const plugin = requirePlugin("WechatSI");
 const manager = plugin.getRecordRecognitionManager();
@@ -83,7 +84,7 @@ const emit = defineEmits([
 
 const textareaRef = ref(null);
 const recordingWaveBtnRef = ref(null);
-const placeholder = ref("快告诉朵朵您在想什么~");
+const placeholder = computed(() => getCurrentConfig().placeholder);
 const inputMessage = ref(props.modelValue || "");
 const isFocused = ref(false);
 const keyboardHeight = ref(0);
@@ -115,14 +116,14 @@ const toggleVoiceMode = () => {
 const handleVoiceTouchStart = () => {
   manager.start({ lang: "zh_CN" });
 
-    visibleWaveBtn.value = true;
+  visibleWaveBtn.value = true;
 
-    // 启动音频条动画
+  // 启动音频条动画
-    nextTick(() => {
+  nextTick(() => {
-      if (recordingWaveBtnRef.value) {
+    if (recordingWaveBtnRef.value) {
-        recordingWaveBtnRef.value.startAnimation();
+      recordingWaveBtnRef.value.startAnimation();
-      }
+    }
-    });
+  });
 };
 
 // 处理语音按钮长按结束

pages/chat/ChatMainList.vue

@@ -181,9 +181,9 @@ import {
 import WebSocketManager from "@/utils/WebSocketManager";
 import TypewriterManager from "@/utils/TypewriterManager";
 import { IdUtils } from "@/utils";
-import { goLogin, checkToken } from "@/hooks/useGoLogin";
+import { checkToken } from "@/hooks/useGoLogin";
-
 import { useAppStore } from "@/store";
+
 const appStore = useAppStore();
 /// 导航栏相关
 const statusBarHeight = ref(20);
@@ -433,7 +433,8 @@ const loadConversationMsgList = async () => {
 const getMainPageData = async () => {
   /// 从个渠道获取如二维，没有的时候就返回首页的数据
   const sceneId = appStore.sceneId || "";
-  const res = await mainPageData(sceneId);
+  const res = await mainPageData({ sceneId });
+
   if (res.code === 0) {
     initData();
     mainPageDataModel.value = res.data;

pages/login/index.vue

@@ -2,23 +2,19 @@
   <view class="login-wrapper" :style="{ backgroundImage: `url(${loginBg})` }">
     <!-- 返回按钮 -->
     <view class="back-btn" @click="goBack">
-      <uni-icons fontFamily="znicons" size="24" color="#333">{{
+      <uni-icons fontFamily="znicons" size="24" color="#333">
-        zniconsMap["zn-nav-arrow-left"]
+        {{ zniconsMap["zn-nav-arrow-left"] }}
-      }}</uni-icons>
+      </uni-icons>
     </view>
 
     <!-- 头部内容 -->
     <view class="login-header">
       <!-- 卡通形象 -->
-      <image class="login-avatar" src="./images/dh.png" mode="widthFix"></image>
+      <image class="login-avatar" :src="logo" mode="widthFix"></image>
-      <image
+      <image class="login-title" :src="subLogo" mode="widthFix"></image>
-        class="login-title"
-        src="./images/dhwq.png"
-        mode="widthFix"
-      ></image>
 
       <!-- 描述 -->
-      <view class="login-desc">您好，欢迎来到朵花温泉！</view>
+      <view class="login-desc">{{ loginDesc }}</view>
     </view>
 
     <!-- 按钮区域 -->
@@ -82,6 +78,7 @@ import loginBg from "./images/bg.png";
 import CheckBox from "@/components/CheckBox/index.vue";
 import AgreePopup from "./components/AgreePopup/index.vue";
 import { zniconsMap } from "@/static/fonts/znicons.js";
+import { getCurrentConfig } from "@/constant/base";
 
 const isAgree = ref(false);
 const visible = ref(false);
@@ -89,6 +86,10 @@ const serviceAgreement = ref("");
 const privacyAgreement = ref("");
 // 协议类型
 const AgreeType = ref("service");
+const logo = computed(() => getCurrentConfig().logo);
+const subLogo = computed(() => getCurrentConfig().subLogo);
+const loginDesc = computed(() => getCurrentConfig().loginDesc);
+const clientId = computed(() => getCurrentConfig().clientId);
 
 // 同意隐私协议并获取手机号
 const handleAgreeAndGetPhone = () => {

project.config.json

@@ -1,5 +1,5 @@
 {
-  "appid": "wx5e79df5996572539",
+  "appid": "wx0be424e1d22065a9",
   "compileType": "miniprogram",
   "libVersion": "3.8.10",
   "packOptions": {

request/api/MainPageDataApi.js

@@ -1,26 +1,19 @@
 import request from "../base/request";
 
 /// 主页数据
-function mainPageData(sceneId) {
+function mainPageData(args) {
-	const args = { sceneId : sceneId}
+  return request.post("/hotelBiz/mainScene/mainPageData", args);
-	return request.post('/hotelBiz/mainScene/mainPageData', args);
 }
 
-
 /// 快速预订组件
 function quickBookingComponent(selectedData) {
-	const args = { selectedData: selectedData }
+  const args = { selectedData: selectedData };
-	return request.post('/hotelBiz/mainScene/quickBookingComponent', args);
+  return request.post("/hotelBiz/mainScene/quickBookingComponent", args);
 }
 
 /// 探索发现卡片组件
 function discoveryCradComponent() {
-	return request.get('/hotelBiz/mainScene/discoveryComponent', {});
+  return request.get("/hotelBiz/mainScene/discoveryComponent", {});
 }
 
-
+export { mainPageData, quickBookingComponent, discoveryCradComponent };
-export { 
-	mainPageData,
-	quickBookingComponent,
-	discoveryCradComponent
- }

request/base/baseUrl.js

@@ -1,4 +1,4 @@
-const isProd = false;
+const isProd = true;
 
 // 测试
 const VITE_BASE_URL_TEST = "https://onefeel.brother7.cn/ingress";

request/base/request.js

@@ -1,10 +1,13 @@
 import { goLogin } from "../../hooks/useGoLogin";
 import { BASE_URL } from "./baseUrl";
+import { getCurrentConfig } from "@/constant/base";
 
+const clientId = getCurrentConfig().clientId;
 const defaultConfig = {
   header: {
     Authorization: "", // 可在此动态设置 token
     "Content-Type": "application/json",
+    clientId: clientId,
   },
 };