From 989837d3259d7d988375d37a22e33a1092bf4bf5 Mon Sep 17 00:00:00 2001
From: tridays <tridays@qq.com>
Date: Wed, 12 Oct 2016 02:11:30 +0800
Subject: [PATCH] update

---
 src/App.vue               |  2 +-
 src/filters/index.js      |  3 ---
 src/router/index.js       |  5 +---
 src/service/index.js      | 26 ++++++++++-----------
 src/service/mock/index.js | 13 ++++-------
 src/service/prod/index.js |  7 ++----
 src/store/index.js        | 27 +++++++++++++++++-----
 src/views/Home.vue        | 48 +++++++++++++++++++++++----------------
 src/views/Login.vue       | 17 ++++++--------
 9 files changed, 78 insertions(+), 70 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2a2206e..642d89d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,7 +41,7 @@
     },
     computed: {
       login: function () {
-        return !!this.$store.state.user
+        return !!this.$store.state.account
       }
     }
   }
diff --git a/src/filters/index.js b/src/filters/index.js
index 622e375..e69de29 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -1,3 +0,0 @@
-/**
- * Created by cauchywei on 16/10/11.
- */
diff --git a/src/router/index.js b/src/router/index.js
index a562557..c31113a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,14 +1,11 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+
 import LoginView from '../views/Login.vue'
 import HomeView from '../views/Home.vue'
 
 Vue.use(Router)
 
