From 3c8eedfbf4a06fb849c1c4b6f43238673b552104 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 21 May 2020 09:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E7=99=BB=E5=BD=95=20=E4=B8=8D=E8=B0=83?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 constant/MappingConstant.js             |  2 +-
 context/Java110Context.js               |  4 ++++
 pages/activityDetail/activityDetail.vue | 10 +++++++---
 utils/DesUtil.js                        |  6 ++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/constant/MappingConstant.js b/constant/MappingConstant.js
index 6e1e58d..009a05a 100644
--- a/constant/MappingConstant.js
+++ b/constant/MappingConstant.js
@@ -8,7 +8,7 @@ class MappingConstant {
 
   static TOKEN = "token"; // token 标识
 
-  static USER_INFO = "userInfo"; // 用户信息
+  static USER_INFO = "STAFF_USER_INFO"; // 用户信息
 
   static AREA_INFO = "areaInfo"; // 地区信息
 
diff --git a/context/Java110Context.js b/context/Java110Context.js
index 0d9e81e..5ddf13e 100644
--- a/context/Java110Context.js
+++ b/context/Java110Context.js
@@ -151,9 +151,13 @@ const _loadArea = function(_level, _parentAreaCode, callBack = _areaList => {})
  */
 const getCurrentCommunity = function() {
 	let currentCommunity = uni.getStorageSync(constant.mapping.CURRENT_COMMUNITY_INFO);
+	console.log('当前小区获取',currentCommunity);
 	if (util.string.isNull(currentCommunity)) {
 		return {};
 	}
+	if(currentCommunity instanceof Object){
+		return currentCommunity;
+	}
 	return JSON.parse(currentCommunity);
 };
 
diff --git a/pages/activityDetail/activityDetail.vue b/pages/activityDetail/activityDetail.vue
index 4f0826b..cc662a2 100644
--- a/pages/activityDetail/activityDetail.vue
+++ b/pages/activityDetail/activityDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="detailContainer">
-		  <image class="headImg" :src="activity.src"></image>
+		  <image class="headImg" v-if="showHeadImage" :src="activity.src" @error="hideHeadImage()"></image>
 		  <view class="ad_titile">
 		    <text class="company">{{activity.title}}</text>
 		  </view>
@@ -23,6 +23,7 @@
 			return {
 				activitiesId:'',
 				currentCommunityId:'',
+				showHeadImage:true,
 				activity:{
 					src:'',
 					title:'',
@@ -38,6 +39,10 @@
 			this._loadActivites();
 		},
 		methods: {
+			hideHeadImage:function(){
+				console.log('加载图片失败')
+				this.showHeadImage = false;
+			},
 			
 			/**
 			   * 加载活动
@@ -60,7 +65,6 @@
 			      success: function (res) {
 			        console.log("请求返回信息：", res);
 			        if (res.statusCode == 200) {
-			
 			          let _activites = res.data.activitiess;
 			          _activites.forEach(function (_item) {
 			            _item.src = _that.java110Constant.url.filePath + "?fileId=" + _item.headerImg + "&communityId=" + _that.currentCommunityId + "&time=" + new Date();
@@ -104,7 +108,7 @@
 	
 	.detailContainer .ad_titile{
 	  text-align: center;
-	  margin-top: 30rpx;
+	  padding-top: 30rpx;
 	  margin-bottom: 30rpx;
 	  font-size: 44rpx;
 	}
diff --git a/utils/DesUtil.js b/utils/DesUtil.js
index 4c1b49c..01b4c77 100644
--- a/utils/DesUtil.js
+++ b/utils/DesUtil.js
@@ -1,5 +1,7 @@
 import CryptoJS from '../lib/crypto-js.js'
 
+const StringUtil = require("./StringUtil")
+
 var keyvi = 'java110_hc_wuxw';
 function des_encrypt(message) {
     var key            = CryptoJS.MD5(keyvi).toString();
@@ -17,6 +19,10 @@ function des_encrypt(message) {
 //des解密 DES-EDE3-CBC
 function des_decrypt(message)
 {
+	console.log("message",message);
+	if(StringUtil.isNull(message)){
+		return message;
+	}
     var key            = CryptoJS.MD5(keyvi).toString();
     var iv            = CryptoJS.MD5(keyvi).toString();
     var crypto_key     = CryptoJS.enc.Utf8.parse(key);