1.11 解决已下架积分商品展示

pages/goods/goods.vue

@@ -172,7 +172,9 @@
 					keyword: this.search || '',
 					category_id: `${category_id}`
 				}).then(res => {
-					this.goodsList = res.data.data
+					this.goodsList = res.data.data.filter(item=>{
+						return item.status == 1
+					})
 					this.totalElements = res.data.total
 					this.pagesize = res.data.per_page
 					this.shortLong()

pages/index/index.scss

@@ -110,7 +110,7 @@
 
 	.home-special-area {
 
-		padding: 72rpx 30rpx 38rpx;
+		padding: 72rpx 30rpx 30rpx;
 		// background-color: deeppink;
 		display: flex;
 		align-items: center;
@@ -258,7 +258,7 @@
 
 	.home-hotel-img {
 		background-color: #F9f9f9;
-		padding: 10rpx 30rpx 20rpx;
+		padding: 0rpx 30rpx 20rpx;
 
 		.home-hotel-img-content {
 			display: flex;

pages/index/vote-detail/index.vue

@@ -81,7 +81,7 @@
 
 			<movable-area class="movableArea">
 				<movable-view class="movableView" direction="all" x="630rpx" y="700rpx">
-					<view class="img-IHg" @click="goJoin">
+					<view class="img-IHg" @click="goJoinActivity">
 						<image style="width: 84rpx; height: 84rpx;border-radius: 50%; " :src="indexVipImg" mode=""></image>
 					</view>
 				</movable-view>
@@ -139,7 +139,7 @@
 						@click="isVoteNum?goVote(activity_project_id,true):closeVote()">
 						<text>{{isVoteNum?'再次投票':'关闭'}}</text>
 					</view>
-					<view v-if="is_prize==0" class="download" @click="isVoteNum||is_vip?goOtherItem():goJoinActivity()">
+					<view v-if="is_prize==0" class="download" @click="isVoteNum||is_vip?goOtherItem():goJoin()">
 						<text>{{isVoteNum||is_vip||!vipRewardTicketNum?'其他项目':'加入IHG会员' }}</text>
 					</view>
 
@@ -454,15 +454,17 @@
 			
 			// 跳转其他小程序
 			goJoinActivity(){
+				let type = 1
 				let _this = this
-				this.jumpHAppID(this.jump_type_vip_Activity, this.jump_config_vip_Activity)
+				this.jumpHAppID(this.jump_type_vip_Activity, this.jump_config_vip_Activity,type)
 			},
 			goJoin() {
+				let type = 2
 				let _this = this
-				this.jumpHAppID(this.jump_type_vip, this.jump_config_vip)
+				this.jumpHAppID(this.jump_type_vip, this.jump_config_vip,type)
 			},
 			// 跳转其他小程序
-			jumpHAppID(id, urls) {
+			jumpHAppID(id, urls,type) {
 				if (id == 1) {
 					const url = urls; // 跳转的外链
 					const navtitle = 'H5'; // 这个标题是你自己可以设置的
@@ -490,29 +492,43 @@
 						success(res) {
 							const page = _this.getPageUrl()
 							let user_id = ''
-							if (_this.admin != null) {
-								user_id = _this.admin.id
-							} else {
-								user_id = 0
-							}
-							_this.$api.my.userMemberAdd({
-								user_id,
-								page,
-							})
-							//增加票数
-							_this.$api.my.userJoinVip({
-								source_type: 1,
-								source_id: _this.sourceId
-							}).then(res => {
-								if(res.code == 0){
-									uni.setStorage({
-										key: `is_vip_${_this.voteDetail.id}`,
-										data: 1,
-									});
-									_this.is_vip = true
-									_this.closeVote()
+							if(type == 2){
+								let pageUrl = `${page}?type=${type}`
+								console.log(pageUrl,'---->pageUrl');
+								if (_this.admin != null) {
+									user_id = _this.admin.id
+								} else {
+									user_id = 0
 								}
-							})
+								_this.$api.my.userMemberAdd({
+									user_id,
+									page:pageUrl,
+								})
+								//增加票数
+								_this.$api.my.userJoinVip({
+									source_type: 1,
+									source_id: _this.sourceId
+								}).then(res => {
+									if(res.code == 0){
+										uni.setStorage({
+											key: `is_vip_${_this.voteDetail.id}`,
+											data: 1,
+										});
+										_this.is_vip = true
+										_this.closeVote()
+									}
+								})
+							}else{
+								if (_this.admin != null) {
+									user_id = _this.admin.id
+								} else {
+									user_id = 0
+								}
+								_this.$api.my.userMemberAdd({
+									user_id,
+									page,
+								})
+							}
 							// 打开成功
 						},
 						fail(e) {

pages/login/login.vue

@@ -380,7 +380,7 @@
 	//登录弹框
 	.popup-login {
 		width: 100%;
-		height: 706rpx;
+		height: 750rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx -10rpx 32rpx 0px rgba(0, 0, 0, 0.04);
 		border-radius: 16rpx 16rpx 0px 0px;

pages/login/youyue.vue

@@ -575,7 +575,7 @@
 	//登录弹框
 	.popup-login {
 		width: 100%;
-		height: 706rpx;
+		height: 750rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx -10rpx 32rpx 0px rgba(0, 0, 0, 0.04);
 		border-radius: 16rpx 16rpx 0px 0px;

pages/map/map.vue

@@ -31,7 +31,7 @@
 					</view>
 				</view>
 				
-				<image @click="goJoin"  style=" flex: none; width: 52rpx;height: 52rpx;border-radius: 50%;" :src="indexVipImg" mode=""></image>
+				<image @click="goJoin"  style=" flex: none; width: 60rpx;height: 60rpx;border-radius: 50%;" :src="indexVipImg" mode=""></image>
 				
 			</view>
 			<view class="search-detail search-detail-input"    style="z-index:9" v-if="search.openId==-2">

pages/my/integral/integral.vue

@@ -42,7 +42,7 @@
 			
 			<view class="ListContent" v-if="integralList.length > 0 ">
 				<view class="home-hotel-img-content">
-					<view @click="goIntegralDetail(item.id)" class="home-hotel-img-content-item" v-for="(item,index) in integralList" :key="index"
+					<view  v-if="item.status==1"  @click="goIntegralDetail(item.id)" class="home-hotel-img-content-item" v-for="(item,index) in integralList" :key="index"
 						:style="{marginTop:item.marginTop || 0 }" >
 						<image class="home-hotel-img-content-item-img"
 							:class="item.short?'home-hotel-img-content-item-img': 'home-hotel-img-content-item-img-long' "
@@ -143,7 +143,9 @@
 				}).then(res=>{
 					console.log(res,"积分产品")
 					if(res.code==0){
-						this.integralList=res.data.data
+						this.integralList=res.data.data.filter(item=>{
+							return item.status == 1
+						})
 						this.totalElements = res.data.total
 						this.pagesize = res.data.per_page
 						this.shortLong()

setting.js

@@ -3,8 +3,8 @@
  */
 const IS_DEV = process.env.NODE_ENV === 'development'
 
-const URL = 'https://t9.9026.com'
-// const URL = 'https://ihg.9026.com'
+// const URL = 'https://t9.9026.com'
+const URL = 'https://ihg.9026.com'
 
 	
 module.exports = {