-// import { createListView } from '../views/CreateListView'
-// import ItemView from '../views/ItemView.vue'
-// import UserView from '../views/UserView.vue'
-
 var router = new Router({
   mode: 'history',
   scrollBehavior: () => ({y: 0}),
diff --git a/src/service/index.js b/src/service/index.js
index 48a9284..f6bbe86 100644
--- a/src/service/index.js
+++ b/src/service/index.js
@@ -5,7 +5,7 @@
 import mockAxios from './mock'
 import prodAxios from './prod'
 
-const env = 'mock'
+const env = 'prod'
 const axios = env === 'mock' ? mockAxios : prodAxios
 
 export function login (username, password) {
@@ -38,18 +38,18 @@ export function register (data) {
   })
 }
 
-export function searchBook (name) {
-  const params = {
-    'ISBN': name,
-    'name': name,
-  }
-  const form = new FormData()
-  form.append('ISBN', name)
-  form.append('name', 'name')
+export function searchBook(params) {
+  return axios.get('/books/search', {
+    params: params
+  });
+}
 
-  return axios({
-    method: 'get',
-    url: '/books/search',
+export function getProfile() {
+  return axios.get('/users/self/');
+}
+
+export function setProfile(form) {
+  return axios.post('/books/self/', {
     data: form
-  })
+  });
 }
diff --git a/src/service/mock/index.js b/src/service/mock/index.js
index 4cf3d6d..36d247e 100644
--- a/src/service/mock/index.js
+++ b/src/service/mock/index.js
@@ -1,6 +1,3 @@
-/**
- * Created by cauchywei on 16/10/11.
- */
 import axios from 'axios'
 import MockAdapter from 'axios-mock-adapter'
 
@@ -8,7 +5,7 @@ var instance = axios.create()
 const mock = new MockAdapter(instance)
 
 mock.onPost('/users/login').reply(200, {
-  role: 'reader',
+  role: 'READER',
   id: 1,
   username: 'cauchywei',
   name: 'Wei Qin',
@@ -17,11 +14,11 @@ mock.onPost('/users/login').reply(200, {
   major: 'CS',
   phone: '23333',
   email: 'cauchywei@gmail.com',
-  remarks: []
+  remarks: 'hi'
 })
 
-mock.onGet('/test').reply(200, {
-  role: 'reader',
+mock.onGet('/users/self/').reply(200, {
+  role: 'READER',
   id: 1,
   username: 'cauchywei',
   name: 'Wei Qin',
@@ -30,7 +27,7 @@ mock.onGet('/test').reply(200, {
   major: 'CS',
   phone: '23333',
   email: 'cauchywei@gmail.com',
-  remarks: []
+  remarks: 'hi'
 })
 
 export default instance
diff --git a/src/service/prod/index.js b/src/service/prod/index.js
index b7f9f46..e2f462e 100644
--- a/src/service/prod/index.js
+++ b/src/service/prod/index.js
@@ -1,16 +1,13 @@
-/**
- * Created by cauchywei on 16/10/11.
- */
 import axios from 'axios'
 
 export function serviceUrl () {
-  return 'http://localhsot:8080/api/'
+  return 'http://xupu.name:6001/'
 }
 
 const instance = axios.create({
   baseURL: serviceUrl(),
   timeout: 1000,
   headers: {'X-Custom-Header': 'foobar'}
-})
+});
 
 export default instance
diff --git a/src/store/index.js b/src/store/index.js
index ac7a945..c7d3ee8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,13 +7,19 @@ import Vuex from 'vuex'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
+
   state: {
-    user: null
+    account: null,
+    searchBooks: null,
+    records: null,
+    books: null,
+    users: null
   },
+
   actions: {
-    ON_LOGIN: ({commit, dispatch, state}, user) => {
+    ON_LOGIN: ({commit, dispatch, state}, account) => {
       // commit('SET_ACTIVE_TYPE', {username,password})
-      commit('SET_LOGIN', user)
+      commit('SET_LOGIN', account)
       return Promise.resolve()
     },
 
@@ -21,6 +27,11 @@ const store = new Vuex.Store({
       // commit('SET_ACTIVE_TYPE', {username,password})
       commit('SET_LOGOUT')
       return Promise.resolve()
+    },
+
+    ON_SEARCH: ({ commit, dispatch, state }, { books }) => {
+      commit('SET_SEARCH_BOOKS', books);
+      return Promise.resolve()
     }
     // // ensure data for rendering given list type
     // FETCH_LIST_DATA: ({ commit, dispatch, state }, { type }) => {
@@ -57,11 +68,15 @@ const store = new Vuex.Store({
   mutations: {
 
     SET_LOGOUT: (state) => {
-      state.user = null
+      state.account = null
+    },
+
+    SET_LOGIN: (state, account) => {
+      state.account = account
     },
 
-    SET_LOGIN: (state, user) => {
-      state.user = user
+    SET_SEARCH_BOOKS: (state, { books }) => {
+      state.searchBooks = books
     }
 
     // SET_ACTIVE_TYPE: (state, { type }) => {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index b07e5a9..2515763 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -3,14 +3,14 @@
     <input class="input-search"
            autofocus autocomplete="off"
            placeholder="Search books here"
-           v-model="search-input"
-           @keyup.enter="addTodo" />
-    <section class="main" v-show="books.length" v-cloak>
+           v-model="searchInput"
+           @keyup.enter="search"/>
+    <section class="main" v-show="searchBooks.length" v-cloak>
       <ul class="book-list">
-        <li v-for="book in books"
+        <li v-for="book in searchBooks"
             class="book"
             :key="book.ISBN"
-            :class="{ completed: book.completed, editing: todo == editedTodo }">
+            :class="{ }">
           <div class="view">
             <label>{{ book.ISBN }}</label>
             <label>{{ book.name }}</label>
@@ -24,26 +24,34 @@
 </template>
 
 <script>
-
   import * as service from '../service'
 
-  var bookStorage = {
-    fetch: function () {
-      var books = [] // JSON.parse(localStorage.getItem(STORAGE_KEY) || '[]')
-      books.forEach(function (book, index) {
-        book.ISBN = index
-        book.name = index
-      })
-      bookStorage.count = books.length
-      return books
+  export default {
+    data() {
+      return {
+        searchBooks: [],
+        searchInput: ''
+      }
+    },
+    watch: {
     },
-    save: function (todos) {
-      // localStorage.setItem(STORAGE_KEY, JSON.stringify(todos))
+    methods: {
+      search: function() {
+        var value = this.searchInput && this.searchInput.trim()
+        if (!value) {
+          return
+        }
+        var params = {
+          'ISBN': name,
+          'name': name
+        };
+        service.searchBook(params).then(function (response) {
+          var data = response.data;
+          console.log(data);
+        })
+      }
     }
   }
-
-  export default {
-  }
 </script>
 
 <style scoped>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 2189abd..50c12a4 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,12 +1,9 @@
-/**
-* Created by cauchywei on 16/10/11.
-*/
 <template>
   <div id="login-panel">
     <form v-on:submit.prevent="login" id="login-form">
-      <input v-model="user.username" placeholder="username"/>
-      <input v-model="user.password" placeholder="password" type="password"/>
-      <button type="submit" class="action-button"> login</button>
+      <input v-model="account.username" placeholder="username" type="text"/>
+      <input v-model="account.password" placeholder="password" type="password"/>
+      <button type="submit" class="action-button">login</button>
     </form>
   </div>
 </template>
@@ -17,22 +14,22 @@
     el: '#login-panel',
     data () {
       return {
-        user: {
+        account: {
           username: '',
           password: ''
         },
-        data: {name: 'test'}
+        data: { name: 'test' }
       }
     },
     methods: {
       login () {
-        const length = this.user.username.length
+        const length = this.account.username.length
         if (length < 2 || length > 18) {
           alert("username's length must between 2~18")
           return
         }
         let self = this
-        service.login(this.username, this.password).then(function (response) {
+        service.login(this.account.username, this.account.password).then(function (response) {
           self.$store.dispatch('ON_LOGIN', response.data)
           self.$router.go(-1)
         }).catch(function (error) {