ytj

src/pages/user/bindMobile/bindMobile.vue

@@ -173,7 +173,7 @@ export default {
         if (this.$route.query.isLottery) {
           setTimeout(() => {
             const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}` : ''
-            window.location.href = `/game/luckdraw/${from}`
+            window.location.href = `${window.location.origin}/c-v2/game/luckdraw/${from}`
           }, 2000)
         } else {
           setTimeout(function () {

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

@@ -132,6 +132,7 @@ const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForC
 const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 const { mapState: mapCardState, mapActions: mapCardActions } = createNamespacedHelpers('myCard')
 const { mapActions: mapUserCenterActions } = createNamespacedHelpers('userCenter')
+const wx = require('weixin-js-sdk')
 
 export default {
   name: '',
@@ -427,6 +428,7 @@ export default {
       window.location.href = this.getUrl('customerSearch')
     },
     locationMapping () {
+      let that = this
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
         title: '城的空间',
         desc: '城的空间',
@@ -438,23 +440,23 @@ export default {
           success: function (res) {
             let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
             let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
-            for (let i = 0; i < this.CaseList.length; i++) {
-              let result = this.CaseList[i].Coordinate.split(",")
+            for (let i = 0; i < that.CaseList.length; i++) {
+              let result = that.CaseList[i].Coordinate.split(",")
               let latitude2 = parseFloat(result[0])
               let longitude2 = parseFloat(result[1])
-              if (this.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
-                this.topCaseInfoData.caseName = this.CaseList[i].CaseName
-                this.topCaseInfoData.caseId = this.CaseList[i].CaseId
-                this.getCaseTableList({
-                  caseid: this.topCaseInfoData.caseId
+              if (that.toolClass.getGreatCircleDistance(latitude1, longitude1, latitude2, longitude2) < 500) {
+                that.topCaseInfoData.caseName = that.CaseList[i].CaseName
+                that.topCaseInfoData.caseId = that.CaseList[i].CaseId
+                that.getCaseTableList({
+                  caseid: that.topCaseInfoData.caseId
                 })
-                this.getCaseTotal({
-                  caseid: this.topCaseInfoData.caseId
+                that.getCaseTotal({
+                  caseid: that.topCaseInfoData.caseId
                 })
               }
             }
-            if (!this.topCaseInfoData.caseId || !this.topCaseInfoData.caseName){
-              this.topCaseInfoData.caseName = '当前位置无案场'
+            if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName){
+              that.topCaseInfoData.caseName = '当前位置无案场'
             }
           }
         })

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

@@ -23,21 +23,21 @@
             <img src="../../../../common/icon/userCenter-icon-1.png" width="100%" height="100%" alt="">
           </div>
           <span>优惠券</span>
-          <span>2张未使用</span>
+          <span>{{Nums.couponnum || 0}}张未使用</span>
         </div>
         <div class="flex-item privilege-item" @click="toCard">
           <div class="img-box">
             <img src="../../../../common/icon/userCenter-icon-2.png" width="100%" height="100%" alt="">
           </div>
           <span>卡券</span>
-          <span>2张未使用</span>
+          <span>{{Nums.cardsnum || 0}}张未使用</span>
         </div>
         <div class="flex-item privilege-item" @click="toVip">
           <div class="img-box">
             <img src="../../../../common/icon/userCenter-icon-3.png" width="100%" height="100%" alt="">
           </div>
           <span>VIP卡</span>
-          <span>￥200 <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
+          <span>￥{{(Nums.account || {}).Amount || 0}} <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
         </div>
       </div>
 
@@ -77,7 +77,8 @@ export default {
   computed: {
     ...mapState({
       userInfo: x => x.userCenter.userInfo,
-      org: x => x.app.orgId
+      org: x => x.app.orgId,
+      Nums: x => x.userCenter.Nums
     })
   },
   components: {
@@ -92,9 +93,10 @@ export default {
         this.isLoading = false
       }
     })
+    this.getNum()
   },
   methods: {
-    ...actions(['getUserInfo']),
+    ...actions(['getUserInfo', 'getNum']),
     toLessonOrder () {
       this.$router.push({ name: 'lessonOrder' })
     },
@@ -114,7 +116,7 @@ export default {
       this.$router.push({ name: 'orderList' })
     },
     toBodyCheck () {
-      window.location.href = `/bodyCheck.html#/`
+      window.location.href = `${window.location.origin}/c-v2/bodyCheck.html#/`
     },
     toLuckdraw () {
       // ^参数约定为97
@@ -122,7 +124,7 @@ export default {
       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
-      window.location.href = `/game/luckdraw/#/lotteryList?from=${userid}`
+      window.location.href = `${window.location.origin}/c-v2/game/luckdraw/#/lotteryList?from=${userid}`
     }
   }
 }

src/pages/user/majorProjectsDetail/index.vue

@@ -74,6 +74,7 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapProjectActions, mapState: mapProjectState } = createNamespacedHelpers('majorProjects')
+const wx = require('weixin-js-sdk')
 
 export default {
   name: '',

src/store/userCenter/userCenter.js

@@ -73,6 +73,7 @@ http.submitData = (data) => { // 绑定手机号
 export default {
   namespaced: true,
   state: {
+    Nums: {},
     userInfo: {},
     caseInfo: {},
     courseOrderList: {},
@@ -80,6 +81,9 @@ export default {
     courseOrderDetail: {},
   },
   mutations: {
+    setNums (state, data) {
+      state.Nums = data || {}
+    },
     setUserInfo (state, data) {
       state.userInfo = data
     },
@@ -96,11 +100,21 @@ export default {
       if (page <= 1) {
         state.courseOrderList = res
       } else {
-        state.courseOrderList = {...res, list: [...state.courseOrderList.list, ...res.list]}
+        state.courseOrderList = { ...res, list: [...state.courseOrderList.list, ...res.list] }
       }
     }
   },
   actions: {
+    getNum (context) { // 获取我的用户领取卡信息
+      return new Promise((resolve) => {
+        Ajax({
+          ...api.user.getNum
+        }).then(res => {
+          context.commit('setNums', res)
+          resolve(res)
+        })
+      })
+    },
     getCustomerCardList (context, { id, payload }) { // 获取我的用户领取卡信息
       return new Promise((resolve) => {
         Ajax(api.sales.getCustomerCardList.url, {

src/util/ajax.js

@@ -10,7 +10,9 @@ const token = function (headers) {
     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization
   }
-  return JWT ? JWT : localStorage.getItem('JWT')
+  const token = JWT ? JWT : localStorage.getItem('JWT')
+
+  return !token ? '' : token
 }
 
 const Axios = axios.create({

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'
 const common = '/common/:org'
@@ -126,6 +126,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/gymcard/:customerGymId`
     },
+    getNum: { // 获取卡券数
+      method: 'get',
+      url: `${baseUrl}${wechat}/customer/info`
+    }
   },
   director: {
     getSales: { // 获取销售列表
@@ -204,7 +208,7 @@ const $api = {
   share: {
     share: {
       method: 'get',
-      url: `${baseUrl}${guest}/wechat/jssdk/signature/:url`
+      url: `${baseUrl}${guest}/wechat/jssdk/signature`
     },
     card: {
       method: 'get',

src/util/share.js

@@ -14,14 +14,16 @@ function wxsdk (params, config) {
   return new Promise(function (resolve, reject) {
     Ajax(api.share.share.url, {
       method: api.share.share.method,
-      urlData: {
+      queryData: {
         ...params
       }
     }).then(result => {
+      console.log(result)
+      let time = parseInt(result.timestamp)
       wx.config({
         debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
         appId: result.appId, // 必填，公众号的唯一标识
-        timestamp: result.timestamp, // 必填，生成签名的时间戳
+        timestamp: time, // 必填，生成签名的时间戳
         nonceStr: result.noncestr, // 必填，生成签名的随机串
         signature: result.signature, // 必填，签名，见附录1
         jsApiList: [