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

src/pages/user/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app" v-if="showPage">
-    <router-view ></router-view>
+    <router-view></router-view>
   </div>
 </template>
 

src/pages/user/app.js

@@ -8,11 +8,13 @@ import Vuex from 'vuex'
 import Ajax from '../../util/ajax'
 import api from '../../util/api'
 import toolClass from '../../util/util'
+const Base64 = require('js-base64').Base64
 
 Vue.use(Vant)
 Vue.use(Vuex)
 Vue.prototype.$api = api
 Vue.prototype.$ajax = Ajax
+Vue.prototype.Base64 = Base64
 Vue.prototype.toolClass = toolClass
 /* eslint-disable no-new */
 new Vue({

src/pages/user/bindMobile/page.scss

@@ -82,10 +82,10 @@
         justify-content: space-between;
         span{
           color: rgba(168,182,200,1);
+          white-space: nowrap;
         }
         i{
           color: rgba(168,182,200,1);
-          padding-left: .14rem;
           font-size: .12rem;
         }
         div{
@@ -99,7 +99,7 @@
           padding: .1rem;
           box-sizing: border-box;
           span{
-            width: 70%;
+            width: 85%;
             overflow:hidden;
             text-overflow:ellipsis;
             white-space:nowrap;

src/pages/user/card/index.vue

@@ -143,7 +143,7 @@ export default {
           })
         }
       } else {
-        this.data[this.active].hasPic
+        this.data[this.active].hasPic = true
       }
     })
   },

src/pages/user/fiveA/index.vue

@@ -83,6 +83,15 @@ export default {
     const _that = this
     this.getLocationDetails().then(res => {
       _that.locations = res
+      let id = _that.$route.query.id
+      let index = 0
+      for (let i = 0; i < _that.locations.length; i++) {
+        if (_that.locations[i].LocationId === id) {
+          index = i
+        }
+      }
+      console.log(index)
+      _that.changeLocation(id, index)
     })
   },
   methods: {
@@ -94,16 +103,16 @@ export default {
     },
     courseInfo (course) {
       return {
-          id: course.CourseId,
-          title: course.CourseName,
-          img: course.CourseImg,
-          remark: course.Remark,
-          address: course.CaseAddress,
-          tag: course.CourseTags || [],
-          courseType: '',
-          defaultPrice: course.Price + '/节',
-          getWay: 'ticket'
-        }
+        id: course.CourseId,
+        title: course.CourseName,
+        img: course.CourseImg,
+        remark: course.Remark,
+        address: course.CaseAddress,
+        tag: course.CourseTags || [],
+        courseType: '',
+        defaultPrice: course.Price + '/节',
+        getWay: 'ticket'
+      }
     },
     // returnCourseList (arr) { // 转换课程列表格式
     //   for (var n = 0; n < arr.length; n++) {

src/pages/user/lessonDetail/index.vue

@@ -46,6 +46,7 @@
       </div>
       <div class="qr-code" v-if="courseOrderDetail.IsDone === 0">
         <qrCode v-if="showQrCode" :msg="courseOrderDetail.QrCodeString"></qrCode>
+        <div>{{courseOrderDetail.QrCodeString}}</div>
       </div>
     </div>
     <div class="useType">
