From 9170d097ca895932328e70dab2845161adbc0d64 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 5 Dec 2022 12:55:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5aa177a..6c73aba 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -39,6 +39,7 @@
 		mounted() {
 			//对cookies进行操作，这里是写
 			//document.cookie = "mytest=qweqwe131231; path=/; max-age=" + 30*24*60*60;
+			console.log('process.env.NODE_ENV',process.env.NODE_ENV);
 		},
 		methods: {
 			submitLogin(){

From 5582acfb945528f08349f6c2f1f062a4a2631754 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 5 Dec 2022 14:52:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E4=B8=80=E4=B8=AA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=9A=84=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/images/default.png | Bin 0 -> 1747 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 static/images/default.png

diff --git a/static/images/default.png b/static/images/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..f969483bd63dbe1f111ce6f44c7a1a5c2b04a75d
GIT binary patch
literal 1747
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

literal 0
HcmV?d00001


From 071a1d7a73b876218247eec69e5e0b762c46c5b7 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 5 Dec 2022 14:57:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/author-img/author-img.vue |  9 ++++++---
 pages/login/loading.vue              | 13 ++++++++++---
 pages/news/index.vue                 |  4 +++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/components/author-img/author-img.vue b/components/author-img/author-img.vue
index 0cdf6f2..d9dff48 100644
--- a/components/author-img/author-img.vue
+++ b/components/author-img/author-img.vue
@@ -3,10 +3,13 @@
 		<view>
 			<u-avatar v-if="avatar && avatar!=''" shape="circle" :size="size" :src="fileBaseUrl + avatar" ></u-avatar>
 			<view  v-else>
-			   <view v-if="sex == null" class="peo" :style="{width:width,height:height}"></view>
+			   <view v-if="sex == null" class="peo" :style="{width:width,height:height}">
+				   <image src="../../static/images/default.png" alt="">
+			   </view>
 			   <view v-else :style="{width:width,height:height}">
-			   	  <view class="peo" v-if="sex === 1 "><image src="../../static/images/man.png" alt=""></view>
-			   	  <view class="peo" v-else><image src="../../static/images/woman.png" alt=""></view>
+			   	  <view class="peo" v-if="sex == 1 "><image src="../../static/images/man.png" alt=""></view>
+			   	  <view class="peo" v-else-if="sex==2 "><image src="../../static/images/woman.png" alt=""></view>
+				  <view class="peo" v-else><image src="../../static/images/man.png" alt=""></view>
 			   </view>
 			 </view>
 		</view>
diff --git a/pages/login/loading.vue b/pages/login/loading.vue
index abfa1aa..afd5cfa 100644
--- a/pages/login/loading.vue
+++ b/pages/login/loading.vue
@@ -27,7 +27,14 @@
 			  plus.runtime.openURL(this.$config.loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
 			  // #endif
 			  // #ifdef H5
-			  window.open(this.$config.loginPath)
+			  console.log('this.$config.loginPath',this.$config.loginPath);
+			  if(this.$config.loginPath.startsWith('http')){
+				  let returnUrl=window.location.protocol+'//'+window.location.host+"/"+this.$config.context;
+				  location.href=this.$config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');
+			  }else{
+				  location.href=this.$config.loginPath;
+			  }
+			  
 			  // #endif
 			}else{
 			  apiLogin.boeLogin(token).then(rs=>{
@@ -55,9 +62,9 @@
 							}
 						}
 					 }else{
-						 uni.switchTab({
+						uni.switchTab({
 						 	url:'/pages/index/index'
-						 })
+						})
 					 }
 					 
 				  });						
diff --git a/pages/news/index.vue b/pages/news/index.vue
index 755d969..6aa7b11 100644
--- a/pages/news/index.vue
+++ b/pages/news/index.vue
@@ -105,7 +105,9 @@
 						if(res.result.list.length!=0){
 							res.result.list.forEach(item => {
 								item.authorInfo={avatar:'',name:'',code:'',sex:null};
-								ids.push(item.sendAid);
+								if(item.sendAid){
+									ids.push(item.sendAid);
+								}
 								item.checked = false;
 								this.message.list.push(item);
 							});