Merge branch 'develop/steels' into feature/steels/yangan

yangan

2024-06-28 3fef62b03c16aa69c109c355150cdb698b777feb

 pages/driver-page/drvier-my/drvier-my.vue

@@ -155,7 +155,7 @@
         </view>
      </view>
      <view class="loginout">
         <view class="loginout-main"><u-button text="重置密码"
         <view class="loginout-main"><u-button text="修改密码"
               type="primary"
               @click="initPwd"
               shape="circle"
@@ -727,7 +727,9 @@
               });
         },
         initPwd() {
            this.initPwdShow = true
        uni.navigateTo({
          url: `/pages/login/resetPassword/resetPassword`
        })
         },
         initPwdConfirm() {
            this.initPwdShow = false