优化

src/api/sunVillage_info/fixedAssets.js

@@ -314,3 +314,33 @@ export function financialAmountPublicMonthList(query) {
     params: query // ?bookId=<账套ID 必填>&yearMonth=<查询年月 必填 yyyy-MM>
   })
 }
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile/get',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'post',
+    params: data
+  })
+}

src/router/index.js

@@ -3124,6 +3124,24 @@ export const constantRoutes = [
       hidden: true,
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_register_detail'], resolve)
+  },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/user',
+    name: 'sunVillageInfoUser',
+    meta: {
+      title: '个人信息',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/user'], resolve)
+  },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/passWord',
+    name: 'sunVillageInfoPassWord',
+    meta: {
+      title: '修改密码',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/passWord'], resolve)
   }
 ];
 

src/views/sunVillage_info/index.vue

@@ -28,9 +28,20 @@
               </van-popup>
 
             </div>
-            <div class="exit_btn" @click="logout">
-                <i class="icon"></i>
-            </div>
+            <van-popover
+              v-model="showPopover"
+              trigger="click"
+              :actions="actions"
+              placement="bottom-end"
+              @select="selectChange"
+            >
+              <template #reference>
+                <div class="exit_btn">
+                  <i class="icon"></i>
+                </div>
+              </template>
+            </van-popover>
+<!--          @click="logout"-->
         </div>
         <div class="index_info">
             <div class="title"></div>
@@ -59,6 +70,12 @@
     name: "certificateList",
     data() {
       return {
+        showPopover: false,
+        actions: [
+          { text: '个人信息', icon: 'manager-o' , index: 0 },
+          { text: '修改密码', icon: 'edit' , index: 1 },
+          { text: '退出登录', icon: 'revoke' , index: 2 },
+        ],
         deptIdOptions:[],
         villageVisbile:false,
         showBookList:false,
@@ -159,6 +176,10 @@
         logout().then(res => {
           this.$router.push({path:"/sunVillage_info/login"})
         })
+      },
+      selectChange(val){
+        console.log(val)
+        val.index == 0 ? this.$router.push({path:"/sunVillage_info/user"}) : val.index == 1 ? this.$router.push({path:"/sunVillage_info/passWord"}) : val.index == 2 ? this.logout() : '';
       }
     },
   }
@@ -199,21 +220,26 @@
                 }
             }
         }
+        /deep/ .van-popover__wrapper{
+          position: absolute;
+          top: 64px;
+          right: 36px;
+        }
         .exit_btn{
             width: 61px;
             height: 61px;
-            background: #3f3d56;
+            /*background: #3f3d56;*/
             border-radius: 50%;
             display: flex;
             align-items: center;
             justify-content: center;
-            position: absolute;
-            top: 64px;
-            right: 36px;
+            /*position: absolute;*/
+            /*top: 64px;*/
+            /*right: 36px;*/
             .icon{
-                width: 35px;
-                height: 33px;
-                background: url('../../assets/images/sunVillage_info/index_icon_2.png') no-repeat;
+                width: 100%;
+                height: 100%;
+                background: url('../../assets/images/sunVillage_info/login_head_t.png') no-repeat;
                 background-size: 100% 100%;
             }
         }

src/views/sunVillage_info/list_finance.vue

@@ -103,21 +103,20 @@
     methods: {
       getList(){
         var _this = this;
-        setTimeout(() => {
-          console.log(_this.queryParams)
-          financePublicList(_this.queryParams).then(response => {
-            _this.listLength = response.total;
-            _this.applicationList = response.rows;
+        financePublicList(_this.queryParams).then(response => {
+          _this.listLength = response.total;
+          response.rows.map(res=>{
+            _this.applicationList.push(res);
+          })
+          if(_this.applicationList.length >= response.total){
+            _this.finished = true;
+            return;
+          }else{
+            _this.loading = false;
+            _this.queryParams.pageNum += 1 ;
+          }
 
-            if(_this.applicationList.length >= response.total){
-              _this.finished = true;
-              return;
-            }else{
-              _this.loading = false;
-              _this.queryParams.pageNum += 1 ;
-            }
-          });
-        }, 1000);
+        });
       },
       tabClick(year){
         this.queryParams.year = year ;

src/views/sunVillage_info/list_finance_add.vue

@@ -80,7 +80,7 @@
 
          </div>
 
-         <div style="margin: 16px;">
+         <div style="margin: 16px auto;width: 50%;">
            <van-button round block type="primary" native-type="submit">
              保存
            </van-button>
@@ -188,6 +188,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/list_finance_edit.vue

@@ -80,7 +80,7 @@
 
          </div>
 
-         <div style="margin: 16px;">
+         <div style="margin: 16px auto;width: 50%;">
            <van-button round block type="primary" native-type="submit">
              保存
            </van-button>
@@ -216,6 +216,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/list_issues.vue

@@ -100,21 +100,21 @@
     methods: {
       getList(){
         var _this = this;
-        setTimeout(() => {
-          console.log(_this.queryParams)
-          majorEventPublicList(_this.queryParams).then(response => {
-            _this.listLength = response.total;
-            _this.applicationList = response.rows;
+        console.log(_this.queryParams)
+        majorEventPublicList(_this.queryParams).then(response => {
+          _this.listLength = response.total;
+          response.rows.map(res=>{
+            _this.applicationList.push(res);
+          })
 
-            if(_this.applicationList.length >= response.total){
-              _this.finished = true;
-              return;
-            }else{
-              _this.loading = false;
-              _this.queryParams.pageNum += 1 ;
-            }
-          });
-        }, 1000);
+          if(_this.applicationList.length >= response.total){
+            _this.finished = true;
+            return;
+          }else{
+            _this.loading = false;
+            _this.queryParams.pageNum += 1 ;
+          }
+        });
       },
       tabClick(year){
         this.queryParams.year = year ;

src/views/sunVillage_info/list_issues_add.vue

@@ -87,7 +87,7 @@
 
       </div>
 
-      <div style="margin: 16px;">
+      <div style="margin: 16px auto;width: 50%;">
         <van-button round block type="primary" native-type="submit">
           保存
         </van-button>
@@ -193,6 +193,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
   .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/list_issues_edit.vue

@@ -86,7 +86,7 @@
            </van-field>
          </div>
 
-         <div style="margin: 16px;">
+         <div style="margin: 16px auto;width: 50%;">
            <van-button round block type="primary" native-type="submit">
              保存
            </van-button>
@@ -221,6 +221,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/list_register.vue

@@ -103,21 +103,21 @@
     methods: {
       getList(){
         var _this = this;
-        setTimeout(() => {
-          console.log(_this.queryParams)
-          listOddjob(_this.queryParams).then(response => {
-            _this.listLength = response.total;
-            _this.applicationList = response.rows;
+        console.log(_this.queryParams)
+        listOddjob(_this.queryParams).then(response => {
+          _this.listLength = response.total;
+          response.rows.map(res=>{
+            _this.applicationList.push(res);
+          })
 
-            if(_this.applicationList.length >= response.total){
-              _this.finished = true;
-              return;
-            }else{
-              _this.loading = false;
-              _this.queryParams.pageNum += 1 ;
-            }
-          });
-        }, 1000);
+          if(_this.applicationList.length >= response.total){
+            _this.finished = true;
+            return;
+          }else{
+            _this.loading = false;
+            _this.queryParams.pageNum += 1 ;
+          }
+        });
       },
       tabClick(year){
         this.queryParams.year = year ;

src/views/sunVillage_info/list_register_add.vue

@@ -48,7 +48,7 @@
 
       </div>
 
-      <div style="margin: 16px;">
+      <div style="margin: 16px auto;width: 50%;">
         <van-button round block type="primary" native-type="submit">
           保存
         </van-button>
@@ -119,6 +119,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
   .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/list_register_edit.vue

@@ -48,7 +48,7 @@
 
       </div>
 
-      <div style="margin: 16px;">
+      <div style="margin: 16px auto;width: 50%;">
         <van-button round block type="primary" native-type="submit">
           保存
         </van-button>
@@ -128,6 +128,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
   .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/list_tourists.vue

@@ -103,21 +103,21 @@
     methods: {
       getList(){
         var _this = this;
-        setTimeout(() => {
-          console.log(_this.queryParams)
-          tempWorkerPublicList(_this.queryParams).then(response => {
-            _this.listLength = response.total;
-            _this.applicationList = response.rows;
+        console.log(_this.queryParams)
+        tempWorkerPublicList(_this.queryParams).then(response => {
+          _this.listLength = response.total;
+          response.rows.map(res=>{
+            _this.applicationList.push(res);
+          })
 
-            if(_this.applicationList.length >= response.total){
-              _this.finished = true;
-              return;
-            }else{
-              _this.loading = false;
-              _this.queryParams.pageNum += 1 ;
-            }
-          });
-        }, 1000);
+          if(_this.applicationList.length >= response.total){
+            _this.finished = true;
+            return;
+          }else{
+            _this.loading = false;
+            _this.queryParams.pageNum += 1 ;
+          }
+        });
       },
       tabClick(year){
         this.queryParams.year = year ;

src/views/sunVillage_info/list_tourists_add.vue

@@ -80,7 +80,7 @@
 
       </div>
 
-      <div style="margin: 16px;">
+      <div style="margin: 16px auto;width: 50%;">
         <van-button round block type="primary" native-type="submit">
           保存
         </van-button>
@@ -185,6 +185,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
   .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/list_tourists_edit.vue

@@ -80,7 +80,7 @@
 
          </div>
 
-         <div style="margin: 16px;">
+         <div style="margin: 16px auto;width: 50%;">
            <van-button round block type="primary" native-type="submit">
              保存
            </van-button>
@@ -215,6 +215,11 @@
 </script>
 
 <style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;

src/views/sunVillage_info/passWord.vue

@@ -0,0 +1,183 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      修改密码
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn" @click="send">保存</div>
+    </div>
+    <van-form @submit="onSubmit" ref="formData">
+      <div class="list_main">
+
+        <van-field required label="旧密码" :rules="[{ required: true , message:'请输入旧密码' }]" v-model="user.oldPassword" placeholder="请输入旧密码" input-align="right" :border="false" />
+
+        <van-field required label="新密码" :rules="[{ required: true , message:'请输入新密码'}]" v-model="user.newPassword" placeholder="请输入新密码" input-align="right" :border="false" />
+
+        <van-field required label="确认密码" :rules="[{ required: true, message: '请确认密码' }]" prop="email" v-model="user.confirmPassword" placeholder="请确认密码" input-align="right" :border="false" />
+
+      </div>
+
+<!--      <div style="margin: 16px;">-->
+<!--        <van-button round block type="primary" native-type="submit">-->
+<!--          保存-->
+<!--        </van-button>-->
+<!--      </div>-->
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { updateUserPwd } from "@/api/sunVillage_info/fixedAssets";
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        user:{},
+      };
+    },
+    created() {
+    },
+    methods: {
+      send(){
+        this.$refs.formData.submit();
+      },
+      onSubmit(){
+        var that = this;
+        if (this.user.newPassword != this.user.confirmPassword){
+          that.$notify({ type: 'warning', message: '两次输入的密码不一致！' });
+          return;
+        }
+        updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+          that.$notify({ type: 'success', message: '修改成功！' });
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 56.4px;
+        height: 40.8px;
+        font-size: 14PX;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+        line-height: 40.8px;
+      }
+    }
+    .release_head{
+      height: 90px;
+      padding:0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+      .people{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        .icon{
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+      .time{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content:flex-end;
+        .icon{
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+    .release_conetnt{
+      padding:0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+      img{
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+      p{
+        margin-bottom: 16px;
+      }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+      &:first-child{
+        padding-top: 0;
+      }
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: auto;
+      display: flex;
+      align-items: center;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0PX;
+    }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
+  }
+</style>

src/views/sunVillage_info/user.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      个人信息
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn" @click="send">保存</div>
+    </div>
+    <van-form @submit="onSubmit" ref="formData">
+      <div class="list_main">
+
+        <van-field required label="用户昵称" :rules="[{ required: true , message:'请输入用户昵称' }]" v-model="user.nickName" placeholder="请输入用户昵称" input-align="right" :border="false" />
+
+        <van-field required label="手机号码" :rules="[{ required: true , message:'请输入手机号码'},{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/ , message:'请输入手机号码'}]" v-model="user.phonenumber" placeholder="请输入手机号码" input-align="right" :border="false" />
+
+        <van-field required label="邮箱" :rules="[{ required: true, message: '邮箱地址不能为空' }]" prop="email" v-model="user.email" placeholder="请输入邮箱" input-align="right" :border="false" />
+
+        <van-field name="radio" label="性别" input-align="right" :border="false">
+          <template #input>
+            <van-radio-group v-model="user.sex" direction="horizontal">
+              <van-radio name="0">男</van-radio>
+              <van-radio name="1">女</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+
+      </div>
+
+<!--      <div style="margin: 16px;">-->
+<!--        <van-button round block type="primary" native-type="submit">-->
+<!--          保存-->
+<!--        </van-button>-->
+<!--      </div>-->
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { addOddjob , getUserProfile , updateUserProfile } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        user:{
+          sex:0
+        },
+      };
+    },
+    created() {
+      this.getUser();
+    },
+    methods: {
+      getUser() {
+        getUserProfile().then(response => {
+          this.user = response.data;
+        });
+      },
+      send(){
+        this.$refs.formData.submit();
+      },
+      onSubmit(){
+        var that = this;
+        updateUserProfile(this.user).then(response => {
+          that.$notify({ type: 'success', message: '修改成功！' });
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
+        });
+      },
+      onConfirmOpenNy(data){
+        this.form.jobTime = this.format(data,'yyyy-MM-dd');
+        this.jobTime = data;
+        this.showBuildTime = false;
+      },
+
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 56.4px;
+        height: 40.8px;
+        font-size: 14PX;
+        position: absolutze;
+        right: 38px;
+        top: 36px;
+        line-height: 40.8px;
+      }
+    }
+    .release_head{
+      height: 90px;
+      padding:0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+      .people{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        .icon{
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+      .time{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content:flex-end;
+        .icon{
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+    .release_conetnt{
+      padding:0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+      img{
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+      p{
+        margin-bottom: 16px;
+      }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+      &:first-child{
+        padding-top: 0;
+      }
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: auto;
+      display: flex;
+      align-items: center;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0PX;
+    }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
+  }
+</style>