格式化
This commit is contained in:
xiaozhiyong
@@ -12,7 +12,8 @@
|
||||
<!-- 顶部填充区域 -->
|
||||
<view class="fill"></view>
|
||||
<!-- 油站位置卡片 -->
|
||||
<view style="margin-top: 10rpx;" class=" serviceStation my-cell margin-left margin-right padding-top padding-bottom radius shadow ">
|
||||
<view style="margin-top: 10rpx;"
|
||||
class=" serviceStation my-cell margin-left margin-right padding-top padding-bottom radius shadow ">
|
||||
<view style="padding-bottom: 25rpx;" class="strong padding-bottom-xs">{{siteData.siteName}}</view>
|
||||
<view class=" textEllipsis font-12 color-999">
|
||||
<uni-icons color="#666666" type="location-filled" size="15"></uni-icons>
|
||||
@@ -53,12 +54,16 @@
|
||||
<view class="newdirvercard">
|
||||
<view class="newdirvercard_left">
|
||||
<view style="flex-shrink: 1;">
|
||||
<view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-if="siteData.headUrl" class="cu-avatar round lg" :style="'background-image:url('+siteData.headUrl+');'"></view>
|
||||
<view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-else class="cu-avatar round lg">星</view>
|
||||
<view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-if="siteData.headUrl"
|
||||
class="cu-avatar round lg" :style="'background-image:url('+siteData.headUrl+');'"></view>
|
||||
<view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-else class="cu-avatar round lg">
|
||||
星</view>
|
||||
</view>
|
||||
<view class="newdirvercard_name ">
|
||||
<view class="newdirvercard_name_text ">{{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}</view>
|
||||
<view class="newdirvercard_name_phone ">{{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}</view>
|
||||
<view class="newdirvercard_name_text ">
|
||||
{{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}</view>
|
||||
<view class="newdirvercard_name_phone ">
|
||||
{{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="newdirvercard_right">
|
||||
@@ -124,11 +129,8 @@
|
||||
<view class="bg-white padding padding-bottom-sm">
|
||||
<!-- 油品类型 v-for siteData.oilSitePriceDetailsVos -->
|
||||
<view style="width: 100%;display: flex;flex-wrap: wrap; margin-bottom: 28rpx;">
|
||||
<view
|
||||
style="margin-right: 15rpx;"
|
||||
v-for="(item,index) in siteData.oilSitePriceDetailsVos"
|
||||
:key="item.priceId"
|
||||
@tap="oilNameSel(item)"
|
||||
<view style="margin-right: 15rpx;" v-for="(item,index) in siteData.oilSitePriceDetailsVos"
|
||||
:key="item.priceId" @tap="oilNameSel(item)"
|
||||
:class="insertResult.oilProductCode===item.oilProductCode?'selecardoil':'cardoil'"
|
||||
class="strong padding-right-xs font-16 cardoil">
|
||||
{{item.oilProductCode}}
|
||||
@@ -147,7 +149,8 @@
|
||||
v-if="(insertResult.sitePrice -1+1)>0">￥{{(insertResult.sitePrice -1+1)|numberFilter}}/{{siteData.siteType|company}}</text>
|
||||
<text class="text-blod oil-main-color" v-else>无价格</text>
|
||||
</text>
|
||||
<text class="s-rich">市场价￥{{insertResult.oilSitePrice|numberFilter}}/{{siteData.siteType|company}}</text>
|
||||
<text
|
||||
class="s-rich">市场价￥{{insertResult.oilSitePrice|numberFilter}}/{{siteData.siteType|company}}</text>
|
||||
</view>
|
||||
|
||||
<view class="padding-top-xs" v-else>
|
||||
@@ -169,7 +172,8 @@
|
||||
<text class="text-blod oil-main-color" v-else>无价格</text>
|
||||
</text>
|
||||
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;">油站价格:￥
|
||||
<text v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text>
|
||||
<text
|
||||
v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text>
|
||||
<text class="text-blod oil-main-color" v-else>无价格</text>
|
||||
</text>
|
||||
</view>
|
||||
@@ -190,8 +194,11 @@
|
||||
<view class="padding padding-bottom-0 padding-top-xs bg-white">
|
||||
<view style="color: #333333;font-size: 30rpx;" class="padding-bottom-sm text-lg">枪号选择：</view>
|
||||
<view class="grid col-5 justify-start">
|
||||
<view style="width: calc(100% / 4);" class="padding-xs" v-for="(item,index) in ColorList" :key="index">
|
||||
<button @tap="gunIdSel(index)" :style="{width: '100%',color:insertResult.bar===index+1?'':'#333333'}" class="cu-btn"
|
||||
<view style="width: calc(100% / 4);" class="padding-xs" v-for="(item,index) in ColorList"
|
||||
:key="index">
|
||||
<button @tap="gunIdSel(index)"
|
||||
:style="{width: '100%',color:insertResult.bar===index+1?'':'#333333'}"
|
||||
class="cu-btn"
|
||||
:class="[insertResult.bar===index+1?'bg-main-oil':'line-gray']">{{index+1}}</button>
|
||||
</view>
|
||||
</view>
|
||||
@@ -207,13 +214,16 @@
|
||||
</view>
|
||||
<view class="cu-form-group" v-else>
|
||||
<view class="title newtitle"> {{siteData.siteType=='2'?'加气升数':'加油金额'}}</view>
|
||||
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney"
|
||||
v-model="insertResult.vol" name="input" />
|
||||
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`"
|
||||
@input="checkNumber" type="digit" @blur="getMoney" v-model="insertResult.vol"
|
||||
name="input" />
|
||||
<view style="width: 170rpx;text-align: end;" class="textEllipsis">
|
||||
<text class="">
|
||||
<!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 -->
|
||||
<text v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text>
|
||||
<text v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text>
|
||||
<text
|
||||
v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text>
|
||||
<text
|
||||
v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text>
|
||||
<!-- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} -->
|
||||
</text>
|
||||
</view>
|
||||
@@ -231,7 +241,8 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge"> {{shake==null?'立即下单':'下单中'}}</button>
|
||||
<button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge">
|
||||
{{shake==null?'立即下单':'下单中'}}</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class v-show="!beforePay&&isG7">
|
||||
@@ -1115,7 +1126,10 @@
|
||||
this.shake = null
|
||||
return false
|
||||
}
|
||||
let location = uni.getStorageSync('location')||{longitude:'',latitude:''};
|
||||
let location = uni.getStorageSync('location') || {
|
||||
longitude: '',
|
||||
latitude: ''
|
||||
};
|
||||
// if(!location){
|
||||
// let locationChenk = true
|
||||
// let that = this
|
||||
@@ -1170,7 +1184,10 @@
|
||||
// return
|
||||
//
|
||||
console.log(data6, 'data6+++++')
|
||||
oliSiteApi.xoilPay(Object.assign(data6,{longitude:location.longitude,latitude:location.latitude})).then(res => {
|
||||
oliSiteApi.xoilPay(Object.assign(data6, {
|
||||
longitude: location.longitude,
|
||||
latitude: location.latitude
|
||||
})).then(res => {
|
||||
console.log(res)
|
||||
if (res.code === 20000) {
|
||||
uni.showToast({
|
||||
|
||||
Reference in New Issue
Block a user