From b43d34fe06c9c4bd0de5b94d056f712fa3f7f395 Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Thu, 6 Jul 2023 14:08:20 +0800
Subject: [PATCH] 11

---
 Activity/pages/index/index.vue       |  4 ++--
 BagAuth/pages/login/login.vue        |  5 ++++-
 BagAuth/pages/login/oldLogin.vue     |  5 +++++
 pages.json                           |  2 +-
 pages/tabbar/station/stationList.vue | 30 ++++++++++++++++------------
 utils/request.js                     |  4 ++--
 6 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Activity/pages/index/index.vue b/Activity/pages/index/index.vue
index 2bf8ba6..84e5c61 100644
--- a/Activity/pages/index/index.vue
+++ b/Activity/pages/index/index.vue
@@ -5,7 +5,7 @@
 			@scrolltolower='scrolltolower'>
 			<view v-for="(item,index) in siteList" :key="item.id">
 				<site-item @tap="toDetail(item)"  :site-item="item" class="cu-list menu-avatar cu-item" />
-				<view class="activityContent">{{item.activityContent}}</view>
+				<view class="activityContent">{{item.activityDetail}}</view>
 			</view>
 		</scroll-view>
 	</view>
@@ -122,7 +122,7 @@
 		    box-sizing: border-box;
 		    padding: 20rpx 30rpx;
 		    color: #FF6700;
-			font-size: 22rpx;
+			font-size: 30rpx;
 	}
 	.Activity_body {
 		width: 100vw;
diff --git a/BagAuth/pages/login/login.vue b/BagAuth/pages/login/login.vue
index 119ef5f..46e6e26 100644
--- a/BagAuth/pages/login/login.vue
+++ b/BagAuth/pages/login/login.vue
@@ -29,7 +29,7 @@
 				@getphonenumber="decryptPhoneNumber">
 				<text class="cuIcon-weixin padding-right-xs"> </text>
 				<text>
-					微信用户一键登录
+					手机号授权一键登录
 				</text>
 			</button>
 			<button class="cu-btn margin-top round lg" @tap="refuseEmpower">
@@ -90,6 +90,9 @@
 			isSwitchEnterprises(n,o){ }
 		},
 		methods: { 
+			onpwd(){
+				uni.$on('')
+			},
 			init(option){
 				if(option){
 					if(option.companyId === '1460872936910831616'){
diff --git a/BagAuth/pages/login/oldLogin.vue b/BagAuth/pages/login/oldLogin.vue
index 476efbd..3288b8b 100644
--- a/BagAuth/pages/login/oldLogin.vue
+++ b/BagAuth/pages/login/oldLogin.vue
@@ -352,6 +352,11 @@
 				authApi.loginRandom(data, type).then(res => {
 					if (res.code == 20000) {
 						this.loginSuccess(res)
+					}else{
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
 					}
 				}).catch(err => {
 					this.logout()
diff --git a/pages.json b/pages.json
index c08e6bc..8faa7ac 100644
--- a/pages.json
+++ b/pages.json
@@ -116,7 +116,7 @@
                     "path" : "pages/index/index",
                     "style" :                                                                                    
                 {
-                    "navigationBarTitleText": "活动列表",
+                    "navigationBarTitleText": "油站活动",
                    "enablePullDownRefresh": false,
                    "navigationStyle": "default",
                    "navigationBarBackgroundColor": "#FF6700",
diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue
index 59e2670..3bd0f93 100644
--- a/pages/tabbar/station/stationList.vue
+++ b/pages/tabbar/station/stationList.vue
@@ -67,6 +67,7 @@
 
 		data() {
 			return {
+				companyCard:uni.getStorageSync('companyCard'),
 				getSiteListTimer:null,
 				areaCodeList:[],
 				loadText:'more',
@@ -238,17 +239,17 @@
 		},
 		onShow() {
 			this.refreshLocation()
-			let storykey = uni.getStorageInfoSync()
-			// console.log('%c look here↓','color:green;font-size:50px')
-			// console.log(storykey)
+			let storykey = uni.getStorageInfoSync()  
+			let nowCompanyCard =  uni.getStorageSync('companyCard')
+			if(this.companyCard&&this.companyCard!==nowCompanyCard){
+				this.companyCard = uni.getStorageSync('companyCard');
+			 this.updateFn()
+			}
 		},
-		onLoad() {
-			console.log("111111111111111",uni.getStorageSync('filterDatas'))
+		onLoad() { 
 			if (!uni.getStorageSync('filterDatas')) {
-				this.getFilterData()
-				// console.log('dhgiuhihqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq')
-			} else{
-				// console.log('dhgiuhihiiiiiiiiiiiiiiiiiiiiiiiiiiiii')
+				this.getFilterData() 
+			} else{ 
 			}
 			this.findPriceDetails()
 			if (uni.getStorageSync('productCodeList')) {
@@ -257,10 +258,7 @@
 			this.getSiteList() 
 		},
 		onPullDownRefresh() {
-			this.filterRes(this.filterDatas)
-			setTimeout(function() {
-				uni.stopPullDownRefresh()
-			}, 600);
+			this.updateFn()
 		},
 		onReachBottom() {
 			if (this.loadStatus == 'load') {
@@ -279,6 +277,12 @@
 			}
 		}, 
 		methods: {
+			updateFn(){
+				this.filterRes(this.filterDatas)
+				setTimeout(function() {
+					uni.stopPullDownRefresh()
+				}, 600);
+			},
 			reunrnFn(){
 				
 			},
diff --git a/utils/request.js b/utils/request.js
index 1724c72..fba27e7 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -6,9 +6,9 @@ import utils from '@/utils/encode'
 const env = 'production'
 // 45
 const testUrl = 'http://192.168.0.254: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({