Merge branch 'v1.0.0' into v1.0.0_saas

# Conflicts:
#	src/pagesLogin/login/index.vue

src/pagesLogin/login/index.vue

@@ -143,6 +143,7 @@ import LoginLayout from "./components/loginLayout.vue";
 import { useMemberStore } from "@/store/index";
 import valid from "@/utils/validate";
 import pinia from "@/store";
+import { onShow } from "@dcloudio/uni-app";
 
 const handleClear = (item: any) => {
   setTimeout(() => {
@@ -237,6 +238,11 @@ const submit = () => {
       }
       ProfileApi.loginByAccount(model1.userInfo).then((res: any) => {
         if (res.code === 200) {
+          if(checkGroup.rememberCheck.length === 1) {
+            uni.setStorageSync('catchLoginInfo', model1.userInfo);
+          } else {
+            uni.setStorageSync('catchLoginInfo', {});
+          }
           store.setProfile(res.data);
           uni.reLaunch({
             url: "/pagesHome/index", // 要跳转到的页面路径
@@ -295,7 +301,6 @@ const handleSelect = (v: any) => {
   state.isShow = false;
   state.dpObj = v;
   model1.userInfo.dpName = v.name;
-  console.log(v.dbIp);
   store.setChildPath(v.dbIp);
 };
 
@@ -304,8 +309,7 @@ const state = reactive({
   isShow: false,
   dpObj: {},
 });
-
+// 获取基地信息
-// // 获取基地信息
 // ProfileApi.getDbInfo({}).then((res) => {
 //   if (res.code === 200) {
 //     state.dpList = res.data.map((item: any) => {
@@ -313,6 +317,16 @@ const state = reactive({
 //     });
 //   }
 // });
+
+onShow(() => {
+  if (uni.getStorageSync('catchLoginInfo')) {
+    const {userName, password} = uni.getStorageSync('catchLoginInfo')
+    model1.userInfo.userName = userName
+    model1.userInfo.password = password
+  }
+  
+});
+
 </script>
 
 <style lang="scss" scoped>

src/utils/http.ts

@@ -68,7 +68,7 @@ export const http = <T>(options: UniApp.RequestOptions) => {
               // #endif
             },
             timeout: 1800000,
-            url: baseUrl + store.profile.childPath + options.url,//仅为示例，非真实的接口地址
+            url: baseUrl + options.url,//仅为示例，非真实的接口地址
             fileType: "image",
             // #ifdef H5
             files: (options as any).data.files,