me bug

sourcecode/h5app/vue/src/components/giftCard.vue

@@ -51,7 +51,7 @@
         },
         data() {
             return {
-                place: ['南区', '斋区', '西南', '西丽'],
+                place: ['南区', '斋区', '西南', '桂庙', '西丽'],
                 statusString: ['审核中', '匹配中', '匹配成功', '交换成功', '审核失败'],
                 statusColor: ['#fd6740', '#00ff00', '#00bfff', '#00fa9a', '#ff0000'],
                 genders: ['未知', '男', '女']

sourcecode/h5app/vue/src/components/schoolCard.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-    import {  Row, Col,  } from 'vant';
+    import {Row, Col, Toast} from 'vant';
     import AddPhoto from "../components/addPhoto";
     import {BasicFunction} from "../connector/basic-service";
     export default {
@@ -64,7 +64,7 @@
                     console.log("------ Data Rcvd in uploadphotoChange --------");
                     console.log(response);
                     if (response.ret === "10000") {
-                        Toast.success("上传成功")
+                        Toast.success("上传成功");
                         this.$router.push('index');
                     } else {
                         Toast.fail("上传失败，请检查网络");
@@ -84,6 +84,7 @@
             let userid = localStorage.getItem('frontend-userid');
             let that = this;
             BasicFunction.get_data('smartIdentity/list?userId=' + userid, function (res) {
+                console.log('----- User Identity -----');
                 console.log(res);
                 if (res.ret === '10000') {
                     var t=res.model.list;
@@ -95,9 +96,9 @@
                         that.statusString='未上传校卡';
                         that.$router.push('verify');
                         return;
-                    } else if (that.status === 0|| that.status === 1000) {
+                    } else if (that.status === 100 || that.status === 1000) {
                         that.schoolpic=that.IMGPREFIX+t[0].userSchoolCardPic;
-                        if(that.status === 0)
+                        if (that.status === 100)
                         {
                             that.statusColor='#c5c530';
                             that.statusString='审核中'

sourcecode/h5app/vue/src/components/schoolidCard.vue

@@ -39,11 +39,20 @@
         </van-cell-group>
         <p>宿舍区</p>
             <van-radio-group v-model="dormDistrict">
-            <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 name="0" checked-color="#fd6740" style="float: left; margin: 0 0 15px 10px"
+                           :disabled="isReadonly">南区
+                </van-radio>
+                <van-radio name="1" checked-color="#fd6740" style="float: left; margin: 0 10px 15px 10px"
+                           :disabled="isReadonly">西南
+                </van-radio>
+                <van-radio name="2" checked-color="#fd6740" style="margin: 0 10px 15px 10px" :disabled="isReadonly">斋区
+                </van-radio>
+                <van-radio name="3" checked-color="#fd6740" style="float: left; margin: 0 0 15px 10px"
+                           :disabled="isReadonly">桂庙
+                </van-radio>
+                <van-radio name="4" checked-color="#fd6740" style="float: left; margin: 0 10px 15px"
+                           :disabled="isReadonly">西丽
+                </van-radio>
         </van-radio-group>
     </div>
 </template>

sourcecode/h5app/vue/src/connector/simple-demo.js

@@ -242,7 +242,7 @@ smartIdentity/saveBatch
 [{
 "reviewId":"",
 "userId":18, // 用户id
-"dormDistrict":1, // 宿舍区 0: 斋区, 1: 西南, 2: 南区, 3: 西丽
+"dormDistrict":1, // 宿舍区 0: 斋区, 1: 西南, 2: 南区, 3: 桂庙, 4: 西丽
 "userSex":1, // 用户性别
 "userSchoolCard":20123333222,
 "userReviewStatus":1000, // 校卡审核状态 30: 默认; 100: 审核中; 1000: 审核通过; 500: 审核失败

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

@@ -123,7 +123,8 @@
                     {id: 0, name: '斋区'},
                     {id: 1, name: '西南'},
                     {id: 2, name: '南区'},
-                    {id: 3, name: '西丽'}
+                    {id: 3, name: '桂庙'},
+                    {id: 4, name: '西丽'},
                 ],
                 photo: null,
                 loading: false

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

@@ -14,6 +14,8 @@
     import AddPresentButton from "../components/addPresentButton";
     import SchoolidCard from "../components/schoolidCard";
     import SchoolCard from "../components/schoolCard";
+    import {BasicFunction} from "../connector/basic-service";
+
     export default {
         name: "me",
         components: {
@@ -32,7 +34,20 @@
                 return;
             }
             this.button_active = false;
-            var userId = localStorage.getItem("frontend-userid");
+            let userid = localStorage.getItem("frontend-userid");
+            let that = this;
+            BasicFunction.get_data("smartGoods/list?isDel=0&ownerId=" + userid, function (response) {
+                console.log("------ Data Rcvd in me --------");
+                console.log(response);
+                if (response.ret === "10000") {
+                    let list = response.model.list;
+                    list.forEach(gift => {
+                        if (gift.sort && gift.sort !== 4) that.button_active = false; // 限制上传1个礼物
+                    });
+                } else {
+                    console.warn("获取资源失败");
+                }
+            }, {});
         }
     }
 </script>

sourcecode/h5app/vue/src/views/share.vue

@@ -9,7 +9,7 @@
                 <van-row>3.将截图发送至<span style="color: #F4A460"> 深大换换 </span>公众号后台，才可获得本次活动的【匹配资格】和【抽奖机会】</van-row>
             </div>
             <div style="position: relative;">
-                <img :src="share[i]" style="max-width: 80%; position: relative;"/>
+                <img :src="isWX ? share_http[i] : share[i]" style="max-width: 80%; position: relative;"/>
             </div>
             <a :href="share[i]" download="post">
                 <van-button size="large" type="primary" @click="savePic">保存</van-button>
@@ -52,7 +52,7 @@
         data() {
             return {
                 note: {
-                    backgroundImage: "url(" + require("../assets/prize_background.jpg") + ")",
+                    backgroundImage: "url('http://pjczv6ygf.bkt.clouddn.com/share_background.jpg')",
                 },
                 transparent: {
                     backgroundColor: "rgba(50,50,50,0.7)",
@@ -64,7 +64,14 @@
                     require('../assets/posts/3.png'),
                     require('../assets/posts/4.png'),
                 ],
-                i: 0
+                share_http: [
+                    "http://pjczv6ygf.bkt.clouddn.com/1.png",
+                    "http://pjczv6ygf.bkt.clouddn.com/2.png",
+                    "http://pjczv6ygf.bkt.clouddn.com/3.png",
+                    "http://pjczv6ygf.bkt.clouddn.com/4.png",
+                ],
+                i: 0,
+                isWX: false
             }
         },
         methods: {
@@ -89,6 +96,7 @@
             }
             this.i = Math.ceil(Math.random() * 4) - 1;
             console.log(this.i);
+            if (isWeiXin()) this.isWX = true;
 
             BasicFunction.getSigned(['onMenuShareTimeline', 'onMenuShareAppMessage',], function () {
                 wx.ready(function () {      //需在用户可能点击分享按钮前就先调用
@@ -128,7 +136,6 @@
                             Toast({
                                 message: "分享失败,您取消了分享!"
                             });
-
                         }
                     })
                 });
@@ -163,11 +170,11 @@
         text-align: left;
     }
     h3{
-        font-size: 22px;
+        font-size: 20px;
     }
 
     .van-row {
-        font-size: 17px;
+        font-size: 15px;
         color: white;
     }
 </style>