caoliancun/MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
caolc
2023-06-12 14:42:21 +08:00
parent 7be1d39055
commit 41dbc836d3
9 changed files with 265 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@@ -113,7 +113,7 @@
success: function(res) {
if (res.confirm) {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
url: '/BagAuth/pages/login/login?loginType=true'
})
}
},

15
BagAuth/pages/login/login.vue
View File

@@ -1,5 +1,5 @@
<template>
<view class="login-page bg-white">
<view v-if="loginType" 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> -->
@@ -73,6 +73,7 @@
},
data() {
return {
loginType:false,
// imgsrc:require('../../../BagStation/static/img/login-bg.png'),
checked: false,
userHandle: false,
@@ -91,7 +92,11 @@
loginOut: uni.getStorageSync('loginOut') ? true : false
}
},
onLoad() {
onLoad(e) {
if(e.loginType){
this.loginType = Boolean(e.loginType);
console.log(e.loginType,'e.loginType')
}
uni.clearStorageSync()
// this.refreshLocation()
uni.login({
@@ -138,6 +143,7 @@
this.checked = val
},
refuseLogin() {
uni.setStorageSync('loginType',false)
uni.switchTab({
url: '/pages/tabbar/home/home'
})
@@ -201,7 +207,6 @@
console.log(res)
if (res.code == 20000) {
this.loginSuccess(res)
}
})
}
@@ -234,6 +239,10 @@
url: '/pages/tabbar/home/home'
})
}else{
console.log(this.loginType,'loginTypeloginTypeloginType')
if(!this.loginType){
this.refuseLogin()
}
console.log('禁摩登录i失败==================')
}
},

4
BagSetup/setup/setup.vue
View File

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

2
BagStation/pages/routePlain/routePlain.vue
View File

@@ -337,7 +337,7 @@
success: (res) => {
if(res.confirm){
uni.reLaunch({
url:'../../../BagAuth/pages/login/login'
url:'../../../BagAuth/pages/login/login?loginType=true'
})
}
}

80
BagStation/pages/stationDetail/stationDetail.vue
View File

