Home Esplora Aiuto
Accedi
suochencheng
/
zhinengdahui
forkato da xiongzhu/tutuxiang
1
0
Forka 0
File
Sfoglia il codice sorgente

图片更新

panhui 7 anni fa
parent
9fbb77093c
commit
7bb60d064a
10 ha cambiato i file con 20 aggiunte e 10 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 11 5
      src/main/vue/src/pagesPre/App.vue
  2. 6 2
      src/main/vue/src/pagesPre/Register.vue
  3. 1 1
      src/main/webapp/WEB-INF/html/admin.html
  4. 1 1
      src/main/webapp/WEB-INF/html/index.html
  5. 1 0
      src/main/webapp/static/css/index.0871c8e21121b80e79a087b817e61d11.css
  6. 0 1
      src/main/webapp/static/css/index.25d509a11c6fb3d133d1c240597703c0.css
  7. 0 0
      src/main/webapp/static/js/11.aa41a2da3910fa271777.js
  8. 0 0
      src/main/webapp/static/js/11.ebdeb655314ac34399c0.js
  9. 0 0
      src/main/webapp/static/js/21.fd982daf47c3f30c1a36.js
  10. 0 0
      src/main/webapp/static/js/manifest.16e5d30ce39a0a4dddf8.js

+ 11 - 5
src/main/vue/src/pagesPre/App.vue
Vedi File 

@@ -26,8 +26,8 @@
 
                                 <span>服务列表</span>
 
                                 <span>服务列表</span>
 
                                 <img src="../assetsPre/menu.png" alt="">
 
                                 <img src="../assetsPre/menu.png" alt="">
 
                             </div>
 
                             </div>
 
-                            <transition name='slide-down'>
 
-                                <div class="service-content" v-if="showMenu">
 
+                            <transition name='slide-down' v-if="showMenu">
 
+                                <div class="service-content">
 
                                     <div class="serive-item" v-for="(item,index) in serviceType">
 
                                     <div class="serive-item" v-for="(item,index) in serviceType">
 
                                         <div class="title">{{item.serviceType}}</div>
 
                                         <div class="title">{{item.serviceType}}</div>
 
                                         <div class="serive-val-list">
 
                                         <div class="serive-val-list">
 
@@ -458,16 +458,22 @@ export default {
 
 
 
                     .serive-val-list {
 
                     .serive-val-list {
 
                         padding-bottom: 12px;
 
                         padding-bottom: 12px;
 
-
 
+                        display: -webkit-box;
 
+                        display: -webkit-flex;
 
+                        display: -ms-flexbox;
 
+                        display: flex;
 
+                        -webkit-flex-wrap: wrap;
 
+                        -webkit-box-lines: multiple;
 
+                        -moz-flex-wrap: wrap;
 
+                        flex-wrap: wrap;
 
                         a {
 
                         a {
 
-                            display: inline-block;
 
-                            width: 30%;
 
                             font-size: 12px;
 
                             font-size: 12px;
 
                             font-family: MicrosoftYaHei;
 
                             font-family: MicrosoftYaHei;
 
                             color: rgba(102, 102, 102, 1);
 
                             color: rgba(102, 102, 102, 1);
 
                             line-height: 16px;
 
                             line-height: 16px;
 
                             margin-top: 6px;
 
                             margin-top: 6px;
 
                             text-decoration: none;
 
                             text-decoration: none;
 
+                            padding: 0 5px;
 
                         }
 
                         }
 
                     }
 
                     }

+ 6 - 2
src/main/vue/src/pagesPre/Register.vue
Vedi File 

@@ -408,7 +408,11 @@ export default {
 
                     this.$message.warning('请发送验证码')
 
                     this.$message.warning('请发送验证码')
 
                     resolve(false)
 
                     resolve(false)
 
                 }
 
                 }
 
-                else if (!this.formData1.code) {
 
+                else if (this.activeName == 'first' && !this.formData1.code) {
 
+                    this.$message.warning('请输入验证码')
 
+                    resolve(false)
 
+                }
 
+                else if (this.activeName == 'second' && !this.formData.code) {
 
                     this.$message.warning('请输入验证码')
 
                     this.$message.warning('请输入验证码')
 
                     resolve(false)
 
                     resolve(false)
 
                 }
 
                 }
 
@@ -417,7 +421,7 @@ export default {
 
                         url: '/rong/verifyCode',
 
                         url: '/rong/verifyCode',
 
                         data: {
 
                         data: {
 
                             sessionId: this.backCode,
 
                             sessionId: this.backCode,
 
-                            code: this.formData1.code
 
+                            code: this.activeName == 'second' ? this.formData.code : this.formData1.code
 
                         }
 
                         }
 
                     }).then(res => {
 
                     }).then(res => {
 
                         if (res.success) {
 
                         if (res.success) {

+ 1 - 1
src/main/webapp/WEB-INF/html/admin.html
Vedi File 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.01ae1664c9c2c87cf19c.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/admin.3725b6b904015686c98e.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.16e5d30ce39a0a4dddf8.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/admin.3725b6b904015686c98e.js></script></body></html>

+ 1 - 1
src/main/webapp/WEB-INF/html/index.html
Vedi File 

@@ -5,7 +5,7 @@
 
             position: absolute;
 
             position: absolute;
 
             top: 0;
 
             top: 0;
 
             left: 0;
 
             left: 0;
 
-        }</style><link href=/static/css/index.25d509a11c6fb3d133d1c240597703c0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.01ae1664c9c2c87cf19c.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/index.b346cb207392f75cd89e.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
 
+        }</style><link href=/static/css/index.0871c8e21121b80e79a087b817e61d11.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.16e5d30ce39a0a4dddf8.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/index.b346cb207392f75cd89e.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
 
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
 
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
 
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
 
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
 
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
 
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/static/css/index.0871c8e21121b80e79a087b817e61d11.css


File diff suppressed because it is too large
+ 0 - 1
src/main/webapp/static/css/index.25d509a11c6fb3d133d1c240597703c0.css


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/11.aa41a2da3910fa271777.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/11.ebdeb655314ac34399c0.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/21.fd982daf47c3f30c1a36.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/manifest.16e5d30ce39a0a4dddf8.js


Some files were not shown because too many files changed in this diff