style:权益卡修改

pages/my/index.vue

@@ -116,7 +116,7 @@ export default {
 				// {thumb:'/static/me/u1833.png',title:'新老系统切换',rightText:'',to:'/myPages/systemSwitch/index'},
 				{thumb:'/static/me/u826.png',title:'储值服务',rightText:'',to:'/myPages/recharge/index'},
 				{thumb:'/static/me/u701.png',title:'交易记录',rightText:'',to:'/myPages/transactionRecord/index'},
-        		{thumb:'/static/me/u11.png',title:'关于我们',rightText:'',to:'/myPages/aboutOur/index'}
+        		{thumb:'/static/me/u11.png',title:'会员须知',rightText:'',to:'/myPages/aboutOur/index'}
 			],
 			group2:[
 

storePages/myRights/index.rpx.scss

@@ -29,21 +29,25 @@
 
 .row-list{
   width: 686rpx;
-  height: 188rpx;
+  min-height:188rpx;
   margin-top: 24rpx;
-  background-image: url('/static/coupon/u210.png');
-  background-repeat: no-repeat;
-  background-size: cover;
+  background: #FFFFFF;
+  //background-image: url('/static/coupon/u210.png');
+  //background-repeat: no-repeat;
+  //background-size: cover;
+  overflow: hidden;
+  border-radius: 20rpx;
 }
 
 
 .h-text{
   width: 200rpx;
-  height: 188rpx;
+  min-height:188rpx;
+  background: #FFE05C;
 }
 .h-center-content{
   width: 298rpx;
-  height: 188rpx;
+  min-height: 188rpx;
 }
 .h-right-content{
   width: 188rpx;
@@ -112,6 +116,7 @@
 }
 .row-list:first-child{
   margin-top: 0;
+
 }
 .btn{
   width: 156rpx;

storePages/myRights/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page" :style="{'height':windowHeight}">
 
-		<view class="flex-col" v-if="equityList.length === 0">
+		<view class="flex-col" v-if="!equityList">
 			<view class="flex-row justify-center">
 				<image class="empty" src="/static/imageIcon/empty.png" mode="widthFix"></image>
 			</view>
@@ -21,7 +21,7 @@
 					<!--				</view>-->
 				</view>
 
-				<view class="h-center-content flex-col justify-around">
+				<view class="h-center-content flex-col justify-around ">
 					<view class="h-value">
 						<text>{{item.title}}</text>
 					</view>
@@ -37,8 +37,8 @@
 
 				</view>
 
-				<view class="h-right-content flex-col justify-center">
-					<image class="h-right-content-img"  :src="item.facePhotoUrl || '/static/logo.png'" mode="aspectFill" @click="magnify(item.facePhotoUrl)"></image>
+				<view class=" flex-col justify-center ">
+					<image class="h-right-content-img "  :src="item.facePhotoUrl || '/static/logo.png'" mode="aspectFill" @click="magnify(item.facePhotoUrl)"></image>
 				</view>
 
 			</view>
@@ -84,7 +84,9 @@
 				this.$api.myEquityCardList().then(res=>{
 					console.log(res)
 					this.equityList = res.data.data
-					this.getImgUrlByBannerOssId(this.equityList)
+					if (this.equityList){
+						this.getImgUrlByBannerOssId(this.equityList)
+					}
 				})
 			},
 

storePages/rights/index.rpx.scss

@@ -33,25 +33,30 @@
 
 .row-list{
   width: 686rpx;
-  height: 188rpx;
+  min-height: 188rpx;
   margin-top: 24rpx;
-  background-image: url('/static/coupon/u210.png');
-  background-repeat: no-repeat;
-  background-size: cover;
+  background: #FFFFFF;
+  //background-image: url('/static/coupon/u210.png');
+  //background-repeat: no-repeat;
+  //background-size: cover;
+  overflow: hidden;
+  border-radius: 20rpx;
 }
 
 
 .h-text{
   width: 200rpx;
-  height: 188rpx;
+  min-height: 188rpx;
+  background: #FFE05C;
 }
 .h-center-content{
   width: 298rpx;
-  height: 188rpx;
+  min-height: 188rpx;
+
 }
 .h-right-content{
   width: 188rpx;
-  height: 188rpx;
+  min-height: 188rpx;
 }
 .money{
   height: 52rpx;

storePages/useRights/index.rpx.scss

@@ -28,25 +28,29 @@
 
 .row-list{
   width: 686rpx;
-  height: 188rpx;
+  min-height: 188rpx;
   margin-top: 24rpx;
-  background-image: url('/static/coupon/u210.png');
-  background-repeat: no-repeat;
-  background-size: cover;
+  background: #FFFFFF;
+  //background-image: url('/static/coupon/u210.png');
+  //background-repeat: no-repeat;
+  //background-size: cover;
+  border-radius: 20rpx;
+  overflow: hidden;
 }
 
 
 .h-text{
   width: 200rpx;
-  height: 188rpx;
+  min-height: 188rpx;
+  background: #FFE05C;
 }
 .h-center-content{
   width: 298rpx;
-  height: 188rpx;
+  min-height: 188rpx;
 }
 .h-right-content{
   width: 188rpx;
-  height: 188rpx;
+  min-height: 188rpx;
 }
 .money{
   height: 52rpx;

storePages/useRights/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page" :style="{'height':windowHeight}">
-		<view class="flex-col" v-if="equityList.length === 0">
+		<view class="flex-col" v-if="!equityList">
 			<view class="flex-row justify-center">
 				<image class="empty" src="/static/imageIcon/empty.png" mode="widthFix"></image>
 			</view>
@@ -20,7 +20,7 @@
 		</view>
 		<view  :style="{'height':scrollViewHeight}">
 			<scroll-view class="scroll " :style="{'height':scrollViewHeight}" scroll-y>
-				<view  class="row-list flex-row justify-start" :class="{'grayscale' :serviceProjectId != item.serviceProjectId || serviceObjectId != item.serviceObjectId }" v-for="(item,index) in equityList" @click="clickCoupons(item,index)" :key="index">
+				<view  class="row-list flex-row justify-start" :class="{'grayscale' :item.serviceProjectId.indexOf(serviceProjectId) === -1 || serviceObjectId != item.serviceObjectId }" v-for="(item,index) in equityList" @click="clickCoupons(item,index)" :key="index">
 					<view class="h-text flex-col justify-center ">
 						<view class="money">
 							<text>￥{{item.faceValue}}</text>
@@ -47,7 +47,7 @@
 
 					<view class="h-right-content flex-col justify-center">
 
-						<view class="flex-row justify-center" v-if="serviceProjectId != item.serviceProjectId || serviceObjectId != item.serviceObjectId ">
+						<view class="flex-row justify-center" v-if="item.serviceProjectId.indexOf(serviceProjectId) === -1 || serviceObjectId != item.serviceObjectId ">
 
 							<view class="h-btn-img">
 								<image class="h-btn-img" src="/static/coupon/u2110.png" mode=""></image>
@@ -121,7 +121,7 @@
 			},
 			clickCoupons(item,index){
 
-				if (this.serviceProjectId != item.serviceProjectId || this.serviceObjectId != item.serviceObjectId){
+				if (item.serviceProjectId.indexOf(this.serviceProjectId) === -1 || this.serviceObjectId != item.serviceObjectId){
 					return
 				}