diff --git a/jshERP-web/public/static/bgimg.png b/jshERP-web/public/static/bgimg.png new file mode 100644 index 00000000..558f22c1 Binary files /dev/null and b/jshERP-web/public/static/bgimg.png differ diff --git a/jshERP-web/public/static/rightImg.png b/jshERP-web/public/static/rightImg.png new file mode 100644 index 00000000..da645e60 Binary files /dev/null and b/jshERP-web/public/static/rightImg.png differ diff --git a/jshERP-web/src/components/layouts/UserLayout.vue b/jshERP-web/src/components/layouts/UserLayout.vue index 226d32d8..72f785c7 100644 --- a/jshERP-web/src/components/layouts/UserLayout.vue +++ b/jshERP-web/src/components/layouts/UserLayout.vue @@ -1,19 +1,33 @@ @@ -28,7 +42,8 @@ mixins: [mixinDevice], data () { return { - systemTitle: window.SYS_TITLE + systemTitle: window.SYS_TITLE, + systemUrl: window.SYS_URL, } }, mounted () { @@ -40,8 +55,29 @@ } + \ No newline at end of file diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue index 4ef85fd2..9bbb6839 100644 --- a/jshERP-web/src/views/user/Login.vue +++ b/jshERP-web/src/views/user/Login.vue @@ -41,14 +41,14 @@ :loading="loginBtn" @mouseover="initWeixin" @click.stop.prevent="handleSubmit" - :disabled="loginBtn">确定 + :disabled="loginBtn">登 录 -