合并 branch 'main' of http://111.79.108.213:3000/AI/AI-app

# Conflicts:
#	pages/index/index.vue
#	unpackage/dist/dev/app-plus/app-service.js

.gitignore

@@ -0,0 +1,12 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+
+unpackage/
+.idea
+.hbuilderx

api/index.js

@@ -2,7 +2,10 @@ import request from '@/request';
 
 
 // 获取汇总
-export const getEnamellingSummaryData = () => request({
-	url: '/mes/mesEnamellingWorkorder/getEnamellingSummaryData',
+export const getAIResponse = (data) => request({
+	method : 'POST',
+	url: '/chat',
+	data
 });
 
+

config.js

@@ -5,11 +5,7 @@ if (process.env.NODE_ENV === 'production') {
 		baseUrl = 'http://106.227.91.181:9081/api'; 
 } else {
 	// 非生产环境代码
-	// baseUrl = 'http://192.168.9.237:8182';
-	 // baseUrl = 'http://192.168.50.200:8080';
-	// baseUrl = 'http://huaerda-api.24yt.com';
-	// baseUrl = 'http://192.168.20.80:8080';
-	baseUrl = 'http://106.227.91.181:9081/api'; 
+	baseUrl = 'http://192.168.1.18:9020/api';
 }
 const config = {
 	baseUrl

request/index.js

@@ -1,70 +1,67 @@
-import config from '@/config'
-import errorCode from '@/utils/errorCode'
-import {
-	toast,
-	showConfirm,
-	tansParams
-} from '@/utils/common'
+import config from "@/config";
+import errorCode from "@/utils/errorCode";
+import { toast, showConfirm, tansParams } from "@/utils/common";
 
-let timeout = 120000
-const baseUrl = config.baseUrl
+let timeout = 120000;
+const baseUrl = config.baseUrl;
 
-const request = config => {
-	// 是否需要设置 token
-	// const isToken = (config.headers || {}).isToken === false
-	config.header = config.header || {}
-	// if (getToken() && !isToken) {
-	//   config.header['Authorization'] = 'Bearer ' + getToken()
-	// }
-	// get请求映射params参数
-	if (config.params) {
-		let url = config.url + '?' + tansParams(config.params)
-		url = url.slice(0, -1)
-		config.url = url
-	}
-	return new Promise((resolve, reject) => {
-		uni.request({
-				method: config.method || 'get',
-				timeout: config.timeout || timeout,
-				url: config.baseUrl || baseUrl + config.url,
-				data: config.data,
-				header: {
-					...config.header,
-					"x-tenant-id": '0'
-				},
-				dataType: 'json'
-			}).then(response => {
-				let res = response
-				const code = res.data.code || 200
-				const msg = errorCode[code] || res.data.msg || errorCode['default']
-				if (code === 500) {
-					// toast(msg)
-					reject('500')
-				} else if (code !== 200) {
-					// console.log(2);
-					// toast(msg)
-					reject(code)
-				}
-				resolve(res.data)
-			})
-			.catch(error => {
-				let {
-					message
-				} = error
+const request = (config) => {
+  // 是否需要设置 token
+  // const isToken = (config.headers || {}).isToken === false
+  config.header = config.header || {};
+  // if (getToken() && !isToken) {
+  //   config.header['Authorization'] = 'Bearer ' + getToken()
+  // }
+  // get请求映射params参数
+  if (config.params) {
+    let url = config.url + "?" + tansParams(config.params);
+    url = url.slice(0, -1);
+    config.url = url;
+  }
+  return new Promise((resolve, reject) => {
+    uni
+      .request({
+        method: config.method || "get",
+        timeout: config.timeout || timeout,
+        url: config.baseUrl || baseUrl + config.url,
+        data: config.data,
+        header: {
+          ...config.header,
+        },
+        dataType: "json",
+      })
+      .then((response) => {
+        let res = response.data.result;
+        // const code = res.data.code || 200
+        // if (code === 500) {
+        // 	reject('500')
+        // } else if (code !== 200) {
+        // 	reject(code)
+        // }
+        if (res.success) {
+          resolve(res.data);
+        } else {
+          resolve(res.error);
+        }
+      })
+      .catch((error) => {
+        let { message } = error;
 
-				if (message === 'Network Error') {
-					message = '网络不稳定,请检查网络 '
-				}else if(error.errMsg === 'request:fail' ) {
-					message = '后端接口连接异常'
-				}else if ( error.errMsg === 'request:fail timeout') {
-					message = '系统接口请求超时'
-				} else if (message.includes('Request failed with status code')) {
-					message = '系统接口' + message.substr(message.length - 3) + '异常'
-				}
-				// toast(message)
-				reject(error)
-			})
-	})
-}
+        if (message === "Network Error") {
+          message = "网络不稳定,请检查网络 ";
+        } else if (error.errMsg === "request:fail") {
+          message = "后端接口连接异常";
+        } else if (error.errMsg === "request:fail timeout") {
+          message = "系统接口请求超时";
+        } else if (message.includes("Request failed with status code")) {
+          message = "系统接口" + message.substr(message.length - 3) + "异常";
+        } else {
+          message = `抱歉，出了点问题: ${error.errMsg || error.message}`;
+        }
+        // toast(message)
+        reject(error);
+      });
+  });
+};
 
-export default request
+export default request;