Merge remote-tracking branch 'origin/master'

pagesUser/userInfo.vue

@@ -39,7 +39,7 @@
 									<view class="te">{{ userData.memCollege ? userData.memCollege : '' }}</view>
 									<view class="xian"></view>
 									<view class="te">
-										{{ userData.memMaxEducation }}
+										{{ userData.memMaxEducation ? userData.memMaxEducation : '' }}
 									</view>
 								</view>
 							</view>
@@ -52,7 +52,7 @@
 							<view class="hint">
 								<image :src="baseUrl+'/user/auth.png'" mode="aspectFill"></image>
 								<view class="t">
-									{{ userData.memRealAuthen }}
+									{{ userData.memRealAuthen ? userData.memRealAuthen : '' }}
 								</view>
 							</view>
 						</view>
@@ -226,7 +226,9 @@
         //是否关注 0:未关注  1:已关注
         isFollowed: '0',
 			  //用户信息
-        userData: {},
+        userData: {
+
+        },
         //点赞字典数据
         userLikeOptions:[],
         //点赞花费金币数

pagesme/message/info.vue

@@ -54,7 +54,7 @@
         </view>
       </template>
     </z-paging>
-    <u-popup :show="show" mode="center"  @close="close" @open="open" customStyle="min-height: 15vh; width: 700rpx; background: linear-gradient(135deg, #E3D4FC 0%, #ffdbd1 50%, #FFFFFF 100%); border-radius: 10rpx;">
+    <u-popup :show="show" mode="center"  @close="close" @open="open" customStyle="min-height: 15vh; width: 700rpx; border-radius: 10rpx;">
       <view class="popup-content">
         <text style="font-weight: bold">互换微信成功</text>
       </view>
@@ -371,10 +371,16 @@ export default {
         if (res.data.code == 200){
           this.$refs.paging.reload();
           this.inputTemp = ''
-        } else {
+        } else if (res.data.code == 1003) {
+          this.showApply = false
           this.isMessageConfirm = true;
           this.tipMsg = res.data.message;
           this.$refs.elmMessage.showDialog();
+        } else {
+          uni.showToast({
+            title: res.data.message,
+            icon: 'none'
+          })
         }
       })
     },
@@ -446,11 +452,16 @@ export default {
             icon: 'none'
           })
           this.showApply = false
-        } else {
+        } else if (res.data.code == 1003) {
           this.showApply = false
           this.isMessageConfirm = true;
           this.tipMsg = res.data.message;
           this.$refs.elmMessage.showDialog();
+        } else {
+          uni.showToast({
+            title: res.data.message,
+            icon: 'none'
+          })
         }
       })
     },