JacquesLu il y a 6 ans
Parent
commit
66ff57a44a

+ 7 - 3
sourcecode/h5app/vue/src/components/schoolCard.vue

@@ -9,7 +9,7 @@
             </van-col>
             </van-col>
         </van-row>
         </van-row>
         <div v-if="status===30 || status === 500">
         <div v-if="status===30 || status === 500">
-            <add-photo :photoURL="imgUrl" @onRead="onRead"/>
+            <add-photo @onRead="onRead"/>
             <p>活动仅允许深大学生参与,请上传正面校卡照片审核~</p>
             <p>活动仅允许深大学生参与,请上传正面校卡照片审核~</p>
             <van-button
             <van-button
                     type="primary"
                     type="primary"
@@ -59,7 +59,11 @@
                     this.loading=false;
                     this.loading=false;
                     return;
                     return;
                 }
                 }
-                this.imgDo.userSchoolCardPic=this.photo;
+                let that=this;
+                console.log('------- photo -------');
+                console.log(this.photo);
+                let formData = new FormData();
+                formData.append('file', this.photo);
                 BasicFunction.get_data("smartIdentity/updateBatch", function (response) {
                 BasicFunction.get_data("smartIdentity/updateBatch", function (response) {
                     console.log("------ Data Rcvd in uploadphotoChange --------");
                     console.log("------ Data Rcvd in uploadphotoChange --------");
                     console.log(response);
                     console.log(response);
@@ -69,7 +73,7 @@
                     } else {
                     } else {
                         Toast.fail("上传失败,请检查网络");
                         Toast.fail("上传失败,请检查网络");
                     }
                     }
-                }, [this.imgDo]);
+                }, formData);
 
 
             },
             },
             onRead: function (e) {
             onRead: function (e) {

+ 21 - 15
sourcecode/h5app/vue/src/views/Assess.vue

@@ -9,7 +9,7 @@
                         placeholder="请输入你想写给ta的感谢信..."
                         placeholder="请输入你想写给ta的感谢信..."
                         rows="5"
                         rows="5"
                         autosize
                         autosize
-                        v-model="assess"
+                        v-model="substance"
                         :error="assessError"
                         :error="assessError"
                         @click="assessError=false"
                         @click="assessError=false"
                         required
                         required
@@ -52,8 +52,9 @@
         data() {
         data() {
             return {
             return {
                 value:0,
                 value:0,
-                assess: '',
+                substance: '',
                 assessError: false,
                 assessError: false,
+                assessDo:{},
                 active: 0,
                 active: 0,
                 Assessimage: require('../assets/thanks.png'),
                 Assessimage: require('../assets/thanks.png'),
 
 
@@ -62,13 +63,12 @@
         methods: {
         methods: {
             assessPresent : function () {
             assessPresent : function () {
                 // 检验输入
                 // 检验输入
-                let that=this;
-                if (this.assess.length <= 15) {
+                if (this.substance.length <= 15) {
                     this.assessError = true;
                     this.assessError = true;
                     Toast.fail('请输入至少15个字的礼物评价!');
                     Toast.fail('请输入至少15个字的礼物评价!');
                     return;
                     return;
                 }
                 }
-                else if(this.assess.length > 300) {
+                else if(this.substance.length > 300) {
                     this.assessError = true;
                     this.assessError = true;
                     Toast.fail('最多输入300个字的礼物评价!');
                     Toast.fail('最多输入300个字的礼物评价!');
                     return;
                     return;
@@ -77,6 +77,8 @@
                     this.$router.push('login');
                     this.$router.push('login');
                     return;
                     return;
                 }
                 }
+                this.assessDo.content=this.substance;
+                this.assessDo.ratingMajor=this.value;
                 let orderId=BasicFunction.utils_get_param("orderId");
                 let orderId=BasicFunction.utils_get_param("orderId");
                 // assess_present()
                 // assess_present()
                 console.log(present);
                 console.log(present);
@@ -84,20 +86,12 @@
                     console.log("------ Data Rcvd in assessPersent --------");
                     console.log("------ Data Rcvd in assessPersent --------");
                     console.log(response);
                     console.log(response);
                     if(response.ret === "10000"){
                     if(response.ret === "10000"){
-
-
+                        Toast.success("上传成功");
                     } else {
                     } else {
                         // 评价失败的处理
                         // 评价失败的处理
                         Toast.fail("上传失败,请检查网络");
                         Toast.fail("上传失败,请检查网络");
                     }
                     }
-                }, [{"feedbackId":"",
-                    "orderId":"13",
-                    "goodId":"3",
-                    "ratingStatus":"1000",
-                    "ratingMajor":value,
-                    "ratingMinor":"4500",
-                    "content": assess,
-                    "ratingTime":"2018-12-10 01:01:01"}]
+                }, [this.assessDo]
                 );
                 );
 
 
                 // this.$router.push('index');
                 // this.$router.push('index');
@@ -113,6 +107,18 @@
             }
             }
             let that=this;
             let that=this;
             let orderId=BasicFunction.utils_get_param("orderId");
             let orderId=BasicFunction.utils_get_param("orderId");
+            BasicFunction.get_data("smartOrderFeedback/list?orderId="+orderId, function (response) {
+                    console.log("------ Data Rcvd in assessPersent --------");
+                    console.log(response);
+                    if(response.ret === "10000"){
+                        var t=response.model.list;
+                        that.assessDo=t[0];
+                    } else {
+                        // 评价失败的处理
+                        Toast.fail("读取失败,请检查网络");
+                    }
+                }, [{}]
+            );
         }
         }
     }
     }
 </script>
 </script>

