ytj

src/pages/user/App.vue

@@ -8,14 +8,11 @@
 import '../../common/css/reset.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
-const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
-const wx = require('weixin-js-sdk')
-import wxsdk from '@/util/share'
 export default {
   name: 'app',
   data () {
     return {
-      showPage: false
+      showPage: false 
     }
   },
   components: {},
@@ -32,25 +29,10 @@ export default {
       this.code = null
     }
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
-      let that = this
-      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`
-      }).then(() => {
-        wx.getLocation({
-          type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-          success: function (res) {
-            that.setLocation({ latitude1: res.latitude, longitude1: res.longitude })
-            that.showPage = true
-          }
-        })
-      })
+      this.showPage = true
     })
   },
   methods: {
-    ...mapIndexActions(['setLocation']),
     ...actions(['getUserInfo'])
   }
 }

src/pages/user/activeList/activeList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="content">
+  <div class="content mainPage">
     <div class="list" @click="toCustomizationList">
       <img :src="dz">
       <span>定制记录</span>
@@ -28,6 +28,8 @@ export default {
 .content {
   padding: 0 0 0 0.1rem;
   background: #fff;
+  height: 100%;
+  box-sizing: border-box;
   .list {
     width: 100%;
     height: 0.8rem;
@@ -49,11 +51,11 @@ export default {
       text-overflow: ellipsis;
       white-space: nowrap;
       font-size: 0.14rem;
-      color: rgba(50, 59, 69, 1);
+      color: #000;
     }
-    i{
-      color: rgba(50, 59, 69, 1);
-      padding-right: .1rem;
+    i {
+      color: #ddd;
+      padding-right: 0.1rem;
     }
   }
 }

src/pages/user/bindMobile/page.scss

@@ -31,7 +31,7 @@
       border-radius:8px;
       padding: .2rem;
       box-sizing: border-box;
-      margin-top: 1.2rem;
+      margin-top: 130px;
       .title{
         font-size: .16rem;
         font-weight: bold;

src/pages/user/calendar/calendar.vue

@@ -1,10 +1,10 @@
 <template>
-  <div style="padding-bottom:.6rem;">
+  <div class="mainPage">
     <div class="top">
       <img :src="topImg" alt>
     </div>
     <div class="middle">
-      <p>云台天境定制专属你的台历</p>
+      <p>云台天境 定制您的2019私人专属台历</p>
       <span>时间: 2018年12月12日-2018年12月19日</span>
       <span>地点: 江宁区云台山河路1号云台天境售楼处</span>
     </div>
@@ -18,9 +18,10 @@
       <div>*活动最终解释权归南京佳运城房地产开发有限公司所有</div>
     </div>
     <div class="btn">
-      <div v-if="state === 1" @click="toCheckModel">立即参与</div>
-      <div v-if="state === 2" class="disable">已参与</div>
-      <div v-if="state === 3" class="disable">活动已结束</div>
+      <div v-if="state === 1" class="disable">活动未开始</div>
+      <div v-if="state === 2" @click="toCheckModel">立即参与</div>
+      <div v-if="state === 3" class="disable">已参与</div>
+      <div v-if="state === 4" class="disable">活动已结束</div>
     </div>
   </div>
 </template>
@@ -30,13 +31,14 @@ import wxsdk from '../../../util/share'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapMakingActions } = createNamespacedHelpers('making')
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
-import topImg from '@/common/icon/topImg.png'
+import topImg from '@/common/icon/topImgBlack.png'
 export default {
   data () {
     return {
       topImg,
       state: 1,
-      endTime: "2018/12/19 00:00:00"
+      startTime: "2018/12/12 00:00:00",
+      endTime: "2018/12/19 23:59:59"
     }
   },
   created () {
@@ -49,14 +51,17 @@ export default {
     this.getUserInfo({ org: this.org }).then(() => {
       this.getCalendarCustomer().then((res) => {
         if (res) {
-          this.state = 2
+          this.state = 3
         } else {
-          let timestamp = new Date(this.endTime).getTime()
+          let start = new Date(this.startTime).getTime()
+          let end = new Date(this.endTime).getTime()
           let now = new Date().getTime()
-          if (timestamp >= now) {
+          if (start <= now && end >= now) {
+            this.state = 2
+          } else if (start > now) {
             this.state = 1
           } else {
-            this.state = 3
+            this.state = 4
           }
         }
       })
@@ -111,7 +116,7 @@ export default {
   }
 }
 .bottom {
-  padding: 0.14rem 0.25rem;
+  padding: 0.14rem 0.25rem 0.6rem;
   p {
     font-size: 0.16rem;
     padding-bottom: 0.05rem;

src/pages/user/calendar/making.vue

@@ -1,88 +1,96 @@
 <template>
-  <div style="background:#fff;">
-    <div v-if="isLoading || windowLoad" class="loading">
-      <img :src="loading" alt>
-      <span>{{msg}}</span>
-    </div>
-    <div class="cutBox" v-for="(item,index) in banner" :key="index">
-      <div class="cutDom" v-if="index === mainIndex-1">
-        <img :src="item.bgImg" class="cover">
-        <div :style="item.styleCut" v-if="!item.CustomerImg && item.defaultBg" class="cla">
-          <img :src="item.defaultBg">
-        </div>
-        <div :style="item.styleCut" v-if="item.CustomerImg" class="cla">
-          <img :src="item.CustomerImg">
+  <div style="background:#fff;" class="mainPage" id="main">
+    <div>
+      <div v-if="isLoading || windowLoad" class="loading">
+        <img :src="loading" alt>
+        <span>{{msg}}</span>
+      </div>
+      <div class="cutBox" v-for="(item,index) in banner" :key="index">
+        <div class="cutDom" v-if="index === mainIndex-1">
+          <img :src="item.bgImg" class="cover">
+          <div :style="item.styleCut" v-show="!item.CustomerImg && item.defaultBg" class="cla">
+            <img :src="item.defaultBg">
+          </div>
+          <div :style="item.styleCut" v-if="item.CustomerImg" class="cla">
+            <img :src="item.CustomerImg">
+          </div>
+          <img class="text-h" v-if="item.ImgName === '10月'" :src="textH">
+          <img class="text-l" v-if="item.ImgName === '4月' || item.ImgName === '7月'" :src="textL">
         </div>
-        <img class="text-h" v-if="item.ImgName === '10月'" :src="textH">
-        <img class="text-l" v-if="item.ImgName === '4月' || item.ImgName === '7月'" :src="textL">
       </div>
-    </div>
-    <div class="topBanner">
-      <swiper :options="swiperOption" ref="mySwiper">
-        <swiper-slide class="swiper-slide" v-for="(item,index) in banner" :key="index">
-          <div
-            class="item"
-            v-if="index === mainIndex-1 || index === mainIndex ||  index === mainIndex-2"
-          >
-            <div>
-              <img :src="item.bgImg" class="cover">
-              <img
-                :style="item.style"
-                v-if="!item.CustomerImg && item.defaultBg"
-                :src="item.defaultBg"
-              >
-              <img :src="item.CustomerImg" :style="item.style" v-if="item.CustomerImg">
-              <img class="text-h" v-if="item.ImgName === '10月'" :src="textH">
-              <img
-                class="text-l"
-                v-if="item.ImgName === '4月' || item.ImgName === '7月'"
-                :src="textL"
-              >
-              <div class="reload-img">
-                <van-uploader :after-read="onRead" v-show="mainIndex !== 1">
-                  <img :src="reloadImg">
-                </van-uploader>
+      <div class="topBanner">
+        <swiper :options="swiperOption" ref="mySwiper">
+          <swiper-slide class="swiper-slide" v-for="(item,index) in banner" :key="index">
+            <div
+              class="item"
+              v-if="index === mainIndex-1 || index === mainIndex ||  index === mainIndex-2"
+            >
+              <div>
+                <img :src="item.bgImg" class="cover">
+                <img
+                  :style="item.style"
+                  v-if="!item.CustomerImg && item.defaultBg"
+                  :src="item.defaultBg"
+                >
+                <img :src="item.CustomerImg" :style="item.style" v-if="item.CustomerImg">
+                <img class="text-h" v-if="item.ImgName === '10月'" :src="textH">
+                <img
+                  class="text-l"
+                  v-if="item.ImgName === '4月' || item.ImgName === '7月'"
+                  :src="textL"
+                >
+                <div class="reload-img">
+                  <van-uploader :after-read="onRead" v-show="mainIndex !== 1">
+                    <img :src="reloadImg">
+                  </van-uploader>
+                </div>
               </div>
             </div>
-          </div>
-        </swiper-slide>
-      </swiper>
-      <div class="swiper-button-next">
-        <i class="iconfont icon-you"></i>
+          </swiper-slide>
+        </swiper>
+        <div class="swiper-button-next">
+          <i class="iconfont icon-you"></i>
+        </div>
+        <div class="swiper-button-prev">
+          <i class="iconfont icon-left"></i>
+        </div>
+        <div class="swiper-pagination"></div>
       </div>
-      <div class="swiper-button-prev">
-        <i class="iconfont icon-left"></i>
+      <div class="meassage" v-if="mainIndex !== 1">备注：为了美观效果请上传{{size}}尺寸照片，未按尺寸会默认裁剪</div>
+      <div class="meassage" v-else>&nbsp;</div>
+      <div class="operation">
+        <div>
+          <van-uploader :after-read="onRead" v-show="mainIndex !== 1">
+            <img :src="uploadImg">
+            <p>自定义图片</p>
+          </van-uploader>
+        </div>
+        <div>
+          <img :src="reSet" v-show="mainIndex !== 1" @click="changeOld">
+          <p v-show="mainIndex !== 1">恢复默认</p>
+        </div>
       </div>
-      <div class="swiper-pagination"></div>
-    </div>
-    <div class="meassage" v-if="mainIndex !== 1">备注：为了美观效果请上传{{size}}尺寸照片，未按尺寸会默认裁剪</div>
-    <div class="meassage" v-else>&nbsp;</div>
-    <div class="operation">
-      <div>
-        <van-uploader :after-read="onRead" v-show="mainIndex !== 1">
-          <img :src="uploadImg">
-          <p>自定义图片</p>
-        </van-uploader>
+      <div class="email">
+        <span>邮箱</span>
+        <input
+          class="input"
+          type="text"
+          placeholder="接收电子版"
+          v-model="email"
+          style="border-radius:5px;background:rgba(245, 246, 250, 1);"
+        >
       </div>
-      <div>
-        <img :src="reSet" v-show="mainIndex !== 1" @click="changeOld">
-        <p v-show="mainIndex !== 1">恢复默认</p>
+      <div class="btn">
+        <div @click="pre">预览</div>
+        <div @click="showPop=true">确定</div>
       </div>
-    </div>
-    <div class="email">
-      <span>邮箱</span>
-      <van-field v-model="email" placeholder="接收电子版" style="border-radius:5px;"/>
-    </div>
-    <div class="btn">
-      <div @click="pre">预览</div>
-      <div @click="showPop=true">确定</div>
-    </div>
-    <div v-show="showPop" class="pop-box">
-      <div class="pop-content">
-        <div>确认定制此台历？</div>
-        <div>
-          <div @click="submit">确定</div>
-          <div @click="showPop=false">取消</div>
+      <div v-show="showPop" class="pop-box">
+        <div class="pop-content">
+          <div>确认定制此台历？</div>
+          <div>
+            <div @click="submit">确定</div>
+            <div @click="showPop=false">取消</div>
+          </div>
         </div>
       </div>
     </div>
@@ -138,8 +146,7 @@ export default {
             })
           }
         }
-      },
-      email: ''
+      }
     }
   },
   components: {
@@ -152,7 +159,8 @@ export default {
     },
     ...mapMakingState({
       bannerBlack: item => item.bannerBlack,
-      bannerRed: item => item.bannerRed
+      bannerRed: item => item.bannerRed,
+      Email: item => item.email
     }),
     size () {
       if (this.mainIndex === 2 || this.mainIndex === 5 || this.mainIndex === 8 || this.mainIndex === 11) {
@@ -160,6 +168,14 @@ export default {
       } else {
         return '竖'
       }
+    },
+    email: {
+      get () {
+        return this.Email
+      },
+      set (val) {
+        this.setEmail(val)
+      }
     }
   },
   created () {
@@ -170,27 +186,24 @@ export default {
     }
   },
   methods: {
-    ...mapMakingActions(['setBanner', 'calendar']),
+    ...mapMakingActions(['setBanner', 'calendar', 'setEmail']),
     upload (url) {
       this.banner[this.mainIndex - 1].CustomerImg = url
       this.setBanner({ type: this.$route.query.type, data: JSON.parse(JSON.stringify(this.banner)) }).then(() => {
-        this.$nextTick(() => {
-          this.calSize().then(() => {
-            let cutDoms = document.getElementsByClassName('cutDom')[0]
-            let that = this
-            cutDoms.onload = function () {
-              that.convert2canvas(cutDoms, that.mainIndex - 1).then(() => {
-                that.isLoading = false
-              }).catch(() => {
-                that.isLoading = false
-              })
-            }
+        this.calSize().then(() => {
+          let cutDoms = document.getElementsByClassName('cutDom')[0]
+          this.convert2canvas(cutDoms, this.mainIndex - 1).then(() => {
+            this.isLoading = false
+          }).catch(() => {
+            this.isLoading = false
           })
         })
       })
     },
     onRead (file) {
       this.isLoading = true
+      // this.banner[this.mainIndex - 1].CustomerImgShow = file.content
+      // this.setBanner({ type: this.$route.query.type, data: JSON.parse(JSON.stringify(this.banner)) })
       this.toolClass.upload(file).then((res) => {
         this.upload(res.result.url)
       }).catch(() => {
@@ -198,20 +211,21 @@ export default {
       })
     },
     changeOld () {
+      if (!this.banner[this.mainIndex - 1].CustomerImg) {
+        return
+      }
       this.isLoading = true
       this.banner[this.mainIndex - 1].CustomerImg = ''
+      // this.banner[this.mainIndex - 1].CustomerImgShow = ''
       this.setBanner({ type: this.$route.query.type, data: JSON.parse(JSON.stringify(this.banner)) }).then(() => {
         this.$nextTick(() => {
           this.calSize().then(() => {
             let cutDoms = document.getElementsByClassName('cutDom')[0]
-            const that = this
-            cutDoms.onload = function () {
-              that.convert2canvas(cutDoms, that.mainIndex - 1).then(() => {
-                that.isLoading = false
-              }).catch(() => {
-                that.isLoading = false
-              })
-            }
+            this.convert2canvas(cutDoms, this.mainIndex - 1).then(() => {
+              this.isLoading = false
+            }).catch(() => {
+              this.isLoading = false
+            })
           })
         })
       })
@@ -235,6 +249,7 @@ export default {
           curr.CustomerImg = curr.defaultNoUser
         }
         delete curr['defaultNoUser']
+        delete curr['CustomerImgShow']
       });
       let submitData = {
         ModelName: this.$route.query.type == 1 ? '黑色' : '红色',
@@ -335,24 +350,39 @@ export default {
     calSize () {
       return new Promise((resolve) => {
         let rotate = this.size
-        let dom = document.getElementsByClassName('cla')[0]
+        let dom = document.getElementsByClassName('cla')
+        if (dom.length < 2) {
+          resolve()
+          return
+        }
+        dom = dom[1]
+        let parentW = dom.offsetWidth
+        let parentH = dom.offsetHeight
         dom.children[0].onload = function () {
           let imgW = dom.children[0].naturalWidth
           let imgH = dom.children[0].naturalHeight
           if (rotate === '横') {
             if (imgW <= imgH) {
-              dom.children[0].style = 'width:100%;position:absolute;left:0;top:50%;transform:translateY(-50%);'
+              dom.children[0].style = 'width:100%;'
+              let Offset = -((dom.children[0].height - parentH) / 2)
+              dom.children[0].style = `width:100%;position:relative;top:${Offset}px;left:0`
               resolve()
             } else {
-              dom.children[0].style = 'height:100%;position:absolute;top:0;left:50%;transform:translateX(-50%);'
+              dom.children[0].style = 'height:100%;'
+              let Offset = -((dom.children[0].width - parentW) / 2)
+              dom.children[0].style = `height:100%;position:relative;left:${Offset}px;top:0`
               resolve()
             }
           } else {
             if (imgW >= imgH) {
-              dom.children[0].style = 'height:100%;position:absolute;top:0;left:50%;transform:translateX(-50%);'
+              dom.children[0].style = 'height:100%;'
+              let Offset = -((dom.children[0].width - parentW) / 2)
+              dom.children[0].style = `height:100%;position:relative;left:${Offset}px;top:0`
               resolve()
             } else {
-              dom.children[0].style = 'width:100%;position:absolute;left:0;top:50%;transform:translateY(-50%);'
+              dom.children[0].style = 'width:100%;'
+              let Offset = -((dom.children[0].height - parentH) / 2)
+              dom.children[0].style = `width:100%;position:relative;top:${Offset}px;left:0`
               resolve()
             }
           }
@@ -371,9 +401,19 @@ export default {
 
 
 <style lang="scss" scoped>
+.input {
+  border-radius: 5px;
+  background: rgb(245, 246, 250);
+  width: 100%;
+  height: 0.4rem;
+  padding-left: 0.1rem;
+}
+.mainPage {
+  position: fixed;
+  overflow-y: scroll;
+}
 .cla {
   overflow: hidden;
-  position: relative;
   z-index: 10;
 }
 .loading {
@@ -406,7 +446,7 @@ export default {
 .pop-box {
   width: 100%;
   height: 100%;
-  position: absolute;
+  position: fixed;
   left: 0;
   top: 0;
   display: flex;
@@ -564,9 +604,9 @@ export default {
   align-items: center;
   padding: 0.15rem 0.2rem 0.3rem;
   > div {
-    flex: 1;
     text-align: center;
     height: 0.68rem;
+    margin: 0 0.4rem;
     img {
       width: 0.68rem;
       height: 0.68rem;

src/pages/user/courseList/index.vue

@@ -84,7 +84,7 @@ export default {
             id: item.CourseId,
             title: item.CourseName,
             img: item.CourseImg,
-            remark: this.toolClass.dateFormat(item.BeginDate, 'yyyy-MM-dd') + '-' + this.toolClass.dateFormat(item.EndDate, 'yyyy-MM-dd'),
+            remark: this.toolClass.dateFormat(item.BeginDate, 'yyyy.MM.dd') + '~' + this.toolClass.dateFormat(item.EndDate, 'MM.dd'),
             address: item.CaseAddress,
             tag: item.CourseTags,
             courseType: '团体课',

src/pages/user/customization/customizationDetail.vue

@@ -1,7 +1,7 @@
 <template>
-  <div v-if="showPage">
+  <div class="mainPage" v-if="showPage">
     <div class="top">
-      <img :src="topImg">
+      <img :src="detail.ModelName === '黑色'?topImgBlack:topImgRed">
       <div>
         <div class="list">
           <img :src="detail.ModelName === '黑色'?cover:cover2">
@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="foot">
-      <div>联系我们: 400-2435 3756</div>
+      <div>联系我们: 025-86426666</div>
     </div>
   </div>
 </template>
@@ -47,13 +47,15 @@
 <script>
 import cover from '@/common/icon/heise.png'
 import cover2 from '@/common/icon/honhse.png'
-import topImg from '@/common/icon/topImg.png'
+import topImgRed from '@/common/icon/topImgRed.jpg'
+import topImgBlack from '@/common/icon/topImgBlack.png'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapCustomizationState, mapActions: mapCustomizationActions } = createNamespacedHelpers('customization')
 export default {
   data () {
     return {
-      topImg,
+      topImgRed,
+      topImgBlack,
       cover,
       cover2,
       showPage: false,
@@ -83,6 +85,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.mainPage {
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  transform: translateZ(0);
+  -webkit-transform: translateZ(0);
+}
 .title {
   font-size: 0.16rem;
   padding: 0.2rem 0 0.1rem 0.25rem;
@@ -162,6 +170,7 @@ export default {
 .bottom {
   background: #fff;
   .pic-list {
+    justify-content: center;
     padding: 0.05rem;
     box-sizing: border-box;
     display: flex;

src/pages/user/customization/customizationList.vue

@@ -1,11 +1,10 @@
 <template>
-  <div class="content" v-if="showPage">
+  <div class="content mainPage" v-if="showPage">
     <div
       class="list"
       v-for="(item,index) in list"
       :key="index"
       @click="toDetail(item.CustomerCalendarId)"
-      v-if="list.length>0"
     >
       <img :src="item.ModelName === '黑色'?cover:cover2">
       <div>
@@ -15,7 +14,7 @@
       </div>
       <span>{{item.MakeStatus === 'making' ? '制作中' : '制作完成'}}</span>
     </div>
-    <noMore v-else></noMore>
+    <noMore v-if="list.length === 0"></noMore>
   </div>
 </template>
 
@@ -39,6 +38,7 @@ export default {
   created () {
     this.getList().then(() => {
       this.showPage = true
+      console.log(this.list)
     })
   },
   computed: {
@@ -67,6 +67,7 @@ export default {
 <style lang="scss" scoped>
 .content {
   padding: 0.2rem 0.16rem;
+  box-sizing: border-box;
   .list {
     padding: 0.16rem 0.1rem;
     display: flex;

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

@@ -46,10 +46,10 @@
                 :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }"
                 style="width:100%;height:100%;position:relative;"
               >
-                <img :src="item.CaseImageUrl" class="cover" alt>
+                <img :src="getImg(item.CmsCaseImgs)" class="cover" alt>
                 <span v-if="item.CaseId!='all'">
                   <i class="iconfont icon-dingwei"></i>
-                  距离{{parseInt(toolClass.getGreatCircleDistance(latitude1, longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1]))}}米
+                  {{item.jl}}
                 </span>
               </router-link>
             </swiper-slide>
@@ -83,7 +83,7 @@
                 <div class="price">
                   <span>￥{{item.Price}}</span>
                 </div>
-                <span>{{`${toolClass.dateFormat(item.BeginDate,'yyyy-MM-dd')}~${toolClass.dateFormat(item.EndDate,'MM-dd')}`}}</span>
+                <span>{{`${toolClass.dateFormat(item.BeginDate,'yyyy.MM.dd')}~${toolClass.dateFormat(item.EndDate,'MM.dd')}`}}</span>
                 <span>{{item.CaseName}}</span>
               </router-link>
             </swiper-slide>
@@ -127,6 +127,8 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions } = createNamespacedHelpers('index')
+const wx = require('weixin-js-sdk')
+import wxsdk from '@/util/share'
 export default {
   name: '',
   data () {
@@ -174,33 +176,33 @@ export default {
     swiperSlide
   },
   created () {
-    this.getIndexLocation({ orgid: this.orgid, issys: '0' }).then((res) => {
-      // this.data.fiveA = this.fiveA
-      this.locationId = 'index'
-      this.getIndexInfo({ orgid: this.orgid, locationid: this.locationId }).then((res) => {
-        this.newsList = this.cms
-        if (this.project !== undefined && this.project !== null) {
-          for (let i = 0; i < this.project.length; i++) {
-            if (this.project[i].CmsCaseImgs != null) {
-              for (let j = 0; j < this.project[i].CmsCaseImgs.length; j++) {
-                if (this.project[i].CmsCaseImgs[j].ImageType === 'cover') {
-                  this.project[i].CaseImageUrl = this.project[i].CmsCaseImgs[j].CaseImageUrl
-                }
-              }
-            }
-          }
+    let that = this
+    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`
+    }).then(() => {
+      wx.getLocation({
+        type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+        success: function (res) {
+          that.setLocation({ latitude1: res.latitude, longitude1: res.longitude })
+          that.showPage = true
+          that.init()
+        },
+        cancel: function () {
+          that.showPage = true
+          that.init()
+        },
+        fail: function () {
+          that.showPage = true
+          that.init()
         }
       })
-      this.getCourseList({
-        pagesize: 10000,
-        page: 1
-      }).then(() => {
-        this.showPage = true
-      })
     })
   },
   methods: {
-    ...mapIndexActions(['getIndexLocation', 'getIndexInfo', 'getCourseList']),
+    ...mapIndexActions(['getIndexLocation', 'getIndexInfo', 'getCourseList', 'setLocation']),
     jump (item) {
       item.ForwardType = item.ForwardType || ''
       if (item.ForwardType === 'url') {
@@ -218,6 +220,35 @@ export default {
         window.location.href = item.InfoUrl
         return
       }
+    },
+    getImg (list) {
+      return list.filter(item => item.ImageType === 'cover')[0].CaseImageUrl
+    },
+    init () {
+      this.getIndexLocation({ orgid: this.orgid, issys: '0' }).then((res) => {
+        // this.data.fiveA = this.fiveA
+        this.locationId = 'index'
+        this.getIndexInfo({ orgid: this.orgid, locationid: this.locationId }).then((res) => {
+          this.newsList = this.cms
+          if (this.project !== undefined && this.project !== null) {
+            for (let i = 0; i < this.project.length; i++) {
+              if (this.project[i].CmsCaseImgs != null) {
+                for (let j = 0; j < this.project[i].CmsCaseImgs.length; j++) {
+                  if (this.project[i].CmsCaseImgs[j].ImageType === 'cover') {
+                    this.project[i].CaseImageUrl = this.project[i].CmsCaseImgs[j].CaseImageUrl
+                  }
+                }
+              }
+            }
+          }
+        })
+        this.getCourseList({
+          pagesize: 10000,
+          page: 1
+        }).then(() => {
+          this.showPage = true
+        })
+      })
     }
   }
 }

