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

src/pages/user/fiveA/index.vue

@@ -28,9 +28,9 @@
           <h5>{{item.Consult}}</h5>
           <div class="newsList flex-h">
             <ul class="flex-item">
-              <router-link tag="li" :to="{name:'',query:{}}" v-for="(newinfo,nindex) in item.News" :key="nindex">
+              <li tag="li" @click="jump(newinfo)" v-for="(newinfo,nindex) in item.News" :key="nindex">
                 <newsItem :data="newinfo" @jump='jump'></newsItem>
-              </router-link>
+              </li>
             </ul>
           </div>
         </div>
@@ -126,7 +126,7 @@ export default {
       if (item.ForwardType === 'url') {
         window.location.href = item.ForwardUrl
       } else if (item.ForwardType === 'course') {
-        this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+        this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId || item.ForwardCourseId } }) // 此处去课程详情
       } else {
         window.location.href = item.InfoUrl
       }

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

@@ -84,8 +84,8 @@ export default {
       locationId: '',
       swiperOption: {
         observer: true,
-        speed: 1000,
         loop: true,
+        speed: 1000,
         autoplay: {
           disableOnInteraction: false,
         }

src/pages/user/majorProjects/index.vue

@@ -151,6 +151,9 @@ export default {
     ]),
     returnTag (arr) {
       var aArr = []
+      if (!arr) {
+        arr = []
+      }
       for (var n = 0; n < arr.length; n++) {
         aArr.push(arr[n].TagName)
       }
@@ -167,7 +170,7 @@ export default {
       this.getProjectInfo({ id: this.$route.query.id }).then((res) => {
         // console.log(JSON.stringify(res))
         // this.initList
-        if (res.Courses === null) {
+        if (!res.Courses) {
           res.Courses = []
         }
         var aArr = []
@@ -192,6 +195,9 @@ export default {
     },
     calcArr () {
       let arr = []
+      if (!this.initList){
+        this.initList = []
+      }
       for (var n = 0; n < this.initList.length; n++) {
         arr.push(new Date(this.initList[n].startDate).getMonth())
       }

src/pages/user/receiveChannel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage" v-if="show">
-    <video :src="data.VideoUrl" height="100%" width="100%" preload="auto" ></video>
-    <!-- <div class="residue">
+    <!-- <video :src="data.VideoUrl" height="100%" width="100%" preload="auto" ></video> -->
+    <div class="residue">
       <i class="iconfont icon-gantanhao"></i>
       <span>仅剩{{data.TotalCount - data.SentCount}}张券可以领取！</span>
     </div>
@@ -44,7 +44,7 @@
       <div class="submit" v-if="button && data.TotalCount - data.SentCount > 0" @click="receive">确认领取</div>
       <div class="submit grays" v-if="button && data.TotalCount - data.SentCount <= 0">优惠券已领完</div>
       <div class="submit" v-if="!button">点击右上角分享给客户</div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -100,7 +100,11 @@ export default {
       if (this.$route.query.type === 'card') {
         this.getCardShare({ id: this.$route.query.id }).then(() => {
           this.data = this.cardShare.Card
-          this.data.address = this.caseList.filter(x => x.CaseId === this.data.CaseId)[0].CaseAddress
+          let arr = this.caseList.filter(x => x.CaseId === this.data.CaseId)
+          if (arr.length <= 0) {
+            arr.push({ CaseAddress: '' })
+          }
+          this.data.address = arr[0].CaseAddress
           if (!this.data.VideoUrl) {
             this.video = false
           }
@@ -110,7 +114,11 @@ export default {
       } else {
         this.getCouponShare({ id: this.$route.query.id }).then(() => {
           this.data = this.couponShare.coupon
-          this.data.address = this.caseList.filter(x => x.CaseId === this.data.CaseId)[0].CaseAddress
+          let arr = this.caseList.filter(x => x.CaseId === this.data.CaseId)
+          if (arr.length <= 0) {
+            arr.push({ CaseAddress: '' })
+          }
+          this.data.address = arr[0].CaseAddress
           if (!this.data.VideoUrl) {
             this.video = false
           }