Home Explore Help
Register Sign In
usoft
/
sso-parent
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修复后台管理验收提供的页面显示问题

huxz 7 years ago
parent
1caf34edb0
commit
0fc0035e0e
5 changed files with 16 additions and 10 deletions
Split View Show Diff Stats
  1. 2 1
      .gitignore
  2. 3 3
      gradle/persist-publish.gradle
  3. 5 3
      sso-manage-console-web/config/index.js
  4. 5 2
      sso-manage-console-web/src/components/accounts/enterprises/EnterpriseBasicInfo.vue
  5. 1 1
      sso-manage-console/src/main/resources/templates/index.html

+ 2 - 1
.gitignore
View File 

@@ -60,6 +60,7 @@ repo/
 
 dist/
 
 node_modules/
 
 sso-manage-console/src/main/resources/public/
 
+sso-manage-console/src/main/resources/templates/
 
 
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 
-!/.mvn/wrapper/maven-wrapper.jar
 
+!/.mvn/wrapper/maven-wrapper.jar

+ 3 - 3
gradle/persist-publish.gradle
View File 

@@ -20,7 +20,7 @@ task persistJar(type: Jar) {
 
     baseName "sso-persist"
 
     from sourceSets.main.output
 
     exclude "spring", "config"
 
-    include "**/entity/**", "**/dao/**", "**/core/**", "**/util/**"
 
+    include "**/entity/**", "**/dao/**", "**/core/**", "**/util/**", "**/support/**"
 
 }
 
 
 task persistSourcesJar(type: Jar) {
 
@@ -28,7 +28,7 @@ task persistSourcesJar(type: Jar) {
 
     classifier 'sources'
 
     from sourceSets.main.allSource
 
     exclude "spring", "config"
 
-    include "**/entity/**", "**/dao/**", "**/core/**", "**/util/**"
 
+    include "**/entity/**", "**/dao/**", "**/core/**", "**/util/**", "**/support/**"
 
 }
 
 
 // Create artifact for other project import
 
@@ -73,4 +73,4 @@ publishing {
 
             }
 
         }
 
     }
 
-}
 
+}

+ 5 - 3
sso-manage-console-web/config/index.js
View File 

@@ -4,7 +4,9 @@
 
 
 const path = require('path')
 
 
-const dist = '../../sso-manage-console/src/main/resources/public'
 
+const dist = '../../sso-manage-console/src/main/resources'
 
+const template = `${dist}/templates`
 
+const resources = `${dist}/public`
 
 
 module.exports = {
 
   dev: {
 
@@ -53,10 +55,10 @@ module.exports = {
 
 
   build: {
 
     // Template for index.html
 
-    index: path.resolve(__dirname, dist + '/index.html'),
 
+    index: path.resolve(__dirname, template + '/index.html'),
 
 
     // Paths, move files to backed server program
 
-    assetsRoot: path.resolve(__dirname, dist),
 
+    assetsRoot: path.resolve(__dirname, resources),
 
     assetsSubDirectory: 'static',
 
     assetsPublicPath: '/',

+ 5 - 2
sso-manage-console-web/src/components/accounts/enterprises/EnterpriseBasicInfo.vue
View File 

@@ -51,8 +51,7 @@
 
           </span>
 
       </el-form-item>
 
       <el-form-item label="注册时间">
 
-        <!-- TODO 注册时间 -->
 
-        <div v-text="enterpriseInfo.registerDate">2017-06-11 12:51:44</div>
 
+        <div v-text="showRegisteDate(enterpriseInfo.registerDate)">2017-06-11 12:51:44</div>
 
       </el-form-item>
 
       <el-form-item>
 
         <div class="action-form-item">
 
@@ -67,6 +66,7 @@
 
   import _ from 'lodash'
 
   import axios from '@/assets/js/axios'
 
   import * as types from '@/store/mutation-types'
 
+  import { formatDate } from '@/assets/js/utils'
 
 
   export default {
 
     name: 'enterprise-basic-info',
 
@@ -107,6 +107,9 @@
 
           return 0
 
         }
 
         this.$message.info('该企业没有上传营业执照附件')
 
+      },
 
+      showRegisteDate (timestamp) {
 
+        formatDate(null, null, timestamp)
 
       }
 
     },
 
     mounted () {

+ 1 - 1
sso-manage-console/src/main/resources/templates/index.html
View File 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>sso-manage-console-web</title><link href=/static/css/app.ea3c1668a479c363f536125083785b3d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f90036c9cf6c695af715.js></script><script type=text/javascript src=/static/js/vendor.c0860049e31b16a93cfc.js></script><script type=text/javascript src=/static/js/app.23fbd42252c33442fd7e.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>sso-manage-console-web</title><link href=/static/css/app.2f9b7de37344e83809000347472bf751.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f7fbc18a0f7fc91b6723.js></script><script type=text/javascript src=/static/js/vendor.c0860049e31b16a93cfc.js></script><script type=text/javascript src=/static/js/app.f65fc7abdbee8bbba516.js></script></body></html>