Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

src/App.vue

@@ -15,10 +15,10 @@ onLaunch(async () => {
 });
 // 设置token并指定过期时间（例如24小时）
 console.log('设定token');
-infoStore.setToken('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjoxOTQwMjQ1NzU5Mjk2ODY0MjU3Iiwicm5TdHIiOiJxRTE5RXhnZHVwa2hpdWo4eUo2M1pSZ0M1ZGxrNmt4YyIsImNsaWVudGlkIjoiMjAyNTAyMTQiLCJvcGVuaWQiOiJva0NHMjRrU29nT2VWTGFkc1JVYm8tS2JqR2Y4IiwidXNlcklkIjoxOTQwMjQ1NzU5Mjk2ODY0MjU3fQ.g8ZPjLyKcQQ2WOOsyoopjQMHepnutGJ5a1MGvAbgwzs');
+// infoStore.setToken('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjoxOTQwMjQ1NzU5Mjk2ODY0MjU3Iiwicm5TdHIiOiJxRTE5RXhnZHVwa2hpdWo4eUo2M1pSZ0M1ZGxrNmt4YyIsImNsaWVudGlkIjoiMjAyNTAyMTQiLCJvcGVuaWQiOiJva0NHMjRrU29nT2VWTGFkc1JVYm8tS2JqR2Y4IiwidXNlcklkIjoxOTQwMjQ1NzU5Mjk2ODY0MjU3fQ.g8ZPjLyKcQQ2WOOsyoopjQMHepnutGJ5a1MGvAbgwzs');
 console.log('获取用户信息,app');
-infoStore.getUserInfo();
-infoStore.getCompanyInfo();
+// infoStore.getUserInfo();
+// infoStore.getCompanyInfo();
 onShow(() => {
     console.log('App Show');
 });

src/pages/login/login.vue

@@ -144,7 +144,7 @@ const clickAgree = () => {
 };
 
 const checkUserRegist = (data) => {
-    return useClientRequest.post('/auth/checkUserRegist', data, false);
+    return useClientRequest.post('/plt-api/auth/checkUserRegist', data, false);
 };
 const getPhoneNumber = (e) => {
     console.log(e);

src/plant/port/port-create/index.vue

@@ -70,11 +70,16 @@
                     </ut-action-sheet>
                     <up-form-item borderBottom label="养殖时间" required prop="queryType6">
                         <ut-datetime-picker v-model="form.queryType6.startDate" mode="date" dateFields="month">
-                            <up-input v-model="form.queryType6.startDate" placeholder="请选择养殖开始时间" border="none"></up-input>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <view class="d-flex mr-20">
+                                <up-input v-model="form.queryType6.startDate" placeholder="请选择养殖开始时间" border="none"></up-input>
+                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            </view>
                         </ut-datetime-picker>
                         <ut-datetime-picker v-model="form.queryType6.endDate" mode="date" dateFields="month">
-                            <up-input v-model="form.queryType6.endDate" placeholder="请选择养殖结束时间" border="none"></up-input>
+                            <view class="d-flex">
+                                <up-input v-model="form.queryType6.endDate" placeholder="请选择养殖结束时间" border="none"></up-input>
+                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            </view>
                         </ut-datetime-picker>
                     </up-form-item>
                 </view>

src/store/modules/info.ts

@@ -151,7 +151,7 @@ export const useInfoStore = defineStore(
         // 微信小程序登录获取的code
 
         const wxLogin = async (data: unknown) => {
-            const res = await useClientRequest.post(`/auth/login`, data, false);
+            const res = await useClientRequest.post(`/plt-api/auth/login`, data, false);
             setToken(res.data?.access_token);
         };
         return {