StephenArk30 6 лет назад
Родитель
Сommit
6d7422e7ef

+ 1 - 0
sourcecode/h5app/vue/src/connector/basic-service.js

@@ -121,6 +121,7 @@ var BasicFunction = new (function () {
     };
 
     this.get_data = function (url, callback, data, scope) {
+        console.log('calling get_data()');
         BasicFunction.Queue.list.push({url: url, callback: callback, gid: -1, data:data, scope: scope});
     };
 

+ 1 - 1
sourcecode/h5app/vue/src/views/index.vue

@@ -26,7 +26,7 @@
         </ul>
         <div style="margin: 50px 10px;">
             <p style="text-align: left; margin-left: 5px"><strong>简单四步,轻松互赠圣诞礼物</strong></p>
-            <img src="../assets/declare_icons/declare.jpg"/>
+            <img src="../assets/declare_icons/declare.jpg" style="margin-bottom: 40px"/>
         </div>
         <add-present-button :can_add="button_active"/>
     </div>

+ 55 - 39
sourcecode/h5app/vue/src/views/login.vue

@@ -1,42 +1,47 @@
 <template>
     <div>
-        <h1>登录</h1>
-        <van-cell-group>
-            <van-field
-                    v-model="phone"
-                    required
-                    clearable
-                    label="手机号"
-                    placeholder="请输入手机号"
-                    :error="phoneError"
-                    @click="phoneError=false"
-            />
-            <van-field
-                    v-model="password"
-                    required
-                    clearable
-                    type="password"
-                    label="密码"
-                    placeholder="请输入密码"
-                    :error="passError"
-                    @click="passError=false"
-            />
+        <img src="../assets/login_background.png"
+             style="max-width: 100%"
+        />
+        <div class="card">
+            <van-cell-group>
+                <van-field
+                        v-model="phone"
+                        required
+                        clearable
+                        label="手机号"
+                        placeholder="请输入手机号"
+                        :error="phoneError"
+                        @click="phoneError=false"
+                />
+                <van-field
+                        v-model="password"
+                        required
+                        clearable
+                        type="password"
+                        label="密码"
+                        placeholder="请输入密码"
+                        :error="passError"
+                        @click="passError=false"
+                />
+
+                <van-field
+                        v-model="sms"
+                        center
+                        clearable
+                        label="短信验证码"
+                        placeholder="请输入短信验证码(暂时不用)"
+                        required
+                        disabled
+                >
+                    <van-button slot="button" size="small" type="primary" disabled>发送验证码</van-button>
+                </van-field>
+            </van-cell-group>
+        </div>
 
-            <van-field
-                    v-model="sms"
-                    center
-                    clearable
-                    label="短信验证码"
-                    placeholder="请输入短信验证码(暂时不用)"
-                    required
-                    disabled
-            >
-                <van-button slot="button" size="small" type="primary" disabled>发送验证码</van-button>
-            </van-field>
-        </van-cell-group>
         <div style="position: fixed; bottom: 5px; width:100%">
-            <van-button type="default" size="large" class='submit' @click="Login">登录</van-button>
-            <van-button type="default" size="large" class='submit' @click="Register">注册</van-button>
+            <van-button type="primary" size="large" class='login' @click="Login">登录</van-button>
+            <van-button type="default" size="large" class='register' @click="Register">注册</van-button>
         </div>
     </div>
 </template>
@@ -97,7 +102,7 @@
                 //     this.passError = true;
                 // }
                 // 检查手机号有无验证
-                BasicFunction.get_data("smartUsers/list", function(data) { console.log(data.model.list); } );
+                // BasicFunction.get_data("smartUsers/list", function(data) { console.log(data.model.list); } );
                 BasicFunction.get_data("ajaxlogin", function(response){
                     console.log("------ Data Rcvd in Login --------");
                     console.log(response);
@@ -146,7 +151,18 @@
 </script>
 
 <style scoped>
-.submit {
-    margin-top: 10px;
-}
+    .card {
+        margin: 20px;
+        border: solid 1px #e4e4e4;
+    }
+    .login {
+        margin-bottom: 10px;
+        width: 85%;
+        background-color: #fd6740;
+        border-color: #fd6740;
+    }
+    .register {
+        margin-bottom: 5px;
+        width: 85%;
+    }
 </style>