pull/7/head
caoliancun 2 years ago
parent d6e55390f3
commit 84613456a7
  1. 4
      BagSetup/setup/setup.vue
  2. 15
      BagStation/pages/newRoutePlanning/components/serviceStation.vue
  3. 2
      manifest.json
  4. 4
      pages/index/startPage/startPage.vue

@ -135,8 +135,8 @@
uni.setStorageSync('loginOut', true) uni.setStorageSync('loginOut', true)
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
// url: '/BagAuth/pages/login/login' url: '/BagAuth/pages/login/login'
url:'/BagAuth/pages/login/oldLogin' // url:'/BagAuth/pages/login/oldLogin'
}) })
}, 1000) }, 1000)
} }

@ -1,10 +1,10 @@
<template> <template>
<view > <view >
<view @touchend='touchend' @touchmove='touchmove' @touchstart='onChange' <view @touchend.stop.prevent ='touchend' @touchmove.stop.prevent ='touchmove' @touchstart.stop.prevent ='onChange'
style="display: flex;flex-direction: column;flex-wrap: wrap;z-index: 9999999999999999999999999 !important;" style="display: flex;flex-direction: column;flex-wrap: wrap;z-index: 9999999999999999999999999 !important;"
:style="{height:isShow.switchBar?`calc(${styles.height}rpx + ${styles.move}rpx )`: ` calc( ${styles.move}rpx + 150rpx)` }" :style="{height:isShow.switchBar?`calc(${styles.height}rpx + ${styles.move}rpx )`: ` calc( ${styles.move}rpx + 150rpx)` }"
:class="styles.open? 'serviceStation_body' :'seleServiceStation_body' "> :class="styles.open? 'serviceStation_body' :'seleServiceStation_body' ">
<view @click.stop="switchBar()" class="switchBar"></view> <view id="switchBar" @tap.stop="switchBar()" class="switchBar"></view>
<view style="flex: 1; overflow: hidden; width: 100%; "> <view style="flex: 1; overflow: hidden; width: 100%; ">
<view style="" class="information"> <view style="" class="information">
<view class="information_left"> <view class="information_left">
@ -49,9 +49,9 @@
</view> </view>
<view class="serviceStation_footer"> <view class="serviceStation_footer">
<view @click.stop="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航 <view id="Navigation" @tap.stop="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航
</view> </view>
<view @tap.stop="jump" style="background-color: #FF6700;" class="serviceStation_footer_butten">详情</view> <view id="jump" @tap.stop="jump" style="background-color: #FF6700;" class="serviceStation_footer_butten">详情</view>
</view> </view>
</view> </view>
</view> </view>
@ -139,12 +139,15 @@
}, },
// //
onChange(e) { onChange(e) {
console.log('开始滑动'); if(e.target.id){
this[e.target.id]()
return
}
console.log(e.target.id,'开始滑动');
this.$emit('dragMap', this.details, false) this.$emit('dragMap', this.details, false)
// this.styles.Y = e.changedTouches[0].clientY + this.styles.move; // this.styles.Y = e.changedTouches[0].clientY + this.styles.move;
this.styles.open = true; this.styles.open = true;
this.styles.Y = e.changedTouches[0].clientY; this.styles.Y = e.changedTouches[0].clientY;
console.log(e,'onChange')
}, },
// //
touchend(e) { touchend(e) {

@ -1,6 +1,6 @@
{ {
"name" : "星油", "name" : "星油",
"appid" : "__UNI__B20D014", "appid" : "__UNI__F7EF840",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",

@ -77,8 +77,8 @@
}) })
} else { } else {
uni.redirectTo({ uni.redirectTo({
// url: '/BagAuth/pages/login/login' url: '/BagAuth/pages/login/login'
url:'/BagAuth/pages/login/oldLogin' // url:'/BagAuth/pages/login/oldLogin'
}) })
} }
}, 2000) }, 2000)

Loading…
Cancel
Save