JacquesLu 6 years ago
parent
commit
442fe3ae06

+ 35 - 41
sourcecode/h5app/vue/src/components/schoolCard.vue

@@ -5,7 +5,7 @@
                 <h3><strong>校卡审核</strong></h3>
             </van-col>
             <van-col span="8">
-                <p :style="{ color: statusColor }">{{statusString}}</p>
+               <p :style="{ color: statusColor }">{{statusString}}</p>
             </van-col>
         </van-row>
         <div v-if="status===30 || status === 500">
@@ -13,7 +13,6 @@
             <p>活动仅允许深大学生参与,请上传正面校卡照片审核~</p>
             <van-button
                     type="primary"
-                    class="submit_button"
                     @click="schoolPresent"
                     :loading="loading"
             >保存
@@ -39,38 +38,39 @@
         },
         data() {
             return {
-                statusColor: '',
-                statusString: '-----',
+                statusColor:'',
+                statusString:'-----',
                 photo: null,
-                loading: false,
-                status: 0,
+                loading:false,
+                status:0,
                 imgage: null,
-                imgDo: {},
-                schoolpic: "",
-                IMGPREFIX: "http://gift.fogice.com"
+                imgDo:{},
+                schoolpic:"",
+                IMGPREFIX:"http://gift.fogice.com"
 
             }
         },
         methods: {
             schoolPresent() {
                 // 检验输入
-                this.loading = true;
+                this.loading=true;
                 if (this.photo === null) {
                     Toast.fail('请上传礼物照片');
-                    this.loading = false;
+                    this.loading=false;
                     return;
                 }
-                this.imgDo.userSchoolCardPic = this.imgUrl;
-                let that = this;
+                this.imgDo.userSchoolCardPic=this.photo;
                 BasicFunction.get_data("smartIdentity/updateBatch", function (response) {
                     console.log("------ Data Rcvd in uploadphotoChange --------");
                     console.log(response);
                     if (response.ret === "10000") {
                         Toast.success("上传成功")
+                        this.$router.push('index');
                     } else {
                         Toast.fail("上传失败,请检查网络");
                     }
                 }, [this.imgDo]);
+
             },
             onRead: function (e) {
                 this.photo = e;
@@ -86,29 +86,30 @@
             BasicFunction.get_data('smartIdentity/list?userId=' + userid, function (res) {
                 console.log(res);
                 if (res.ret === '10000') {
-                    var t = res.model.list;
-                    that.status = t[0].userReviewStatus;
-                    that.imgDo = t[0];
+                    var t=res.model.list;
+                    that.status=t[0].userReviewStatus;
+                    that.imgDo=t[0];
                     console.log(that);
-                    if (that.status === 30) {
-                        that.statusColor = '#c5c5c5';
-                        that.statusString = '未上传校卡';
+                    if(that.status === 30){
+                        that.statusColor='#c5c5c5';
+                        that.statusString='未上传校卡';
                         that.$router.push('verify');
                         return;
-                    } else if (that.status === 0 || that.status === 1000) {
-                        that.schoolpic = that.IMGPREFIX + t[0].userSchoolCardPic;
-                        if (that.status === 0) {
-                            that.statusColor = '#c5c530';
-                            that.statusString = '审核中'
+                    } else if (that.status === 0|| that.status === 1000) {
+                        that.schoolpic=that.IMGPREFIX+t[0].userSchoolCardPic;
+                        if(that.status === 0)
+                        {
+                            that.statusColor='#c5c530';
+                            that.statusString='审核中'
                         }
 
-                        if (that.status === 1000) {
+                        if(that.status === 1000) {
                             that.statusColor = '#00ff00';
-                            that.statusString = '审核通过'
+                            that.statusString='审核通过'
                         }
                     } else {
-                        that.statusColor = '#ff0000';
-                        that.statusString = '审核未通过'
+                        that.statusColor='#ff0000';
+                        that.statusString='审核未通过'
                     }
                 }
             }, {});
@@ -134,17 +135,10 @@
         padding: 15px;
         text-align: left;
     }
-
-    .submit_button {
-        margin-bottom: 10px;
-        margin-left: auto;
-        margin-right: auto;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background-color: #fd6740;
-        border-color: #fd6740;
-        width: 85%;
-    }
+    .van-button {
+         background-color: #fd6740;
+         border-color: #fd6740;
+         margin: 10px 0 10px;
+         width: 55%;
+     }
 </style>

+ 21 - 14
sourcecode/h5app/vue/src/components/schoolidCard.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="card" style="margin-bottom: 20px">
+    <div class="card" >
         <van-row style="border-bottom: solid 1px #e4e4e4;">
             <van-col span="14">
                 <h3><strong>个人资料</strong></h3>
             </van-col>
-            <van-col span="6" style="">
+            <van-col span="6"  >
                 <p @click="toggleReadOnly()">{{isReadonly ? "编辑" : "保存"}}</p>
             </van-col>
         </van-row>
@@ -22,8 +22,8 @@
         </van-cell-group>
         <p>性别</p>
         <van-radio-group v-model="gender">
-            <van-radio name="0" checked-color="#fd6740" style="float: left; margin-right: 20px" :disabled="isReadonly">男</van-radio>
-            <van-radio name="1" checked-color="#fd6740" :disabled="isReadonly">女</van-radio>
+            <van-radio name="1" checked-color="#fd6740" style="float: left; margin-right: 20px" :disabled="isReadonly">男</van-radio>
+            <van-radio name="2" checked-color="#fd6740" :disabled="isReadonly">女</van-radio>
         </van-radio-group>
         <p>微信号</p>
         <van-cell-group>
@@ -39,11 +39,11 @@
         </van-cell-group>
         <p>宿舍区</p>
             <van-radio-group v-model="dormDistrict">
-            <van-radio name="0" checked-color="#fd6740" style="float: left; margin-right: 20px" :disabled="isReadonly">南区</van-radio>
-            <van-radio name="1" checked-color="#fd6740" style="float: left; margin-right: 20px" :disabled="isReadonly">西南</van-radio>
-            <van-radio name="2" checked-color="#fd6740" style="float: left; margin-right: 20px" :disabled="isReadonly">斋区</van-radio>
-            <van-radio name="3" checked-color="#fd6740" style="float: left; margin-right: 20px" :disabled="isReadonly">桂庙</van-radio>
-            <van-radio name="4" checked-color="#fd6740" :disabled="isReadonly">西丽</van-radio>
+            <van-radio name="0" checked-color="#fd6740" style="float: left; margin-right: 10px" :disabled="isReadonly">南区</van-radio>
+            <van-radio name="1" checked-color="#fd6740" style="float: left; margin-right: 10px" :disabled="isReadonly">西南</van-radio>
+            <van-radio name="2" checked-color="#fd6740" style="float: left; margin-right: 10px" :disabled="isReadonly">斋区</van-radio>
+            <van-radio name="3" checked-color="#fd6740" style="float: left; margin-right: 10px" :disabled="isReadonly">桂庙</van-radio>
+            <van-radio name="4" checked-color="#fd6740" style="float: left; margin-right: 10px" :disabled="isReadonly">西丽</van-radio>
         </van-radio-group>
     </div>
 </template>
@@ -191,19 +191,26 @@
         color: #fd6740;
     }
 
-    p, h3 {
-        padding: 5px;
+    h3 {
+        padding: 3px;
     }
 
     p {
-        padding-top: 3px;
+        padding-top: 7px;
     }
 
     .card {
         background-color: white;
-        margin: 20px 20px;
+        margin-top: 20px;
+        margin-left: 20px;
+        margin-right: 20px;
+        margin-bottom: 20px;
         border: solid 1px #e4e4e4;
-        padding: 15px;
+        padding-top: 15px;
+        padding-left: 15px;
+        padding-right: 15px;
+        padding-bottom: 40px;
+
         text-align: left;
     }
 </style>

+ 10 - 5
sourcecode/h5app/vue/src/views/share.vue

@@ -4,15 +4,16 @@
             <!--分享页面-->
             <div class="card">
                 <h3 style="color: white"><strong>提交成功!最后一步</strong></h3>
-                <van-row>保存邀请卡片(图片)至手机</van-row>
-                <van-row>转发图片至朋友圈并截图</van-row>
-                <van-row>将截图发送至<span style="color: #F4A460"> 深大欢欢 </span>公众号后台,才可获得本次活动的【匹配资格】和【抽奖机会】</van-row>
+                <van-row>1.保存邀请卡片(图片)至手机</van-row>
+                <van-row>2.转发图片至朋友圈并截图</van-row>
+                <van-row>3.将截图发送至<span style="color: #F4A460"> 深大换换 </span>公众号后台,才可获得本次活动的【匹配资格】和【抽奖机会】</van-row>
             </div>
             <div style="position: relative;">
                 <img :src="share" style="max-width: 80%; position: relative;"/>
             </div>
-            <van-button size="large" type="primary" @click="Toshare">分享</van-button>
+            <van-button size="large" type="primary" @click="Toshare"></van-button>
             <van-button size="large" type="primary" @click="Toindex">返回首页</van-button>
+            <a href="assets/post.png"> 保存 </a>
         </div>
 
     </div>
@@ -138,10 +139,14 @@
         padding: 15px;
         text-align: left;
     }
+    h3{
+        font-size: 2em;
+
+    }
 
     .van-row {
 
-        font-size: 0.3em;
+        font-size: 1.5em;
         color: white;
     }
 </style>