caoliancun/MP_XOIL_company_new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-10-12 11:02:14 +08:00
parent e331393f09
commit 7bd17a3692
15 changed files with 497 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@@ -38,6 +38,8 @@
})
this.onShareAppMessage(option.query.scene);
},
methods: {

46
BagStation/orderDetail/orderDetail.vue
View File

@@ -60,7 +60,8 @@
<view class="padding-tb-xs text-left">
油品油枪
<text class="fr nowrap">
{{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
{{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}
</text>
</view>
<view class="padding-tb-xs text-left">
{{order.oilProductType=='GAS'?'加气重量：':'加油升数：'}}
@@ -74,7 +75,8 @@
</view>
<view class="padding-tb-xs text-left">
优惠价格
<text class="fr">约{{moneyIntercept(order.realPrice) }}￥/{{order.oilProductType=='GAS'?'L':'L'}}</text>
<text
class="fr">约{{moneyIntercept(order.realPrice) }}￥/{{order.oilProductType=='GAS'?'L':'L'}}</text>
</view>
<view class="padding-tb-xs text-left">
加油员
@@ -144,12 +146,16 @@
<button class="cu-btn block flex-sub lg bg-main-oil " @tap="makePay">立即支付</button>
<button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button>
</view>
<view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall">
<!-- <view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall">
<text class="cuIcon-service padding-right-sm">联系客服</text>
</view>
</view> -->
<!-- <button class=" cu-btn bg-white oil-main-color block flex-sub lg " open-type="contact"><text class="cuIcon-service padding-right-sm"></text> 在线客服</button> -->
<!-- <button class="cu-btn block lg margin-top " @tap="delOrder">删除订单</button> -->
</view>
<view class="customer-service" @click="arousePhone">
<image src="../../static/img/customer-service.png"></image>
联系客服
</view>
</view>
</template>
@@ -194,12 +200,12 @@
tkiQrcode
},
methods: {
// 拨打电话
makeCall() {
arousePhone() {
uni.makePhoneCall({
phoneNumber: '4008-56-5355' //仅为示例
phoneNumber: '4008-56-5355'
})
},
newQrString() {
this.getOrderQrCode()
},
@@ -395,7 +401,31 @@
}
</script>
<style scoped>
<style lang="scss" scoped>
.customer-service {
position: fixed;
right: 0;
top: 60%;
padding-left: 15rpx;
width: 180rpx;
height: 57rpx;
line-height: 57rpx;
background: #FFE9CC;
font-size: 26rpx;
color: #FF6700;
box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(255, 232.1327966451645, 216.63716733455658, 1);
border-radius: 30rpx 0rpx 0rpx 30rpx;
image {
position: relative;
top: 11rpx;
// vertical-align: middle;
width: 40rpx;
height: 40rpx;
margin-right: 7rpx;
}
}
.move-tops {
transform: translateY(-17px);
}

15
BagStation/pages/newRoutePlanning/components/addressSelector.vue
View File

@@ -13,11 +13,12 @@
<view class="flexone margin size">{{Route.start.title}}</view>
</view>
<view v-for="item,index in midwayPointList" :key="index"
@click="chooseLocation('midwayPoint',index)" class=" Padding addressInput flex ac flexone height79">
<view v-for="item,index in midwayPointList" :key="index" @click="chooseLocation('midwayPoint',index)"
class=" Padding addressInput flex ac flexone height79">
<view style="background-color: #32CD32;" class="yuan" />
<view class="flexone margin size">{{item.title || '请输入途经点'}}</view>
<image @click.stop="removeLocation(index)" class="remove" src="../../../static/img/remove.png"></image>
<image @click.stop="removeLocation(index)" class="remove" src="../../../static/img/remove.png">
</image>
</view>
<view @click="chooseLocation('end')" class=" Padding addressInput flex ac flexone height79">
@@ -174,17 +175,17 @@
value: items.id
})
})
if (item === 'productCodes') {
this.menuList.push(data)
}
})
this.menuList[2].Sublist.unshift({
lable: '全渠道',
value: ''
});
// [this.menuList[1],this.menuList[3]]=[this.menuList[3],this.menuList[1]]
[this.menuList[0], this.menuList[1], this.menuList[2], this.menuList[3]] = [this.menuList[0],
this.menuList[3], this.menuList[1], this.menuList[2]
[this.menuList[0], this.menuList[1], this.menuList[2], ] = [this.menuList[0],
this.menuList[2], this.menuList[1]
];
// console.log(this.menuList, '***')
})
},
datassFn() {

95
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 v-if="isShow" @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 v-if="isShow" @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 ">
@@ -30,8 +32,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">
@@ -70,10 +74,12 @@
<view class="padding-top-sm">
<view class="nsjz-flex">
<view class="nsjz-flex-left">
<image :src="ureaproductType == 2?areaLogoUrl1:areaLogoUrl" mode="" style="width: 36rpx;height: 36rpx;"></image>
<image :src="ureaproductType == 2?areaLogoUrl1:areaLogoUrl" mode=""
style="width: 36rpx;height: 36rpx;"></image>
<view class="nsjz-flex-left-body">
<text>{{ureaproductType == '2'?'品牌桶装尿素':'加注机'}}</text>
<text v-if="ureaproductType == 2">{{areaPrice}}元/桶<text style="font-size: 12px;margin: 0;">起</text></text>
<text v-if="ureaproductType == 2">{{areaPrice}}元/桶<text
style="font-size: 12px;margin: 0;">起</text></text>
<text v-if="ureaproductType == 1">￥{{areaPrice}}/L</text>
</view>
</view>
@@ -112,7 +118,8 @@
<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 && !siteInfo.oilSiteOrderInfoVos.length">
<view class="cu-item no-border"
v-if="siteInfo.oilSiteOrderInfoVos && !siteInfo.oilSiteOrderInfoVos.length">
暂无
</view>
@@ -152,10 +159,12 @@
<view class=" cu-modal show" v-show="showtitle">
<view class="cu-dialog overflow-unset dialog-box box-paddings">
<view class="close-icon" @tap="hidendialog">
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode="" style="width:50rpx;height: 50rpx;"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode=""
style="width:50rpx;height: 50rpx;"></image>
</view>
<view class="">
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode="" style="width:100rpx;height: 100rpx;"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode=""
style="width:100rpx;height: 100rpx;"></image>
</view>
<view class="cu-bar box-panding text-centerS">
<text class="headShow"> 支付提醒 </text>
@@ -173,6 +182,10 @@
</view>
</view>
</view>
<view class="customer-service" @click="arousePhone">
<image src="../../static/img/customer-service.png"></image>
联系客服
</view>
</view>
</template>
@@ -226,7 +239,10 @@
return
}
let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse(option.item) : {siteId:option.siteId}
let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse(
option.item) : {
siteId: option.siteId
}
uni.setStorageSync('oilItem', oilItem)
this.getSiteInfo(oilItem.siteId)
@@ -246,12 +262,18 @@
this.ContextAudio(this.audioUrl)
},
methods: {
arousePhone() {
uni.makePhoneCall({
phoneNumber:'4008-56-5355'
})
},
areaJump() {
// var itemS = {
// siteId:this.siteInfo.xoilUreaPriceVos[0].siteId
// }
uni.navigateTo({
url: '/BagStation/pages/ureaDetail/ureaDetail?item='+ JSON.stringify(this.siteInfo.xoilUreaPriceVos[0]),
url: '/BagStation/pages/ureaDetail/ureaDetail?item=' + JSON.stringify(this.siteInfo
.xoilUreaPriceVos[0]),
fail: (err) => {
// console.log(err)
},
@@ -377,8 +399,11 @@
this.innerAudioContext?.stop()
let siteId = uni.getStorageSync('siteId')
siteId
? uni.switchTab({url:'../../../pages/tabbar/home/home'})
: uni.navigateBack() ;
?
uni.switchTab({
url: '../../../pages/tabbar/home/home'
}) :
uni.navigateBack();
},
selectRadio() {
this.radio === 'A' ? this.radio = '' : this.radio = 'A'
@@ -432,7 +457,30 @@
}
</script>
<style scoped>
<style lang="scss" scoped>
.customer-service {
position: fixed;
right: 0;
top: 60%;
padding-left: 15rpx;
width: 180rpx;
height: 57rpx;
line-height: 57rpx;
background: #FFE9CC;
font-size: 26rpx;
color: #FF6700;
box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(255, 232.1327966451645, 216.63716733455658, 1);
border-radius: 30rpx 0rpx 0rpx 30rpx;
image {
position: relative;
top: 11rpx;
// vertical-align: middle;
width: 40rpx;
height: 40rpx;
margin-right: 7rpx;
}
}
.content {
min-height: 100%;
@@ -527,24 +575,29 @@
.yu-card-xuan .action {
white-space: nowrap;
}
.text-centerS {
display: flex;
justify-content: center;
align-items: center;
text-align: center;
}
.red_btn {
margin-right: 20rpx;
color: #FFFFFF;
background-color: #FF6700;
}
.box-paddings {
padding: 40rpx 0;
}
.headShow {
font-size: 36rpx;
font-weight: 600;
}
.showtext {
line-height: 2;
font-size: 30rpx;
@@ -554,12 +607,14 @@
letter-spacing: 3px;
text-align: left;
}
.checklocation_box_button {
display: flex;
justify-content: center;
/* align-items: center; */
padding: 0 5%;
}
.btn-box {
width: 45%;
flex: 0 0 auto;
@@ -570,9 +625,11 @@
box-sizing: border-box;
border: 2rpx solid #bfbfbf;
}
.box-panding {
padding: 10 0;
}
.checklocation {
position: fixed;
top: 50%;
@@ -580,9 +637,11 @@
right: 20%;
z-index: 999;
}
.checklocation_box {
background-color: #FFFFFF;
}
.content {
min-height: 100%;
position: relative;
@@ -602,14 +661,17 @@
.oil-price {
position: relative;
}
.close-icon {
position: absolute;
right: 2%;
top: 2%;
}
.dialog-box {
position: relative;
}
.oil-price radio {
position: absolute;
left: 0rem;
@@ -696,22 +758,27 @@
align-items: center;
justify-content: space-between;
}
.nsjz-flex-left {
display: flex;
align-items: center;
}
.nsjz-flex-left-body text {
font-weight: 600;
color: #000;
}
.nsjz-flex-left-body {
margin-left: 20rpx;
}
.nsjz-flex-left-body text:last-child {
color: #ff6700;
margin-left: 30rpx;
font-size: 32rpx;
}
.nsjz-flex-botton {
color: #FFFFFF;
border-radius: 5px;

BIN
BagStation/static/img/customer-service.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 988 B

121
components/tabbar/index.vue Normal file
View File

@@ -0,0 +1,121 @@
<template>
<view class="container">
<view class="item" v-for="item,index in menuList">
<image :src="currentPage == index ? item.selectedIconPath :item.iconPath" @click="jump(item.pagePath)"></image>
<!-- {{index}} -->
</view>
</view>
</template>
<script>
export default {
props: {
currentPage: Number
},
data() {
return {
menuList: [{
// 首页
"pagePath": "/pages/tabbar/home/home",
"iconPath": "../../static/img/tabbar/home.png",
"selectedIconPath": "../../static/img/tabbar/homeactive.png"
},
{
// 油站
"pagePath": "/pages/tabbar/station/stationList",
"iconPath": "../../static/img/tabbar/oil.png",
"selectedIconPath": "../../static/img/tabbar/oilactive.png"
},
{
// 加油
"pagePath": "/pages/tabbar/qrCenter/qrCenter",
"iconPath": "../../static/img/tabbar/icon.png",
"selectedIconPath": "../../static/img/tabbar/icon.png"
},
{
// 订单
"pagePath": "/pages/tabbar/order/orderList/orderList",
"iconPath": "../../static/img/tabbar/order.png",
"selectedIconPath": "../../static/img/tabbar/orderactive.png"
},
{
// 司机
"pagePath": "/pages/tabbar/user/user",
"iconPath": "../../static/img/tabbar/me.png",
"selectedIconPath": "../../static/img/tabbar/meactive.png"
}
]
}
},
methods: {
jump(path) {
console.log('path',path)
uni.switchTab({
url:path
})
}
}
}
</script>
<style lang="scss" scoped>
.container {
display: flex;
position: fixed;
left: 0;
bottom: 0;
width: 100%;
height: 120rpx;
background: #fff;
.item {
position: relative;
flex: 1;
text-align: center;
line-height: 120rpx;
image {
width: 50rpx;
height: 50rpx;
}
&:nth-of-type(2) {
image {
position: relative;
left: -13rpx
}
;
}
&:nth-of-type(4) {
image {
position: relative;
right: -13rpx
}
;
}
&:nth-of-type(3) {
flex: none;
width: 110rpx;
height: 110rpx;
position: relative;
transform: translateY(-30%);
border-radius: 100%;
overflow: hidden;
background: #fff;
image {
width: 100%;
height: 100%;
}
}
}
}
</style>

3
main.js
View File

@@ -9,7 +9,7 @@ import encode from '@/utils/encode'
import global from '@/api/global.js'
import topBar from './components/topbar.vue'
import tools from '@/utils/tools.js'
// import tabbar from '@/components/tabbar/index.vue'
@@ -17,6 +17,7 @@ import tools from '@/utils/tools.js'
import Empty from '@/components/Empty.vue'
// Vue.component('tabbar', tabbar)
Vue.component('my-icon', myIcon)
Vue.component('cu-custom', cuCustom)
Vue.component('my-empty', Empty)

4
pages.json
View File

@@ -377,8 +377,8 @@
//#ifdef MP-WEIXIN
{
"pagePath": "pages/tabbar/qrCenter/qrCenter",
"iconPath": "static/img/tabbar/qr.png",
"selectedIconPath": "static/img/tabbar/qractive.png"
"iconPath": "static/img/tabbar/icon.png",
"selectedIconPath": "static/img/tabbar/icon.png"
},
//#endif
//#ifndef MP-WEIXIN

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

@@ -160,6 +160,7 @@
<msg-models :showAuthFrror="showAuthFrror" @hideOneModal="hideModel"></msg-models>
<three-sites @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
<transBlcok ref="transBlcok" />
<!-- <tabbar :current-page="0"/> -->
</view>
</template>
@@ -330,8 +331,10 @@
console.log(n, o, '=================')
}
},
created() {},
onReady() {
let _that = this
let IsOtherUser = _that.isOther
if (IsOtherUser) {
@@ -362,6 +365,8 @@
}
},
onLoad(e) {
// uni.hideTabBar()
let _that = this
let IsOtherUser = _that.isOther

1
pages/tabbar/order/orderList/orderList.vue
View File

@@ -63,6 +63,7 @@
</view>
</view>
<uni-load-more status="more"></uni-load-more>
<!-- <tabbar :current-page="3"/> -->
</view>
</template>

1
pages/tabbar/qrCenter/qrCenter.vue
View File

@@ -33,6 +33,7 @@
</view>
</view>
<three-sites @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
<!-- <tabbar :current-page="2"/> -->
</view>
</template>

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

@@ -52,6 +52,7 @@
<view class="bg-white">
<uni-load-more :status="loadText"></uni-load-more>
</view>
<!-- <tabbar :current-page="1"/> -->
</view>
</template>
@@ -280,7 +281,8 @@
currentPage: this.currentPage,
pageSize: 10,
params: { //类型：Object 必有字段 备注：// 筛选对象
siteNameOrId: this.siteName, //产品类型(加注方式)：
// siteNameOrId: this.siteName, //产品类型(加注方式)：
address:this.siteAddress,
productType: this.productType ? this.productType : '', //1-加注机； 2-桶装
brandName: this.brandName ? this.brandName : '', // 桶装品牌名称
currentLongitude: location.longitude + '', // 当前经度
@@ -392,10 +394,10 @@
res.data.channelCodes.map(item => {
this.menuList[3].detailLists.push({
title: item.name,
value: item.id
})
// this.menuList[3].detailLists.push({
// title: item.name,
// value: item.id
// })
})
res.data.productCodes.map(item => {
this.menuList[2].detailList.push({

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

@@ -134,6 +134,7 @@
</view>
<SwitchEnterprises @submit='upadteCompanyCard' @logout='logout' :is-show.sync="isSwitchEnterprises">
</SwitchEnterprises>
<!-- <tabbar :current-page="4"/> -->
</view>
</template>

BIN
static/img/tabbar/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

4
utils/request.js
View File

@@ -6,9 +6,9 @@ import utils from '@/utils/encode'
const env = 'production'
// 45
const testUrl = 'http://192.168.1.132:38080'
// const productUrl = 'https://www.xingoil.com/adminapi'
const productUrl = 'https://www.xingoil.com/adminapi'
const productUrl = 'http://uat.xingoil.com/adminapi'
// const productUrl = 'http://uat.xingoil.com/adminapi'
// const productUrl = 'http://192.168.0.191:38080'
// const productUrl = 'http://121.196.213.68/adminapi'
const service = axios.create({