Explorar o código

修改登录问题

快乐的梦鱼 hai 6 días
pai
achega
c1ddb6af93
Modificáronse 3 ficheiros con 16 adicións e 15 borrados
  1. 1 1
      src/components/form/Field.vue
  2. 5 5
      src/pages/dig/forms/forms.ts
  3. 10 9
      src/pages/user/login.vue

+ 1 - 1
src/components/form/Field.vue

@@ -92,7 +92,7 @@
             confirm-type="done"
             :type="selectStyleType(type, 'text', {
               text: 'text',
-              password: 'safe-password',
+              password: 'text',
               number: 'number',
               decimal: 'digit',
               tel: 'tel',

+ 5 - 5
src/pages/dig/forms/forms.ts

@@ -538,7 +538,7 @@ const villageCommonContent : FormDefine = {
     {
       label: '图片',
       name: 'images',
-      type: 'richtext',
+      type: 'uploader',
       defaultValue: '',
       params: {
         upload: useAliOssUploadCo('xiangyuan/common'),
@@ -565,7 +565,7 @@ const villageInfoForm : Record<string, Record<number, SingleForm>> = {
           type: 'text', 
           defaultValue: '',
           params: {
-            placeholder: '请输入村落名称',
+            placeholder: '请输入您的村落名称,例如:后埔',
           },
           rules:  [{
             required: true,
@@ -607,7 +607,7 @@ const villageInfoForm : Record<string, Record<number, SingleForm>> = {
           params: {
             placeholder: '请输入村落所在乡镇',
           },
-          rules:  [{
+          rules: [{
             required: true,
             message: '请输入村落所在乡镇',
           }] 
@@ -622,8 +622,8 @@ const villageInfoForm : Record<string, Record<number, SingleForm>> = {
               .map((p) => ({
                 value: p.id,
                 text: p.title,
-              }))
-            ,
+              })),
+            placeholder: '请选择村落类型',
           } as PickerIdFieldProps,
           itemParams: { showRightArrow: true } as FieldProps,
           rules: [{

+ 10 - 9
src/pages/user/login.vue

@@ -114,13 +114,11 @@ function loginWechat() {
       console.log(res);
       //return;
       authStore.loginWechart(res[0].code, res[1]).then(() => {
-        setTimeout(() => {
-          navTo('/pages/index');
-          toast({
-            type: 'success',  
-            content: '登录成功',
-          });
-        }, 200);
+        toast({
+          type: 'success',  
+          content: '登录成功',
+        });
+        setTimeout(() => redirectToIndex(), 200);
       }).catch(showError);
     })
     .catch(showError)
@@ -140,12 +138,15 @@ function loginMobile() {
       type: 'success',  
       content: '登录成功',
     });
-    setTimeout(() => navTo('/pages/index'), 200);
+    setTimeout(() => redirectToIndex(), 200);
   }).catch((e) => { 
     closeToast()
     showError(e); 
   })
 }
+function redirectToIndex() {
+  uni.redirectTo({ url: '/pages/index' });
+}
 
 onMounted(() => {
   toast({
@@ -155,7 +156,7 @@ onMounted(() => {
   setTimeout(() => {
     closeToast();
     if (authStore.isLogged) 
-      navTo('/pages/index');
+      redirectToIndex();
   }, 800);
 })