Merge branch 'master' of http://39.96.27.29/zhengxiuming/shop_mobile_uni

manifest.json

@@ -2,7 +2,7 @@
   "name": "shop_mobile_uni",
   "appid": "__UNI__F904656",
   "description": "",
-  "versionName": "1.0.17",
+  "versionName": "1.0.18",
   "versionCode": "100",
   "transformPx": false,
   "app-plus": {
@@ -51,7 +51,7 @@
       "mode": "history",
       "base": "/uni"
     },
-		"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.17/",
+    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.18/",
     "optimization": {
       "treeShaking": {
         "enable": true

package.json

 {
   "name": "shop_mobile_uni",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "谛宝多多商城",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

pages/signin/signin.vue

@@ -8,7 +8,7 @@
 				<text class="title2">花积分：</text>
 				<text class="tab" style="margin-left: 0;">兑好礼</text>
 				<text class="tab">兑权益</text>
-				<text class="tab">支付抵扣</text>
+				<!-- <text class="tab">支付抵扣</text> -->
 			</view>
 		</view>
 		<view class="content">
@@ -18,12 +18,12 @@
 					<text class="eosfont" @click="$jump(`/pages/signRecord/signRecord?sign_id=${sign_id}&sign_days_continues=${sign_days_continues}`,2)">我的签到记录&#xe744;</text>
 				</view>
 				<view class="days">
-					<view class="day_item" v-for="(item, index) in sign_list" :key="index">
+					<view class="day_item" v-for="(item, index) in sign_list" :key="index" :style="[(index+1)%7 === 0 ? {'margin-right': '0'} : null]">
 						<view v-if="item.sign_goods_logo" class="item_bg" style="background-color: transparent;">
 							<image :src="item.sign_goods_logo"></image>
 						</view>
 						<view class="item_bg" v-else :class="{act: item.is_sign === '1'}">+{{item.point}}</view>
-						<view class="day" v-if="item.date_diff !== '0'" :class="{seven: index === 6}">第{{index+1}}天</view>
+						<view class="day" v-if="item.date_diff !== '0'" :class="{seven: index === sign_list.length-1}">第{{index+1}}天</view>
 						<view class="day actDay" v-else>今天</view>
 					</view>
 				</view>
@@ -296,13 +296,12 @@
 		}
 		.sign_content {
 			width: 702rpx;
-			height: 396rpx;
 			background: #fff;
 			border-radius: 16rpx;
 			margin: 0 auto;
 			overflow: hidden;
 			box-shadow:0px 4px 16px 0px rgba(0,0,0,0.04);
-			padding: 0 26rpx;
+			padding: 0 26rpx 32rpx;
 			box-sizing: border-box;
 			.content_flex {
 				display: flex;
@@ -324,7 +323,8 @@
 			}
 			.days {
 				display: flex;
-				justify-content: space-between;
+				justify-content: center;
+				flex-wrap: wrap;
 				align-items: center;
 				margin: 40rpx auto 30rpx;
 			}
@@ -359,6 +359,7 @@
 			}
 		}
 		.day_item {
+			margin: 0 20rpx 24rpx 0;
 			.item_bg {
 				background: url('https://dbc-static.oss-cn-beijing.aliyuncs.com/static/3881593574115_.pic.jpg') no-repeat;
 				background-size: 100% 100%;
@@ -408,7 +409,7 @@
 		.day_item2 {
 			margin-right: 36rpx;
 		}
-		.day_item2:nth-of-type(4), .day_item2:last-child {
+		.day_item2:nth-of-type(4n) {
 			margin-right: 0;
 		}
 		.benefit_title {
@@ -549,14 +550,13 @@
 			}
 			.dialog_content {
 				width: 100%;
-				height: 532rpx;
 				border-radius: 40rpx;
 				background-color: #fff;
 				margin-top: 40rpx;
 				display: flex;
 				justify-content: center;
 				flex-wrap: wrap;
-				padding: 48rpx 0 0;
+				padding: 48rpx 0 20rpx;
 			}
 			.dialog_btn {
 				width: 480rpx;

pages/vipCenter/vipCenter.vue

@@ -44,8 +44,8 @@
 					</swiper-item>
 				</swiper>
 			</view>
-			<view class="top_title">当前等级权益</view>
-			<view class="now_benefit" v-for="(val, key) in member_list" v-if="key === index" :key="key" :style="[heightFlag ? {'height': height+'rpx'} : null]" :class="val.grade_list.length > 4 ? 'height1' : 'height2'">
+			<view class="top_title" v-if="titleFlag">当前等级权益</view>
+			<view class="now_benefit" v-for="(val, key) in member_list" v-if="key === index && val.grade_list !==null" :key="key" :style="[heightFlag ? {'height': height+'rpx'} : null]" :class="val.grade_list.length > 4 ? 'height1' : 'height2'">
 				<view class="benefit_item" v-for="(item, k) in val.grade_list" :key="k" :style="[key != 0 ? {color: 'rgba(255,255,255,0.4)'} : null]">
 					{{item.short_title}}
 					<text class="dia" v-if="key === 0"></text>
@@ -89,6 +89,7 @@
 				}],
 				index: 0,
 				moreFlag: true,
+				titleFlag: true,
 				php: php
 			}
 		},
@@ -116,6 +117,12 @@
 			},
 			changeHeight(data, index) {
 				this.index = index;
+				if(data === null) {
+					this.moreFlag = false;
+					this.titleFlag = false;
+					return
+				}
+				this.titleFlag = true;
 				if(data.length > 8) {
 					this.moreFlag = true;
 				} else {
@@ -128,6 +135,12 @@
 			swiperChange(e) {
 				var current  = e.detail.current;
 				this.index = current;
+				if(this.member_list[current].grade_list === null) {
+					this.moreFlag = false;
+					this.titleFlag = false;
+					return
+				}
+				this.titleFlag = true;
 				let length = this.member_list[current].grade_list.length;
 				if(length > 8) {
 					this.moreFlag = true;
@@ -151,7 +164,7 @@
 			background-color: #2D3239;
 			overflow: hidden;
 			margin-top: -8rpx;
-			padding: 0 24rpx;
+			padding: 0 24rpx 24rpx;
 			border-radius: 0 0 24rpx 24rpx;
 		}
 		.swiper_content {