From f9077ade64337ae5f1a9745c9123e68a521664df Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Thu, 1 Dec 2022 16:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BagStation/orderDetail/orderDetail.vue | 6 ++++--
BagStation/pages/makeOrder/payResult.vue | 7 ++++---
components/sl-filter/filter-view.vue | 4 ++--
pages/tabbar/station/stationList.vue | 17 +++++++++--------
utils/request.js | 2 +-
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue
index 8cdddc4..806baed 100644
--- a/BagStation/orderDetail/orderDetail.vue
+++ b/BagStation/orderDetail/orderDetail.vue
@@ -14,7 +14,7 @@
<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
+ background="#fff" :foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval
:usingComponents="usingComponents" showLoading />
</view>
</view>
@@ -164,6 +164,7 @@
export default {
data() {
return {
+ foreground:'#000',
showQr:false,
val:'',
id: '',
@@ -213,7 +214,8 @@
this.showQr = false
}else if(res.code == 20000){
this.showQr = true
- this.val =res.data.codeStr
+ this.val =res.data.codeStr;
+ this.foreground = this.val.indexOf('SHLFC/V1')==-1?'#000':'#1A487E';
}
} )
},
diff --git a/BagStation/pages/makeOrder/payResult.vue b/BagStation/pages/makeOrder/payResult.vue
index 4d48af5..bda47c9 100644
--- a/BagStation/pages/makeOrder/payResult.vue
+++ b/BagStation/pages/makeOrder/payResult.vue
@@ -21,7 +21,7 @@
<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
+ background="#fff" :foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval
:usingComponents="usingComponents" showLoading />
</view>
</view>
@@ -144,6 +144,7 @@
data() {
const now = new Date()
return {
+ foreground:'#000',
oilItem:{},
status:"",
showtitles:"",
@@ -203,6 +204,8 @@
this.showQr = true
this.showtext =false
this.val =res.data.codeStr
+ this.foreground = this.val.indexOf('SHLFC/V1')==-1?'#000':'#1A487E';
+ console.log(this.foreground,'foreground')
}
} )
},
@@ -310,7 +313,6 @@
let _that = this
if(oilItems.listTag == '万金油'){
_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
-
}else if(oilItems.listTag == '星油'){
_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/xingyouyunzhan.mp3'
}else if(oilItems.listTag == '壳牌'){
@@ -318,7 +320,6 @@
}else if(oilItems.listTag == '上汽联名卡'){
_that.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3'
}
-
this.ContextAudio(this.audioUrl)
}else{
console.log('这里是支付失败')
diff --git a/components/sl-filter/filter-view.vue b/components/sl-filter/filter-view.vue
index d611d32..1b1699c 100644
--- a/components/sl-filter/filter-view.vue
+++ b/components/sl-filter/filter-view.vue
@@ -475,13 +475,13 @@
},
resetSelected(list, key) {
console.log('%c 重置方法第二步resetSelected函数参数↓','color:green;font-size:30px')
- console.log(list, key)
if (typeof this.result[key] == 'object') {
this.result[key] = [];
this.selectedTitleObj[key] = list[0].title;
} else {
this.result[key] = '';
this.selectedTitleObj[key] = list[0].title;
+ console.log(this.result,'重置之后的数据')
}
for (let i = 0; i < list.length; i++) {
if (i == 0) {
@@ -540,7 +540,7 @@
obj.result.provinceCode = this.provinceCode
obj.result.cityCode = this.cityCode
obj.result.areaCode = this.areaCode
- obj.result.distance = this.detailItems
+ // obj.result.distance = this.detailItems
console.log(obj,'look me!')
// console.log(this.seleIdex.split('/'),this.productCodeList[this.seleIdex.split('/')[1]][this.seleIdex.split('/')[0]],this.seleIdex.split('/')[2],'dddddddddddddddddd')
if(this.seleIdex!==null&&this.seleIdex.split('/')[2]==2){
diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue
index 039d0e9..fbbdb5d 100644
--- a/pages/tabbar/station/stationList.vue
+++ b/pages/tabbar/station/stationList.vue
@@ -1,9 +1,9 @@
<template>
- <view class="my-bg">
+ <view style="height: 100vh;" class="my-bg flex_column">
<cu-custom class="main-totextbar bg-main-oil" bgColor="bg-main-oil">
<block slot="content">附近油站</block>
</cu-custom>
- <view class="">
+ <view style="flex: 1;" class="flex_column">
<view class="headList">
<view class="headList_head" v-for="(list,i) in tabHeadS" :class="[TabHead == i? 'ativeHead':'']" :key='i' @tap='changeHaed(list.value)'>
{{list.title}}
@@ -25,7 +25,7 @@
</view>
<!-- 筛选开始 -->
- <scroll-view class="screentop bg-white">
+ <scroll-view style="flex: 1;" class="screentop bg-white">
<view @click="reunrnFn" class="">
<sl-filter reflexTitle ref="slFilter" :productCodeList="productCodeList" :areaCodeList="areaCodeList" @result="filterRes" :menuList="menuList" v-if="TabHead == 0"></sl-filter>
<sl-filter reflexTitle ref="slFilter" @result="filterRes" :menuList="ureaMenuList" v-if="TabHead == 1 && changeHs == true"></sl-filter>
@@ -93,19 +93,19 @@
key: 'distance',
detailList: [{
title: "默认",
- value: 20
+ value: ''
},
{
title: "20Km",
- value: 20
+ value: 20000
},
{
title: "30Km",
- value: 30
+ value: 30000
},
{
title: "50Km",
- value: 50
+ value: 50000
}
]
},{
@@ -345,7 +345,7 @@
}
},
filterRes(val) {
- console.log(val)
+ console.log(val,'重置')
if(this.TabHead ==0){
this.filterDatas = val
this.currentPage = 1
@@ -671,6 +671,7 @@
</script>
<style scoped>
+ .flex_column{display: flex;flex-direction: column;}
.headList_head{
padding: 2% 0;
width: 16%;
diff --git a/utils/request.js b/utils/request.js
index 08e1a8e..afc8a3d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,7 +5,7 @@ import utils from '@/utils/encode'
// const env = 'test'
const env = 'production'
// 45
-const testUrl = 'http://192.168.0.45:38080'
+const testUrl = 'https://5210i098j7.hsk.top'
// const productUrl = 'https://www.xingoil.com/adminapi'
const productUrl = 'http://uat.xingoil.com/adminapi'