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

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP-XiaoXing into caolc

Browse Source
pull/14/head
caolc 2 years ago
parent 1372ebb4fd 0f949e85bb
commit 0f2e0f33ea
5 changed files with 270 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      BagStation/orderDetail/orderDetail.vue
  2. 29
      BagStation/pages/components/price-tab.vue
  3. 2
      BagStation/pages/stationDetail/stationDetail.vue
  4. 92
      components/site-item/site-item.vue
  5. 16
      pages/tabbar/home/home.vue

85
BagStation/orderDetail/orderDetail.vue
Unescape View File

@ -13,14 +13,15 @@
<view class="qr-container ">
<view class="qrimg">
<view class="qrimg" @tap="newQrString">
<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx"
background="#fff" foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff"
foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
:usingComponents="usingComponents" showLoading />
</view>
</view>
</view>
<view class="text-center text-sm justify-center align-center flex">
<image src="../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;" class="margin-right-sm"></image>
<image src="../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;" class="margin-right-sm">
</image>
<text>壳牌</text>
</view>
<view class="text-center padding-top text-sm margin-bottom">
@ -38,7 +39,8 @@
<view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)">
订单编号：
<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text class="cuIcon-copy padding-left-xs"></text></text>
<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text
class="cuIcon-copy padding-left-xs"></text></text>
</view>
</view>
@ -87,7 +89,8 @@
</view>
<view class="padding-tb-xs text-left">
星油优惠：
<text class="text-red fr">{{order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat}}</text>
<text
class="text-red fr">{{order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat}}</text>
</view>
<view class="padding-tb-xs text-left">
优惠券：
@ -96,7 +99,8 @@
<view class="padding-tb-xs text-left">
合计：
<text class="text-red text-bold text-lg fr">{{order.payRealAmount>0?order.payRealAmount:'xxx.x' }}</text>
<text
class="text-red text-bold text-lg fr">{{order.payRealAmount>0?order.payRealAmount:'xxx.x' }}</text>
</view>
<view class="padding-tb-xs text-left">
支付方式：
@ -138,8 +142,10 @@
<!-- <view class=" ">
<button class="cu-btn nowrap " @tap="showMiniBtn=false">收起</button>
</view> -->
<view class="margin-bottom-sm">
<button class="cu-btn nowrap bg-white" @tap="gotoInvoicing()">查看开票信息</button>
<view class="more-frame">
<button class="more-item nowrap bg-white " @tap="goDiscount()">优惠油站</button>
<button class="more-item nowrap bg-white " @tap="toRiskControl()">中交风控</button>
<button class="more-item nowrap bg-white " @tap="gotoInvoicing()">查看开票信息</button>
</view>
</view>
<text class="text-lg">更多</text>
@ -149,7 +155,8 @@
<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>
<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 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>
@ -158,7 +165,8 @@
<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>
<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 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>
@ -172,6 +180,7 @@
import oilSiteApi from '@/api/oil-site.js'
import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import financelApi from '@/api/oil-finance.js'
import Financial from '@/api/Financial.js'
export default {
components: {
ThirdPartyVoucher,
@ -220,12 +229,34 @@
}
},
methods: {
goDiscount() {
uni.navigateTo({
url: '/Activity/pages/index/index'
})
},
toRiskControl() {
const user = uni.getStorageSync('user');
if (user) {
Financial.findHomePageReport({
customerId: user.id
}).then(res => {
if (res.data) {
uni.navigateTo({
url: `/Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
})
} else {
uni.navigateTo({
url: '/Financial/pages/index?guide=1'
})
}
});
}
},
newQrString() {
this.getOrderQrCode()
},
getOrderQrCode() {
oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then((res) => {
console.log(res)
this.val = res.data
if (res.code == 40000) {
this.showQr = false
@ -236,11 +267,7 @@
})
},
gotoInvoicing() { //前往开票
console.log(this.order,'+++++++++++++')
financelApi.checkStatus(this.order.orderSerialNumber).then((res) => {
console.log('这里是check是否开发票')
console.log(res)
console.log(this.order.realAmount)
if (res.code == 20000) {
if (res.data.openInvoicMark === 'TO_INVOICED') {
uni.navigateTo({
@ -250,7 +277,8 @@
} else {
uni.navigateTo({
url: '/BagStation/orderInvoicing/orderInvoicing?orderId=' + this.order
.orderSerialNumber + '&&customerId=' + this.order.customerId + '&&payRealAmount=' + this.order.payRealAmount +
.orderSerialNumber + '&&customerId=' + this.order.customerId +
'&&payRealAmount=' + this.order.payRealAmount +
'&&realAmount=' + this.order.realAmount + '&&code=' + 1
})
}
@ -449,12 +477,33 @@
}
</script>
<style scoped>.move-tops{
<style scoped lang="scss">
.more-frame {
height: 158rpx;
overflow-y: auto;
.more-item {
margin: 10rpx 0;
padding: 0 30rpx;
font-size: 28rpx;
height: 64rpx;
line-height: 64rpx;
text-align: center;
&::after {
border: none;
}
}
}
.move-tops {
transform: translateY(-17px);
}
.bg-red {
background-color: red;
}
.text-centers {
text-align: center;
width: 90%;
@ -462,6 +511,7 @@
border-radius: 7px;
overflow: hidden;
}
.move-top {
margin-top: -2rem;
}
@ -470,6 +520,7 @@
right: 110upx;
bottom: 10upx;
}
.move-top {
margin-top: -2rem;
}

29
BagStation/pages/components/price-tab.vue
Unescape View File

@ -32,9 +32,15 @@
<view class="padding-top-sm">
<text class="cu-tag line-yellow margin-right-xs" v-for="(itemy,index) in tagList" :key="index">{{itemy}}</text>
</view>
<view class="activity" v-if="siteInfo.activitySwitch">
<view class="content">
{{siteInfo.activityContent}}
</view>
</view>
</view>
</view>
</view>
</template>
<script>
@ -43,6 +49,12 @@
channelList: {
type: Array,
default () {}
},
siteInfo:{
type: Object,
default: () => {
return {}
}
}
},
data() {
@ -124,7 +136,7 @@
}
</script>
<style scoped>
<style scoped lang="scss">
.site-icon {
width: 2rem;
vertical-align: middle;
@ -133,4 +145,19 @@
.my-tag {
padding: 0 12rpx;
}
.activity {
margin-top: 15rpx;
display: flex;
width: 45%;
border:2rpx solid #fbbd0850;
// border-radius: 10rpx;
.content {
flex: 1;
padding: 10rpx 20rpx;
line-height: 36rpx;
// min-height: 80rpx;
color: #fbbd08;
}
}
</style>

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

@ -65,7 +65,7 @@
</view>
<!-- 价格 -->
<price-tab @onChangeChannelCode="getChannelCode" @onChangePayQr="onChangePayQr" @onChangePay="onChangePay"
:channel-list="siteInfo.oilSiteChannelDetailsVos"></price-tab>
:channel-list="siteInfo.oilSiteChannelDetailsVos" :siteInfo="siteInfo"></price-tab>
<!-- 客户评价 -->

92
components/site-item/site-item.vue
Unescape View File

@ -1,15 +1,23 @@
<template>
<view class="cu-item cur padding no-mr-border site-item" :style="{height:siteItem.oilProductCodeAndPrices?siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':'': ''}">
<view class="cu-avatar radius lg "
<!-- :style="{height:siteItem.oilProductCodeAndPrices?siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':'': ''}" -->
<view class="site-item">
<view class="radius"
:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
</view>
<view class="content">
<view class="action">
<view class="text-grey text-sm " style="padding-top: 6rpx;">
<!-- <my-icon iconName="sy-der-icon.png" class="padding-right-xs text-sm"></my-icon> -->
{{siteItem.juli|distanceFilter}}
</view>
</view>
<view>
<view class="text-cut text-black text-lg padding-right-sm ">{{siteItem.siteName}}</view>
</view>
<view class="listTages">
<!-- <view v-if="siteItem.siteLevel" class=" cu-tag round bg-self--dark-yellow yu-tag text-xs">{{siteItem.siteLevel}}级</view> -->
<view class="cu-tag round bg-self-yellow yu-tag text-xs" :class="siteItem.channelCode=='XOIL'?'tag-red':''">{{siteItem.listTag|channelCodeFamt}}
<view class="cu-tag round bg-self-yellow yu-tag text-xs"
:class="siteItem.channelCode=='XOIL'?'tag-red':''">{{siteItem.listTag|channelCodeFamt}}
</view>
<view class="cu-tag round bg-self--dark-yellow yu-tag text-xs" v-show="first">距离最近</view>
</view>
@ -18,8 +26,9 @@
{{siteItem.address}}
</view>
</view>
<view class="text-gray flex" style="width: calc(100% + 30%);display: flex;flex-wrap: wrap;">
<view v-if="listHeight" class="youpin" style="" v-for="(item,index) in siteItem.oilProductCodeAndPrices">
<view class="text-gray flex" style="display: flex;flex-wrap: wrap;">
<view v-if="listHeight" class="youpin" style=""
v-for="(item,index) in siteItem.oilProductCodeAndPrices">
<view class="text-bold yellow-oil text-xl padding-right-xs">
{{item.oilProductCode}}
</view>
@ -44,18 +53,18 @@
<!-- <my-icon iconName="￥.png" class="padding-right-xs icon-rectangle"></my-icon>
<my-icon iconName="f.png" class="padding-right-xs "></my-icon> -->
</view>
</view>
<view class="activity" v-if="siteItem.activitySwitch">
<view class="title">活动</view>
<view class="content">
{{siteItem.activityContent}}
</view>
<view class="action">
<view class="text-grey text-sm " style="padding-top: 6rpx;">
<!-- <my-icon iconName="sy-der-icon.png" class="padding-right-xs text-sm"></my-icon> -->
{{siteItem.juli|distanceFilter}}
</view>
</view>
</view>
</template>
@ -125,19 +134,42 @@
}
</script>
<style scoped>
<style scoped lang="scss">
.site-item {
margin-bottom: 1.8rem;
position: relative;
display: flex;
align-items: flex-start !important;
height: 150rpx!important;
padding: 25rpx;
// margin-bottom: 1.8rem;
line-height: 1.5rem;
.content {
flex: 1;
overflow: hidden;
.action {
position: absolute;
right: 35rpx;
top: 24rpx;
}
}
>.radius {
margin-right: 30rpx;
width: 96rpx;
height: 96rpx;
font-size: 2em;
background-size: 100% 100%;
}
}
.yellow-oil {
color: #e8775a;
}
.cu-avatar{
background-color: transparent !important;
}
.youpin {
border: 1px solid #e4e4e4;
display: flex;
@ -146,7 +178,33 @@
margin-right: 5px;
margin-bottom: 5px;
}
.text-xl {
font-size: 30rpx;
}
.activity {
display: flex;
width: 85%;
// padding: 10rpx 20rpx;
border: 2rpx solid #FF8C00;
border-radius: 10rpx;
.title {
width: 20%;
padding: 10rpx 0;
line-height: 36rpx;
text-align: center;
color: #FF8C00;
background: #FF8C0030;
}
.content {
flex: 1;
padding: 10rpx 20rpx;
line-height: 36rpx;
min-height: 80rpx;
color: #FFA500;
}
}
</style>

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

@ -201,18 +201,18 @@
data() {
return {
swiperArray: [
// {
// src:this.global.starUrl+'banner.png',
// link:''
// },
{
src:this.global.starUrl+'banner.png',
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/baichuan_MP/banner_baichuan.png',
JumpPage:'/Activity/pages/index/index'
},
// {
// src:'https://xoil-public.oss-cn-beijing.aliyuncs.com/baichuan_MP/banner_baichuan.png',
// JumpPage:'/Activity/pages/index/index'
// },
],
listHeight: 160,
siteInfo: {

Write Preview
Loading…
Cancel
Save