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

bug 12.08

Browse Source
This commit is contained in:
齐天大圣 2023-12-08 13:33:52 +08:00
parent 4c674b0109
commit ce0c69be7a
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -162,7 +162,7 @@
</el-form-item> </el-form-item>
<el-form-item label="可用油品" prop="oilType" v-if="form.type == 0"> <el-form-item label="可用油品" prop="oilType" v-if="form.type == 0">
<el-checkbox-group v-model="form.oilType"> <el-checkbox-group v-model="form.oilType">
<el-checkbox v-for="city in oillist" :label="city" :key="city">{{city}}</el-checkbox> <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="满足金额" prop="satisfiedAmount" v-if="form.discountType == 0"> <el-form-item label="满足金额" prop="satisfiedAmount" v-if="form.discountType == 0">
@ -362,7 +362,7 @@
<script> <script>
import QRCode from 'qrcodejs2' import QRCode from 'qrcodejs2'
import { listFavorable, getFavorable,getcardFavorable,getcount,getcountList, delFavorable, addFavorable, updateFavorable } from "@/api/EventMarketing/cardFavorable"; import { listFavorable, getFavorable,getcardFavorable,getcount,getcountList, delFavorable, addFavorable, updateFavorable } from "@/api/EventMarketing/cardFavorable";
import { getoilName, } from "@/api/EventMarketing/activeConsumption";
export default { export default {
name: "Favorable", name: "Favorable",
data() { data() {
@ -391,7 +391,8 @@ export default {
yue: ['1', '2', '3', '4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31'], yue: ['1', '2', '3', '4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31'],
lookyue:[], lookyue:[],
zhou:['周一','周二','周三','周四','周五','周六','周天'], zhou:['周一','周二','周三','周四','周五','周六','周天'],
oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#',], oillist:[],
/* oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#',],*/
checkboxGroup1: ['1'], checkboxGroup1: ['1'],
centerDialogVisible:false, centerDialogVisible:false,
loadingdialog:true, loadingdialog:true,
@ -513,8 +514,17 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getoilName()
}, },
methods: { methods: {
getoilName(){
getoilName().then(res=>{
console.log(res)
this.oillist = res.data
})
},
yueinput(e){ yueinput(e){
console.log(e) console.log(e)
this.lookyue = e this.lookyue = e

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

@ -40,22 +40,23 @@
</view> </view>
<!-- 底部 --> <!-- 底部 -->
<view class="bottom-box">
<view class="anniu">
<text>立即充值</text>
</view>
<view class="dibu">
<view class="">充值记录</view>
<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
</view>
<view class="box-hui">
<view style="margin-bottom: 15px;">服务说明</view>
<view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
<view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
</view>
</view>
</view> </view>
<view class="bottom-box">
<view class="anniu">
<text>立即充值</text>
</view>
<view class="dibu">
<view class="">充值记录</view>
<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
</view>
<view class="box-hui">
<view style="margin-bottom: 15px;">服务说明</view>
<view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
<view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
</view>
</view>
</view> </view>
<!-- 囤油充值 --> <!-- 囤油充值 -->