ytj

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

@@ -429,37 +429,45 @@ export default {
     },
     locationMapping () {
       let that = this
-      wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
-        title: '城的空间',
-        desc: '城的空间',
-        link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
-      }).then(() => {
-        wx.getLocation({
-          type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-          success: function (res) {
-            let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
-            let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
-            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 (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
-                })
-                that.getCaseTotal({
-                  caseid: that.topCaseInfoData.caseId
-                })
-              }
-            }
-            if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName){
-              that.topCaseInfoData.caseName = '当前位置无案场'
-            }
-          }
-        })
+      // wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
+      //   title: '城的空间',
+      //   desc: '城的空间',
+      //   link: `${window.location.origin}${window.location.pathname}/user.html#/mainPage/indexPage`,
+      //   thu_image: `${window.location.origin}${window.location.pathname}${logo}`
+      // }).then(() => {
+      //   wx.getLocation({
+      //     type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+      //     success: function (res) {
+      //       let latitude1 = res.latitude // 纬度，浮点数，范围为90 ~ -90
+      //       let longitude1 = res.longitude // 经度，浮点数，范围为180 ~ -180。
+      //       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 (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
+      //           })
+      //           that.getCaseTotal({
+      //             caseid: that.topCaseInfoData.caseId
+      //           })
+      //         }
+      //       }
+      //       if (!that.topCaseInfoData.caseId || !that.topCaseInfoData.caseName){
+      //         that.topCaseInfoData.caseName = '当前位置无案场'
+      //       }
+      //     }
+      //   })
+      // })
+      that.topCaseInfoData.caseName = that.CaseList[0].CaseName
+      that.topCaseInfoData.caseId = that.CaseList[0].CaseId
+      that.getCaseTableList({
+        caseid: that.topCaseInfoData.caseId
+      })
+      that.getCaseTotal({
+        caseid: that.topCaseInfoData.caseId
       })
     },
     beforeClose (action, done) {

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

@@ -73,6 +73,7 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
+const { mapState: mapUserState } = createNamespacedHelpers('userCenter')
 export default {
   name: '',
   data () {
@@ -99,6 +100,9 @@ export default {
     }
   },
   computed: {
+    ...mapUserState({
+      userInfo: x => x.userInfo
+    }),
     ...mapState({
       orgid: x => x.app.orgId,
       fiveA: x => x.index.fiveA,
@@ -120,6 +124,10 @@ export default {
     swiperSlide,
   },
   created () {
+    if (this.userInfo.customer.MapUser) {
+      this.$router.push({ name: 'coffeeIndex' })
+      return
+    }
     this.getIndexLocation({ orgid: this.orgid, issys: '0' }).then((res) => {
       this.data.fiveA = this.fiveA
       this.locationId = 'index'

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'

vue.config.js

@@ -25,9 +25,9 @@ module.exports = {
       // '/api-v2': {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', // wf
+        target: 'http://192.168.0.62:8080', // wf
         // target: 'http://192.168.0.125:8080', // hyq
-        target: 'http://192.168.0.11', // ys
+        // target: 'http://192.168.0.11', // ys
         // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {