Merge branch 'v_c_application_feature_0824' into 'master'

1.消费应用新增学校消费会员的判断;

See merge request !5

src/pages/ApplyConsumption/ConsumptionQuota/ConsumptionQuota.vue

@@ -340,7 +340,7 @@
 			},
 			async switchChange(e) {
 				console.warn("开启限额", e.detail.value)
-				await this.QueryProductContractItem()
+				// await this.QueryProductContractItem()
 				this.parentConsumeLimit.switch = e.detail.value
 				if (this.parentConsumeLimit.singleLimit == 0) {
 					this.parentConsumeLimit.singleLimit = '50.00';

src/pages/ApplyConsumption/Home/Home.vue

@@ -84,7 +84,7 @@
 			</view>
 		</view>
 		<!-- 会员尊享权益 -->
-		<view class="menberImg" v-if="HomeDataInfo['vipStatus']!=1">
+		<view class="menberImg" v-if="HomeDataInfo['vipStatus']!=1&&HomeDataInfo['membershipStatus']==1">
 			<image :src="this.$ImgUrl + 'applyCons/menberImg.png'" mode="aspectFit"></image>
 			<view class="tomenber" @tap="openAzMenber"></view>
 		</view>
@@ -161,7 +161,11 @@
 					// 刷脸消费会员到期时间
 					"vipExpiredDt": "",
 					// 刷脸消费会员开通状态 1已开通并生效 2未开通 3已过期 4未生效
-					"vipStatus": 1
+					"vipStatus": 1,
+					// 学校是否开通消费会员
+					"membershipStatus": 0,
+					// 学生id
+					"schoolId": 0
 				},
 				// 学校 学生id
 				userInfo: {
@@ -295,16 +299,18 @@
 				if (!item.path) {
 					return
 				}
-				if (item['auth'] && item['serviceItemCode']) {
-					// 查询消费会员权益项
-					const result = await this.QueryProductContractItem(item['serviceItemCode'])
-					if (result == "fail") {
-						this.contractMenber = true
-						throw ('您还未开通消费会员，')
+				if (this.HomeDataInfo['membershipStatus'] == 1) {
+					if (item['auth'] && item['serviceItemCode']) {
+						// 查询消费会员权益项
+						const result = await this.QueryProductContractItem(item['serviceItemCode'])
+						if (result == "fail") {
+							this.contractMenber = true
+							throw ('您还未开通消费会员，')
+						}
 					}
 				}
 				const query =
-					`?name=${this.HomeDataInfo['userName']}&userId=${this.userInfo['userId']}&schoolId=${this.userInfo['schoolId']}`
+					`?name=${this.HomeDataInfo['userName']}&userId=${this.userInfo['userId']}&schoolId=${this.userInfo['schoolId']}&membershipStatus=${this.HomeDataInfo['membershipStatus']}`
 				uni.switchTab({
 					url: item.path + query,
 					fail: () => {