@@ -65,10 +66,6 @@ const { mapActions: mapUserActions, mapState: mapUserState } = createNamespacedH
 export default {
   data () {
     return {
-      msg: {
-        course_type: 800,
-        orderNo: '342897789334'
-      },
       useType: '未使用',
       used,
       failure,

src/pages/user/lessonDetail/page.scss

@@ -66,7 +66,7 @@
   }
   .useType{
     position: absolute;
-    top: 2.5rem;
+    top: 3.3rem;
     right: .5rem;
     width: .76rem;
     height: .76rem;
@@ -75,4 +75,9 @@
     font-size: .12rem;
     color: #FC6243 !important;
   }
+  .qr-code{
+    div{
+      text-align: center;
+    }
+  }
 }

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: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
+          thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg?x-oss-process=style/wxicon`
         }).then(() => {
           wx.getLocation({
             type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'

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

@@ -117,7 +117,7 @@ export default {
       let userid = this.userInfo.customer.CustomerId
       let num = Math.floor(Math.random() * 10 + 1) * 100 + Math.floor(Math.random() * 10 + 1) * 10 + Math.floor(Math.random() * 10 + 1)
       num = num >= 1000 ? 999 : num
-      userid = parseInt(`${userid}${num}`) ^ 97
+      userid = `${userid}${num}`
       window.location.href = `${window.location.origin}/game/luckdraw/#/lotteryList?from=${userid}`
     }
   }

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: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
+        thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg?x-oss-process=style/wxicon`
       }).then(() => {
         let result = this.courseDetail.CaseInfo.Coordinate.split(",")
         let latitude = parseFloat(result[0])

src/pages/user/placeOrder/index.vue

@@ -303,6 +303,7 @@ export default {
         detail: JSON.stringify(this.postData.detail),
         coupon: JSON.stringify(this.postData.coupon)
       }).then((res) => {
+        this.showCalcMenu = false
         this.showSuccessPopup = true
         // this.$dialog.alert({
         //   message: '下单成功！',

src/pages/user/placeOrder/page.scss

@@ -244,8 +244,8 @@
     position: fixed;
     top: 0;
     left: 0;
-    z-index: 999;
-    background: rgba(0, 0, 0, .05);
+    z-index: 2;
+    background: rgba(0, 0, 0, .35);
     >div{
       position: absolute;
       top: 50%;
@@ -262,7 +262,7 @@
       align-items: center;
       padding: .2rem;
       i{
-        color: #fc6243;
+        color: #000;
         font-size: .36rem;
         margin-bottom: .2rem;
       }

src/pages/user/placeOrderDetail/index.vue

@@ -65,6 +65,13 @@
         <a @click="sureSelectCoupon">确定</a>
       </div>
     </div>
+    <div class="successPopup" v-if="showSuccessPopup">
+      <div>
+        <i class="iconfont icon-gou"></i>
+        <div class="text">出单成功</div>
+        <div class="back" @click="popBack">返回等待</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -81,6 +88,7 @@ export default {
       showSelectCouponLayer: false,
       getCouponOff: false,
       couponList: [], // 优惠券列表
+      showSuccessPopup: false,
       postData: {
         info: {
           CaseId: decodeURI(_self.$route.query.caseid),
@@ -225,13 +233,19 @@ export default {
         detail: JSON.stringify(this.postData.detail),
         customercouponid: this.postData.customercouponid
       }).then((res) => {
-        this.$dialog.alert({
-          message: '下单成功！'
-        }).then(() => {
-          window.history.go(-2)
-        })
+        this.showSuccessPopup = true
+        // this.$dialog.alert({
+        //   message: '下单成功！'
+        // }).then(() => {
+        //   window.history.go(-2)
+        // })
       })
     },
+    
+    popBack () {
+      this.showSuccessPopup = false
+      window.history.go(-2)
+    },
     cancel () {
       window.history.go(-1)
     },

src/pages/user/placeOrderDetail/page.scss

@@ -305,8 +305,8 @@
     position: fixed;
     top: 0;
     left: 0;
-    z-index: 999;
-    background: rgba(0, 0, 0, .05);
+    z-index: 2;
+    background: rgba(0, 0, 0, .35);
     >div{
       position: absolute;
       top: 50%;
@@ -323,7 +323,7 @@
       align-items: center;
       padding: .2rem;
       i{
-        color: #fc6243;
+        color: #000;
         font-size: .36rem;
         margin-bottom: .2rem;
       }

src/pages/user/placeOrderForCourse/index.vue

@@ -28,7 +28,8 @@
                     <span>时间描述</span>
                   </div>
                 </div>
-                <span v-if="courseTimeList.length">{{returnCourseTime(courseTimeList[0].BeginDate,courseTimeList[0].EndDate)}}</span>
+                <!-- <span v-if="courseTimeList.length">{{returnCourseTime(courseTimeList[0].BeginDate,courseTimeList[0].EndDate)}}</span> -->
+                <span v-if="courseTimeList.length">{{toolClass.dateFormat(courseTimeList[0].BeginDate,'yyyy-MM-dd') + ' ~ ' + toolClass.dateFormat(courseTimeList[0].EndDate, 'yyyy-MM-dd')}}</span>
               </li>
               <li class="flex-h">
                 <div class="flex-item">
@@ -182,7 +183,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() && res[n].CaseId === caseid) {
+                if (res[n].Coupon.Targets[a].TargetId === id && nowDate > new Date(res[n].StartDate).getTime() && 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,
@@ -250,7 +251,7 @@ export default {
       }).then((res) => {
         // console.log(JSON.stringify(res))
         this.$dialog.alert({
-          message: '下单成功！'
+          title: '下单成功！'
         }).then(() => {
           // this.$router.push({name: 'majorProjects'})
           window.history.go(-2)
@@ -292,3 +293,9 @@ export default {
 <style lang="scss" scoped>
 @import 'page.scss';
 </style>
+
+<style lang="scss">
+.van-dialog{
+  width: 60% !important;
+}
+</style>

src/pages/user/receive/index.vue

@@ -136,10 +136,10 @@ export default {
     sdk (info) {
       let logo, title
       if (this.$route.query.type === 'card') {
-        logo = this.data.Images[0].CardImageUrl
+        logo = this.data.Images[0].CardImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CardName
       } else {
-        logo = this.data.Images[0].CouponImageUrl
+        logo = this.data.Images[0].CouponImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CouponName
       }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {

src/pages/user/receiveChannel/index.vue

@@ -15,16 +15,7 @@
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
       <div class="title" v-else>{{data.CouponName}}</div>
       <!-- <div class="video" v-if='video'> -->
-        <video :src="data.VideoUrl" height="100%"
-          style="object-fit:fill" 
-          webkit-playsinline="true" 
-          x-webkit-airplay="true" 
-          playsinline="true" 
-          x5-video-player-type="h5"
-          x5-video-orientation="h5" 
-          x5-video-player-fullscreen="true"
-          preload="auto" 
-        ></video>
+        <video :src="data.VideoUrl" height="100%" width="100%" preload="auto" ></video>
       <!-- </div> -->
       <div class="text">
         <div>
@@ -146,10 +137,10 @@ export default {
     sdk (info) {
       let logo, title
       if (this.$route.query.type === 'card') {
-        logo = this.data.Images[0].CardImageUrl
+        logo = this.data.Images[0].CardImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CardName
       } else {
-        logo = this.data.Images[0].CouponImageUrl
+        logo = this.data.Images[0].CouponImageUrl + '?x-oss-process=style/wxicon'
         title = this.data.CouponName
       }
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {

src/util/ajax.js

@@ -5,7 +5,7 @@ import router from '../pages/user/router'
 import { Toast } from '../../node_modules/vant';
 
 const token = function (headers) {
-  let JWT
+  let JWT = ''
   if (headers) {
     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization

src/util/api.js

@@ -1,5 +1,5 @@
-const baseUrl = '/api-v2'
-// const baseUrl = '/api'
+// const baseUrl = '/api-v2'
+const baseUrl = '/api'
 const wechat = '/wechat/:org'
 const guest = '/guest/:org'