ytj

public/index.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
     charset="utf-8" />
-  <link rel="stylesheet" href="//at.alicdn.com/t/font_681879_zlsjvjaiir.css">
+  <link rel="stylesheet" href="//at.alicdn.com/t/font_775069_clu263vfyod.css">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>
     <%= htmlWebpackPlugin.options.title %>

src/pages/user/App.vue

@@ -12,7 +12,7 @@ export default {
   name: 'app',
   data () {
     return {
-      showPage: true
+      showPage: false
     }
   },
   components: {},
@@ -23,14 +23,14 @@ export default {
     })
   },
   created () {
-    // if (location.search && this.toolClass.UrlSearch(location.search).code) {
-    //   this.code = this.toolClass.UrlSearch(location.search).code
-    // } else {
-    //   this.code = null
-    // }
-    // this.getUserInfo({ org: this.org, code: this.code }).then(() => {
-    //   this.showPage = true
-    // })
+    if (location.search && this.toolClass.UrlSearch(location.search).code) {
+      this.code = this.toolClass.UrlSearch(location.search).code
+    } else {
+      this.code = null
+    }
+    this.getUserInfo({ org: this.org, code: this.code }).then(() => {
+      this.showPage = true
+    })
   },
   methods: {
     ...actions(['getUserInfo'])

src/pages/user/bindMobile/bindMobile.vue

@@ -20,10 +20,14 @@
             <span>{{salesName}}</span>
             <i class="iconfont icon-triangle-bottom"></i>
           </div>
-        </div> -->
-
+        </div>-->
         <div class="mobile">
           <i class="iconfont icon-zhanghu"></i>
+          <input type="tel" placeholder="真实姓名" v-model="postData.name">
+        </div>
+
+        <div class="mobile">
+          <i class="iconfont icon-mima"></i>
           <input type="tel" placeholder="推荐码 (非必填)" v-model="postData.recommendCode">
         </div>
 
@@ -61,7 +65,7 @@
             @confirm="onConfirmS"
           />
         </div>
-      </transition> -->
+      </transition>-->
     </div>
   </div>
 </template>
@@ -83,6 +87,7 @@ export default {
       seconds: 61,
       postData: {
         phone: '',
+        name: '',
         // case: '',
         // sales: '',
         recommendCode: '',
@@ -196,6 +201,11 @@ export default {
         this.canSubmit = true
         return
       }
+      if (!this.postData.name) {
+        this.$toast('请填真实姓名')
+        this.canSubmit = true
+        return
+      }
       if (this.postData.recommendCode) {
         this.recommendCode({ recommendCode: this.postData.recommendCode }).then((res) => {
           if (res) {

src/pages/user/bindMobile/page.scss

@@ -27,11 +27,11 @@
     }
     .box{
       width: 3.25rem;
-      height: 3.5rem;
       background:rgba(255,255,255,1);
       border-radius:8px;
       padding: .2rem;
       box-sizing: border-box;
+      margin-top: .5rem;
       .title{
         font-size: .16rem;
         font-weight: bold;

src/pages/user/calendar/calendar.vue

@@ -26,8 +26,9 @@
 </template>
 
 <script>
-import { createNamespacedHelpers } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapMakingActions } = createNamespacedHelpers('making')
+const { mapActions: actions } = createNamespacedHelpers('userCenter')
 import topImg from '@/common/icon/topImg.png'
 export default {
   data () {
@@ -37,25 +38,46 @@ export default {
     }
   },
   created () {
-    this.getCalendarCustomer().then((res) => {
-      if (res) {
-        this.state = 2
-      } else {
-        let stringTime = "2018-12-22 00:00:00"
-        let timestamp = Date.parse(new Date(stringTime))
-        let now = new Date().getTime()
-        if (timestamp >= now) {
-          this.state = 1
+    this.getUserInfo({ org: this.org }).then(() => {
+      this.getCalendarCustomer().then((res) => {
+        if (res) {
+          this.state = 2
         } else {
-          this.state = 3
+          let stringTime = "2018-12-22 00:00:00"
+          let timestamp = Date.parse(new Date(stringTime))
+          let now = new Date().getTime()
+          if (timestamp >= now) {
+            this.state = 1
+          } else {
+            this.state = 3
+          }
         }
-      }
+      })
+    })
+  },
+  computed: {
+    ...mapState({
+      org: x => x.app.orgId,
+      userInfo: x => x.userCenter.userInfo
     })
   },
   methods: {
+    ...actions(['getUserInfo']),
     ...mapMakingActions(['getCalendarCustomer']),
     toCheckModel () {
-      this.$router.push({ name: 'checkModel' })
+      if (!this.userInfo.customer.Phone) {
+        this.$dialog.confirm({
+          title: '标题',
+          message: '您还不是注册会员，注册成功后即可参与此活动'
+        }).then(() => {
+          // on confirm
+          this.$router.push({ name: 'bindMobile' })
+        }).catch(() => {
+          // on cancel
+        });
+      } else {
+        this.$router.push({ name: 'checkModel' })
+      }
     }
   }
 }
@@ -88,8 +110,8 @@ export default {
     padding-bottom: 0.05rem;
     font-weight: bold;
   }
-  div{
-    padding-bottom: .08rem;
+  div {
+    padding-bottom: 0.08rem;
   }
 }
 .btn {

src/pages/user/calendar/making.vue

@@ -56,6 +56,8 @@
       <div class="swiper-pagination" v-show="mainIndex !== 1"></div>
       <div class="swiper-cover" v-show="mainIndex === 1">封面</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">
@@ -149,7 +151,14 @@ export default {
     ...mapMakingState({
       bannerBlack: item => item.bannerBlack,
       bannerRed: item => item.bannerRed
-    })
+    }),
+    size () {
+      if (this.mainIndex === 1 || this.mainIndex === 3 || this.mainIndex === 7 || this.mainIndex === 10) {
+        return '横'
+      } else {
+        return '竖'
+      }
+    }
   },
   created () {
     if (this.$route.query.type == 1) {
@@ -216,7 +225,7 @@ export default {
       }
       this.calendar({ Calendar: JSON.stringify(submitData) }).then(() => {
         this.$toast('日历已生成')
-        this.$router.push({ name: 'customizationList' })
+        this.$router.replace({ name: 'userCenter' })
       })
     },
     pre () {
@@ -328,6 +337,12 @@ export default {
     color: #fff;
   }
 }
+.meassage {
+  color: red;
+  padding: 0.1rem;
+  text-align: center;
+  font-size: 0.12rem;
+}
 .pop-box {
   width: 100%;
   height: 100%;
@@ -487,7 +502,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 0.5rem 0.2rem;
+  padding: 0.2rem 0.2rem 0.3rem;
   > div {
     flex: 1;
     text-align: center;
@@ -513,7 +528,7 @@ export default {
   }
 }
 .btn {
-  margin-top: 0.3rem;
+  margin-top: 0.1rem;
   width: 100%;
   box-sizing: border-box;
   display: flex;

src/pages/user/customization/customizationList.vue

@@ -43,7 +43,16 @@ export default {
     toDetail (id) {
       this.$router.push({ name: 'customizationDetail', query: { id: id } })
     }
-  }
+  },
+  // beforeRouteLeave (to, from, next) {
+  //   console.log(to)
+  //   console.log(from)
+  //   if (to.name === 'making') {
+  //     next({ name: 'activeList' })
+  //   } else {
+  //     next()
+  //   }
+  // }
 }
 </script>
 

src/pages/user/fiveA/index.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="mainPage flex-v">
     <nav class="flex-h">
-      <a class="flex-item" v-for="(item,index) in locations" :key="index" :class="{'active':index==active.index}" @click="changeLocation(item,index)">{{item.LocationName}}</a>
+      <a
+        class="flex-item"
+        v-for="(item,index) in locations"
+        :key="index"
+        :class="{'active':index==active.index}"
+        @click="changeLocation(item,index)"
+      >{{item.LocationName}}</a>
     </nav>
     <div class="flex-item">
       <div>
@@ -9,8 +15,18 @@
           <div class="banner flex-h">
             <div class="flex-item">
               <swiper :options="swiperOption" ref="mySwiper">
-                <swiper-slide class="swiper-slide" v-for="(banner,bindex) in item.Banners" :key="bindex">
-                  <img :src='banner.ImageUrl' class="cover" style="border-radius: .12rem;" alt=""  @click="jump(banner)">
+                <swiper-slide
+                  class="swiper-slide"
+                  v-for="(banner,bindex) in item.Banners"
+                  :key="bindex"
+                >
+                  <img
+                    :src="banner.ImageUrl"
+                    class="cover"
+                    style="border-radius: .12rem;"
+                    alt
+                    @click="jump(banner)"
+                  >
                 </swiper-slide>
               </swiper>
             </div>
@@ -18,7 +34,12 @@
           <h5>{{item.Title}}</h5>
           <div class="courseList flex-h">
             <ul class="flex-item" v-if="!fiveANoData">
-              <router-link tag="li" v-for="(course,cindex) in item.Courses" :key="cindex" :to="{name:'majorProjectsDetail',query:{id: course.CourseId}}">
+              <router-link
+                tag="li"
+                v-for="(course,cindex) in item.Courses"
+                :key="cindex"
+                :to="{name:'majorProjectsDetail',query:{id: course.CourseId}}"
+              >
                 <courseItem :data="courseInfo(course)"></courseItem>
               </router-link>
             </ul>
@@ -28,7 +49,13 @@
           <h5>{{item.Consult || '资讯'}}</h5>
           <div class="newsList flex-h">
             <ul class="flex-item">
-              <li tag="li" @click="jump(newinfo)" v-for="(newinfo,nindex) in item.News" v-if="nindex < 5" :key="nindex">
+              <li
+                tag="li"
+                @click="jump(newinfo)"
+                v-for="(newinfo,nindex) in item.News"
+                v-if="nindex < 5"
+                :key="nindex"
+              >
                 <newsItem :data="newinfo"></newsItem>
               </li>
             </ul>
@@ -107,7 +134,7 @@ export default {
         id: course.CourseId,
         title: course.CourseName,
         img: course.CourseImg,
-        remark: course.Remark,
+        remark: `${this.toolClass.dateFormat(course.BeginDate, 'yyyy-MM-dd')} ~ ${this.toolClass.dateFormat(course.EndDate, 'yyyy-MM-dd')}`,
         address: course.CaseAddress,
         tag: course.CourseTags || [],
         courseType: '',
@@ -126,7 +153,7 @@ export default {
       if (item.ForwardType === 'url') {
         window.location.href = item.ForwardUrl
       } else if (item.ForwardType === 'course') {
-        if (item.ForwardResourceId){
+        if (item.ForwardResourceId) {
           this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
         } else {
           this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardCourseId } }) // 此处去课程详情

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

@@ -1,12 +1,12 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="showPage">
     <div class="banner flex-h">
       <div class="flex-item">
         <div>
           <div>
             <swiper :options="swiperOption" ref="mySwiper">
               <swiper-slide class="swiper-slide" v-for="(item,index) in banner" :key="index">
-                <img :src='item.ImageUrl' class="cover" alt="" @click="jump(item)">
+                <img :src="item.ImageUrl" class="cover" alt @click="jump(item)">
               </swiper-slide>
             </swiper>
           </div>
@@ -15,8 +15,14 @@
     </div>
     <div class="subNav">
       <ul class="flex-h">
-        <router-link tag="li" class="flex-item" v-for="(item, index) in fiveA" :to="{name:'fiveA',query:{id:item.LocationId}}" :key="index">
-          <img :src="item.TypeImg" alt="">
+        <router-link
+          tag="li"
+          class="flex-item"
+          v-for="(item, index) in fiveA"
+          :to="{name:'fiveA',query:{id:item.LocationId}}"
+          :key="index"
+        >
+          <img :src="item.TypeImg" alt>
           <span>{{item.LocationName}}</span>
         </router-link>
       </ul>
@@ -30,9 +36,16 @@
         <div>
           <swiper :options="swiperHOption" ref="mySwiperH">
             <swiper-slide class="swiper-slide" v-for="(item,index) in project" :key="index">
-              <router-link tag="div" :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }" style="width:100%;height:100%;position:relative;">
-                <img :src='item.CaseImageUrl' class="cover" alt="">
-                <span><i class="iconfont icon-dingwei"></i>距离{{item.Coordinate}}米</span>
+              <router-link
+                tag="div"
+                :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }"
+                style="width:100%;height:100%;position:relative;"
+              >
+                <img :src="item.CaseImageUrl" class="cover" alt>
+                <span>
+                  <i class="iconfont icon-dingwei"></i>
+                  距离{{parseInt(toolClass.getGreatCircleDistance(latitude1, longitude1, item.Coordinate.split(',')[0], item.Coordinate.split(',')[1]))}}米
+                </span>
               </router-link>
             </swiper-slide>
           </swiper>
@@ -48,12 +61,18 @@
         <div>
           <swiper :options="swiperHOption" ref="mySwiperH">
             <swiper-slide class="swiper-slide" v-for="(item,index) in courseList" :key="index">
-              <router-link tag="div" :to="{ name:'majorProjectsDetail', query:{ id: item.CourseId } }" style="width:100%;position:relative;overflow:visible">
+              <router-link
+                tag="div"
+                :to="{ name:'majorProjectsDetail', query:{ id: item.CourseId } }"
+                style="width:100%;position:relative;overflow:visible"
+              >
                 <div class="img">
-                  <img :src='item.CourseImg' class="cover centerLabel" alt="">
+                  <img :src="item.CourseImg" class="cover centerLabel" alt>
                   <span>{{item.CourseName}}</span>
                 </div>
-                <div class="price"><span>￥{{item.Price}}</span></div>
+                <div class="price">
+                  <span>￥{{item.Price}}</span>
+                </div>
                 <span>{{toolClass.dateFormat(item.BeginDate)}}</span>
                 <span>{{item.CaseName}}</span>
               </router-link>
@@ -71,7 +90,7 @@
           <ul>
             <li class="flex-h" v-for="(item,index) in newsList" :key="index" @click="jump(item)">
               <a class="img">
-                <img :src="item.ImageUrl" class="centerLabel cover" alt="">
+                <img :src="item.ImageUrl" class="centerLabel cover" alt>
               </a>
               <div class="flex-item">
                 <div>
@@ -92,6 +111,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 () {
@@ -109,7 +130,8 @@ export default {
         freeMode: true,
         slidesPerView: 'auto',
       },
-      newsList: []
+      newsList: [],
+      showPage: false
     }
   },
   computed: {
@@ -120,6 +142,8 @@ export default {
       message: x => x.index.message,
       project: x => x.index.project,
       cms: x => x.index.cms,
+      longitude1: x => x.index.longitude1,
+      latitude1: x => x.index.latitude1
     }),
     ...mapIndexState({
       courseList: x => x.courseList
@@ -136,31 +160,47 @@ 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.getIndexLocation({ orgid: that.orgid, issys: '0' }).then((res) => {
+            // that.data.fiveA = that.fiveA
+            that.locationId = 'index'
+            that.getIndexInfo({ orgid: that.orgid, locationid: that.locationId }).then((res) => {
+              that.newsList = that.cms
+              if (that.project !== undefined && that.project !== null) {
+                for (let i = 0; i < that.project.length; i++) {
+                  if (that.project[i].CmsCaseImgs != null) {
+                    for (let j = 0; j < that.project[i].CmsCaseImgs.length; j++) {
+                      if (that.project[i].CmsCaseImgs[j].ImageType === 'cover') {
+                        that.project[i].CaseImageUrl = that.project[i].CmsCaseImgs[j].CaseImageUrl
+                      }
+                    }
+                  }
                 }
               }
-            }
-          }
+            })
+            that.getCourseList({
+              pagesize: 5,
+              page: 1
+            }).then(() => {
+              that.showPage = true
+            })
+          })
         }
       })
-      this.getCourseList({
-        pagesize: 5,
-        page: 1
-      })
     })
   },
   methods: {
-    ...mapIndexActions(['getIndexLocation', 'getIndexInfo', 'getCourseList']),
+    ...mapIndexActions(['getIndexLocation', 'getIndexInfo', 'getCourseList', 'setLocation']),
     jump (item) {
       item.ForwardType = item.ForwardType || ''
       if (item.ForwardType === 'url') {

src/pages/user/mainPage/indexPage/page.scss

@@ -28,9 +28,11 @@
           top: 0;
           bottom: 0;
           overflow: hidden;
-          >div{
+          border-radius: .1rem;
+        >div{
             width: 100%;
             height: 100%;
+            border-radius: .1rem;
           }
         }
       }

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

@@ -94,8 +94,6 @@ export default {
       this.user = this.userInfo.customer
       if (this.user.AccountInfo) {
         this.AccountInfo = JSON.parse(this.user.AccountInfo)
-
-
       }
       this.headimgurl = this.user.Headimgurl
     })
@@ -136,7 +134,7 @@ export default {
       userid = `${userid}${num}`
       window.location.href = `${window.location.origin}/game/luckdraw/#/lotteryList?from=${userid}`
     },
-    toActiveList(){
+    toActiveList () {
       this.$router.push({ name: 'activeList' })
     }
   }

src/pages/user/majorProjectsList/index.vue

@@ -4,11 +4,21 @@
       <div class="flex-item">
         <div>
           <ul>
-            <router-link v-for="(item, index) in project" :key="index" class="flex-h" tag="li" :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }">
+            <router-link
+              v-for="(item, index) in project"
+              :key="index"
+              class="flex-h"
+              tag="li"
+              :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }"
+            >
               <a class="img">
                 <img :src="item.CmsCaseImgs[0].CaseImageUrl" class="cover" alt>
               </a>
-              <router-link tag="div" class="flex-item" :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }">
+              <router-link
+                tag="div"
+                class="flex-item"
+                :to="{ name:'majorProjects', query:{ id: item.CmsCaseId } }"
+              >
                 <div>
                   <span>{{item.Name}}</span>
                   <span>{{item.CaseAddress}}</span>
@@ -25,7 +35,8 @@
 <script>
 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 () {
@@ -41,14 +52,28 @@ export default {
   components: {
   },
   created () {
-    this.getProjectList({
-      orgid: this.orgid
+    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(() => {
-      console.log(this.project)
+      wx.getLocation({
+        type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+        success: function (res) {
+          that.setLocation({ latitude1: res.latitude, longitude1: res.longitude })
+          that.getProjectList({
+            orgid: that.orgid
+          }).then(() => {
+            console.log(that.project)
+          })
+        }
+      })
     })
   },
   methods: {
-    ...mapIndexActions(['getProjectList'])
+    ...mapIndexActions(['getProjectList', 'setLocation'])
   }
 }
 </script>

src/store/index/index.js

@@ -1,5 +1,6 @@
 import Ajax from '../../util/ajax'
 import api from '../../util/api'
+import toolClass from '../../util/util'
 const http = new Object
 
 // 请求数据
@@ -91,7 +92,9 @@ export default {
     message: [],
     project: [],
     cms: [],
-    courseList: []
+    courseList: [],
+    longitude1: 0,
+    latitude1: 0
   },
   mutations: {
     setBanner (state, data) { // 获取首页轮播图
@@ -112,7 +115,21 @@ export default {
     },
     setProject (state, data) { // 获取项目专题
       data = data || []
-      state.project = data
+      let arr = []
+      let dataNew = []
+      data.forEach((item) => {
+        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])))
+      })
+      arr.sort((a, b) => { return a - b })
+      arr.forEach((curr) => {
+        data.forEach((item) => {
+          if (curr === item.jl) {
+            dataNew.push(item)
+          }
+        })
+      })
+      state.project = dataNew
     },
     setCms (state, data) { // 获取cms
       data = data || []
@@ -121,8 +138,15 @@ export default {
     updateCourseList (state, data) { // 更新附近课程
       state.courseList = data.list || []
     },
+    upDateLocation (state, data) {
+      state.longitude1 = data.longitude1
+      state.latitude1 = data.latitude1
+    }
   },
   actions: {
+    setLocation (context, data) {
+      context.commit('upDateLocation', data)
+    },
     getCourseList (context, payload) { // 获取附近课程
       return new Promise((resolve, reject) => {
         Ajax(api.index.getCourseList.url, {