Merge branch 'dev' of gitlab.33.cn:chenqikuai/fns_front_2 into dev

src/router/index.ts

@@ -127,14 +127,14 @@ const routes: Array<RouteRecordRaw> = [
             /* webpackChunkName: "UserAgreement" */ '@/views/Auth/UserAgreement/index.vue'
           ),
       },
-      // {
-      //   path: '/auth/PwdSetting',
-      //   name: 'PwdSetting',
-      //   component: () =>
-      //     import(
-      //       /* webpackChunkName: "PwdSetting" */ '@/views/Auth/PwdSetting/index.vue'
-      //     ),
-      // },
+      {
+        path: '/auth/PwdSetting',
+        name: 'PwdSetting',
+        component: () =>
+          import(
+            /* webpackChunkName: "PwdSetting" */ '@/views/Auth/PwdSetting/index.vue'
+          ),
+      },
       {
         path: '/auth/PwdFind',
         name: 'PwdFind',

src/views/withMenu/Mine/setting.vue

@@ -19,8 +19,8 @@
             <div class=" text-xs text-gray-400 pt-1">保障账户登录安全</div>
           </div>
           <div class="flex items-center text-xs h-1 text-right">
-            <span v-if="hasPassword == 3">设置</span>
-            <span v-else-if="hasPassword == 2">修改</span>
+            <span v-if="hasPassword == 3" @click="pushRouter">设置</span>
+            <span v-else-if="hasPassword == 2" @click="pushRouter">修改</span>
             <icon
               name="icon-gengduo"
               color="#8E92A3"
@@ -43,16 +43,18 @@ import { deleteUserMsg, getUserMsg } from '@/utils/userMsg'
 import filter from "@/filter"
 import router from '@/router'
 import { userLogout } from '@/service/UserManagementService'
-
+import { userChangePwd,userLogin} from '@/service/UserManagementService'
+import { eSmsType, sendVerifyCode } from '@/service/VerificationService'
+import set from '@/views/Auth/PwdSetting/index.vue'
 export default defineComponent({
-  components: { NavBar, Icon },
+  components: { NavBar, Icon ,set},
   computed: {
     hasPassword(): eAccountType {
       return eAccountType.REG_PDSET
     },
     getPhone(){
       const phone =getUserMsg()?.userInfo.phone+''
-      var newphone= phone.replace(phone.substr(3, 4),"****")
+      var newphone= phone.replace(phone.substr(3,5),"*****")
       return newphone
     }
   },
@@ -69,6 +71,20 @@ export default defineComponent({
       filter,
       clickLogout
     }
+  },
+  methods:{
+    pushRouter(){
+      console.log('123');
+      if(this.hasPassword == 3){
+        this.$router.push({
+          name: 'PwdSetting'
+        })
+      }else if(this.hasPassword == 2){
+        this.$router.push({
+          name: 'PwdModify'
+        })
+      }
+    },
   }
 })
 </script>