Merge branch 'master' into 'dev'

# Conflicts: # src/components/product-intro.vue # src/views/home.vue # src/views/register.vue

Merge branch 'master' into 'dev'
# Conflicts: # src/components/product-intro.vue # src/views/home.vue # src/views/register.vue
a76af235 · Administrator · 03ef7229 · 148bb131 · a76af235 · a76af235
Commit a76af235 authored Mar 02, 2023 by Administrator
Show whitespace changes
Inline Side-by-side

Showing with 31 additions and 7 deletions

src/App.vue
+3 -0

src/components/head.vue
+1 -1

src/router/index.js
+5 -5

src/views/home.vue
+21 -0

src/views/register.vue
+1 -1

No files found.
--- a/src/App.vue
+++ b/src/App.vue
 <template>
  <div id="app">
+    <!-- <Head /> -->
    <router-view />
  </div>
 </template>
 <script>
+// import Head from './components/head.vue'
 export default {
  data() {
    return {}
  },
+  // components: { Head },
 }
 </script>
 <style>

--- a/src/components/head.vue
+++ b/src/components/head.vue
@@ -64,7 +64,7 @@ export default {
      })
    },
    login() {
-      this.$router.push('/login')
+      this.$router.push('/')
    },
    register() {
      this.$router.push('/register')

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -48,11 +48,11 @@ const routes = [
    name: 'register',
    component: (resolve) => require(['../views/register'], resolve),
  },
-  {
+  // {
-    path: '/login',
+  //   path: '/login',
-    name: 'login',
+  //   name: 'login',
-    component: (resolve) => require(['../views/login'], resolve),
+  //   component: (resolve) => require(['../views/login'], resolve),
-  },
+  // },
  {
    path: '/contact',
    name: 'contact',

--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -34,6 +34,27 @@ export default {
    this.$el.removeEventListener('scroll', this.onScroll)
  },
  methods: {
+    submitForm(e) {
+      e.preventDefault()
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          const hash = md5.create()
+          hash.update(this.ruleForm.password)
+          const passwordHash = hash.hex()
+          let url = `business/user/login`
+          post(url, {
+            email: this.ruleForm.email,
+            password: passwordHash,
+          }).then((res) => {
+            if (res.code === 200) {
+              this.ruleForm = {}
+              this.$router.push('/contact')
+            }
+          })
+        }
+      })
+    },
    onScroll() {
      const top = this.$el.scrollTop
      if (top === 0) {

--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -86,7 +86,7 @@
      </div>
      <div style="margin-top: 20px; font-size: 14px; text-align: center">
        已有账号？
-        <router-link class="link" to="/login">马上登录</router-link>
+        <router-link class="link" to="/">马上登录</router-link>
      </div>
    </div>
  </div>