+ 20 - 30
sourcecode/h5app/vue/src/views/share.vue

@@ -9,12 +9,20 @@
                 <van-row>3.将截图发送至<span style="color: #F4A460"> 深大换换 </span>公众号后台,才可获得本次活动的【匹配资格】和【抽奖机会】</van-row>
                 <van-row>3.将截图发送至<span style="color: #F4A460"> 深大换换 </span>公众号后台,才可获得本次活动的【匹配资格】和【抽奖机会】</van-row>
             </div>
             </div>
             <div style="position: relative;">
             <div style="position: relative;">
-                <img :src="isWX ? share_http[i] : share[i]" style="max-width: 80%; position: relative;"/>
+                <img :src="share[i]" style="max-width: 80%; position: relative;"/>
             </div>
             </div>
             <a :href="share[i]" download="post">
             <a :href="share[i]" download="post">
-                <van-button size="large" type="primary" @click="savePic">保存</van-button>
+                <van-button size="large" type="primary" @click="savePic" style="background-color: #00FF00;
+        border-color: #00FF00;
+        margin: 10px 0 10px;
+        width: 55%;"
+                >保存</van-button>
             </a>
             </a>
-            <van-button size="large" type="primary" @click="Toindex">返回首页</van-button>
+            <van-button size="large" type="primary" @click="Toindex" style="background-color: #fd6740;
+        border-color: #fd6740;
+        margin: 10px 0 10px;
+        width: 55%;"
+            >返回首页</van-button>
         </div>
         </div>
 
 
     </div>
     </div>
@@ -52,7 +60,7 @@
         data() {
         data() {
             return {
             return {
                 note: {
                 note: {
-                    backgroundImage: "url('http://pjczv6ygf.bkt.clouddn.com/share_background.jpg')",
+                    backgroundImage: "url(" + require("../assets/prize_background.jpg") + ")",
                 },
                 },
                 transparent: {
                 transparent: {
                     backgroundColor: "rgba(50,50,50,0.7)",
                     backgroundColor: "rgba(50,50,50,0.7)",
@@ -64,14 +72,7 @@
                     require('../assets/posts/3.png'),
                     require('../assets/posts/3.png'),
                     require('../assets/posts/4.png'),
                     require('../assets/posts/4.png'),
                 ],
                 ],
-                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
+                i: 0
             }
             }
         },
         },
         methods: {
         methods: {
@@ -79,7 +80,6 @@
                 this.$router.push('index');
                 this.$router.push('index');
             },
             },
             savePic() {
             savePic() {
-                console.log(isWeiXin());
                 if (isWeiXin()) alert('请长按图片,保存至手机');
                 if (isWeiXin()) alert('请长按图片,保存至手机');
             }
             }
             // Toshare() {
             // Toshare() {
@@ -96,7 +96,6 @@
             }
             }
             this.i = Math.ceil(Math.random() * 4) - 1;
             this.i = Math.ceil(Math.random() * 4) - 1;
             console.log(this.i);
             console.log(this.i);
-            if (isWeiXin()) this.isWX = true;
 
 
             BasicFunction.getSigned(['onMenuShareTimeline', 'onMenuShareAppMessage',], function () {
             BasicFunction.getSigned(['onMenuShareTimeline', 'onMenuShareAppMessage',], function () {
                 wx.ready(function () {      //需在用户可能点击分享按钮前就先调用
                 wx.ready(function () {      //需在用户可能点击分享按钮前就先调用
@@ -136,6 +135,7 @@
                             Toast({
                             Toast({
                                 message: "分享失败,您取消了分享!"
                                 message: "分享失败,您取消了分享!"
                             });
                             });
+
                         }
                         }
                     })
                     })
                 });
                 });
@@ -144,24 +144,12 @@
     }
     }
 
 
     function isWeiXin() {
     function isWeiXin() {
-        let ua = navigator.userAgent.toLowerCase();
-        // if (ua.match(/micromessenger/i) == "micromessenger") {
-        //     return true;
-        // } else {
-        //     return false;
-        // }
-        return ua.match(/micromessenger/i) == "micromessenger";
+        let ua = window.navigator.userAgent.toLowerCase();
+        return ua.match(/MicroMessenger/i) === 'micromessenger';
     }
     }
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
-    .van-button {
-        background-color: #fd6740;
-        border-color: #fd6740;
-        margin: 10px 0 10px;
-        width: 55%;
-    }
-
     .card {
     .card {
         margin-bottom: 20px;
         margin-bottom: 20px;
         margin-left: 20px;
         margin-left: 20px;
@@ -170,11 +158,13 @@
         text-align: left;
         text-align: left;
     }
     }
     h3{
     h3{
-        font-size: 20px;
+        font-size: 1.5em;
+
     }
     }
 
 
     .van-row {
     .van-row {
-        font-size: 15px;
+
+        font-size: 1em;
         color: white;
         color: white;
     }
     }
 </style>
 </style>