1212

BagStation/orderInvoicing/orderInvoicing.vue

@@ -113,7 +113,9 @@
 					invoicBankNumber: '', //银行账号
 					remark: '', //发票备注
 					invoicEmail: '', //电子邮箱,
-					orderSerialNumber: '' //订单编号
+					orderSerialNumber: '' ,//订单编号,
+					"clientBelong":"ZHONGPIN",
+					
 				}
 			}
 		},

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

@@ -587,7 +587,8 @@
 					payType : 'CUSTOMER_ACTIVE',
 					userType:'0',
 					xoilAmountGun:e ,
-					priceId:this.activeSitePrice
+					priceId:this.activeSitePrice,
+					clientBelong: "ZHONGPIN"
 				} 
 				this.xoilAmountGun = e 
 				oilSiteApi.getOrderDiscountInfo(number).then( res=>{
@@ -635,7 +636,8 @@
 					payType : 'CUSTOMER_ACTIVE',
 					userType:'0',
 					xoilAmountGun:e.detail.value,
-					priceId:this.activeSitePrice
+					priceId:this.activeSitePrice,
+					clientBelong: "ZHONGPIN"
 				} 
 				this.xoilAmountGun = e.detail.value
 				oilSiteApi.getOrderDiscountInfo(number).then( res=>{
@@ -896,6 +898,7 @@
 				 		'version':1,
 				 		'xoilAmountGun':this.vol
 				 	}
+					console.log(orderData,'orderDataorderDataorderDataorderDataorderDataorderDataorderDataorderData');
 				 	oilOrderApi.createOrder(orderData).then(res => {
 				 		if (res.code == 20000) {
 							clearTimeout(this.timer)
@@ -919,7 +922,10 @@
 			// 获取渠道下价格等信息
 			getNewSitePrice(channelId) {
 				this.oilSitePriceDetailsVo = []
-				oilSiteApi.getNewSitePrice(channelId).then(res => {
+				oilSiteApi.getNewSitePriceZp({
+					channelId:channelId,
+					clientBelong: "ZHONGPIN"
+				}).then(res => {
 					if (res.code == 20000) {
 						this.plateNumbers = res.data.plateNumbers
 						this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo;

BagStation/pages/makeOrder/makeOrder.vue

@@ -112,7 +112,8 @@
 			getSiteInfo(id) {
 				let data2 = {
 					...uni.getStorageSync('location'),
-					siteId: id
+					siteId: id,
+					clientBelong: "ZHONGPIN"
 				}
 				oilSiteApi.getSiteDetails(data2).then(res => {
 					if (res.code == 20000) {

BagStation/pages/makeOrder/orderPaying.vue

@@ -318,7 +318,7 @@
 					userIp:  (this.userIp?this.userIp:"36.57.160.59") ,
 					merchantNo:'10089027856'
 				}
-
+				console.log(payData,'payDatapayData')
 				oilPayApi.aggregatePay(payData).then(res => {
 					if (res.code == 20000) {
 						uni.requestPayment({
@@ -327,10 +327,6 @@
 							success: (res1) => {
 								console.log(res)
 								if (res.code == 20000) {
-									// this.getPayStatus(this.outTradeNo)
-									// this.getLastMoney()
-									// this.getCards()
-									// console.log('success:' + JSON.stringify(res));
 									uni.showToast({
 										title: res.msg
 									})
@@ -351,23 +347,9 @@
 								}
 							},
 							fail: function(err) {
-								console.log(res, err, '************')
-								// console.log('fail:' + JSON.stringify(err));
 							}
 						})
-						// uni.showToast({
-						// 	title: res.msg
-						// })
-						// uni.redirectTo({
-						// 	url: '/BagStation/pages/makeOrder/payResult?status=success',
-						// 	fail: (err) => {
-						// 		console.log(err)
-						// 	}
-						// })
 					} else {
-						// uni.redirectTo({
-						// 	url: '/BagStation/pages/makeOrder/payResult?status=fail'
-						// })
 					}
 
 				})

BagStation/pages/stationDetail/stationDetail.vue

@@ -252,7 +252,8 @@
 				console.log('进入获取油站信息')
 				let data2 = {
 					...uni.getStorageSync('location'),
-					siteId: id
+					siteId: id,
+					clientBelong: "ZHONGPIN"
 				}
 				oilSiteApi.getSiteDetails(data2).then(res => {
 					console.log('进入获取油站信息getSiteDetails',res)

api/oil-order.js

@@ -4,6 +4,8 @@ const group_name = "oilSiteOrderInfo"
 export default {
 	// 下单
 	createOrder(data) {
+		 // data = Object.assign(data,{'clientBelong':'ZHONGPIN',});
+		 console.log(data,'datadatadata')
 		return request({
 			url: `/${service_name}/${group_name}/createOrder`,
 			method: 'post',

api/oil-site.js

@@ -82,6 +82,14 @@ export default {
 			method: 'get'
 		})
 	},
+	// 中品 下单 -- 获取最新油站价格、司机、加油员相关信息
+	getNewSitePriceZp(data) {
+		return request({
+			url: `/${service_name}/${group_name}/getSitePriceByBelong `,
+			method: 'post',
+			data:data
+		})
+	},
 	//根据地址获取详细地址信息
 	 getGeoByAddress(address) {
 	  return request({

components/three-sites.vue

@@ -73,18 +73,22 @@
 					currentPage: 1,
 					pageSize: 3,
 					params: { //类型：Object  必有字段  备注：// 筛选对象
+					clientBelong:'ZHONGPIN',
 						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
 						...uni.getStorageSync('location'),
-						...this.filterData
+						...this.filterData,
+						comprehensiveSort:1,
 						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
 						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
 						// oilProductCode: "" //   备注：// 油号选择 ( 0# 92# 92#)
 					}
 			
 				}
-				oilSiteApi.getSiteList(data1).then(res => {
+				oilSiteApi.getSiteLists(data1).then(res => {
 					if (res.code == 20000) {
-						this.siteList = res.data.list
+						this.siteList = res.data.list;
+						(this.siteList.length>3)&&(this.siteList.length = 3)
+						
 					}
 				})
 			},

pages/index/startPage/startPage.vue

@@ -44,6 +44,40 @@
 			}
 		},
 		onLoad(option) {
+			let taht = this
+			const updateManager = uni.getUpdateManager();
+			updateManager.onCheckForUpdate(function(res) {
+				// 请求完新版本信息的回调
+				console.log('请求完新版本信息的回调', res.hasUpdate);
+				if (!res.hasUpdate) {
+					taht.initFn(option)
+				}
+			});
+
+			updateManager.onUpdateReady(function(res) {
+				uni.showModal({
+					title: '更新提示',
+					content: '新版本已经准备好，是否重启应用？',
+					success(res) {
+						if (res.confirm) {
+							console.log(res.confirm, 'res.confirm版本信息')
+							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate();
+						} else {
+							taht.initFn(option)
+						}
+					},
+				});
+			});
+
+			updateManager.onUpdateFailed(function(res) {
+				console.log('新的版本下载失败')
+				// 新的版本下载失败
+			});
+		},
+		onReady(option) {},
+		methods: {
+			initFn(option) {
 				const token = uni.getStorageSync('Authorization')
 				const openid = uni.getStorageSync('openid')
 				let key = ''
@@ -52,13 +86,6 @@
 				} else {
 					key = '离线'
 				}
-			if (key == '在线') {
-				// if (!uni.getStorageSync('filterData')) {
-				// 	this.getFilterData()
-				// } else if (uni.getStorageSync('filterData')[0].detailList.length < 2) {
-				// 	this.getFilterData()
-				// }
-			}
 				// 在页面中定义插屏广告
 				let interstitialAd = null
 
@@ -113,34 +140,6 @@
 					}, 2000)
 				})
 			},
-		onReady(option) {
-			const updateManager = uni.getUpdateManager();
-
-			updateManager.onCheckForUpdate(function(res) {
-				// 请求完新版本信息的回调
-				console.log('请求完新版本信息的回调', res.hasUpdate);
-			});
-
-			updateManager.onUpdateReady(function(res) {
-				uni.showModal({
-					title: '更新提示',
-					content: '新版本已经准备好，是否重启应用？',
-					success(res) {
-						if (res.confirm) {
-							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-							updateManager.applyUpdate();
-						}
-					}
-				});
-
-			});
-
-			updateManager.onUpdateFailed(function(res) {
-				// 新的版本下载失败
-			});
-
-		},
-		methods: {
 			getFilterData() {
 				console.log('在线')
 				oilSiteApi.getCheckInfo().then(res => {
@@ -172,7 +171,7 @@
 						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);
-						console.log('存入',this.menuList)
+						console.log('存入', this.menuList)
 						// this.$refs.slFilter.resetMenuList(this.menuList)
 					}
 				})

pages/tabbar/home/home.vue

@@ -109,15 +109,15 @@
 		<!-- 广告图片开始 -->
 		<view class="my-bg padding">
 			<view class="" >
-				<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
+				<!-- <swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
 					<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
 						<image :src="item.src" style="width: 100%;"  mode="widthFix"></image>
 					</swiper-item>
 					<swiper-item>
 						<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
 					</swiper-item>
-				</swiper>
+				</swiper> -->
-				<!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
+				<image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image>
 			</view>
 		</view>
 		<!-- 筛选开始 -->

pages/tabbar/order/orderList/orderList.vue

@@ -98,6 +98,7 @@
 
 		data() {
 			return {
+				getSiteListTimer:null,
 				TabCur: 0,
 				search: '',
 				status: {
@@ -214,6 +215,7 @@
 				}
 			},
 			onRequest() {
+				
 					if (this.TabCur == 0) {
 						this.currentPage.currentPage = 1
 						this.list = []
@@ -235,8 +237,13 @@
 						this.list3 = []
 						this.getOrder('3', this.currentPage.currentPage3,'onRequest')
 					}
+				
+				
 			},
 			getOrder(id, page, tip) {
+				clearTimeout(this.getSiteListTimer);
+				this.getSiteListTimer = setTimeout(()=>{
+					
 					let postData = {
 						currentPage: page, //类型：Number  必有字段  备注：无
 						pageSize: 10, //类型：Number  必有字段  备注：无
@@ -326,6 +333,8 @@
 							}
 						}
 					})
+				},500)
+				
 			}
 		}
 	}

pages/tabbar/station/stationList.vue

@@ -69,6 +69,7 @@
 
 		data() {
 			return {
+				getSiteListTimer:null,
 				filterData: {
 					// oilProductCode: '0#'
 				},
@@ -374,7 +375,6 @@
 
 			getSiteList() {
 				this.refreshLocation()
-
 				let data1 = {
 					currentPage: this.currentPage,
 					pageSize: 10,
@@ -482,16 +482,28 @@
 
 			},
 			onInput() {
-				setTimeout(() => {
+				// setTimeout(() => {
+				// 	this.currentPage = 1
+				// 	this.siteList = []
+				// 	this.getSiteList()
+				// }, 100)
+				clearTimeout(this.getSiteListTimer);
+				this.getSiteListTimer = setTimeout(()=>{
 					this.currentPage = 1
 					this.siteList = []
 					this.getSiteList()
-				}, 100)
+				},500);
 			},
 			onSearch() {
+				// this.currentPage = 1
+				// this.siteList = []
+				// this.getSiteList()
+				clearTimeout(this.getSiteListTimer);
+				this.getSiteListTimer = setTimeout(()=>{
 					this.currentPage = 1
 					this.siteList = []
 					this.getSiteList()
+				},500);
 			}
 		}
 	}

utils/request.js

@@ -4,7 +4,7 @@ import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
 const env = 'production'/*  */
 // const env = 'test'
-const testUrl = 'http://192.168.110.99:38080'
+const testUrl = 'http://192.168.0.23:38080'
 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
 
 // const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new