Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP_XOIL_company_new into lixuan

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';
 					}
 				} )
 			},

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('这里是支付失败')

components/sl-filter/filter-view.vue

@@ -489,6 +489,7 @@
 				} 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) {
@@ -548,7 +549,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){

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
 							}
 						]
 					},{
@@ -349,7 +349,7 @@
 				}
 			},
 			filterRes(val) {
-				console.log(val)
+				console.log(val,'重置')
 				if(this.TabHead ==0){
 					this.filterDatas = val 
 					this.currentPage = 1
@@ -676,6 +676,7 @@
 </script>
 
 <style scoped>
+	.flex_column{display: flex;flex-direction: column;}
 	.headList_head{
 		padding: 2% 0;
 		width: 16%;

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'