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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-06 14:19:34 +08:00
commit ae1f1090ed
5 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -1173,7 +1173,9 @@ export default {
},
/** 提交按钮 */
submitForm() {
if (!this.form.tableDatas || this.form.tableDatas.length==0){
this.form.tableDatas = []
}
this.form.activeConsumptionChildList = this.form.tableDatas.concat(this.tableDatas, this.form.shiwudata);
console.log(this.form.activeConsumptionChildList)

2
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -9,7 +9,7 @@
<view class="my-icons"></view>
</view>
<!-- 顶部区域 -->
<view class="tap-box">
<view class="tap-box" v-if="actinput == 0">
<view class="box-tap" :class="{ 'act' :types == index }" v-for="(item,index) in taplist" :key="index"
@click="getindex(index)">
<view class="title">{{item.title}}</view>

6
gasStation-uni/pagesHome/order/order.vue
View File

@ -318,7 +318,7 @@
},
}).then((res) => {
uni.showToast({
title: "支付失败!",
title: "支付失败，请联系商家!",
icon: "error"
})
})
@ -339,7 +339,7 @@
})
} else {
uni.showToast({
title: "支付失败!",
title: "支付失败，请联系商家!",
icon: "error"
})
}
@ -349,7 +349,7 @@
} else {
uni.showToast({
title: "支付失败!",
title: "支付失败，请联系商家!",
icon: "error"
})
}

14
gasStation-uni/pagesMy/today/today.vue
View File

@ -9,7 +9,7 @@
</view>
<!-- 顶部区域 -->
<view class="top-box">
<view style="font-size: 18px; font-weight: bold;">11月20号</view>
<view style="font-size: 18px; font-weight: bold;">{{getTime()}}</view>
<view style="font-size: 14px;">对比上次价格波动</view>
<view class="tupian"></view>
</view>
@ -65,6 +65,18 @@
},
methods: {
// 获取当前时间
getTime(){
let date = new Date();
let y = date.getFullYear() + "-";
let mon = ((date.getMonth() + 1 < 10) ? ('0' + (+date.getMonth() + 1)) : (+date.getMonth() + 1)) + "月";
let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + "号";
let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
// return new Date(y , mon , d , h , m , s);
return mon+d;
},
// 查询全部充值订单
getTodayOilPriceList() {
let params = {

3
gasStation-uni/pagesRefuel/orderDetail/index.vue
View File

@ -352,7 +352,8 @@
data: {"orderNo":_this.orderNo,"status":"payFail"},
}).then((ress)=>{})
uni.showToast({
title:res.data.msg,
// title:res.data.msg,
title:"支付失败，请联系商家",
icon:"none"
})
// _this.goBack()