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

caolc #13

Merged
caoliancun merged 3 commits from caolc into master 2 years ago
Conversation 0 Commits 3 Files Changed 12
12 changed files with 444 additions and 190 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 133
      Activity/pages/index/index.vue
  2. 2
      App.vue
  3. 15
      BagAuth/pages/login/login.vue
  4. 4
      BagSetup/setup/setup.vue
  5. 2
      BagStation/pages/routePlain/routePlain.vue
  6. 80
      BagStation/pages/stationDetail/stationDetail.vue
  7. 7
      api/oil-site.js
  8. 16
      pages.json
  9. 64
      pages/tabbar/home/home.vue
  10. 41
      pages/tabbar/station/stationList.vue
  11. 30
      pages/tabbar/user/user.vue
  12. 4
      utils/request.js

133
Activity/pages/index/index.vue
Unescape View File

@ -0,0 +1,133 @@
<template>
<view class="Activity_body">
<scroll-view @refresherrefresh='refresherrefresh' :refresher-enabled='true'
:refresher-triggered='refresherTriggered' style="height: 100%;" scroll-y="true"
@scrolltolower='scrolltolower'>
<view v-for="(item,index) in siteList" :key="item.id">
<site-item @tap="toDetail(item)" :site-item="item" class="cu-list menu-avatar cu-item" />
<view class="activityContent">{{item.activityDetail}}</view>
</view>
</scroll-view>
</view>
</template>
<script>
import oilSiteApi from '@/api/oil-site.js'
export default {
data() {
return {
refresherTriggered: false,
page: {
currentPage: 1,
pageSize: 10,
params: { //类型：Object 必有字段 备注：// 筛选对象
// sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
siteName: '',
clientBelong:'BAICHUAN',
...uni.getStorageSync('location'),
// ...this.filterData
// siteBrand: this.siteName ? '' : this.filterDatas
siteBrand: '', // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: this.siteName ? '' : this.filterDatas
channelCode: '', // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: this.siteName ? '' : this.filterDatas
oilProductCode: '', // 备注：// 油号选择 ( 0# 92# 92#)
siteLevel: '',
sort: 'juli',
provinceCode: '',
cityCode: '',
areaCode: '',
distance: ''
}
},
siteList: []
}
},
created() {
this.init()
},
methods: {
toDetail(item){
let itemS = JSON.stringify(item)
if (uni.getStorageSync('user')) {
if (item.channelCode === 'TY') {
uni.setStorageSync('OtherSiteInfo', item)
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?channerCode=${item.channelCode}`,
fail: (err) => {
// console.log(err)
},
success: () => {
// console.log('err')
}
})
return
}
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'
})
}
}
})
}
},
refresherrefresh() {
this.page.currentPage =1;
this.refresherTriggered = true;
this.getSiteList()
},
init(){
this.getSiteList();
},
getSiteList() {
let location = uni.getStorageSync('location');
oilSiteApi.getBCSitesByActivity(this.page).then(res => {
if(this.page.currentPage>1){
this.siteList = this.siteList.concat(res.data.list)
}else{
this.siteList = res.data.list
}
}).finally(()=>{
this.refresherTriggered = false;
})
},
scrolltolower() {
this.page.currentPage += 1;
this.getSiteList()
},
}
}
</script>
<style scoped lang="scss">
.activityContent{
background: #ff670026;
border-radius: 10rpx;
margin: 10rpx 30rpx;
box-sizing: border-box;
padding: 20rpx 30rpx;
color: #FF6700;
font-size: 30rpx;
}
.Activity_body {
width: 100vw;
height: 100vh;
overflow: hidden;
}
</style>

2
App.vue
Unescape View File

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

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

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

4
BagSetup/setup/setup.vue
Unescape View File

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

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

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

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

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

7
api/oil-site.js
Unescape View File

@ -38,6 +38,13 @@ export default {
data: data data: data
}) })
}, },
getBCSitesByActivity(data) {
return request({
url: `/${service_name}/${group_name}/getBCSitesByActivity`,
method: 'post',
data: data
})
},
getSiteDetails(data) { getSiteDetails(data) {
return request({ return request({
url: `/${service_name}/${group_name}/getSiteDetails`, url: `/${service_name}/${group_name}/getSiteDetails`,

16
pages.json
Unescape View File

@ -120,6 +120,22 @@
} }
] ]
}, },
{
"root": "Activity",
"pages": [{
"path" : "pages/index/index",
"style" :
{
"navigationBarTitleText": "油站活动",
"enablePullDownRefresh": false,
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fe0505",
"navigationBarTextStyle": "white"
}
}
]
},
{ {
"root": "Financial", "root": "Financial",
"pages": [{ "pages": [{

64
pages/tabbar/home/home.vue
Unescape View File

@ -65,6 +65,7 @@
中交风控 中交风控
</text> </text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -151,12 +152,12 @@
<view class="my-bg padding"> <view class="my-bg padding">
<view class=""> <view class="">
<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular> <swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular>
<!-- <swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray"> <swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
<image :src="item.src" style="width: 100%;" mode="widthFix"></image> <image :src="item.src" style="width: 100%;" mode="widthFix"></image>
</swiper-item> -->
<swiper-item>
<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
</swiper-item> </swiper-item>
<!-- <swiper-item>
<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
</swiper-item> -->
</swiper> </swiper>
<!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> --> <!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
</view> </view>
@ -204,9 +205,13 @@
// src:this.global.starUrl+'banner.png', // src:this.global.starUrl+'banner.png',
// link:'' // link:''
// }, // },
// {
// src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
// link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473'
// },
{ {
src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png', src:'https://xoil-public.oss-cn-beijing.aliyuncs.com/baichuan_MP/banner_baichuan.png',
link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473' JumpPage:'/Activity/pages/index/index'
}, },
], ],
listHeight: 160, listHeight: 160,
@ -354,6 +359,7 @@
}, },
methods: { methods: {
toActivity(){},
toManagement() { toManagement() {
const user = uni.getStorageSync('user'); const user = uni.getStorageSync('user');
if (user) { if (user) {
@ -378,10 +384,15 @@
} }
}, },
swiperClick(item, index) { swiperClick(item, index) {
if (!item?.link) return // if (!item?.link) return
// uni.navigateTo({
// url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link))
// })
if(item?.JumpPage){
uni.navigateTo({ uni.navigateTo({
url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) url: item.JumpPage
}) })
}
}, },
goToPage(url) { goToPage(url) {
if (!url) return; if (!url) return;
@ -575,27 +586,32 @@
}, },
toDetail(item) { toDetail(item) {
let itemS = encodeURIComponent(JSON.stringify(item)) let itemS = encodeURIComponent(JSON.stringify(item))
console.log(itemS)
if (uni.getStorageSync('user')) {
uni.navigateTo({ uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
fail: (err) => {}, fail: (err) => {},
success: () => {} success: () => {}
}) })
} else { // console.log(itemS)
uni.showModal({ // if (uni.getStorageSync('user')) {
title: '请您登录', // uni.navigateTo({
content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡", // url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
confirmText: '去登陆', // fail: (err) => {},
success: (res) => { // success: () => {}
if (res.confirm) { // })
uni.reLaunch({ // } else {
url: '../../../BagAuth/pages/login/login' // uni.showModal({
}) // title: '请您登录',
} // content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
} // confirmText: '去登陆',
}) // success: (res) => {
} // if (res.confirm) {
// uni.reLaunch({
// url: '../../../BagAuth/pages/login/login?loginType=true'
// })
// }
// }
// })
// }
}, },
getFilterData() { getFilterData() {
oilSiteApi.getCheckInfo().then(res => { oilSiteApi.getCheckInfo().then(res => {

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

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

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

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

4
utils/request.js
Unescape View File

@ -4,7 +4,7 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV // const env = process.env.NODE_ENV
const env = 'production'/* */ const env = 'production'/* */
// const env = 'test' // const env = 'test'
const testUrl = 'http://192.168.0.45:38080' const testUrl = 'http://192.168.0.254:38080'
// const productUrl = 'http://121.196.213.68/adminapi' //预生产 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
@ -90,7 +90,7 @@ service.interceptors.response.use(
uni.hideLoading() uni.hideLoading()
if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1){ 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({ uni.showToast({
title: res.msg, title: res.msg,
icon: "none" icon: "none"

Write Preview
Loading…
Cancel
Save