@@ -4,8 +4,10 @@
<block slot="content">中石化紫云路</block>
<block slot="backText">返回</block>
</cu-custom> -->
<view class="bg-img fixed-top flex align-end margin-bottom-lg " :style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
<image @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix" class="position-ab site-back">
<view class="bg-img fixed-top flex align-end margin-bottom-lg "
:style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
<image @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix"
class="position-ab site-back">
</image>
<view class="cu-list menu margin padding-sm radius my-shadow bg-white yu-card-xuan">
<view class="cu-item ">
@@ -29,8 +31,10 @@
</view>
</view>
</view>
<view class="bg-img placeholder-hidden flex align-end margin-bottom-lg " :style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
<image @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix" class="position-ab site-back">
<view class="bg-img placeholder-hidden flex align-end margin-bottom-lg "
:style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
<image @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix"
class="position-ab site-back">
</image>
<view class="flex-sub">
<view class="cu-list menu margin padding-sm radius my-shadow bg-white yu-card-xuan">
@@ -81,20 +85,22 @@
<view class="bg-gray padding-top-sm ">
<view class="cu-list bg-white no-border menu padding-top ">
<text class="padding margin-top">客户订单</text>
<view class="cu-item " v-for="(itm,index) in siteInfo.oilSiteOrderInfoVos" :key="index">
<view class="cu-item no-border"
v-if="!siteInfo.oilSiteOrderInfoVos||!siteInfo.oilSiteOrderInfoVos.length">
暂无
</view>
<view v-else class="cu-item " v-for="(itm,index) in siteInfo.oilSiteOrderInfoVos" :key="index">
<text class="text-black">
{{itm.userName|usernameF}} {{itm.plateNumber|plateNumberF}}
</text>
<text class=" text-black ">加 {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red">
￥{{itm.discountAmount}}</text></text>
</view>
<view class="cu-item no-border" v-if="!siteInfo.oilSiteOrderInfoVos.length">
暂无
</view>
</view>
<!-- 底部去支付 -->
<view class="" v-if="activePay||qrcodePay">
<view class="" >
<view class="btn bg-white placeholder-hidden">
<view class="flex bg-white padding flex-direction">
<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay">
@@ -111,7 +117,7 @@
</view>
<view class="btn bg-white fixed ">
<view class="flex bg-white padding flex-direction">
<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay">
<button class="cu-btn block bg-main-oil lg" @tap="makePay">
<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
</image>
一键支付
@@ -194,7 +200,7 @@
var oilItem = JSON.parse(decodeURIComponent(option.item))
}
uni.setStorageSync('oilItem', oilItem)
this.getSiteInfo(oilItem.siteId)
this.getSiteInfo(oilItem.siteId, oilItem)
this.siteId = oilItem.siteId
if (oilItem.listTag == '万金油') {
this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
@@ -247,21 +253,28 @@
url: `/BagStation/pages/stationDetail/stieQr?siteId=${this.siteId}&activeChannelCode=${this.activeChannelCode}&secondChannelCode=${this.secondChannelCode}`
})
},
getSiteInfo(id) {
console.log('进入获取油站信息')
getSiteInfo(id, item) {
console.log('进入获取油站信息');
let user = uni.getStorageSync('user');
let data2 = {
...uni.getStorageSync('location'),
siteId: id
}
if (user) {
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('进入获取油站信息getSiteDetails', res)
if (res.code == 20000) {
this.siteInfo = res.data
}
})
} else {
this.siteInfo = item
}
},
makePay() {
console.log(this.siteInfo.juli)
let user = uni.getStorageSync('user');
if (this.activePay && user) {
if (this.siteInfo.juli > 1000) {
this.showtitle = true
} else {
@@ -270,6 +283,29 @@
url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
})
}
} else {
if(!user){
uni.showModal({
title: '请您登录',
content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
confirmText: '去登陆',
success: (res) => {
if (res.confirm) {
uni.reLaunch({
url: '../../../BagAuth/pages/login/login?loginType=true'
})
}
}
})
}else{
uni.showToast({
title:'暂无可选油品',
icon:'none'
})
}
}
},
onChangePayQr(val) {
this.qrcodePay = val
@@ -443,31 +479,39 @@
.yu-card-xuan .action {
white-space: nowrap;
}.close-icon{
}
.close-icon {
position: absolute;
right: 2%;
top: 2%;
}
.dialog-box {
position: relative;
}
.text-centerS {
display: flex;
justify-content: center;
align-items: center;
text-align: center;
}
.red_btn {
color: #FFFFFF;
background-color: #fe0505;
}
.box-paddings {
padding: 40rpx 0;
}
.headShow {
font-size: 36rpx;
font-weight: 600;
}
.showtext {
line-height: 2;
font-size: 30rpx;
@@ -477,12 +521,14 @@
letter-spacing: 3px;
text-align: left;
}
.checklocation_box_button {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 5%;
}
.btn-box {
width: 45%;
flex: 0 0 auto;
@@ -493,9 +539,11 @@
box-sizing: border-box;
border: 2rpx solid #bfbfbf;
}
.box-panding {
padding: 10 0;
}
.checklocation {
position: fixed;
top: 50%;
@@ -503,9 +551,11 @@
right: 20%;
z-index: 999;
}
.checklocation_box {
background-color: #FFFFFF;
}
.content {
min-height: 100%;
position: relative;

37
pages/tabbar/home/home.vue
View File

@@ -575,27 +575,32 @@
},
toDetail(item) {
let itemS = encodeURIComponent(JSON.stringify(item))
console.log(itemS)
if (uni.getStorageSync('user')) {
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
fail: (err) => {},
success: () => {}
})
} else {
uni.showModal({
title: '请您登录',
content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
confirmText: '去登陆',
success: (res) => {
if (res.confirm) {
uni.reLaunch({
url: '../../../BagAuth/pages/login/login'
})
}
}
})
}
// console.log(itemS)
// if (uni.getStorageSync('user')) {
// uni.navigateTo({
// url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
// fail: (err) => {},
// success: () => {}
// })
// } else {
// uni.showModal({
// title: '请您登录',
// content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
// confirmText: '去登陆',
// success: (res) => {
// if (res.confirm) {
// uni.reLaunch({
// url: '../../../BagAuth/pages/login/login?loginType=true'
// })
// }
// }
// })
// }
},
getFilterData() {
oilSiteApi.getCheckInfo().then(res => {

41
pages/tabbar/station/stationList.vue
View File

@@ -426,8 +426,7 @@
},
toDetail(item) {
let itemS = encodeURIComponent(JSON.stringify(item))
if (uni.getStorageSync('user')) {
let itemS = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
fail: (err) => {
@@ -437,20 +436,30 @@
// console.log('err')
}
})
} else {
uni.showModal({
title: '请您登录',
content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
confirmText: '去登陆',
success: (res) => {
if (res.confirm) {
uni.reLaunch({
url: '../../../BagAuth/pages/login/login'
})
}
}
})
}
// if (uni.getStorageSync('user')) {
// uni.navigateTo({
// url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
// fail: (err) => {
// // console.log(err)
// },
// success: () => {
// // console.log('err')
// }
// })
// } else {
// uni.showModal({
// title: '请您登录',
// content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
// confirmText: '去登陆',
// success: (res) => {
// if (res.confirm) {
// uni.reLaunch({
// url: '../../../BagAuth/pages/login/login?loginType=true'
// })
// }
// }
// })
// }
},
nameSelect(value, item) {
this.title2 = item.text

30
pages/tabbar/user/user.vue
View File

@@ -121,9 +121,9 @@
</view>
</view>
</view>
<view class="xu-content card-menu margin margin-bottom-xs radius my-shadow">
<!-- <view class="xu-content card-menu margin margin-bottom-xs radius my-shadow">
<view class=" cu-list sm-border grid col-4 no-border ">
<view class="cu-item">
<view @click="clickFn" class="cu-item">
<view class=" padding-tb-0">
<view class="image-self-view">
<img :src="starUrl+'wd-ic-1.png'" lazy-load class="png" mode="widthFix"></img>
@@ -131,7 +131,7 @@
</view>
<text>红包卡券</text>
</view>
<view class="cu-item">
<view @click="clickFn" class="cu-item">
<view class=" padding-tb-0">
<view class="image-self-view">
<img :src="starUrl+'wd-ic-2.png'" lazy-load class="png" mode="widthFix"></img>
@@ -139,7 +139,7 @@
</view>
<text>活动通知</text>
</view>
<view class="cu-item">
<view @click="clickFn" class="cu-item">
<view class=" padding-tb-0">
<view class="image-self-view">
<img :src="starUrl+'wd-ic-3.png'" lazy-load class="png" mode="widthFix"></img>
@@ -156,7 +156,7 @@
<text>操作说明</text>
</view>
</view>
</view>
</view> -->
<view class="xu-content padding-sm">
<view class="cu-list menu">
<view class="cu-item hidden-cu-item">
@@ -173,12 +173,12 @@
</view>
</view>
<view class="cu-item arrow">
<!-- <view @click="clickFn" class="cu-item arrow">
<view class="content">
<image :src="starUrl+'gywm.png'" class="png" mode="aspectFit"></image>
<text class="text-grey padding-left-sm">关于我们</text>
</view>
</view>
</view> -->
</view>
</view>
</view>
@@ -207,7 +207,21 @@
this.getAmount()
},
methods: {
clickFn(e){
uni.showToast({
title:'功能正在开发中',
icon:'none'
})
},
goToPage(url) {
const token = uni.getStorageSync('Authorization')
if(!token){
uni.showToast({
title:'功能正在开发中',
icon:'none'
})
return
}
if (!url) return;
uni.navigateTo({
url
@@ -228,7 +242,7 @@
this.routerTo('/BagSetup/setup/setup')
}else{
uni.reLaunch({
url:'../../../BagAuth/pages/login/login'
url:'../../../BagAuth/pages/login/login?loginType=true'
})
}
},

2
utils/request.js
View File

@@ -90,7 +90,7 @@ service.interceptors.response.use(
uni.hideLoading()
if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1){
if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != '登录与操作设备不同') {
if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != '登录与操作设备不同' && res.msg != '用户未登录只可查询前两页油站信息') {
uni.showToast({
title: res.msg,
icon: "none"