分享

apis/utils/request.js

@@ -1,6 +1,5 @@
 import  carhelp from '@/apis/utils/mixin.js'
 import requestSon from './requestSon.js';
-import requestNum from './requestNum.js';
 
 
 const request = (options) => {
@@ -27,8 +26,6 @@ const request = (options) => {
 	return new Promise((resolve, reject) => {
 		 var loginurl="/mobile/regUser/findByOpenId"
 		 
-		
-		 
 		uni.request({
 			method:'get',
 			url: process.car.BASE_URL + loginurl,

apis/utils/requestNum.js

@@ -1,56 +1,88 @@
 import  carhelp from '@/apis/utils/mixin.js'
+import requestSon from './requestSon2.js';
+
 
-//记录请求次数和响应次数
-let reqCount = 0,
-	resCount = 0;
-var baseUrl=process.car.BASE_URL;
 const request = (options) => {
+	//记录请求次数和响应次数
+	var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
+	var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
+	
 	var token=carhelp.getToken(options);
 	
-	reqCount++;
-	 
+	 if(token_tdate&&token_tdate==tdate){
+	 	return requestSon(options);
+	 }
+	 var openId=carhelp.getOpenId()
+	var  urlindex="/wechat/findUserInfo"
+	var k=options.url.indexOf(urlindex)==-1;
+	
+	 if(!openId&&k){
+		 return
+	 }
+	if(!k){
+		return requestSon(options);
+	}
+	
 	return new Promise((resolve, reject) => {
-		//如果特殊链接需要传入token
-		if(options&&options.token){
-			token=options.token;
-		}
+		 var loginurl="/mobile/regUser/findByOpenId"
+		 
 		uni.request({
-			method: 'post',
-			url: baseUrl + '/mobile/messageApi/readMessageNum',
-			//data: options.data?options.data:{},
+			method:'get',
+			url: process.car.BASE_URL + loginurl,
+			data: {
+				openId:openId,
+			
+			},
 			
 			header: {
 				'Content-Type': 'application/x-www-form-urlencoded',
 				'X-Requested-With': 'XMLHttpRequest',
-				'Authorization':token
+				//'Authorization':token
 			}
 		}).then((response) => {
-			//for(var t = Date.now(); Date.now() - t <= 2000;);
+ 			let [error, res] = response;
 			
-			resCount++
-			//防止连续请求多个接口时loading闪现
-			let [error, res] = response;
 			
+			if (res.data.code == 200&&res.data.result) {
+				
+				var token = res ? res.data.data.token : '';
+				carhelp.setPersonInfo(res.data.data.regUser );
+				
+				carhelp.setToken(token);
+				carhelp.setPersonInfoPlus(res.data.data);
+				
+				options.token=token
+				
+				var isson= requestSon(options)
+				//requestNum(options);
+				resolve(isson);
+				 
+			} else  if(res.data.code == 415||(res.data.code == 200&&!res.data.result)||res.data.code == 400){
+				
+				//var url=window.location.href.split("#")[1]
 			
-			if (res.data.code != 200) {
-				reject(res.data.message)
-			} else {
-				if(!res.data.result){
-					uni.showToast({
-						title: res.data.message,
-						position:'bottom'
-					})
-					reject(res.data.message);
-				}else{
-					
-					carhelp.set("tabbar_show_num",res.data.data);
-					resolve(res.data);
+				console.log("没有免登陆 ----------------"+options.url)
+				//var url="/pages/login/index?message=请登录&back="+ url+"&phone="+options.data.phone
+				var thisurl='/pages/login/index';
+				
+				if(options&&options.data&&options.data.jpcode){
+					thisurl+="?jpcode="+options.data.jpcode
 				}
-			
+				carhelp.signOut()
+				uni.redirectTo({
+					url: thisurl
+				})
+				
+				
+				
+			 
+				
+			}else{
+		
+				reject(res.data.message)
 			}
 		}).catch(error => {
-			resCount++
-		
+			
 			let [err, res] = error;
 			reject(err)
 		})

apis/utils/requestSon2.js

@@ -0,0 +1,69 @@
+import  carhelp from '@/apis/utils/mixin.js'
+
+//记录请求次数和响应次数
+let reqCount = 0,
+	resCount = 0;
+var baseUrl=process.car.BASE_URL;
+
+if (process.env.NODE_ENV === "development") {
+	baseUrl='http://192.168.77.162:8081/railroad-server/';
+}
+const request = (options) => {
+	var token=carhelp.getToken(options);
+	
+	reqCount++;
+	 
+	return new Promise((resolve, reject) => {
+		//如果特殊链接需要传入token
+		if(options&&options.token){
+			token=options.token;
+		}
+		uni.request({
+			method: options.method?options.method:'get',
+			url: baseUrl + options.url,
+			data: options.data?options.data:{},
+			
+			header: options.header?{
+				...options.header,
+				'Authorization':token
+			}:{
+				'Content-Type': 'application/x-www-form-urlencoded',
+				'X-Requested-With': 'XMLHttpRequest',
+				'Authorization':token
+			}
+		}).then((response) => {
+			//for(var t = Date.now(); Date.now() - t <= 2000;);
+			
+			resCount++
+			//防止连续请求多个接口时loading闪现
+			let [error, res] = response;
+			
+			
+			if (res.data.code == 415&&res.data.message=='请先注册信息') {
+				carhelp.signOut()
+				uni.redirectTo({
+					url: 'pages/login/index'
+				})
+				return;
+			}
+			
+			if (res.data.code != 200) {
+				reject(res.data.message)
+			} else {
+				if(!res.data.result){
+					
+					reject(res.data.message);
+				}else{
+					resolve(res.data);
+				}
+			
+			}
+		}).catch(error => {
+			resCount++
+		
+			let [err, res] = error;
+			reject(err)
+		})
+	});
+}
+export default request

components/ShareServer.vue

@@ -1,5 +1,5 @@
 <template>
-	<div></div>
+	<view></view>
 </template>
 
 <script>
@@ -39,32 +39,31 @@
 			//获取微信jssdk配置信息
 			get_wx_config() {
 				
-				this.isLoading = true;
+				
 				API_WeiXin.getConfig(window.location.href.split("#")[0]).then(response => {
-					this.isLoading = false;
-
-					var wxconfig = response.wxConfig;
+					
+					
+					var wxconfig = response.data.wxConfig;
+					
 					console.log(wxconfig.nonceStr)
-					this.wxConfig = wxconfig;
+					//this.wxConfig = wxconfig;
+				
 					wx.config({
-						debug: true, // 开启调试模式,
+						debug: false, // 开启调试模式,
 						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
 						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
 						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
 						signature: wxconfig.signature, // 必填，签名，见附录1
 						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 
-						'onMenuShareQQ', 'onMenuShareQZone','updateAppMessageShareData','updateTimelineShareData'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-					});
-					wx.error(function(res){
-						 console.log(res)
-						  console.log("error")
-					  // config信息验证失败会执行 error 函数，如签名过期导致验证失败，具体错误信息可以打开 config 的debug模式查看，也可以在返回的 res 参数中查看，对于 SPA 可以在这里更新签名。
+						'onMenuShareQQ', 'onMenuShareQZone','updateAppMessageShareData','updateTimelineShareData'] ,// 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+						//'checkJsApi',
 					});
 					
+						console.log("aaa")
 					//this.wxShare()
 				}).catch(error => {
-					this.isLoading = false;
-					
+					console.log(error)
+						console.log("errorerror")
 				})
 			},
 			setUrl(url){
@@ -79,8 +78,8 @@
 			//微信分享自定义
 			wxShare() {
 				var userInfo=this.carhelp.getPersonInfo()
-				//var img=require("@/assets/img/logo.png")
-				var img=""
+				var img=require("@/assets/img/logo.png")
+				
 				var title="[微官网]"+this.title
 			//	var desc=
 				let joinUrl = this.url;
@@ -90,14 +89,7 @@
 				var _this = this;
 				
 				wx.ready(function() {
-					wx.checkJsApi({
-					  jsApiList:  ['onMenuShareTimeline', 'onMenuShareAppMessage', 
-						'onMenuShareQQ', 'onMenuShareQZone','updateAppMessageShareData','updateTimelineShareData'], // 需要检测的 JS 接口列表，所有 JS 接口列表见附录2,
-					  success: function(res) {
-					 console.log(res)
-					 console.log("1111")
-					  }
-					});
+					
 					
 					wx.updateTimelineShareData({
 						title: title,
@@ -106,7 +98,7 @@
 						 imgUrl: img,
 						success: function() {
 							if(userInfo){
-								//_this.addPoint()
+								_this.addPoint()
 							}
 							// 设置成功
 							_this.$emit("wxShare",null);
@@ -119,7 +111,7 @@
 						 imgUrl: img,
 						success: function() {
 							if(userInfo){
-								//_this.addPoint()
+								_this.addPoint()
 							}
 							// 设置成功
 							_this.$emit("wxShare",null);
@@ -132,7 +124,7 @@
 						 imgUrl: img,
 						success: function() {
 							if(userInfo){
-								//_this.addPoint()
+								_this.addPoint()
 							}
 							// 设置成功
 							_this.$emit("wxShare",null);
@@ -144,6 +136,9 @@
 						link: joinUrl,
 						 imgUrl: img,
 						success: function() {
+							if(userInfo){
+								_this.addPoint()
+							}
 							// 设置成功
 							_this.$emit("wxShare",null);
 						}

config/.env.dev.js

@@ -4,7 +4,7 @@ const UNI_APP = {
 	IMG_URL:"http://www.jsrailway.com.cn/",
 	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	
-	BASE_URL:'http://192.168.77.162:8081/railroad-server/',
+	//BASE_URL:'http://192.168.77.162:8081/railroad-server/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 	
 	NODE_ENV :"dev",

config/.env.js

@@ -32,9 +32,7 @@ function() {
 		} 
       
     }  
-	if(isWeiXin()){
-			ENV_VAR = require('./.env.prod.js'); 
-	}
+	
 
     if (ENV_VAR) {  
 		process.car = {};  

pages/homePage/homePage.vue

@@ -99,7 +99,7 @@
 				</view>
 
 				<view class="img">
-					<img  v-if="item.pic" :src="item.pic" alt="">
+					<img  v-if="item.pic" :src="imgurl+item.pic" alt="">
 					<img  v-else src="@/assets/img/default_img.png" alt="">
 					
 				</view>
@@ -131,14 +131,15 @@
 				],
 				toplist:[],
 				footlist:[],
-				topindex:0,
+				topindex:0,
+				imgurl:process.car.IMG_URL,
 			}
 		},
 		onLoad(){
 			 
 				this.getSwiperList()
-				this.getList("de3958c2-0010-4009-b7e1-15bfdcc60cef",5,"toplist");//通知公告
-				this.getList("ee0ea72a-75bf-4970-ad34-11e3132bc6a3",5,"footlist");//新闻资讯-图片新闻
+				this.getListtoplist("de3958c2-0010-4009-b7e1-15bfdcc60cef",5,"toplist");//通知公告
+				this.getListfootlist("ee0ea72a-75bf-4970-ad34-11e3132bc6a3",5,"footlist");//新闻资讯-图片新闻
 			
 			
 		},
@@ -180,14 +181,30 @@
 				var id=this.list[index].id;
 				this.ckInfo(id);
 			},
-			getList(id,pageSize,sz){
+			getListfootlist(id,pageSize,sz){
 				
 				API.tabList({
 					pageSize: pageSize,
 					typeId:id,
 				}).then((response) => {
 					uni.hideLoading();
-					this[sz]=response.data
+					this.footlist=response.data
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getListtoplist(id,pageSize,sz){
+				
+				API.tabList({
+					pageSize: pageSize,
+					typeId:id,
+				}).then((response) => {
+					uni.hideLoading();
+					this.toplist=response.data
 					
 				}).catch(error => {
 					uni.showToast({

pages/staffHome/staffHome.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="职工之家"></u-navbar>
+		<u-navbar title="职工之家" :is-back="false" ></u-navbar>
 		<view class="banner" v-if="false">
 			<view class="">
 				2023年度荆州市地方铁路优先公司

uni_modules/uview-ui/components/u-navbar/u-navbar.vue

@@ -90,7 +90,7 @@
 			// 返回的文字提示
 			backText: {
 				type: String,
-				default: ''
+				default: '返回'
 			},
 			// 返回的文字的 样式
 			backTextStyle: {
@@ -225,6 +225,7 @@
 		created() {},
 		methods: {
 			navberBack(){
+				
 				const pages=getCurrentPages()
 				if(pages.length===1){
 					history.back()