修改

zkeyword · Jan 25, 2017 · 953160d · 953160d
1 parent 7b1b1ed
commit 953160d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 42 deletions.
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui"/>
-<title>vue2-demo</title>
+<title>寻族宝</title>
 </head>
 <body>
     <div id="app">加载中...</div>

diff --git a/src/App.vue b/src/App.vue
@@ -1,7 +1,7 @@
 <template>
     <div style="height: 100%">
         <router-view></router-view>
-        <toast v-model="isShowToast" type="text">{{toastText}}</toast>
+        <toast v-model="isShowToast" type="text" @on-hide="onHide">{{toastText}}</toast>
         <loading v-model="isShowLoading" :text="loadingText"></loading>
     </div>
 </template>
@@ -10,11 +10,6 @@
     import { mapGetters } from 'vuex'
     export default {
         name: 'app',
-        data() {
-            return {
-                // isShowToast: true
-            }
-        },
         computed: mapGetters([
             'isShowToast',
             'toastText',
@@ -24,6 +19,14 @@
         components: {
             Toast,
             Loading
+        },
+        methods: {
+            ...mapActions([
+                'showToast'
+            ]),
+            onHide() {
+                this.showToast()
+            }
         }
     }
 </script>
diff --git a/src/api/index.js b/src/api/index.js
@@ -2,7 +2,7 @@ import axios from 'axios'
 export default {
     reset(data) {
         return axios
-            .get('/api/auth/reset_password', data)
+            .post('/api/auth/reset_password', data)
     },
     login(data) {
         return axios
@@ -26,11 +26,11 @@ export default {
     },
     parent(data) {
         return axios
-            .get('/api/common/parent_items', data)
+            .get('/api/common/parent_items', { params: data })
     },
     spouseList(data) {
         return axios
-            .get('/api/common/spouse_items', data)
+            .get('/api/common/spouse_items', { params: data })
     },
     perfectInfo(data) {
         return axios

diff --git a/src/pages/base/signUp.vue b/src/pages/base/signUp.vue
@@ -28,7 +28,7 @@
                     <input type="number" class="ui-input" placeholder="请输入您的家族标识" v-model="family_sn" maxlength="11">
                 </div>
             </div>
-            <div class="ui-btn max" @click="verifySms">下一步</div>
+            <div class="ui-btn max" v-bind:class="isNext" @click="verifySms">下一步</div>
         </div>
     </section>
 </template>
@@ -53,6 +53,9 @@
             ltHeader
         },
         computed: {
+            isNext() {
+                
+            },
             isGetCode() {
                 let isDisable = true
                 if (this.isRequestCode) {
@@ -74,8 +77,7 @@
             ...mapActions([
                 'postSendSms',
                 'postVerifySms',
-                'postRegister',
-                'showToast'
+                'postRegister'
             ]),
             getCode() {
                 if (!this.isRequestCode) return
@@ -100,7 +102,8 @@
                 let self = this
                 self.postVerifySms({
                     params: {
-                        'code': self.code
+                        code: self.code,
+                        mobile: self.mobile
                     },
                     success() {
                         self.postRegister({

diff --git a/src/store/getters.js b/src/store/getters.js
@@ -4,9 +4,5 @@ export default {
     isShowToast: state => state.isShowToast,
     toastText: state => state.toastText,
     isShowLoading: state => state.isShowLoading,
-    loadingText: state => state.loadingText,
-    userFormName: state => state.userFormName,
-    userFormValue: state => state.userFormValue,
-    userFormType: state => state.userFormType,
-    userFormTitle: state => state.userFormTitle
+    loadingText: state => state.loadingText
 }
diff --git a/src/store/index.js b/src/store/index.js
@@ -13,11 +13,7 @@ const state = {
     isShowToast: false,
     toastText: '',
     isShowLoading: false,
-    loadingText: '请稍候~~',
-    userFormName: '',
-    userFormValue: '',
-    userFormType: '',
-    userFormTitle: ''
+    loadingText: '请稍候~~'
 }
 
 export default new Vuex.Store({

diff --git a/src/store/mutations.js b/src/store/mutations.js
@@ -40,18 +40,5 @@ export default {
     },
     [HIDELOADING](state) {
         state.isShowLoading = false
-    },
-    /* 用户表单 */
-    [USERFORMTITLE](state, { title }) {
-        state.userFormTitle = title
-    },
-    [USERFORMTYPE](state, obj) {
-        state.userFormType = obj
-    },
-    [USERFORMNAME](state, { name }) {
-        state.userFormName = name
-    },
-    [USERFORMVALUE](state, { value }) {
-        state.userFormValue = value
     }
 }
diff --git a/src/store/types.js b/src/store/types.js
@@ -8,8 +8,3 @@ export const HIDETOAST = 'HIDETOAST'
 
 export const SHOWLOADING = 'SHOWLOADING'
 export const HIDELOADING = 'HIDELOADING'
-
-export const USERFORMTITLE = 'USERFORMTITLE'
-export const USERFORMTYPE = 'USERFORMNAME'
-export const USERFORMNAME = 'USERFORMNAME'
-export const USERFORMVALUE = 'USERFORMVALUE'