登录优化和原组合票定位取消

pages/combination/combiChoose/combiChoose.vue

@@ -28,8 +28,7 @@
 										</template>
 									</view>
 
-									<view v-if="showDistance" class="title-right">
-										距您{{ item.distance ? parseFloat((item.distance / 1000).toFixed(2)) : 0 }}km
+									<view class="title-right">
 										<u-icon name="arrow-right" style="margin-left: 4rpx;" size='26' color='#B4B4B4'></u-icon>
 									</view>
 								</view>
@@ -229,7 +228,6 @@ export default {
       currentNum:0,//轮播图下标
       imgList: [], //图片列表
       scenicList: [], //景区数据
-      showDistance: false, //定位成功显示距离
       buyKnowData: '', //购买须知数据
       chooseProduct: [], //选中的产品
       showModal: false, //是否显示模态框
@@ -361,38 +359,18 @@ export default {
     let newTimestamp=uni.getStorageSync('newTimestamp')||''
     let token = uni.getStorageSync('token')
     if (token) {
-      uni.getLocation({
-        type: 'wgs84',
-        success: res => {
-          let latitude = res.latitude //纬度
-          let longitude = res.longitude //经度
-          this.showDistance = true
-          //判断时间戳,之前请求失败，必须大于缓存时间戳才进行请求
-          if(newTimestamp){
-            if(Date.now()>newTimestamp){
-              this.initList(latitude, longitude)
-            }else{
-              this.showTip=true
-            }
-          }else{
-            this.initList(latitude, longitude)
-          }
-        },
-        fail: res => {
-          let latitude = ''
-          let longitude = ''
-          //判断时间戳,之前请求失败，必须大于缓存时间戳才进行请求
-          if(newTimestamp){
-            if(Date.now()>newTimestamp){
-              this.initList(latitude, longitude)
-            }else{
-              this.showTip=true
-            }
-          }else{
-            this.initList(latitude, longitude)
-          }
+      let latitude = ''
+      let longitude = ''
+      //判断时间戳,之前请求失败，必须大于缓存时间戳才进行请求
+      if(newTimestamp){
+        if(Date.now()>newTimestamp){
+          this.initList(latitude, longitude)
+        }else{
+          this.showTip=true
         }
-      })
+      }else{
+        this.initList(latitude, longitude)
+      }
     }
   },
   methods: {

pages/login/login.vue

@@ -10,7 +10,7 @@ export default {
     }
   },
   onLoad() {
-    this.login()
+    this.getCodeLogin()
   },
   // 一般页面用onUnload
   // tabbar页面用onHide
@@ -21,8 +21,8 @@ export default {
     }  
   },
   methods:{
-    //---登录
-    login(){
+    //---获取编码并登录
+    getCodeLogin(){
       uni.getProvider({
         service: 'oauth',
         success:proRes=>{
@@ -49,48 +49,7 @@ export default {
                     let openid = res.data.openid
                     uni.setStorageSync('openid', openid)
                     let userId = res.data.userId || ''
-                    let datas = { openid, source, userId }
-                    this.$request('wechatUser/login/findWxUserAndLogin', datas).then(res => {
-                      //通过openid获取token
-                      if (res.code == '00') {
-                        let token = res.data.token || ''
-                        uni.setStorageSync('token', token)
-                        let createUserId = res.data.personId || ''
-                        uni.setStorageSync('createUserId', createUserId)
-                        let userId = res.data.userId || ''
-                        uni.setStorageSync('userId', userId)
-                        let enterOptions = uni.getStorageSync('enterOptions')
-                        let queryTotal = ''
-                        for (let key in enterOptions.query) {
-                          queryTotal += '&' + key + '=' + enterOptions.query[key]
-                        }
-                        queryTotal = queryTotal.substr(1)
-                        if (token) {
-                          uni.reLaunch({
-                            url: '/' + enterOptions.path + '?' + queryTotal
-                          })
-                          //保存当前日期
-                          let oldDate=this.$commonjs.today()
-                          uni.setStorageSync('oldDate', oldDate)
-                          // uni.navigateBack({
-                          // 	delta:1
-                          // })
-                        }
-                      } else {
-                        uni.showToast({
-                          title: res.message,
-                          icon: 'none'
-                        })
-                      }
-                    }).catch(err => {
-                      uni.showToast({
-                        title: '登录失败,请退出并重新登录',
-                        icon: 'none'
-                      })
-                      this.timer = setTimeout(() => {
-                        this.login()
-                      }, 2000)
-                    })
+                    this.login(openid,userId,source)
                   } else {
                     uni.showToast({
                       title: res.message,
@@ -103,7 +62,7 @@ export default {
                     icon: 'none'
                   })
                   this.timer = setTimeout(() => {
-                    this.login()
+                    this.getCodeLogin()
                   }, 2000)
                 })
               }
@@ -111,6 +70,51 @@ export default {
           })
         }
       })
+    },
+    //---登录
+    login(openid,userId,source){
+      let datas = {openid,userId,source}
+      this.$request('wechatUser/login/findWxUserAndLogin', datas).then(res => {
+			  //通过openid获取token
+			  if (res.code == '00') {
+			    let token = res.data.token || ''
+			    uni.setStorageSync('token', token)
+			    let createUserId = res.data.personId || ''
+			    uni.setStorageSync('createUserId', createUserId)
+			    let userId = res.data.userId || ''
+			    uni.setStorageSync('userId', userId)
+			    let enterOptions = uni.getStorageSync('enterOptions')
+			    let queryTotal = ''
+			    for (let key in enterOptions.query) {
+			      queryTotal += '&' + key + '=' + enterOptions.query[key]
+			    }
+			    queryTotal = queryTotal.substr(1)
+			    if (token) {
+			      uni.reLaunch({
+			        url: '/' + enterOptions.path + '?' + queryTotal
+			      })
+			      //保存当前日期
+			      let oldDate=this.$commonjs.today()
+			      uni.setStorageSync('oldDate', oldDate)
+			      // uni.navigateBack({
+			      // 	delta:1
+			      // })
+			    }
+			  } else {
+			    uni.showToast({
+			      title: res.message,
+			      icon: 'none'
+			    })
+			  }
+      }).catch(err => {
+			  uni.showToast({
+			    title: '登录失败,请退出并重新登录',
+			    icon: 'none'
+			  })
+			  this.timer = setTimeout(() => {
+			    this.login(openid,userId,source)
+			  }, 2000)
+      })
     }
   }
 }