fix(front): 逻辑调整

front/project/www/components/Header/index.js

@@ -89,7 +89,7 @@ function Header(props) {
               }
             >
               <Link to="/my/main" className="info">
-                <Assets className="avatar" src={user.info.avatar} />
+                <Assets className="avatar" name="sun_blue" src={user.info.avatar} />
                 <span className="t-2 f-s-12">{user.info.nickname || `qx${user.info.mobile}`}</span>
               </Link>
             </Dropdown>

front/project/www/routes/my/main/index.less

@@ -3,9 +3,11 @@
 #my-main {
   .top-layout {
     position: relative;
+
     .assets {
       width: 100%;
     }
+
     .close {
       top: 12px;
       right: 12px;
@@ -14,6 +16,7 @@
       cursor: pointer;
       position: absolute;
     }
+
     .go {
       top: 37px;
       right: 51px;
@@ -59,6 +62,7 @@
 
     .action {
       padding: 10px 30px;
+      position: relative;
 
       .button {
         margin-right: 10px;
@@ -75,11 +79,25 @@
 
       .right {
         cursor: pointer;
-        float: right;
-        position: relative;
+        position: absolute;
         z-index: 1000;
+        right: 30px;
+        top: 12px;
         background-color: #fff;
 
+        >span {
+          margin-right: 10px;
+        }
+
+        .g-date-block.hide-input {
+          display: none;
+        }
+
+        .g-date {
+          right: 0;
+          left: unset !important;
+        }
+
         .cal {
           position: absolute;
           right: 0;
@@ -278,14 +296,17 @@
 
   .vip-layout {
     text-align: center;
+
     .body {
       padding: 20px 20px 10px;
       border-bottom: 1px solid #eee;
       text-align: left;
+
       .t {
         line-height: 30px;
       }
     }
+
     .footer {
       padding: 12px 0;
     }

front/project/www/routes/my/main/page.js

@@ -4,7 +4,7 @@ import './index.less';
 import { Tooltip, Icon } from 'antd';
 import Page from '@src/containers/Page';
 import Assets from '@src/components/Assets';
-import { formatPercent, formatDate, formatSeconds, getMap } from '@src/services/Tools';
+import { zeroFill, formatPercent, formatDate, formatSeconds, getMap } from '@src/services/Tools';
 import { asyncSMessage } from '@src/services/AsyncTools';
 import moment from 'moment';
 import Date from '../../../components/Date';
@@ -435,14 +435,13 @@ export default class extends Page {
             }}
           />
           <div className="right">
+            {day === 'other' && <span>{formatDate(time, 'YYYY-MM-DD')}</span>}
             <Assets
-              className="right"
               name="calendar"
               onClick={() => {
                 this.setState({ showCal: true });
               }}
             />
-            {day === 'other' && <span className="right">{formatDate(time, 'YYYY-MM-DD')}</span>}
             {showCal && (
               <Date
                 show
@@ -535,7 +534,7 @@ export default class extends Page {
               >
                 {info.nickname || `qx${info.mobile}`}{' '}
               </div>
-              <div className="id">ID: {info.id} </div>
+              <div className="id">ID: {zeroFill(info.id, 4)} </div>
             </div>
           </div>
           <div className="auth">

front/src/services/Tools.js

@@ -78,6 +78,9 @@ export function checkEmail(s) {
   }
   return false;
 }
+export function zeroFill(num, length) {
+  return (Array(length).join('0') + num).slice(-length);
+}
 export function loadScript(url, callback) {
   const script = document.createElement('script');
   script.type = 'text/javascript';

server/gateway-api/src/main/java/com/qxgmat/service/UsersService.java

@@ -150,18 +150,18 @@ public class UsersService extends AbstractService {
         User mm = User.builder()
                 .id(openUser != null ? openUser.getId() : null)
                 .build();
-        if (openUser ==null || openUser.getAvatar() == null || openUser.getAvatar().isEmpty()) {
-            mm.setAvatar(data.getAvatar());
-            if(openUser != null){
-                openUser.setAvatar(data.getAvatar());
-            }
-        }
-        if (openUser == null || openUser.getNickname() == null|| openUser.getNickname().isEmpty()){
-            mm.setNickname(data.getNickName());
-            if(openUser != null){
-                openUser.setNickname(data.getNickName());
-            }
-        }
+//        if (openUser ==null || openUser.getAvatar() == null || openUser.getAvatar().isEmpty()) {
+//            mm.setAvatar(data.getAvatar());
+//            if(openUser != null){
+//                openUser.setAvatar(data.getAvatar());
+//            }
+//        }
+//        if (openUser == null || openUser.getNickname() == null|| openUser.getNickname().isEmpty()){
+//            mm.setNickname(data.getNickName());
+//            if(openUser != null){
+//                openUser.setNickname(data.getNickName());
+//            }
+//        }
 
         switch(platform){
             case "wechat_pc":
@@ -226,6 +226,7 @@ public class UsersService extends AbstractService {
             user.setRegisterIp(registerIp);
             user.setRegisterCity(registerInfo != null ? String.join(",",registerInfo) : "");
             user.setLatestLoginIp(registerIp);
+            user.setNickname("qx"+user.getMobile());
         }
         // 绑定第三方登录信息
         if (openUser != null){
@@ -250,8 +251,8 @@ public class UsersService extends AbstractService {
         if(openUser.getWechatUnionid() != null) user.setWechatUnionid(openUser.getWechatUnionid());
         if(openUser.getWechatAccessToken() != null) user.setWechatAccessToken(openUser.getWechatAccessToken());
         if(openUser.getWechatRefreshToken() != null) user.setWechatRefreshToken(openUser.getWechatRefreshToken());
-        if(openUser.getNickname() != null) user.setNickname(openUser.getNickname());
-        if(openUser.getAvatar() != null) user.setAvatar(openUser.getAvatar());
+//        if(openUser.getNickname() != null) user.setNickname(openUser.getNickname());
+//        if(openUser.getAvatar() != null) user.setAvatar(openUser.getAvatar());
         return user;
     }