Merge remote-tracking branch 'origin/master'

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

@@ -17,7 +17,7 @@
         props: ['can_add'],
         methods: {
             toAddPresent() {
-                this.$router.push('presentRegister');
+                this.$router.push('verify');
             }
         }
     }

sourcecode/h5app/vue/src/connector/basic-service.js

@@ -59,7 +59,7 @@ var BasicFunction = new (function () {
 
     this.goajax = function (jqObject) {
         if(typeof jqObject.data !== "string"){
-            if(jqObject.toString().indexOf("FromData") !== -1) {
+            if (typeof jqObject.data === "object" && jqObject.data.toString().indexOf("FormData") !== -1) {
                 return fetch(jqObject.url, {
                     method: 'POST',
                     body: jqObject.data

sourcecode/h5app/vue/src/views/PresentRegister.vue

@@ -137,6 +137,7 @@
                     console.log('----- upload photo result -----');
                     console.log(res);
                     if (res.ret === '10000') {
+                        console.log('success');
                     } else {
                         Toast.fail('上传图片失败，请检查网络');
                     }

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

@@ -1,5 +1,6 @@
 <template>
     <div>
+        <nav-bar path="index"/>
         <div class='card'>
             <h3><strong>个人资料</strong></h3>
             <van-cell-group :border="false">
@@ -65,7 +66,7 @@
                 <!--</button>-->
                 <!--</form>-->
                 <add-photo v-model="photo"/>
-                <van-button class="submit_button" type="primary" @click="publishPresent">下一步</van-button>
+                <van-button class="submit_button" type="primary" @click="next">下一步</van-button>
             </div>
             <p>活动仅允许深大学生参与，请上传正面校卡照片审核~</p>
         </div>
@@ -74,6 +75,7 @@
 
 <script>
     import {BasicFunction} from "../connector/basic-service";
+    import NavBar from '../components/navBar';
     import {
         Uploader, Icon,
         CellGroup, Field,
@@ -88,6 +90,7 @@
         name: "SecurityVerify",
         components: {
             AddPhoto,
+            NavBar,
             [Uploader.name]: Uploader, [Icon.name]: Icon,
             [CellGroup.name]: CellGroup, [Field.name]: Field,
             [RadioGroup.name]: RadioGroup, [Radio.name]: Radio,
@@ -132,19 +135,6 @@
                     return;
                 }
 
-                // let success = true;
-                // BasicFunction.get_data("ajaxregister?u=" + this.phone + '&p=' + this.password, function (response) {
-                //     console.log("------ Data Rcvd in Reg --------");
-                //     console.log(response);
-                //     if (response.ret !== "10000") {
-                //         // 不需要 设置 SessionID， 已经自动保存在jSessionID中
-                //         Toast.fail("注册失败，请检查网络");
-                //         success = false;
-                //     } else {
-                //         localStorage.setItem("frontend-userid", response.model.userId);
-                //     }
-                // }, {});
-                // if (!success) return;
                 console.log('------- photo -------');
                 console.log(this.photo);
                 let formData = new FormData();
@@ -153,6 +143,7 @@
                     console.log('----- upload photo result -----');
                     console.log(res);
                     if (res.ret === '10000') {
+                        console.log('success');
                     } else {
                         Toast.fail('上传图片失败，请检查网络');
                     }
@@ -188,6 +179,17 @@
                 this.dormitory = item.name;
                 this.dorId = item.id;
             }
+        },
+        created: function () {
+            let userid = localStorage.getItem('frontend-userid');
+            let that = this;
+            BasicFunction.get_data('smartUsers/list?uid=' + userid, function (res) {
+                console.log('----- User Info ----- ' + userid);
+                console.log(res);
+                if (res.ret === '10000') {
+                    if (res.model.list[0].phone.length !== 0) that.$router.push('presentRegister');
+                }
+            }, {});
         }
     }
 </script>

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

@@ -15,10 +15,15 @@
     export default {
         created: function () {
             let otp = this.$route.query.o;
+            // let otp = BasicFunction.utils_get_param("o");
             console.log('otp: ');
             console.log(otp);
             let userid = '';
-            BasicFunction.get_data("ajaxotplogin?otp=" + otp, function (response) {
+            if (localStorage.getItem('frontend-userid')) {
+                userid = localStorage.getItem('frontend-userid');
+                this.$router.push('index');
+            }
+            BasicFunction.get_data("ajaxotplogin?otp=" + otp.toString(), function (response) {
                 console.log("------ User Info --------");
                 console.log(response);
                 if (response.ret === "10000") {