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

Compare commits

base: caoliancun:1d314caefd65248d133345c3d24dd7ade550cb77
Branches Tags
caoliancun:master caoliancun:中小 caoliancun:zyj caoliancun:xiaozy_大卫用户协议 caoliancun:caolc1 caoliancun:caolc caoliancun:xiaozy1
..
compare: caoliancun:xiaozy1
Branches Tags
caoliancun:中小 caoliancun:master caoliancun:zyj caoliancun:xiaozy_大卫用户协议 caoliancun:caolc1 caoliancun:caolc caoliancun:xiaozy1

3 Commits
1d314caefd ... xiaozy1

Author SHA1 Message Date
xiaozhiyong
afd4e3b501 更新 2023-08-01 09:03:28 +08:00
肖志勇
50feac9fe5 Merge pull request '更新' (#9) from xiaozy into master 
Reviewed-on: #9
 2023-07-29 02:08:08 +00:00
xiaozhiyong
2bd0a3b42e 更新 2023-07-29 10:05:49 +08:00
2 changed files with 119 additions and 62 deletions
Expand all files Collapse all files

80
BagStation/orderDetail/orderDetail.vue
View File

@@ -13,14 +13,15 @@
<view class="qr-container "> <view class="qr-container ">
<view class="qrimg"> <view class="qrimg">
<view class="qrimg" @tap="newQrString"> <view class="qrimg" @tap="newQrString">
<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" <tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff"
background="#fff" foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
:usingComponents="usingComponents" showLoading /> :usingComponents="usingComponents" showLoading />
</view> </view>
</view> </view>
</view> </view>
<view class="text-center text-sm justify-center align-center flex"> <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> <text>壳牌</text>
</view> </view>
<view class="text-center padding-top text-sm margin-bottom"> <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-bottom-xs margin-bottom-xs dashed-bottom">
<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)"> <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>
</view> </view>
@@ -87,7 +89,8 @@
</view> </view>
<view class="padding-tb-xs text-left"> <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>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
优惠券： 优惠券：
@@ -96,7 +99,8 @@
<view class="padding-tb-xs text-left"> <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>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
支付方式： 支付方式：
@@ -138,8 +142,10 @@
<!-- <view class=" "> <!-- <view class=" ">
<button class="cu-btn nowrap " @tap="showMiniBtn=false">收起</button> <button class="cu-btn nowrap " @tap="showMiniBtn=false">收起</button>
</view> --> </view> -->
<view class="margin-bottom-sm"> <view class="more-frame">
<button class="cu-btn nowrap bg-white" @tap="gotoInvoicing()">查看开票信息</button> <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>
</view> </view>
<text class="text-lg">更多</text> <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 bg-main-oil " @tap="makePay">立即支付</button>
<button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button> <button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button>
</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 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>
<!-- <button class="cu-btn block lg margin-top " @tap="delOrder">删除订单</button> --> <!-- <button class="cu-btn block lg margin-top " @tap="delOrder">删除订单</button> -->
</view> </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 bg-main-oil " @tap="makePay">立即支付</button>
<button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button> <button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button>
</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 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>
<!-- <button class="cu-btn block lg margin-top " @tap="delOrder">删除订单</button> --> <!-- <button class="cu-btn block lg margin-top " @tap="delOrder">删除订单</button> -->
</view> </view>
@@ -172,6 +180,7 @@
import oilSiteApi from '@/api/oil-site.js' import oilSiteApi from '@/api/oil-site.js'
import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器 import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import financelApi from '@/api/oil-finance.js' import financelApi from '@/api/oil-finance.js'
import Financial from '@/api/Financial.js'
export default { export default {
components: { components: {
ThirdPartyVoucher, ThirdPartyVoucher,
@@ -220,6 +229,29 @@
} }
}, },
methods: { 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() { newQrString() {
this.getOrderQrCode() this.getOrderQrCode()
}, },
@@ -250,7 +282,8 @@
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '/BagStation/orderInvoicing/orderInvoicing?orderId=' + this.order 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 '&&realAmount=' + this.order.realAmount + '&&code=' + 1
}) })
} }
@@ -451,12 +484,33 @@
} }
</script> </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); transform: translateY(-17px);
} }
.bg-blue { .bg-blue {
background-color: red; background-color: red;
} }
.text-centers { .text-centers {
text-align: center; text-align: center;
width: 90%; width: 90%;
@@ -464,6 +518,7 @@
border-radius: 7px; border-radius: 7px;
overflow: hidden; overflow: hidden;
} }
.move-top { .move-top {
margin-top: -2rem; margin-top: -2rem;
} }
@@ -472,6 +527,7 @@
right: 110upx; right: 110upx;
bottom: 10upx; bottom: 10upx;
} }
.move-top { .move-top {
margin-top: -2rem; margin-top: -2rem;
} }

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

@@ -160,14 +160,15 @@
data() { data() {
return { return {
swiperArray: [ swiperArray: [
// {
// src:this.global.starUrl+'banner.png',
// link:''
// },
{ {
src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/baichuan_MP/banner_baichuan.png', src:this.global.starUrl+'banner.png',
JumpPage: '/Activity/pages/index/index' link:''
}, },
// {
// 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/WMP-IMG/banner-2dwk.png', // src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
// link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473' // link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473'