dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.8

Browse Source
This commit is contained in:
cun-nan 2024-10-08 17:58:46 +08:00
parent 843dfa0878
commit a020da8d38
3 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gasStation-uni/pagesHome/MyCard/MyCard.vue
View File

@ -17,11 +17,11 @@
NO.xxxxxxxxxxxxxxxxxx
</view> -->
</view>
<view class="card_1" @click="goDetails('oilCard')">
<view class="card_1" @click="goDetails('oilCard')" v-for="(item,index) in cardsList" :key="index">
<view class="top_card">
<view class="">囤油卡</view>
<view style="display: flex;" @click="goCode()">
<view style="margin-right: 5px;">汽油92# 7.28元/L</view>
<view style="margin-right: 5px;">{{item.oilName}} 7.28元/L</view>
<image src="../../static/new/rwm.png" style="width: 25px; height: 25px; "></image>
</view>
</view>
@ -29,7 +29,7 @@
剩余油量
</view>
<view class="card-num">
0L
{{item.fuelAmount}}L
</view>
<!-- <view class="r-box">
NO.xxxxxxxxxxxxxxxxxx
@ -99,7 +99,6 @@
},
onShow() {
this.query.chainStoreId = uni.getStorageSync('chainStoreId');
// this.getCardFuleRecords();
this.getUserBalance()
this.getFleetInfo()
},
@ -160,6 +159,8 @@
}).then(res => {
if (res.code == 200) {
this.cardBalance = res.data
console.log(res,163);
this.cardsList = res.data.userFuel
}
})
},

4
gasStation-uni/pagesHome/memberRecharge/index.vue
View File

@ -116,7 +116,7 @@
export default {
data() {
return {
type: 'oilCard',
type: 'balance',
show: false,
windex: 0,
storeId: uni.getStorageSync("storeId"),
@ -319,6 +319,7 @@
},
setIndex(index, data) {
this.windex = index
this.isEdit = true
if (this.type == 'balance') {
if (index != this.rechargeList.length) {
this.rechargeOrder.balance = data.rechargeBalance
@ -333,6 +334,7 @@
this.rechargeOrder.bidBalance = 0
this.rechargeOrder.rechargeBalance = 0
this.rechargeOrder.giftBalance = 0
this.isEdit = false
}
}
if (this.type == 'oilCard') {

54
gasStation-uni/pagesRefuel/orderSuccess/index.vue
View File

@ -12,26 +12,35 @@
<image src="../../static/icon/zfcg.png" style="width: 80px; height: 80px; "></image>
</view>
<view style="margin: 20px auto;font-size: 16px;color: #22AF5B;">支付成功</view>
<view class="m_num">￥190.00</view>
<view class="m_num">￥{{orderInfo.goodsMoney}}</view>
<view class="m_bs">
<view class="">门店名称</view>
<view class="">中建锦绣二期站</view>
<view class="">{{orderInfo.storeName}}</view>
</view>
<view class="x_"></view>
<view class="m_bs">
<view class="">交易类型</view>
<view class="">油品</view>
<view class="">{{orderInfo.content}}</view>
</view>
<view class="m_bs">
<view class="">支付方式</view>
<view class="">会员储值卡</view>
<view class="" v-if="orderInfo.payType=='ALIPAY'">支付宝</view>
<view class="" v-if="orderInfo.payType=='WECHAT'">微信</view>
<view class="" v-if="orderInfo.payType=='UNIONPAY'">银联二维码</view>
<view class="" v-if="orderInfo.payType=='CASH'">现金</view>
<view class="" v-if="orderInfo.payType=='APPLET_CODE'">小程序码</view>
<view class="" v-if="orderInfo.payType=='card_value'">储值卡</view>
<view class="" v-if="orderInfo.payType=='fule_card'">囤油卡</view>
<view class="" v-if="orderInfo.payType=='car_card_value'">车队卡</view>
<view class="" v-if="orderInfo.payType=='car_fule_card'">车队囤油卡</view>
<view class="" v-if="orderInfo.payType=='after_pay'">挂账</view>
</view>
<view class="m_bs">
<view class="">流水编号</view>
<view class="">xxxxxxxxxxxxxxxx</view>
<view class="">{{orderInfo.orderNo}}</view>
</view>
<view v-if="orderNo" @click="goOrderInfo" style="border: solid 1px #FA6400;margin: 20px auto;width: 70%;
<view v-if="orderInfo.type==1" @click="goOrderInfo" style="border: solid 1px #FA6400;margin: 20px auto;width: 70%;
height: 40px;line-height: 40px;color: #FA6400;">{{timestamp}}s后去评价</view>
<view v-else @click="goBack" style="border: solid 1px #FA6400;margin: 20px auto;width: 70%;
height: 40px;line-height: 40px;color: #FA6400;">{{timestamp}}s后返回首页</view>
@ -41,25 +50,50 @@
</template>
<script>
import request from '../../utils/request'
export default {
data() {
return {
timestamp: 3,
timer: {},
orderNo: "",
orderNo: "234520241008171716e578f0",
orderInfo: {},
oilOrder:{},
}
},
onLoad(e) {
if (e.orderNo) {
this.orderNo = e.orderNo
}
// this.countdown()
this.getOrder()
this.countdown()
},
methods: {
getOrder() {
request({
url: "/business/allOrderInfo/queryByOrderNo",
method: 'get',
params: {
orderNo: this.orderNo,
},
}).then((res) => {
this.orderInfo = res.data
if (res.data.type == 1){
request({
url: "business/oilOrder/oilOrderId/" + this.orderNo,
method: 'get',
}).then((res) => {
if(res.data){
this.oilOrder = res.data
}
})
}
})
},
goOrderInfo() {
clearInterval(this.timer)
uni.navigateTo({
url: '/pagesMy/details/details?orderNo=' + this.orderNo,
url: '/pagesMy/comment/comment?orderId=' + this.oilOrder.id
})
},
// 倒计时刷新
@ -70,7 +104,7 @@
_this.timestamp--;
// 如果倒计时为0，清除定时器
if (_this.timestamp === 0) {
if (_this.orderNo) {
if (_this.orderInfo.type==1) {
_this.goOrderInfo()
} else {
_this.goBack()