Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

pages/components/notice-index.vue

@@ -6,13 +6,13 @@
 				<text class="dl-text">通告</text>
 			</view>
 			<view class="left-search">
-				<view class="left-search-box" style="width: 90%;">
+				<view class="left-search-box" style="width: 90%;" @click="goSeach">
 					<uni-search-bar radius="20" style="width: 100%;" placeholder="VIP极速搜索" clearButton="auto"
 						cancelButton="none" @confirm="search" @clear="clear">
 					</uni-search-bar>
 					<image class="dl-vip" src="@/static/index/vip.png" mode="aspectFit"></image>
 					<!-- 遮罩层 -->
-					<view v-if="!canSearch" class="dl-zhezhao" @click="goSeach"></view>
+					<!-- <view v-if="!canSearch" class="dl-zhezhao" @click="goSeach"></view> -->
 				</view>
 			</view>
 			<view class="right-text">
@@ -252,7 +252,7 @@
 			this.getByCodeInfo()
 			this.selectDataList()
 			//鉴权
-			this.checkRights()
+			// this.checkRights()
 		},
 		onLoad: function() {
 
@@ -799,7 +799,7 @@
 			}
 
 			.dl-item-box {
-				height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 555rpx);
+				height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 585rpx);
 				isplay: flex;
 				flex-direction: column;
 			}

pages/components/notice-item.vue

@@ -3,7 +3,7 @@
 		<view v-for="(item,index) in dataList" class="dl-notice-box" @click="goDetail(item)">
 			<view class="dl-is-urgent" v-if="'1'==item.isUrgent">急招</view>
 			<view class="dl-notice-title">
-				<image class="dl-image" :src="'/static/platform/fang/'+item.platformCode+'.png'" mode="aspectFit">
+				<image class="dl-image" :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit">
 				</image>
 				<view class="dl-text">{{item.title}}</view>
 			</view>
@@ -268,4 +268,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/index.vue

@@ -3,7 +3,7 @@
 		<!-- 主体区域 -->
 		<view class="content-body">
 			<!-- 通告列表页 -->
-			<notice-index v-if="'home'==menuCode" @openVip="openVip"></notice-index>
+			<notice-index style="height: 100%;" v-if="'home'==menuCode" @openVip="openVip"></notice-index>
 			<mine-index :key="nowUserType" :nowUserType="nowUserType" v-if="'my'==menuCode"
 				@refreshUserType="refreshUserType()"></mine-index>
 			<subscribe v-if="'dingyue'==menuCode"></subscribe>

pages/login.vue

@@ -76,6 +76,12 @@
 				}],
 				//是否同意
 				ifAgree: false,
+				canBack: "false",
+			}
+		},
+		onLoad(params) {
+			if (params.canBack) {
+				this.canBack = params.canBack
 			}
 		},
 		created() {
@@ -192,8 +198,14 @@
 			loginSuccess(result) {
 				// 设置用户信息
 				this.$store.dispatch('GetInfo').then(res => {
+					if ("true" == this.canBack) {
+						uni.navigateBack({
+							delta: 1
+						})
+					} else {
+						this.$tab.reLaunch('/pages/index')
+					}
 
-					this.$tab.reLaunch('/pages/index')
 				})
 			}
 		}

pages/mine/mine-index.vue

@@ -211,7 +211,7 @@
 				localUserType: this.nowUserType,
 				globalConfig: getApp().globalData.config,
 				//是否已开通会员
-				ifHasCard: true,
+				ifHasCard: false,
 				userInfo: {
 					coupon: 0
 				},
@@ -264,6 +264,12 @@
 					this.userInfo.coupon = res.data.coupon.toString()
 					this.userInfo.addNotice = res.data.addNotice.toString()
 					this.userInfo.avatar = this.imageUrl + res.data.avatar
+					if (res.data.memberEndDate && null != res.data.memberEndDate) {
+						this.ifHasCard = true
+						this.memberEndDate = res.data.memberEndDate
+					} else {
+						this.ifHasCard = false
+					}
 				})
 			},
 			/**

pages/notice/detail.vue

@@ -175,7 +175,7 @@
 			<!-- 去报名，始终浮动下方 -->
 			<view class="dl-bottom-box" v-show="showBottom&&type=='common'">
 				<!-- 报名 -->
-				<view class="report-box">
+				<view class="report-box" v-if="'2'!=noticeDetail.approvalStatus">
 					<view @click="goHome()">
 						<image src="@/static/detail/home.png" mode="aspectFit"></image>
 					</view>
@@ -971,4 +971,4 @@
 			}
 		}
 	}
-</style>
+</style>

utils/request.js

@@ -45,8 +45,8 @@ const request = config => {
 				const msg = errorCode[code] || res.data.msg || errorCode['default']
 				if (code === 401) {
 					store.dispatch('LogOut').then(res => {
-						uni.reLaunch({
-							url: '/pages/login'
+						uni.navigateTo({
+							url: '/pages/login?canBack=true'
 						})
 					})
 				} else if (code === 500) {