ytj

src/pages/user/fiveA/index.vue

@@ -29,7 +29,7 @@
           <div class="newsList flex-h">
             <ul class="flex-item">
               <li tag="li" @click="jump(newinfo)" v-for="(newinfo,nindex) in item.News" :key="nindex">
-                <newsItem :data="newinfo" @jump='jump'></newsItem>
+                <newsItem :data="newinfo"></newsItem>
               </li>
             </ul>
           </div>
@@ -126,7 +126,11 @@ 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 || item.ForwardCourseId } }) // 此处去课程详情
+        if (item.ForwardResourceId){
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
+        } else {
+          this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardCourseId } }) // 此处去课程详情
+        }
       } else {
         window.location.href = item.InfoUrl
       }

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

@@ -477,6 +477,12 @@ export default {
       // that.topCaseInfoData.caseName = that.CaseList[0].CaseName
       // that.topCaseInfoData.caseId = that.CaseList[0].CaseId
       if (this.userInfo.customer.MapUser !== '') {
+        wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+          title: '城的空间',
+          desc: '城的空间',
+          link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
+          thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
+        })
         this.topCaseInfoData.caseId = this.userInfo.customer.BelongCaseId
         for (let i = 0; i < this.CaseList.length; i++) {
           if (this.CaseList[i].CaseId === this.topCaseInfoData.caseId) {
@@ -521,6 +527,7 @@ export default {
                 }
               }
               if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName) {
+                that.$toast('当前位置无案场')
                 that.topCaseInfoData.caseName = '当前位置无案场'
               }
             }
@@ -538,7 +545,7 @@ export default {
     toOrders (subItem, item) {
       const _that = this
       this.getCaseConf({ caseid: subItem.CaseId }).then(res => {
-        if (this.checkCanOrder()){
+        if (this.checkCanOrder()) {
           _that.$toast('您的点单功能已被关闭！')
           return
         }

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

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

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

@@ -84,7 +84,9 @@ export default {
   mounted () {
     this.getUserInfo({ org: this.org }).then(() => {
       this.user = this.userInfo.customer
-      this.AccountInfo = JSON.parse(this.user.AccountInfo)
+      if (this.user.AccountInfo) {
+        this.AccountInfo = JSON.parse(this.user.AccountInfo)
+      }
       this.headimgurl = this.user.Headimgurl
     })
     this.getNum()
@@ -110,7 +112,8 @@ export default {
       this.$router.push({ name: 'orderList' })
     },
     toBodyCheck () {
-      window.location.href = `${window.location.origin}/bodyCheck.html#/`
+      var url = window.location.pathname
+      window.location.href = url.replace('user.html', 'bodyCheck.html') + '#/'
     },
     toLuckdraw () {
       // ^参数约定为97

src/pages/user/majorProjects/index.vue

@@ -68,57 +68,7 @@ export default {
         }
       },
       courseList: [], // 课程列表
-      initList: [
-        // { // 初始化课程列表
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1514779200000,
-        //   endDate: 1514781600000,
-        // }, {
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1514779200000,
-        //   endDate: 1514781600000,
-        // }, {
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1517460000000,
-        //   endDate: 1517467200000,
-        // }, {
-        //   id: '',
-        //   title: '课程名称',
-        //   img: '',
-        //   time: '2018.04.04 18:30-20:00',
-        //   address: '南京南',
-        //   tag: ['儿童教育', '小小外交官'],
-        //   courseType: '团体课',
-        //   defaultPrice: '168/节',
-        //   getWay: 'ticket',
-        //   startDate: 1517460000000,
-        //   endDate: 1517467200000,
-        // }
-      ],
+      initList: [],
     }
   },
   computed: {
@@ -179,8 +129,8 @@ export default {
             id: res.Courses[n].CourseId,
             title: res.Courses[n].CourseName,
             img: res.Courses[n].CourseImg,
-            time: this.returnDate(res.Courses[n].BeginDate) + '至' + this.returnDate(res.Courses[n].EndDate),
-            address: res.CaseAddress == undefined ? '暂无数据' : res.CaseAddress,
+            remark: this.toolClass.dateFormat(res.Courses[n].BeginDate, 'yyyy-MM-dd') + '至' + this.toolClass.dateFormat(res.Courses[n].EndDate, 'yyyy-MM-dd'),
+            address: res.Courses[n].CaseInfo.CaseAddress,
             tag: this.returnTag(res.Courses[n].CourseTags),
             courseType: '团体课',
             defaultPrice: res.Courses[n].Price + '/节',
@@ -189,6 +139,7 @@ export default {
             endDate: new Date(res.Courses[n].EndDate).getTime(),
           })
         }
+        console.log(aArr)
         this.initList = aArr
         this.calcArr()
       })

src/pages/user/placeOrder/index.vue

@@ -9,7 +9,7 @@
               <span>项目名称：{{caseName}}</span>
             </div>
           </div>
-          <span>{{userInfo.customer != undefined ? userInfo.customer.CustomerName : ''}}您好！</span>
+          <span>{{userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name}}您好！</span>
         </div>
       </div>
       <div class="tableInfo flex-h">

src/pages/user/receive/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="mainPage" v-if="show">
     <div class="banner"  v-if="!video">
-      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="type === 'card'">
-      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-if="type === 'coupon'">
+      <img :src="data.Images[0].CardImageUrl" alt="" v-if="type === 'card'">
+      <img :src="data.Images[0].CouponImageUrl" alt="" v-if="type === 'coupon'">
     </div>
     <div class="content">
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>

src/pages/user/receive/page.scss

@@ -18,6 +18,10 @@
   .banner{
     width: 100%;
     height: 1.8rem;
+    text-align: center;
+    img{
+      height: 100%;
+    }
   }
   .content{
     padding: .2rem;

src/pages/user/receiveChannel/index.vue

@@ -9,8 +9,8 @@
       <img :src="logo" alt="">
     </div>
     <div class="banner"  v-if="!video">
-      <img :src="data.Images[0].CardImageUrl" alt="" width="100%" height="100%" v-if="type === 'card'">
-      <img :src="data.Images[0].CouponImageUrl" alt="" width="100%" height="100%" v-if="type === 'coupon'">
+      <img :src="data.Images[0].CardImageUrl" alt="" v-if="type === 'card'">
+      <img :src="data.Images[0].CouponImageUrl" alt="" v-if="type === 'coupon'">
     </div>
     <div class="content">
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>

src/pages/user/receiveChannel/page.scss

@@ -18,6 +18,10 @@
   .banner{
     width: 100%;
     height: 1.8rem;
+    text-align: center;
+    img{
+      height: 100%;
+    }
   }
   .content{
     padding: .2rem;

src/store/index/index.js

@@ -94,12 +94,15 @@ export default {
   },
   mutations: {
     setBanner (state, data) { // 获取首页轮播图
+      data = data || []
       state.banner = data
     },
     setFiveA (state, data) { // 获取5A
+      data = data || []
       state.fiveA = data
     },
     setMessage (state, data) { // 获取首页消息
+      data = data || []
       if (data.length > 3) {
         state.message = data.slice(0,3)
       } else {
@@ -107,9 +110,11 @@ export default {
       }
     },
     setProject (state, data) { // 获取项目专题
+      data = data || []
       state.project = data
     },
     setCms (state, data) { // 获取cms
+      data = data || []
       state.cms = data
     }
   },