Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/user/App.vue

@@ -38,7 +38,7 @@ export default {
     //   title: '城的空间',
     //   desc: '城的空间',
     //   link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-    //   thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+    //   thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
     // })
   },
   methods: {

src/pages/user/mainPage/coffeeIndex/index.vue

@@ -482,7 +482,7 @@ export default {
           title: '城的空间',
           desc: '城的空间',
           link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-          thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+          thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
         }).then(() => {
           wx.getLocation({
             type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'

src/pages/user/majorProjectsDetail/index.vue

@@ -186,7 +186,7 @@ export default {
         title: '城的空间',
         desc: '城的空间',
         link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+        thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
       }).then(() => {
         let result = this.courseDetail.CaseInfo.Coordinate.split(",")
         let latitude = parseFloat(result[0])

src/pages/user/placeOrderForCourse/index.vue

@@ -162,14 +162,14 @@ export default {
   created () {
     this.getCouponList().then((res) => {
       this.getCourseDetailInfo({ id: this.$route.query.id }).then((result) => {
-        var arr = result.CourseDetail
-        console.log(arr)
+        var arr = result.CourseDetail, caseid = result.CaseId
+        // console.log(arr)
         this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
         var id = this.$route.query.id, arr = [], nowDate = Date.now()
         for (var n = 0; n < res.length; n++) {
-          console.log(res[n])
+          // console.log(res[n])
           if (res[n].Coupon.CouponType === 'course' && res[n].Status === 1) {
-            if (res[n].Coupon.IsAll) {
+            if (res[n].Coupon.IsAll && res[n].CaseId === caseid) {
               this.couponList.push({
                 title: res[n].Coupon.CouponName,
                 desc: res[n].Coupon.Share.UseInstruction,
@@ -182,7 +182,7 @@ export default {
               })
             } else {
               for (var a = 0; a < res[n].Coupon.Targets.length; a++) {
-                if (res[n].Coupon.Targets[a].TargetId === id && nowDate < new Date(res[n].EndDate).getTime()) {
+                if (res[n].Coupon.Targets[a].TargetId === id && nowDate < new Date(res[n].EndDate).getTime() && res[n].CaseId === caseid) {
                   this.couponList.push({
                     title: res[n].Coupon.CouponName,
                     desc: res[n].Coupon.Share.UseInstruction,