vue 1.0.1

sourcecode/h5app/vue/src/App.vue

@@ -8,7 +8,7 @@
 <script>
     import TabBar from "./components/TabBar";
     export default {
-        components: {TabBar}
+        components: {TabBar},
     }
 </script>
 

sourcecode/h5app/vue/src/components/TabBar.vue

@@ -10,11 +10,6 @@
                         style="width: 30px; height: 30px"
                 >
             </van-tabbar-item>
-            <van-tabbar-item to="/presentRegister">
-                <img src="../assets/add_button.png"
-                     class="add_button"
-                />
-            </van-tabbar-item>
             <van-tabbar-item to="/me">
                 <span>我的</span>
                 <img
@@ -51,11 +46,5 @@
 </script>
 
 <style scoped>
-.add_button {
-    position: relative;
-    margin-bottom: 45px;
-    width: 50px;
-    height: 50px;
-    z-index: 1;
-}
+
 </style>

sourcecode/h5app/vue/src/components/addPresentButton.vue

@@ -0,0 +1,39 @@
+<template>
+    <div class="button_container">
+            <img src="../assets/add_button_active.png"
+                 class="add_button"
+                 v-if="can_add" @click="toAddPresent"
+            />
+            <img src="../assets/add_button_inactive.png"
+                 class="add_button"
+                 v-if="!can_add"
+            />
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "add-present-button",
+        props: ['can_add'],
+        methods: {
+            toAddPresent() {
+                this.$router.push('presentRegister');
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .add_button {
+        width: 50px;
+        height: 50px;
+        pointer-events: auto;
+    }
+    .button_container {
+        position: fixed;
+        bottom: 20px;
+        z-index: 2;
+        width: 100%;
+        pointer-events: none;
+    }
+</style>

sourcecode/h5app/vue/src/views/SecurityVerify.vue

@@ -19,9 +19,9 @@
                         label="短信验证码"
                         placeholder="请输入短信验证码"
                         required
-                        disabled=false
+                        disabled
                 >
-                    <van-button slot="button" size="small" type="primary" disabled=false>发送验证码</van-button>
+                    <van-button slot="button" size="small" type="primary">发送验证码</van-button>
                 </van-field>
                 <van-field
                         v-model="password"

sourcecode/h5app/vue/src/views/index.vue

@@ -23,16 +23,19 @@
                     @to-detail="toDetail(index)"
             ></li>
         </ul>
+        <add-present-button :can_add="button_active"/>
     </div>
 </template>
 
 <script>
     import IndexPresent from "../components/IndexPresent";
     import { Button, Row, Col} from "vant"
+    import AddPresentButton from "../components/addPresentButton";
 
     export default {
         name: "index",
         components: {
+            AddPresentButton,
             IndexPresent,
             [Button.name]: Button,
             [Row.name]: Row, [Col.name]: Col
@@ -41,6 +44,7 @@
             return {
                 active: 0,
                 indexTop: require('../assets/banner.png'),
+                button_active: false,
             }
         },
         computed: {

sourcecode/h5app/vue/src/views/login.vue

@@ -29,9 +29,9 @@
                     label="短信验证码"
                     placeholder="请输入短信验证码（暂时不用）"
                     required
-                    disabled=false
+                    disabled
             >
-                <van-button slot="button" size="small" type="primary" disabled=false>发送验证码</van-button>
+                <van-button slot="button" size="small" type="primary" disabled>发送验证码</van-button>
             </van-field>
         </van-cell-group>
         <div style="position: fixed; bottom: 5px; width:100%">
@@ -75,16 +75,16 @@
                 }
                 // 检查手机号有无注册
 
-                // let API = "http://south.niimei.com:8866/server";
-                // let GETUSERINFO = "/smartUsers/list";
-                // this.$http.get(API+GETUSERINFO).then((data) => {
-                //     // 响应成功回调
-                //     console.log(data);
-                // }, (err) => {
-                //     // 响应错误回调
-                //     console.log(err);
-                //     console.log(this);
-                // });
+                let API = "http://south.niimei.com:8866/server";
+                let GETUSERINFO = "/smartUsers/list";
+                this.$http.get(API+GETUSERINFO).then((data) => {
+                    // 响应成功回调
+                    console.log(data);
+                }, (err) => {
+                    // 响应错误回调
+                    console.log(err);
+                    console.log(this);
+                });
                 // let login_info = {
                 //     phone: this.phone,
                 //     pass: this.password

sourcecode/h5app/vue/src/views/me.vue

@@ -1,12 +1,23 @@
 <template>
     <div>
         <h1>我的页面</h1>
+        <add-present-button :can_add="button_active"/>
     </div>
 </template>
 
 <script>
+    import AddPresentButton from "../components/addPresentButton";
     export default {
         name: "me",
+        components: {AddPresentButton},
+        data() {
+            return {
+                button_active: true
+            }
+        },
+        created: function () {
+            this.button_active = false;
+        }
     }
 </script>