src/pages/user/majorProjectsList/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="showPage">
     <div class="flex-h">
       <div class="flex-item">
         <div>
@@ -12,7 +12,7 @@
               :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }"
             >
               <a class="img">
-                <img :src="item.CmsCaseImgs[0].CaseImageUrl" class="cover" alt>
+                <img :src="getImg(item.CmsCaseImgs)" class="cover" alt>
               </a>
               <router-link
                 tag="div"
@@ -33,17 +33,59 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
+const wx = require('weixin-js-sdk')
+import wxsdk from '@/util/share'
 export default {
   name: '',
   data () {
     return {
+      showPage: false
     }
   },
   computed: {
     ...mapState({
-      project: x => x.index.project
+      project: x => x.index.project,
+      orgid: x => x.app.orgId
     })
+  },
+  created () {
+    let that = this
+    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`
+    }).then(() => {
+      wx.getLocation({
+        type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+        success: function (res) {
+          that.setLocation({ latitude1: res.latitude, longitude1: res.longitude })
+          that.showPage = true
+          that.init()
+        },
+        cancel: function () {
+          that.showPage = true
+          that.init()
+        },
+        fail: function () {
+          that.showPage = true
+          that.init()
+        }
+      })
+    })
+  },
+  methods: {
+    ...mapIndexActions(['getProjectList', 'setLocation']),
+    getImg (list) {
+      return list.filter(item => item.ImageType === 'cover')[0].CaseImageUrl
+    },
+    init () {
+      this.getProjectList({ orgid: this.orgid, locationid: 'index' }).then(() => {
+        this.showPage = true
+      })
+    }
   }
 }
 </script>

src/pages/user/majorProjectsList/page.scss

@@ -37,10 +37,10 @@
                   width: 100%;
                   display: block;
                   line-height: .2rem;
-                  font-size: .14rem;
+                  font-size: .15rem;
                   font-weight: bolder;
                   &:nth-child(2){
-                    font-size: .12rem;
+                    font-size: .13rem;
                     color: #999;
                     font-weight: normal;
                   }

src/store/index/index.js

@@ -114,27 +114,35 @@ export default {
       }
     },
     setProject (state, data) { // 获取项目专题
-      data = data || []
-      let arr = []
-      let dataNew = []
-      data.forEach((item) => {
-        if (item.Coordinate) {
-          item.jl = parseInt(toolClass.getGreatCircleDistance(state.latitude1, state.longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1]))
-          arr.push(parseInt(toolClass.getGreatCircleDistance(state.latitude1, state.longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1])))
-        } else {
-          item.jl = 400000000
-          arr.push(400000000)
-        }
-      })
-      arr.sort((a, b) => { return a - b })
-      arr.forEach((curr) => {
+      if (state.latitude1 === 0 && state.longitude1 === 0) {
+        data.forEach((item) => {
+          item.jl = '未获取到当前定位'
+        })
+        state.project = data
+      } else {
+        data = data || []
+        let arr = []
+        let dataNew = []
         data.forEach((item) => {
-          if (curr === item.jl) {
-            dataNew.push(item)
+          if (item.Coordinate) {
+            item.jl = parseInt(toolClass.getGreatCircleDistance(state.latitude1, state.longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1]))
+            arr.push({ jl: item.jl, CmsCaseId: item.CmsCaseId })
+          } else {
+            item.jl = 400000000
+            arr.push({ jl: item.jl, CmsCaseId: item.CmsCaseId })
           }
         })
-      })
-      state.project = dataNew
+        arr.sort((a, b) => { return a.jl - b.jl })
+        arr.forEach((curr) => {
+          data.forEach((item) => {
+            if (curr.CmsCaseId === item.CmsCaseId && item.jl === curr.jl) {
+              item.jl = `距离${item.jl}米`
+              dataNew.push(item)
+            }
+          })
+        })
+        state.project = dataNew
+      }
     },
     setCms (state, data) { // 获取cms
       data = data || []

src/store/making/index.js

@@ -59,6 +59,7 @@ export default {
         defaultBg: b1,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/96917dcd-ed9f-446b-b54d-d2160416cf1a-20181205094151.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b1.jpg',
         ImgName: '1月',
         Sort: 2,
@@ -70,6 +71,7 @@ export default {
         defaultBg: b2,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/dd3e0c2d-5ea4-47d5-84b7-c1259ddf9cf1-20181205094235.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b2.jpg',
         ImgName: '2月',
         Sort: 3,
@@ -81,6 +83,7 @@ export default {
         defaultBg: b3,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/3a24c0c3-694f-4af2-aa09-0287eb0110fd-20181205094257.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b3.jpg',
         ImgName: '3月',
         Sort: 4,
@@ -92,6 +95,7 @@ export default {
         defaultBg: b4,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/b387debc-dc6b-4864-8d26-ce41c2702f1a-20181205094322.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b4.jpg',
         ImgName: '4月',
         Sort: 5,
@@ -103,6 +107,7 @@ export default {
         defaultBg: b5,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/c5b51b42-078d-414b-8cb8-5b5daf6e5463-20181205094344.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b5.jpg',
         ImgName: '5月',
         Sort: 6,
@@ -114,6 +119,7 @@ export default {
         defaultBg: b6,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/8b6a3cb2-23d2-4993-b84b-308e9b302cda-20181205094359.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b6.jpg',
         ImgName: '6月',
         Sort: 7,
@@ -125,6 +131,7 @@ export default {
         defaultBg: b7,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/11a72196-3ca1-4759-88c3-6b4317928857-20181205094421.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b7.jpg',
         ImgName: '7月',
         Sort: 8,
@@ -136,6 +143,7 @@ export default {
         defaultBg: b8,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/0d563fa7-7a5c-46fe-bddc-dbb9cdfba160-20181205094436.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b8.jpg',
         ImgName: '8月',
         Sort: 9,
@@ -147,6 +155,7 @@ export default {
         defaultBg: b9,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/44f83cc7-f57b-472d-b65b-84b5b10babc7-20181205094453.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b9.jpg',
         ImgName: '9月',
         Sort: 10,
@@ -158,6 +167,7 @@ export default {
         defaultBg: b10,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/6cf9a507-87c2-47f9-ad15-990032ecdaac-20181205094510.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b10.jpg',
         ImgName: '10月',
         Sort: 11,
@@ -169,6 +179,7 @@ export default {
         defaultBg: b11,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/2e8d2090-c528-4f37-8964-201a638e17ed-20181205094529.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b11.jpg',
         ImgName: '11月',
         Sort: 12,
@@ -180,6 +191,7 @@ export default {
         defaultBg: b12,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/e36c0bd2-5a48-42f0-86c6-99a56bb27210-20181205094545.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b12.jpg',
         ImgName: '12月',
         Sort: 13,
@@ -193,6 +205,7 @@ export default {
         defaultBg: '',
         CalendarImg: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/coverRed.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/coverRed.jpg',
         ImgName: '封面',
         Sort: 1,
@@ -203,6 +216,7 @@ export default {
         defaultBg: b1,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/de1214b4-2984-4d42-b224-66ea4f199b83-20181205094956.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b1.jpg',
         ImgName: '1月',
         Sort: 2,
@@ -214,6 +228,7 @@ export default {
         defaultBg: b2,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/c5d961ed-6a8e-401a-b371-19e3c7be070a-20181205095012.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b2.jpg',
         ImgName: '2月',
         Sort: 3,
@@ -225,6 +240,7 @@ export default {
         defaultBg: b3,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/390afecc-e7f9-4643-beaf-e696de93f2bf-20181205095032.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b3.jpg',
         ImgName: '3月',
         Sort: 4,
@@ -236,6 +252,7 @@ export default {
         defaultBg: b4,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/52015d95-f4a3-44bc-9650-79750c3a8a55-20181205095057.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b4.jpg',
         ImgName: '4月',
         Sort: 5,
@@ -247,6 +264,7 @@ export default {
         defaultBg: b5,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/2ea3e866-151b-4a38-8899-778113672e4b-20181205095118.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b5.jpg',
         ImgName: '5月',
         Sort: 6,
@@ -258,6 +276,7 @@ export default {
         defaultBg: b6,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/23c4e345-addf-40cd-b383-658f2a998367-20181205095139.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b6.jpg',
         ImgName: '6月',
         Sort: 7,
@@ -269,6 +288,7 @@ export default {
         defaultBg: b7,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/f686a7cd-b7d1-4501-aaad-177c10377618-20181205095200.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b7.jpg',
         ImgName: '7月',
         Sort: 8,
@@ -280,6 +300,7 @@ export default {
         defaultBg: b8,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/04d53ced-f552-4986-8f53-8ddc52f2ea9f-20181205095229.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b8.jpg',
         ImgName: '8月',
         Sort: 9,
@@ -291,6 +312,7 @@ export default {
         defaultBg: b9,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/e8c6cf08-9036-4e50-9c2f-4ebc5d79f4d5-20181205095248.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b9.jpg',
         ImgName: '9月',
         Sort: 10,
@@ -302,6 +324,7 @@ export default {
         defaultBg: b10,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/2c5cceb6-f418-4e49-bba6-bbd9f36eec2c-20181205095306.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b10.jpg',
         ImgName: '10月',
         Sort: 11,
@@ -313,6 +336,7 @@ export default {
         defaultBg: b11,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/e471c47e-2142-47e1-ad26-abe87af7b168-20181205095320.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b11.jpg',
         ImgName: '11月',
         Sort: 12,
@@ -324,6 +348,7 @@ export default {
         defaultBg: b12,
         CalendarImg: 'http://spaceofcheng.oss-cn-beijing.aliyuncs.com/0592e7b4-f7c5-44dd-a557-e20b282e60ca-20181205095342.jpg',
         CustomerImg: '',
+        CustomerImgShow: '',
         defaultNoUser: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/calendar/b12.jpg',
         ImgName: '12月',
         Sort: 13,
@@ -343,6 +368,9 @@ export default {
     },
     upDateWindowLoad (state, data) {
       state.windowLoad = data
+    },
+    upDateEmail (state, data) {
+      state.email = data
     }
   },
   actions: {
@@ -352,6 +380,12 @@ export default {
         resolve()
       })
     },
+    setEmail (context, data) {
+      return new Promise((resolve) => {
+        context.commit('upDateEmail', data)
+        resolve()
+      })
+    },
     calendar (context, data) {
       return new Promise((resolve, reject) => {
         Ajax({