xiaozy #11

Merged
xiaozhiyong merged 3 commits from xiaozy into master 2 years ago
  1. 24
      App.vue
  2. 119
      BagAuth/pages/login/login.vue
  3. 14
      pages/index/startPage/startPage.vue
  4. 114
      pages/tabbar/home/home.vue

@ -92,7 +92,7 @@
imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png',
}
}
console.log(view.route)
// console.log(view.route)
clearTimeout(loginTimer)
clearTimeout(onlineTimer)
@ -165,16 +165,16 @@
},
onShow: function() {
uni.getLocation({
type: 'wgs84',
success: function(res) {
uni.setStorageSync('location', {
longitude: res.longitude + '',
latitude: res.latitude + ''
})
}
});
console.log('onReady')
// uni.getLocation({
// type: 'wgs84',
// success: function(res) {
// uni.setStorageSync('location', {
// longitude: res.longitude + '',
// latitude: res.latitude + ''
// })
// }
// });
// console.log('onReady')
const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('openid')
let key = ''
@ -188,7 +188,7 @@
}
setTimeout(() => {
console.log(key)
// console.log(key)
if (key == '在线') {
} else {

@ -1,127 +1,43 @@
<template>
<view class="login-page bg-white">
<view class="image login-bg">
<!-- <image :src="imgURL+'login-bg.png'" mode="widthFix"></image> -->
<!-- <image src="../../../BagStation/static/img/LV.png" mode="widthFix"></image> -->
<image src="../../../static/img/login-bg.png" mode="widthFix"></image>
</view>
<scroll-view scroll-x class=" bg-white nav padding">
<view class="flex text-center padding-bottom">
<view class="cu-item flex-sub">
</view>
<view class="cu-item flex-sub" :class="0==TabCur?'text-red cur':''" @tap="tabSelect(0)">
个人账号
</view>
<view class="cu-item flex-sub">
</view>
<!--<view class="cu-item flex-sub" :class="1==TabCur?'text-red cur':''" @tap="tabSelect(1)">
企业账号
</view>
-->
</view>-->
</view>
</scroll-view>
<view class="cu-load load-modal" v-if="loadModal">
<view class="gray-text">加载中...</view>
</view>
<view class="margin-lg flex flex-direction text-center">
<button class="cu-btn round bg-main-oil lg text-lg" open-type="getPhoneNumber"
@getphonenumber="decryptPhoneNumber">
<text class="cuIcon-weixin padding-right-xs"> </text>
<text>
微信用户一键登录
</text>
</button>
<button class="cu-btn margin-top round lg" @tap="refuseEmpower">
<!-- <button class="cu-btn margin-top round lg" @tap="refuseEmpower">
输入手机号码登录
</button>
</button> -->
<button class="cu-btn bg-0 margin-top round text-sm" @tap="refuseLogin">
跳过
</button>
</view>
<!-- <loginBottom :check="loginOut" /> -->
<loginBottom @onCheck="checkAgree" />
</view>
</template>
@ -131,7 +47,6 @@
import loginBottom from './components/loginBottom.vue'
import oilIdentityApi from '@/api/oil-identity'
export default {
components: {
loginBottom
@ -139,6 +54,7 @@
data() {
return {
// imgsrc:require('../../../BagStation/static/img/login-bg.png'),
checked:false,
userHandle: false,
TabCur: 0,
accuntSource: false,
@ -157,7 +73,7 @@
},
onLoad() {
uni.clearStorageSync()
this.refreshLocation()
// this.refreshLocation()
uni.login({
provider: 'weixin',
success: (loginRes) => {
@ -198,18 +114,21 @@
})
},
methods: {
checkAgree(val) {
this.checked = val
},
refuseLogin() {
uni.switchTab({
url: '/pages/tabbar/home/home'
})
},
refreshLocation() {
uni.getLocation({
type: 'wgs84',
success: function(res) {
uni.setStorageSync('location', res)
}
});
// uni.getLocation({
// type: 'wgs84',
// success: function(res) {
// uni.setStorageSync('location', res)
// }
// });
},
autoLogin() {
// let url = 'loginCompany'
@ -231,6 +150,13 @@
decryptPhoneNumber(e) {
if (!this.checked) {
uni.showToast({
title: '请您阅读并同意协议',
icon: 'none'
})
return
}
// console.log(e.detail)
if (e.detail.errMsg === 'getPhoneNumber:ok') {
const data1 = {
@ -306,6 +232,7 @@
height: 750rpx;
background-color: #fff;
}
.bg-0 {
background-color: transparent;
color: #555555;

@ -69,7 +69,7 @@
})
}
interstitialAd.onLoad((err) => {
console.log('onLoad event emit', err)
// console.log('onLoad event emit', err)
})
interstitialAd.onError((err) => {
setTimeout(() => {
@ -77,7 +77,7 @@
uni.switchTab({
url: '/pages/tabbar/home/home',
fail: (err) => {
console.log(err)
// console.log(err)
}
// url:'/BagStation/orderDetail/orderDetail'
})
@ -87,12 +87,12 @@
})
}
}, 2000)
console.log('onError event emit', err)
// console.log('onError event emit', err)
})
// 广
if (interstitialAd) {
interstitialAd.show().catch((err) => {
console.error(err)
// console.error(err)
})
}
interstitialAd.onClose(res => {
@ -101,7 +101,7 @@
uni.switchTab({
url: '/pages/tabbar/home/home',
fail: (err) => {
console.log(err)
// console.log(err)
}
// url:'/BagStation/orderDetail/orderDetail'
})
@ -118,7 +118,7 @@
updateManager.onCheckForUpdate(function(res) {
//
console.log('请求完新版本信息的回调', res.hasUpdate);
// console.log('', res.hasUpdate);
});
updateManager.onUpdateReady(function(res) {
@ -165,7 +165,7 @@
value: item.id
})
})
console.log(channelCodes, productCodes, siteBrands)
// console.log(channelCodes, productCodes, siteBrands)
this.menuList[0].detailList = this.menuList[0].detailList.concat(channelCodes)
this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes)
this.menuList[2].detailList = this.menuList[2].detailList.concat(siteBrands)

@ -15,7 +15,8 @@
</view>
<view class="search-form radius" @tap="InputFocus">
<text class="cuIcon-search"></text>
<input disabled :adjust-position="false" type="text" placeholder="搜索油站名称" confirm-type="search" />
<input disabled :adjust-position="false" type="text" placeholder="搜索油站名称"
confirm-type="search" />
</view>
<!-- <view class="">
阿三
@ -167,8 +168,8 @@
</view> -->
<view class=" ">
<view class="" v-if="siteList.length>0">
<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0" :listHeight="listHeight"
class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
:listHeight="listHeight" class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
</site-item>
</view>
<view class="" v-else>
@ -330,11 +331,6 @@
},
onLoad() {
this.reverseGeocoder(this.location)
this.refreshLocation()
// if (!uni.getStorageSync('filterData')) {
// this.getFilterData()
// }
},
onPullDownRefresh() {
this.refreshLocation()
@ -354,25 +350,16 @@
icon: "none"
})
}
uni.navigateTo({
// url: `/BagStation/orderDetail/orderDetail?id=XOILAWMP202107070000025117`
})
// uni.redirectTo({
// url:'/BagStation/pages/makeOrder/makeOrder'
// // url:'/BagStation/pages/makeOrder/payResult?status=success'
// })
// url:'/BagStation/pages/makeOrder/payResult?status=success'
},
beforeCreate() {},
onReady() {
// this.getSiteList()
this.refreshLocation()
},
methods: {
toManagement() {
const user = uni.getStorageSync('user');
if (user) {
Financial.findHomePageReport({customerId:user.id}).then(res=>{
Financial.findHomePageReport({
customerId: user.id
}).then(res => {
if (res.data) {
uni.navigateTo({
url: `../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
@ -392,16 +379,9 @@
},
swiperClick(item, index) {
if (!item?.link) return
switch (Number(index)) {
// case 0:
// this.goCall()
// break;
default:
console.log('item.link')
uni.navigateTo({
url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link))
})
}
},
goToPage(url) {
if (!url) return;
@ -417,6 +397,35 @@
})
},
refreshLocation() {
uni.getLocation({
type: 'wgs84',
success: (res) => {
uni.setStorageSync('location', res)
},
fail: () => {
uni.getSetting({
success: (res) => {
if (!res.authSetting['scope.userLocation']) {
uni.showModal({
title: '请您打开定位权限',
content: '用于获取您当前位置附近的油站',
confirmText: '去设置',
success: (resSec) => {
if (resSec.confirm) {
uni.openSetting({})
}
}
})
}
}
})
},
complete: () => {
this.getSiteList()
},
});
},
realPosition() {
uni.getLocation({
type: 'wgs84',
success: (res) => {
@ -424,9 +433,7 @@
},
complete: () => {
this.getSiteList()
// // console.log('made')
},
});
},
hideModel(name) {
@ -443,7 +450,7 @@
oilSiteApi.getUserAuthInfo().then(res => {
if (res.code === 20000) {
this.getAmount()
this.getSiteList()
// this.getSiteList()
// realStatus: 0 vehicleStatus: 0
if (this.showAuthFrzen <= new Date().getTime()) {
this.showAuthFrror = res.data.realStatus && res.data.vehicleStatus ? false :
@ -490,7 +497,8 @@
uni.removeStorageSync("origins")
uni.removeStorageSync("destination")
wx.navigateTo({
url:'../../../BagStation/pages/routePlain/routePlain'})
url: '../../../BagStation/pages/routePlain/routePlain'
})
} else if (index == 8) {
this.goToPage('/BagAuth/pages/agreeMent/OperationGuide')
}
@ -523,11 +531,10 @@
url: '/pages/tabbar/order/orderList/orderList'
})
},
filterRes(val) {
this.filterData = val
this.getSiteList()
},
// filterRes(val) {
// this.filterData = val
// this.getSiteList()
// },
getSiteList() {
let data1 = {
currentPage: 1,
@ -544,48 +551,23 @@
// oilProductCode: "0#" // // ( 0# 92# 92#)
comprehensiveSort: 1
}
}
if (!uni.getStorageSync('user')) {
oilSiteApi.readOnlySites(data1).then(res => {
this.getCount++
if (res.code == 20000) {
// console.log(res.data.list)
this.siteList = res.data.list
} else {
if (this.getCount == 1) {
setTimeout(() => {
this.getSiteList()
}, 1000)
} else {
uni.getSetting({
success: (resSet) => {
if (resSet.authSetting['scope.address'] == false) {
uni.showMode({
title: '请您打开定位权限',
content: '用于获取您当前位置附近的油站',
confirmText: '去设置',
success: (res) => {
if (res.confirm) {
uni.openSetting({
})
}
}
})
}
}
})
}
}
})
} else {
console.log(data1,'dayindata111111111111')
oilSiteApi.getSiteLists(data1).then(res => {
if (res.code == 20000) {
// console.log(res.data.list)
this.siteList = res.data.list
}
})
@ -597,12 +579,8 @@
if (uni.getStorageSync('user')) {
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
fail: (err) => {
// console.log(err)
},
success: () => {
// console.log('err')
}
fail: (err) => {},
success: () => {}
})
} else {
uni.showModal({

Loading…
Cancel
Save