Merge pull request 'zyj' (#14) from zyj into master

Reviewed-on: #14

App.vue

@@ -67,7 +67,7 @@
 								value: item.id
 							})
 						})
-						console.log(channelCodes, productCodes, siteBrands)
+						// console.log(channelCodes, productCodes, siteBrands)
 						this.menuList[0].detailList = this.menuList[0].detailList.concat(channelCodes)
 						this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes)
 						this.menuList[2].detailList = this.menuList[2].detailList.concat(siteBrands)
@@ -95,10 +95,12 @@
 					if(view.route === 'BagStation/pages/stationDetail/stationDetail') {
 						uni.removeStorageSync('refuseLogin')
 					}
+					// console.log('white.includes(view.route)',white.includes(view.route))
 					// // 是否跳过登陆
 					let isRefuseLogin = uni.getStorageSync('refuseLogin')
 					if(isRefuseLogin || white.includes(view.route) || view.route.includes('BagAuth')) return 	
-					 this.getAmount()
+					// console.log('111111111111111')
+					this.getAmount()
 				})
 			},
 			// 是否token过期或ip更改
@@ -106,10 +108,14 @@
 				// clearTimeout(loginTimer)
 				accountApi.getTotalOilCardInfo().then(res => {
 					if (res.code == 42011) {
+						uni.setStorageSync('Authorization',null)
+						uni.setStorageSync('openid',null)
+						
 						uni.showModal({
 							title: '需要您重新登录',
 							content: res.msg,
 							duration: '3000',
+							showCancel:false,
 							success: function(res) {
 								if (res.confirm) {
 									uni.redirectTo({
@@ -125,13 +131,17 @@
 		onReady() {
 
 		},
+		
+		onUnload() {
+			uni.hideLoading()
+		},
 
 		onShow: function(option) {
-			const token = uni.getStorageSync('Authorization')
+			// const token = uni.getStorageSync('Authorization')
-			const openid = uni.getStorageSync('openid')
+			// const openid = uni.getStorageSync('openid')
-			if (token && openid) {
+			// if (token && openid) {
-				this.getAmount()
+			// 	this.getAmount()
-			}
+			// }
 			uni.getLocation({
 				type: 'wgs84',
 				success: function(res) {
@@ -142,7 +152,9 @@
 				}
 			});
 		},
+
 	}
+	
 </script>
 <style lang="scss">
 

AppletCode/pages/index/index.vue

@@ -280,9 +280,16 @@
 			submit() {
 				this.checkFn('name');
 				this.checkFn('plateNumber');
-				if (!this.fromStyle.nameType || !this.fromStyle.plateNumberType) {
+				if (!this.fromStyle.nameType) {
 					uni.showToast({
-						title: '还有信息没有填哦',
+						title: '请输入姓名',
+						icon: 'error'
+					});
+					return
+				};
+				if (!this.fromStyle.plateNumberType) {
+					uni.showToast({
+						title: '车牌号格式有误',
 						icon: 'error'
 					});
 					return

BagStation/orderDetail/orderDetail.vue

@@ -153,7 +153,7 @@
 			<!-- <button class="cu-btn block lg margin-top " @tap="delOrder">删除订单</button> -->
 		</view>
 		<view class="customer-service" @click="arousePhone">
-			<image src="../../static/img/customer-service.png"></image>
+			<image src="../../BagStation/static/img/customer-service.png"></image>
 			联系客服
 		</view>
 	</view>
@@ -161,7 +161,7 @@
 
 <script>
 	import orderApi from '@/api/oil-order.js'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 
 	import oilSiteApi from '@/api/oil-site.js'
 	export default {

BagStation/orderDetail/orderDetailUrea.vue

@@ -164,7 +164,7 @@
 
 <script>
 	import orderApi from '@/api/oil-order.js'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	import oilSiteApi from '@/api/oil-site.js'
 	import ureaFinanceApi from '../../api/urea_finance.js'
 	export default {

BagStation/pages/SeparateProcess/payResult.vue

@@ -135,7 +135,7 @@
 	import toilApi from '@/api/toil.js'
 	import ThirdPartyVoucher from '../components/third-party-voucher/third-party-voucher.vue'
 	import oilSiteApi from '@/api/oil-site.js'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	export default {
 		components: {
 			ThirdPartyVoucher,

BagStation/pages/components/price-select-tab.vue

@@ -188,6 +188,24 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class=" menu cu-list  "  v-if="plateNumberOcrShow==true">
+			<view class="cu-item nowrap">
+				<view class="text-bold ">
+					车牌识别
+				</view>
+				<view  @tap="srcPhoto" class="text-center" style="width: 60%;margin: 0 2%;">
+					<input v-model="plateNumberOcr"  type="digit" class="block"
+						placeholder="请点击拍照识别车牌" value="" style="border-bottom: 1px solid #efefef;" />
+				</view>
+				<view  @tap="srcPhoto">
+					<uni-icons type="camera-filled" size="30"></uni-icons>
+				</view>
+			</view>
+		</view>
+		
+		
+		
 		<view class="bg-white padding">
 			<view class="">
 				<text class="text-bold">优惠</text>
@@ -367,6 +385,39 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="cu-modal bottom-modal " :class="showPlicePhoto">
+	
+			<view class="cu-dialog bg-white">
+				<view class="cu-bar bg-white justify-end">
+					<view class="content"></view>
+					<view class="action" @tap="showPlicePhoto=''">
+						<text class="cuIcon-close text-red"></text>
+					</view>
+				</view>
+				
+			<view style="height: 1000rpx;">
+				<view style="margin: 100rpx 0;">
+					<uni-icons type="clear" size="80" color="#f56c6c"></uni-icons>
+					<view>
+						<text style="color: #d9001b;font-size: 30rpx;font-weight: bold;">识别失败!</text>
+					</view>
+					
+				</view>
+				<view style="margin: 60rpx 0;">
+					<button @tap="srcPhoto" style="width: 60%;background-color: #409EFF;color: #ffffff;">重新拍照</button>
+				</view>
+				<view style="margin: 60rpx 0;">
+					<button style="width: 60%;background-color: #F59A23;color: #ffffff;" @click="manualInput">手动输入车牌号</button>
+				</view>
+			</view>
+			</view>
+		</view>
+		<uni-popup ref="inputDialog" type="dialog">
+			<uni-popup-dialog mode="input" title="请输入车牌号" value="" :before-close="true"
+				placeholder="请输入" @close="inputClose" @confirm="inputConfirm"></uni-popup-dialog>
+		</uni-popup>
+	
 	</view>
 </template>
 
@@ -377,6 +428,7 @@
 	import oilOssApi from '@/api/oil-oss.js'
 	import utils from '@/utils/encode'
 	import oilInterfacesApi from '@/api/oil-interfaces.js'
+	import user from '@/api/user.js'
 	export default {
 		props: {
 			channelList: {
@@ -504,13 +556,18 @@
 				activeChannelCode: '',
 				checkBar: [],
 				realMoney: '',
-				xoilAmountGun: ''
+				xoilAmountGun: '',
+				plateNumberOcr:'',
+				plateNumberOcrShow:false,
+				showPlicePhoto:'',
+				plateNumberImages:''
 			}
 		},
 		created() {
 			let oilItem = uni.getStorageSync('oilItem'),
 				oilSite = uni.getStorageSync(''),
-				otherUser = uni.getStorageSync('otherUserInfo')
+				otherUser = uni.getStorageSync('otherUserInfo'),
+				companyId = JSON.parse(uni.getStorageSync('companyCard')).companyId
 			if (otherUser) {
 				// console.log('这里是卡里')
 				this.isOtherUser = true
@@ -520,6 +577,8 @@
 			console.log('oilItem', oilItem)
 			this.showtitles = oilItem.listTag;
 			this.init()
+			console.log(companyId)
+			this.getCompanyConfig(companyId)
 		},
 		watch: {
 			activeChannelCode: {
@@ -598,6 +657,86 @@
 			}
 		},
 		methods: {
+			manualInput(){
+				this.showPlicePhoto=''
+				this.$refs.inputDialog.open()
+			},
+			inputClose(){
+				this.$refs.inputDialog.close()
+			},
+			inputConfirm(val){
+				if(val){
+					this.plateNumberOcr = val
+					this.$refs.inputDialog.close()
+				}else{
+					uni.showToast({
+						title: '请输入车牌号',
+						icon: 'none'
+					})
+				}
+				
+			},
+			getCompanyConfig(companyId){
+				if(companyId){
+					user.getCompanyConfigByCompanyId(companyId).then(res=>{
+						if(res.data.plateNumberOcr==1){
+							this.plateNumberOcrShow = true
+						}else{
+							this.plateNumberOcrShow = false
+						}
+						
+					})
+				}
+			},
+			srcPhoto(){
+				this.showPlicePhoto=''
+				let _that = this
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['camera'], // 只能拍照
+					success: function(res) {
+						uni.showLoading({
+							title: '识别中',
+							mask: true
+						});
+								
+						const JSESSIONID = utils.uuid()
+						uni.uploadFile({
+							url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/carNoIdentify',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							header: {
+								"Content-Type": "multipart/form-data",
+								"Authorization": uni.getStorageSync('Authorization'),
+								'dataSources': 'MP',
+								"imei": uni.getStorageSync('unionid'),
+								"openId": uni.getStorageSync('openid'),
+								'JSESSIONID': JSESSIONID,
+								'token': utils.md5Salt(JSESSIONID)
+							},
+							success(e) {
+								uni.hideLoading()
+								let obj = JSON.parse(e.data)
+								if(obj.data&&obj.data.carNo){
+									 _that.plateNumberOcr = obj.data.carNo
+									 _that.plateNumberImages = obj.data.imgUrl
+								}else{
+									_that.plateNumberOcr = ''
+									_that.showPlicePhoto = 'show'
+								}
+							},fail(res){
+								uni.hideLoading()
+								_that.showPlicePhoto = 'show'
+							}
+						})
+
+						
+					}
+				})
+
+
+			},
 			typeChenk() {
 				return this.channelList[this.activeCur]?.secondChannelCode && this.thirdPartyDynamicData.includes(this
 					.channelList[this.activeCur].secondChannelCode)
@@ -1135,14 +1274,23 @@
 						'xoilAmountGun': this.vol
 					}
 				} else {
-					var orderData = {
+					if(!this.plateNumberOcr){
+						uni.showToast({
+							icon: 'none',
+							title: '请上传车牌照片'
+						})
+						return
+					}
+					if(this.plateNumberOcrShow == true){
+						var orderData = {
 						amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
 						shareCompanyQuota: 0, // 共享标识
 						priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String  必有字段  备注：油价主键
 						orderType: "REAL_ORDER", //类型：String  必有字段  备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
 						orderSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：订单来源（WECHAT_MINIAPPS）
-						plateNumber: this.plateNumber ? this.plateNumber : this
+						plateNumber: this.plateNumberOcrShow == true ? this.plateNumberOcr : this
-							.plateNumberSel, //类型：String  必有字段  备注：车牌号
+							.plateNumber, //类型：String  必有字段  备注：车牌号
+						plateNumberImages: this.plateNumberImages, // 车牌照片地址
 						siteUserName: this.jober, //类型：String  必有字段  备注：加油员
 						oilsBar: this.oilBar, //类型：Number  必有字段  备注：油枪
 						volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
@@ -1155,6 +1303,29 @@
 						'version': 1,
 						'xoilAmountGun': this.vol
 					}
+					}else{
+						var orderData = {
+							amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
+							shareCompanyQuota: 0, // 共享标识
+							priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String  必有字段  备注：油价主键
+							orderType: "REAL_ORDER", //类型：String  必有字段  备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
+							orderSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：订单来源（WECHAT_MINIAPPS）
+							plateNumber: this.plateNumber ? this.plateNumber : this
+								.plateNumberSel, //类型：String  必有字段  备注：车牌号
+							siteUserName: this.jober, //类型：String  必有字段  备注：加油员
+							oilsBar: this.oilBar, //类型：Number  必有字段  备注：油枪
+							volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
+								.vol, //类型：Number  必有字段  备注：加油升数
+							realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number  必有字段  备注：实际加油价格
+							suppleMark: 0, //类型：Number  必有字段  备注：补录标识（0：实时订单 1：补录订单）
+							createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String  必有字段  备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET）
+							// "deviceImei": "mock", //类型：String  可有字段  备注：设备唯一码
+							// "networkIp": "mock" //类型：String  可有字段  备注：ip地址
+							'version': 1,
+							'xoilAmountGun': this.vol
+						}
+					}
+					
 				}
 				// console.log(orderData)
 				let location = uni.getStorageSync('location') || {

BagStation/pages/components/tki-qrcode/tki-qrcode.vue

@@ -91,6 +91,7 @@
 		},
 		methods: {
 			_makeCode() {
+
 				let that = this
 				if (!this._empty(this.val)) {
 					qrcode = new QRCode({

BagStation/pages/makeOrder/payResult.vue

@@ -144,7 +144,7 @@
 	import toilApi from '@/api/toil.js'
 	import ThirdPartyVoucher from '../components/third-party-voucher/third-party-voucher.vue'
 	import oilSiteApi from '@/api/oil-site.js'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	export default {
 		components: {
 			ThirdPartyVoucher,

BagStation/pages/newRoutePlanning/newRoutePlanning.vue

@@ -487,7 +487,7 @@
 				markerList.forEach((item, index) => {
 					let configure = {
 						siteId: item.id,
-						id: Number(`${index}`), //2023.08.30 在此处踩坑 一作这b竟然把id重新赋值了 
+						id: Number(`${index}`), //2023.08.30 在此处踩坑 一作这b竟然把id重新赋值了。  一作：去好好查一下官网的MAP中的marker的文档 id字段的注意事项，再看一下后台给的id， 补补课
 						imgCustomCallout: this.olitype(item.siteChannel),
 						iconPath: '../../static/img/tt.png',
 						width: 5,

BagStation/pages/oilQRcode/index.vue

@@ -22,7 +22,7 @@
 
 <script>
 	import serve from '@/api/account.js'
-	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue'
+	import tkiQrcode from '@/BagStation/pages/components/tki-qrcode/tki-qrcode.vue'
 	export default {
 		components: {
 			tkiQrcode
@@ -39,12 +39,14 @@
 		computed: {
 			phoneHandle() {
 				let phone = this.user.userPhone
+				console.log('user',this.user)
 				if(!phone) return ''
 				return `${phone.substr(0,3)}****${phone.substr(-4)}`
 			}
 		},
 		methods: {
 			getQrStr(reset = 0) {
+				console.log('this.user', this.user)
 				if (this.user.id) {
 					serve.getQrStr(this.user.id, reset).then(res => {
 						if (!res.data) return

BagStation/pages/overviewMap/components/footer.vue

@@ -56,16 +56,16 @@
 				seleIndex:0,
 				kmData:[
 					{
-						lable:'20KM',
+						lable:'5KM',
-						value:20000
+						value:5000
+					},
+					{
+						lable:'10KM',
+						value:10000
 					},
 					{
 						lable:'30KM',
 						value:30000
-					},
-					{
-						lable:'50KM',
-						value:50000
 					}
 				]
 			}

BagStation/pages/overviewMap/overviewMap.vue

@@ -62,7 +62,7 @@
 					width: 40,
 					height: 50
 				},
-				radius: 20000,
+				radius: 5000,
 				LastCoordinate: [],
 				timer: null,
 				TXSDK: null,
@@ -212,7 +212,7 @@
 					// list.length = 100;
 					this.markers = this.locationProcessing(res.data);
 					this.spareMarkers = JSON.parse(JSON.stringify(this.markers));
-					console.log(this.spareMarkers, '////////////////////////')
+					// console.log(this.spareMarkers, '////////////////////////')
 					// markersArray.forEach((item,index)=>{
 
 					// })
@@ -363,8 +363,8 @@
 			},
 			mapUpdated(e) {
 				let that = this
-				console.log('%c 更新', 'font-size:50px;color:red');
+				// console.log('%c 更新', 'font-size:50px;color:red');
-				console.log(e, '*****************************************')
+				// console.log(e, '*****************************************')
 				// that.mapContext.getScale({
 				// 	success: function(e) {
 				// 		// that.$nextTick(function() {

BagStation/pages/stationDetail/stieQr.vue

@@ -172,7 +172,7 @@
 	import accountApi from '@/api/account.js'
 	import priceTab from '../components/price-tab.vue'
 	import threeSites from '@/components/three-sites.vue'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	export default {
 		components: {
 			priceTab,
@@ -215,10 +215,10 @@
 				if (this.activeChannelCode) {
 					if (this.secondChannelCode) {
 						this.posName = '壳牌'
-						return `../../BagStation/static/img/YDJY.png`
+						return `../../../static/img/YDJY.png`
 					} else {
 						this.posName = '星油云站'
-						return `../../BagStation/static/img/${this.activeChannelCode}.png`
+						return `../../../static/img/${this.activeChannelCode}.png`
 					}
 				}
 			},

BagStation/ureaOrderDetail/ureaOrderDetail.vue

@@ -127,7 +127,7 @@
 
 <script>
 	import orderApi from '@/api/oil-order.js'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器 
+	import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器 
 	import oilSiteApi from '@/api/oil-site.js'
 	import ureaFinanceApi from '../../api/urea_finance.js'
 	export default {

api/oil-site.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 const service_name = "oil-site"
 const group_name = "oilSiteAppInfo"
 const order_name = 'oilSiteOrderInfo'
-export default {
+export default { 
 	getOrderDiscountInfo(data) {
 		return request({
 			url: `/${service_name}/${order_name}/getBOrderDiscountInfo`,
@@ -175,18 +175,11 @@ export default {
 			}
 		})
 	},
-	//检测在线状态
+//检测在线状态
 	isLoginSuccess() {
 		return request({
 			url: `/oil-identity/operationUser/isLoginSuccess`,
-			method: 'POST',
+			method: 'POST', 
-		})
-	},
-	getOilDriverQrCode(params) {
-		return request({
-			url: '/oil-site/qrCode/getOilDriverQrCode',
-			method:'post',
-			data:params
 		})
 	},
 }

api/user.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+const service_name = "oil-user"
+const group_name = "oilCustomerInfo" 
+export default{
+	carNoIdentify(data) { //图片上传-ORC识别
+		return request({
+			url: `/${service_name}/${group_name}/carNoIdentify`,
+			method: 'post',
+			data: data
+		})
+	},
+	// 查询企业配置
+	getCompanyConfigByCompanyId(id) {
+		return request({
+			url: `/${service_name}/sysCompanyConfig/getCompanyConfigByCompanyId/${id}`,
+			method: 'GET' 
+		})
+	},
+}

components/three-sites.vue

@@ -1,19 +1,27 @@
 <template>
-	<!-- 三个最近的油站弹窗 -->
+	<!-- 三个最近的油站弹窗 --> 
 	<view>
-		<view class="cu-modal" :class="showThreeSites?'show':''" @touchmove.stop>
+		<view class="cu-modal" :class="showThreeSites?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
-					<!-- <view class="content">选择油站</view> -->
+					<view class="content">选择油站</view>
-					<view class="action" @tap="hideModal">
+					<view class="action" @tap="hideModal('sites')">
 						<text class="cuIcon-close text-red"></text>
 					</view>
 				</view>
-				<view class="bg-white pb30">
+				<view class="padding-xl bg-white">
-					<tki-qrcode ref="qrcode" cid="2" :val="qrcodeText" :size="400" :isHaveBg="true" pdground="#000"
+					<view class="" v-if="siteList.length>0">
-						foreground="#000" background="#fff" onval showLoading loadMake />
+						<three-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
-					<view class="text-center padding-top text-sm margin-bottom">
+							class="cu-list menu-avatar cu-item " @tap="toDetail(item)">
-						提示：该二维码每隔<text style="color: #ff0000;">3分钟</text>自动刷新一次
+						</three-item>
+					</view>
+					<view class="" v-else>
+						<my-empty></my-empty>
+					</view>
+					<view class="btn-box padding-top">
+						<button @tap="toSitePage" class="cu-tn bg-red round margin-bottom lg" color="#3982F6"
+							size="large">前往油站列表查找
+						</button>
 					</view>
 				</view>
 			</view>
@@ -23,13 +31,11 @@
 </template>
 
 <script>
-	import serve from '@/api/oil-site.js'
+	import oilSiteApi from '@/api/oil-site.js'
-	import accountApi from '@/api/account.js'
+	import threeItem from './three-item.vue'
-
-	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue'
 	export default {
 		components: {
-			tkiQrcode
+			threeItem
 		},
 		props: {
 			showThreeSites: {
@@ -39,63 +45,91 @@
 		},
 		data() {
 			return {
-				qrcodeText: '',
+				siteList: [],
-				user: uni.getStorageSync('user'),
+				imgURL: this.global.baseURL,
-				timerInstance: null
 			}
 		},
-
+		created() {
-		watch: {
+			this.getSiteList()
-			showThreeSites: {
+		},
-				handler(newval) {
+		watch:{
-					if (newval) { 
+			showThreeSites:{
-						this.initQRCode()
+				handler(newval){
+					if(newval==true){
+						this.getSiteList()
 					}
-				},
+				}
-				immediate: true
 			}
 		},
 		methods: {
-
+			toSitePage(){
-			async initQRCode() {
+				// uni.setStorageSync('activeCur','station')
-				if (this.timerInstance) {
+				uni.switchTab({
-					clearInterval(this.timerInstance)
+				    url: '/pages/tabbar/station/stationList'
-					this.timerInstance = null
+				});
+			},
+			refreshLocation(){
+				uni.getLocation({
+				    type: 'wgs84',
+				    success: function (res) {
+						uni.setStorageSync('location',res)
+				    }
+				});
+			},
+			getSiteList() {
+				this.refreshLocation()
+				let data1 = {
+					currentPage: 1,
+					pageSize: 3,
+					params: { //类型：Object  必有字段  备注：// 筛选对象
+						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
+						...uni.getStorageSync('location'),
+						...this.filterData
+						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
+						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
+						// oilProductCode: "" //   备注：// 油号选择 ( 0# 92# 92#)
+					}
+			
 				}
-
+				// readOnlySites
-				let accountResult = await accountApi.getUserAccount()
+				oilSiteApi.getSiteList(data1).then(res => {
-				if (!accountResult.data.length) return
+					if (res.code == 20000) {
-
+						this.siteList = res.data.list
-				let params = {
+					}
-					companyId: accountResult.data[0].companyId,
-					orderSource: "WECHAT_MINIAPPS",
-					customerId: this.user.id,
-					channelCode: 'XOIL',
-					oilCardNature: accountResult.data[0].oilCardType, //油卡性质
-					accountCardCode: accountResult.data[0].accountCardCode //油卡卡号
-				}
-
-				serve.getOilDriverQrCode(params).then(res => {
-					if (!res.data) return
-					this.qrcodeText = res.data.codeStr
 				})
-
-
-				this.timerInstance = setInterval(() => {
-					serve.getOilDriverQrCode(params).then(res => {
-						if (!res.data) return
-						this.qrcodeText = res.data.codeStr
-					})
-				}, 1000 * 60 * 3)
 			},
-			hideModal() {
+			toDetail(item) {
-				clearInterval(this.timerInstance)
+				let itemS = JSON.stringify(item)
-				this.timerInstance = null
+				console.log(itemS)
-				this.$refs.qrcode._clearCode()
+				uni.navigateTo({
-				this.$emit('hideOneModal')
+					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
+					fail: (err) => {
+						// console.log(err)
+					},
+					success: () => {
+						// console.log('err')
+					}
+				})
 			},
-
+			callShipper() {
-
+				uni.makePhoneCall({
+					phoneNumber: this.waybillData.shippePhone
+				})
+			},
+			hideModal(name) {
+				this.$emit('hideOneModal', name)
+			},
+			registerContracts() {
+				this.$emit('registerContracts')
+			},
+			toSetLocation() {
+				this.$emit('toSetLocation')
+			},
+			toAuth() {
+				uni.navigateTo({
+					url: '认证路径'
+				})
+			}
 		}
 	}
 </script>
@@ -120,8 +154,4 @@
 		left: 0.2rem;
 		min-width: 100%;
 	}
-
-	.pb30 {
-		padding-bottom: 30rpx;
-	}
 </style>

pages/index/startPage/startPage.vue

@@ -53,7 +53,7 @@
 			}
 		},
 		mounted() {
-			console.log('mounted')
+			// console.log('mounted')
 		},
 		onLoad(option) {
 			this.option = option;
@@ -62,7 +62,7 @@
 		onReady(option) {},
 		methods: {
 			versionUpdate() {
-				console.log('versionUpdate')
+				// console.log('versionUpdate')
 				let that = this
 				const updateManager = uni.getUpdateManager();
 				updateManager.onCheckForUpdate(function(res) {
@@ -102,7 +102,7 @@
 					    if(res.code==20000) isOnline = true
 					}).catch(err=>{})
 				} 
-				console.log(isOnline,'isOnline')
+				// console.log(isOnline,'isOnline')
 				if (isOnline) {
 					this.key = '在线'
 				} else {
@@ -131,7 +131,7 @@
 					})
 				}
 				if (this.key == '在线') {
-					console.log(type, 'typetypetypetype');
+					// console.log(type, 'typetypetypetype');
 
 					uni.switchTab({
 						url: `/pages/tabbar/home/home`,
@@ -148,7 +148,7 @@
 			},
 			Interceptor(id) {
 				let taht = this
-				console.log(`%c 检测到参数拦截器启动`, 'color:red;font-size:50px');
+				// console.log(`%c 检测到参数拦截器启动`, 'color:red;font-size:50px');
 				// this.tools.overallInterceptor((opentype) => {
 				// 	uni.removeInterceptor(opentype);
 				// 	wxCode.getQrCodeType({
@@ -181,7 +181,7 @@
 				})
 			},
 			getFilterData() {
-				console.log('wodefenzhi')
+				// console.log('wodefenzhi')
 				oilSiteApi.getCheckInfo().then(res => {
 					if (res.code == 20000) {
 
@@ -206,13 +206,13 @@
 								value: item.id
 							})
 						})
-						console.log(channelCodes, productCodes, siteBrands)
+						// console.log(channelCodes, productCodes, siteBrands)
 						this.menuList[0].detailList = this.menuList[0].detailList.concat(channelCodes)
 						this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes)
 						this.menuList[2].detailList = this.menuList[2].detailList.concat(siteBrands)
 						uni.setStorageSync('filterData', this.menuList)
 						uni.setStorageSync('productCodeList', res.data.productCodeList)
-						console.log(res, '%c 这里是启动页调用的菜单列表', 'font-size:36px;color:red;')
+						// console.log(res, '%c 这里是启动页调用的菜单列表', 'font-size:36px;color:red;')
 						// this.$refs.slFilter.resetMenuList(this.menuList)
 					}
 				})

utils/request.js

@@ -5,10 +5,10 @@ import utils from '@/utils/encode'
 // const env = 'test' 
 const env = 'production'
 // 45
-const testUrl = 'http://192.168.1.83:38080' 
+const testUrl = 'http://192.168.1.132:38080' 
-// const productUrl = 'https://www.xingoil.com/adminapi'
+const productUrl = 'https://www.xingoil.com/adminapi'
 
-const productUrl = 'http://uat.xingoil.com/adminapi'
+// const productUrl = 'http://uat.xingoil.com/adminapi'
 // const productUrl = 'http://192.168.0.191:38080'
 // const productUrl = 'http://121.196.213.68/adminapi'
 const service = axios.create({