修复激励广告

apis/interfaces/rank.js

@@ -0,0 +1,31 @@
+/**
+ * Web-zdx
+ * moduleName:排行榜
+ */
+
+import {
+	request
+} from '../index'
+
+
+
+// 上周加成榜
+const week_mul = () => {
+	return request({
+		url: 'user/rank/week_mul'
+	})
+}
+
+
+// 本周推荐榜
+const week = () => {
+	return request({
+		url: 'user/rank/week'
+	})
+}
+
+
+export {
+	week_mul,
+	week,
+}

node_modules/.package-lock.json

@@ -1,27 +0,0 @@
-{
-    "name": "dtx_store",
-    "version": "1.0.0",
-    "lockfileVersion": 2,
-    "requires": true,
-    "packages": {
-        "node_modules/uni-read-pages": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
-            "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==",
-            "hasInstallScript": true
-        },
-        "node_modules/uni-simple-router": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz",
-            "integrity": "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA=="
-        },
-        "node_modules/uview-ui": {
-            "version": "2.0.31",
-            "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.31.tgz",
-            "integrity": "sha512-I/0fGuvtiKHH/mBb864SGYk+SJ7WaF32tsBgYgeBOsxlUp+Th+Ac2tgz2cTvsQJl6eZYWsKZ3ixiSXCAcxZ8Sw==",
-            "engines": {
-                "HBuilderX": "^3.1.0"
-            }
-        }
-    }
-}

pages.json

@@ -442,6 +442,17 @@
             "style" : {
         		"navigationBarTitleText" : "发布"
         	}
+        }
+	    ,{
+            "path" : "pages/rank/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "会员推荐",
+                "enablePullDownRefresh": false,
+                "navigationBarTextStyle":"white",
+                "navigationBarBackgroundColor":"#34CE98"
+            }
+            
         }
     ],
 	"tabBar": {
@@ -458,12 +469,12 @@
 			"pagePath": "pages/store/index",
 			"text": "DT商城"
 		},
-        // {
+        {
-        // 	"iconPath": "static/tabBar/tabBar_02.png",
+        	"iconPath": "static/tabBar/tabBar_05.png",
-        // 	"selectedIconPath": "static/tabBar/tabBar_show_02.png",
+        	"selectedIconPath": "static/tabBar/tabBar_show_05.png",
-        // 	"pagePath": "pages/chat/index",
+        	"pagePath": "pages/rank/index",
-        // 	"text": "DT圈子"
+        	"text": "周排行榜"
-        // }, 
+        }, 
         {
 			"iconPath": "static/tabBar/tabBar_03.png",
 			"selectedIconPath": "static/tabBar/tabBar_show_03.png",

pages/life/capacity.vue

@@ -7,7 +7,7 @@
 				<view class="title">我的角色</view>
 				<view class="nickname">{{nickname}}</view>
 			</view>
-			<view class="capacity-block-glf">{{identityText}}:{{base}}GLF/h</view>
+			<view class="capacity-block-glf ">{{identityText}}:{{base}}GLF/h</view>
 		</view>
 		<view class="capacity-block">
 			<view class="capacity-block-title">
@@ -15,7 +15,7 @@
 				<view class="capacity-block-glf">{{group.capacity}}GLF/h</view>
 				<!-- <view class="more" @click="onInvitation">邀请更多好友</view> -->
 			</view>
-			<view class="capacity-block-table">
+			<view class="capacity-block-table pt30">
 				<view class="header">
 					<view class="flex-item">家族成员产率</view>
 				</view>
@@ -44,17 +44,24 @@
 		</view>
 		<view class="capacity-block">
 			<view class="capacity-block-title">
-				<view class="title">共建产率<text>0GLF/h</text></view>
+				<view class="title">共建产率<text>{{build.capacity}}GLF/h</text></view>
-				<view class="subtitle">-/-</view>
+				<view class="subtitle">{{build.current}}/{{build.max}}</view>
 			</view>
-			<view class="capacity-block-text">产品当前设置共建者每日可以通过看广告获得共建值（暂未开放，敬请期待）</view>
+			<view class="capacity-block-text ">产品当前设置共建者每日可以通过看广告获得共建值</view>
 		</view>
 		<view class="capacity-block">
 			<view class="capacity-block-title">
-				<view class="title">共力值产率<text>0GLF/h</text></view>
+				<view class="title">共力值产率<text>{{together.capacity}}GLF/h</text></view>
-				<view class="subtitle">-/-</view>
+				<view class="subtitle">{{together.current}}/{{together.max}}</view>
 			</view>
-			<view class="capacity-block-text">根据正常用户的使用在平台的使用习惯，购物等行为产生对应共力值（暂未开放，敬请期待）</view>
+			<view class="capacity-block-text ">根据正常用户的使用在平台的使用习惯，购物等行为产生对应共力值（暂未开放，敬请期待）</view>
+		</view>
+        <view class="capacity-block" v-for="(item,index) in other" :keys='index'>
+        	<view class="capacity-block-title">
+        		<view class="title">{{item.title}}</view>
+        		<view class="capacity-block-glf">{{item.capacity}}GLF/h</view>
+        	</view>
+        	<view class="capacity-block-text " v-if="item.remark">{{item.remark}}</view>
         </view>
 		<view class="capacity-hint">
 			PS产品设置每100个共力值或共建值可以加速5%的角色产率；
@@ -91,13 +98,14 @@
 					novip_count	: '-',
 					vip_text	: '-',
 					novip_text	: '-',
-				}
+				},
+                build:{},
+                together:{},
+                other:{}
 			};
 		},
 		created() {
-			uni.showLoading({
+			uni.showLoading({})
-				title: '加载中...'
-			})
 			glz().then(res => {
 				this.nickname	  = res.nickname
 				this.identityText = res.identity_text
@@ -106,6 +114,9 @@
 				this.group		  = res.group
 				this.recommend	  = res.recommend
 				this.partner	  = res.partner
+                this.build        = res.build
+                this.together     = res.together
+                this.other        = res.other
 				uni.setNavigationBarTitle({
 					title: res.glz + 'GLF'
 				})
@@ -158,11 +169,11 @@
 			&-glf{
 				color: $main-color;
 				font-size: 30rpx;
+                // padding-top: 30rpx;
 			}
 			&-title{
 				font-weight: bold;
 				font-size: 34rpx;
-				padding-bottom: 30rpx;
 				line-height: 60rpx;
 				display: flex;
 				justify-content: space-between;
@@ -197,10 +208,12 @@
 				font-size: 28rpx;
 				color: gray;
 				line-height: 40rpx;
+                padding-top: 30rpx;
 			}
 			&-table{
 				border:solid 1px $border-color;
 				margin-bottom: 20rpx;
+                padding-top: 30rpx;
 				&:last-child{
 					margin-top: 0;
 				}
@@ -229,5 +242,8 @@
 				
 			}
 		}
+        .pt30{
+            padding-top: 30rpx;
+        }
 	}
 </style>

pages/life/life.vue

@@ -17,11 +17,15 @@
 					<view class="life-sign-num">{{base_hour}}</view>
 					<view class="life-sign-unit">GLF/h</view>
 					<view class="life-sign-time">
-						<u-count-down ref="countDown" :time="nextSignAt" format="HH:mm:ss" :autoStart="false" @change="TimeDown" @finish="TimeFinish">
+						<u-count-down ref="countDown" :time="nextSignAt" format="HH:mm:ss" :autoStart="false"
+							@change="TimeDown" @finish="TimeFinish">
 							<view class="time">
-								<text class="time__item">{{ timeData.hours > 9 ? timeData.hours: '0'+timeData.hours}}:</text>
+								<text
-								<text class="time__item">{{ timeData.minutes > 9 ? timeData.minutes: '0'+timeData.minutes }}:</text>
+									class="time__item">{{ timeData.hours > 9 ? timeData.hours: '0'+timeData.hours}}:</text>
-								<text class="time__item">{{ timeData.seconds > 9 ? timeData.seconds: '0'+timeData.seconds }}</text>
+								<text
+									class="time__item">{{ timeData.minutes > 9 ? timeData.minutes: '0'+timeData.minutes }}:</text>
+								<text
+									class="time__item">{{ timeData.seconds > 9 ? timeData.seconds: '0'+timeData.seconds }}</text>
 							</view>
 						</u-count-down>
 					</view>
@@ -29,7 +33,7 @@
 			</view>
 			<image class="life-cover-back" :src="require('@/static/life/back.png')"></image>
 			<view class="life-role">
-				<image class="life-role-src" :src="figurePath" mode="widthFix"/>
+				<image class="life-role-src" :src="figurePath" mode="widthFix" />
 				<view class="life-role-content">
 					<view class="life-role-nick">{{nickname || '-'}}</view>
 					<view class="life-role-card">
@@ -103,7 +107,10 @@
 </template>
 
 <script>
-	import { life, sign } from '@/apis/interfaces/life.js'
+	import {
+		life,
+		sign
+	} from '@/apis/interfaces/life.js'
 	import AD from '@/utils/ad.js'
 	var account;
 	export default {
@@ -116,22 +123,22 @@
 				},
 				children: {
 					recommend: 0,
-					indirect : 0
+					indirect: 0
 				},
 				message: 0,
 				order: {
-					all			: 0,
+					all: 0,
-					init		: 0,
+					init: 0,
-					pay			: 0,
+					pay: 0,
-					delivered	: 0
+					delivered: 0
 				},
-				nextSignAt	: 0,
+				nextSignAt: 0,
-				glz			: 0,
+				glz: 0,
-				base_hour	: 0,
+				base_hour: 0,
 				base_seconds: 0,
-				timeData	: {},
+				timeData: {},
-				isSign		: false,
+				isSign: false,
-				isAccount	: false,
+				isAccount: false,
 			};
 		},
 		onShow() {
@@ -139,19 +146,19 @@
 		},
 		methods: {
 			// 倒计时
-			TimeDown(e){
+			TimeDown(e) {
 				this.timeData = e
 			},
 			// 倒计时结束
-			TimeFinish(){
+			TimeFinish() {
 				this.isSign = false
-				if(this.isAccount){
+				if (this.isAccount) {
 					this.isAccount = false;
 					clearInterval(account)
 				}
 			},
 			// 共力人生
-			getLife(){
+			getLife() {
 				life().then(res => {
 					this.glz = res.account.glz
 					this.base_hour = res.account.base_hour
@@ -164,64 +171,63 @@
 					this.message = res.message
 					this.order = res.order
 					this.isSign = res.is_sign
-					if(res.is_sign){
+					if (res.is_sign) {
 						this.outTime()
 					}
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,
-						icon : 'none'
+						icon: 'none'
 					})
 				})
 			},
 			// 计时器
-			outTime(){
+			outTime() {
 				this.$nextTick(() => {
-					try{
+					try {
 						// 计算数值
-						if(!this.isAccount){
+						if (!this.isAccount) {
 							this.isAccount = true;
-							account = setInterval(() =>{
+							account = setInterval(() => {
 								let newGlz = (Number(this.glz) + this.base_seconds)
 								this.glz = newGlz.toFixed(4)
 							}, 1000)
 						}
 						// 签到开始倒计时
 						this.$refs.countDown.start();
-					}catch(e){
+					} catch (e) {
 						uni.showToast({
 							title: e,
-							icon : 'none'
+							icon: 'none'
 						})
 					}
 				})
 			},
 			// 签到
-			onSign(){
+			onSign() {
-				console.log(1111);
+				if(this.isSign){
-				// if(this.isSign){
+					this.$Router.push({name: 'Capacity'})
-				// 	this.$Router.push({name: 'Capacity'})
+					return
-				// 	return
+				}
-				// }
 				this.checkIMEI().then(res => {
-					switch (res){
+					switch (res) {
 						case 'Permanent':
 							uni.showModal({
-								title		: '提示',
+								title: '提示',
-								content		: '签到功能需使用您的电话状态和网络信息，请在手机设置中权限开启您的权限',
+								content: '签到功能需使用您的电话状态和网络信息，请在手机设置中权限开启您的权限',
-								showCancel	: false,
+								showCancel: false,
 							})
 							break;
 						case 'Temporary':
 							uni.showModal({
-								title		: '提示',
+								title: '提示',
-								content		: '签到功能需使用您的电话状态和网络信息，请点击设置开启应用权限',
+								content: '签到功能需使用您的电话状态和网络信息，请点击设置开启应用权限',
-								cancelText	: '获取权限',
+								cancelText: '获取权限',
-								confirmText	: '稍后再说',
+								confirmText: '稍后再说',
-								success		: e => {
+								success: e => {
-									if(e.cancel){
+									if (e.cancel) {
 										this.checkIMEI().then(IMEI => {
-											if(IMEI === 'Success'){
+											if (IMEI === 'Success') {
 												this.showAd()
 											}
 										})
@@ -236,11 +242,11 @@
 				})
 			},
 			// 激励广告
-			showAd(){
+			showAd() {
 				AD.show({
-					adpid		: 1428308887,
+					adpid: 1428308887,
-					adType		: 'RewardedVideo'
+					adType: 'RewardedVideo'
-				}, res => {
+				}, detail => {
 					if (detail && detail.isEnded) {
 						uni.showLoading({
 							title: '签到中..'
@@ -248,57 +254,61 @@
 						sign().then(res => {
 							uni.showToast({
 								title: '签到成功',
-								icon : 'none'
+								icon: 'none'
 							})
 							this.getLife()
 						}).catch(err => {
 							uni.showToast({
 								title: err.message,
-								icon : 'none'
+								icon: 'none'
 							})
 						})
 					}
 				}, err => {
 					uni.showToast({
 						title: err.errMsg,
-						icon : 'none'
+						icon: 'none'
 					})
 				})
 			},
 			// 我的订单
-			onNav(name, type){
+			onNav(name, type) {
-				if(type){
+				if (type) {
-					this.$Router.pushTab({...name})
+					this.$Router.pushTab({
+						...name
+					})
 					return
 				}
-				this.$Router.push({...name})
+				this.$Router.push({
+					...name
+				})
 			},
 			// 开发中提示
-			onToast(title){
+			onToast(title) {
 				uni.showToast({
 					title,
-					icon : 'none'
+					icon: 'none'
 				})
 			},
 			// imei权限
-			checkIMEI(){
+			checkIMEI() {
 				// 检查imei权限
 				return new Promise((resolve, reject) => {
-					if(plus.os.name == "Android"){
+					if (plus.os.name == "Android") {
-						plus.android.requestPermissions(['android.permission.READ_PHONE_STATE'], (e)=> {
+						plus.android.requestPermissions(['android.permission.READ_PHONE_STATE'], (e) => {
-							if(e.deniedAlways.length > 0){
+							if (e.deniedAlways.length > 0) {
 								resolve('Permanent');
 							}
-							if(e.deniedPresent.length > 0){
+							if (e.deniedPresent.length > 0) {
 								resolve('Temporary');
 							}
-							if(e.granted.length > 0){
+							if (e.granted.length > 0) {
 								resolve('Success');
 							}
-						},(e) =>{
+						}, (e) => {
 							uni.showToast({
 								title: JSON.stringify(e),
-								icon : 'none'
+								icon: 'none'
 							})
 						})
 						return
@@ -308,14 +318,14 @@
 			}
 		},
 		onHide() {
-			try{
+			try {
 				clearInterval(account)
 				this.$refs.countDown.pause();
 				this.isAccount = false;
-			}catch(err){
+			} catch (err) {
 				uni.showToast({
 					title: err,
-					icon : 'none'
+					icon: 'none'
 				})
 			}
 
@@ -325,29 +335,33 @@
 
 <style scoped>
 	/* 气泡漂浮 */
-	.number-float{
+	.number-float {
 		animation: 4s octfloat infinite;
 	}
-	@keyframes octfloat{
+
-		0%{
+	@keyframes octfloat {
+		0% {
 			margin-top: 0;
 		}
-		50%{
+
+		50% {
 			margin-top: 15rpx;
 		}
-		100%{
+
+		100% {
 			margin-top: 0;
 		}
 	}
 </style>
 
 <style lang="scss" scoped>
-	.life{
+	.life {
 		min-height: 100vh;
 		background: #f8f8f8;
 	}
+
 	// 功能栏目
-	.life-flex{
+	.life-flex {
 		padding: 30rpx 20rpx 30rpx;
 		border-radius: 30rpx;
 		margin-top: -30rpx;
@@ -356,19 +370,22 @@
 		flex-wrap: wrap;
 		position: relative;
 		z-index: 1;
-		.life-flex-item{
+
+		.life-flex-item {
 			background: white;
 			border-radius: 20rpx;
 			width: calc(50% - 20rpx);
 			margin: 10rpx;
 			padding: 30rpx;
 			box-sizing: border-box;
-			&.house{
+
+			&.house {
 				height: 400rpx;
 				position: relative;
 				overflow: hidden;
 				background-color: #555;
-				image{
+
+				image {
 					position: absolute;
 					width: 100%;
 					height: 100%;
@@ -376,31 +393,36 @@
 					left: 0;
 					opacity: .5;
 				}
-				.house-content{
+
+				.house-content {
 					position: relative;
 					z-index: 1;
 					height: 100%;
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
-					.house-title{
+
+					.house-title {
 						color: white;
 						font-size: 36rpx;
 						font-weight: bold;
 					}
-					.house-subtitle{
+
+					.house-subtitle {
 						color: white;
 						font-size: 26rpx;
 					}
 				}
 			}
-			&.nav{
+
+			&.nav {
 				width: calc(33.33% - 20rpx);
 				height: 150rpx;
 				position: relative;
 				overflow: hidden;
 				background-color: #555;
-				image{
+
+				image {
 					position: absolute;
 					width: 100%;
 					height: 100%;
@@ -408,7 +430,8 @@
 					left: 0;
 					opacity: .5;
 				}
-				.nav-content{
+
+				.nav-content {
 					position: relative;
 					z-index: 1;
 					height: 100%;
@@ -416,31 +439,37 @@
 					flex-direction: column;
 					justify-content: center;
 					align-items: center;
-					.nav-title{
+
+					.nav-title {
 						color: white;
 						font-size: 40rpx;
 						font-weight: bold;
 					}
 				}
 			}
-			&.both{
+
+			&.both {
 				background: none;
 				padding: 0;
 				border-radius: 0;
-				.both-item{
+
+				.both-item {
 					background: white;
 					height: 190rpx;
 					border-radius: 20rpx;
 					padding: 20rpx;
 					box-sizing: border-box;
-					&:first-child{
+
+					&:first-child {
 						margin-bottom: 20rpx;
 					}
-					&.team{
+
+					&.team {
 						position: relative;
 						overflow: hidden;
 						background-color: #555;
-						image{
+
+						image {
 							position: absolute;
 							width: 100%;
 							height: 100%;
@@ -448,19 +477,22 @@
 							left: 0;
 							opacity: .5;
 						}
-						.team-content{
+
+						.team-content {
 							position: relative;
 							z-index: 1;
 							height: 100%;
 							display: flex;
 							flex-direction: column;
 							justify-content: space-between;
-							.team-title{
+
+							.team-title {
 								color: white;
 								font-size: 36rpx;
 								font-weight: bold;
 							}
-							.team-subtitle{
+
+							.team-subtitle {
 								color: white;
 								font-size: 24rpx;
 							}
@@ -468,42 +500,49 @@
 					}
 				}
 			}
-			&.other{
+
+			&.other {
 				height: 160rpx;
 				position: relative;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-				.other-back{
+
+				.other-back {
 					width: 150rpx;
 					height: 150rpx;
 					position: absolute;
 					bottom: 0;
 					right: 0;
 				}
-				.other-title{
+
+				.other-title {
 					font-size: 36rpx;
 					font-weight: bold;
 					color: #333;
-					image{
+
+					image {
 						width: 36rpx;
 						vertical-align: middle;
 						margin-bottom: 4rpx;
 						margin-right: 10rpx;
 					}
 				}
-				.other-subtitle{
+
+				.other-subtitle {
 					font-size: 26rpx;
 					color: gray;
 				}
 			}
 		}
 	}
+
 	// 入口模块
-	.life-nav{
+	.life-nav {
 		padding: 20rpx 20rpx 10rpx;
 		display: flex;
-		&-item{
+
+		&-item {
 			margin: 10rpx;
 			border-radius: 20rpx;
 			width: 33.33%;
@@ -512,43 +551,51 @@
 			color: white;
 			font-weight: bold;
 			font-size: 36rpx;
-			image{
+
+			image {
 				width: 60rpx;
 				height: 60rpx;
 				vertical-align: top;
 			}
-			&:nth-child(1){
+
+			&:nth-child(1) {
 				background-color: #6da2f8;
 			}
-			&:nth-child(2){
+
+			&:nth-child(2) {
 				background-color: #faa471;
 			}
-			&:nth-child(3){
+
+			&:nth-child(3) {
 				background-color: #8c79f9;
 			}
 		}
 	}
+
 	// header
-	.life-header{
+	.life-header {
 		position: fixed;
 		top: 0;
 		left: 0;
 		right: 0;
 		z-index: 999;
 		@extend .ios-top;
-		.life-header-flex{
+
+		.life-header-flex {
 			padding: 20rpx 30rpx 30rpx;
 			display: flex;
 			justify-content: center;
 			height: 70rpx;
 			line-height: 70rpx;
-			.life-header-item{
+
+			.life-header-item {
 				border-radius: 35rpx;
 				padding: 0 20rpx;
 				margin-right: 20rpx;
 				font-size: 42rpx;
 				font-weight: bold;
-				text{
+
+				text {
 					font-weight: normal;
 					padding-left: 5rpx;
 					font-size: 70%;
@@ -556,32 +603,37 @@
 			}
 		}
 	}
+
 	// 角色信息
-	.life-cover{
+	.life-cover {
 		position: relative;
 		width: 100%;
 		padding-top: 134%;
 		overflow: hidden;
-		.life-sign{
+
+		.life-sign {
 			position: absolute;
 			top: 15vh;
 			right: $margin * 2;
 			z-index: 999;
 			text-align: center;
-			.life-sign-icon{
+
+			.life-sign-icon {
 				display: inline-block;
 				width: 98rpx;
 				height: 98rpx;
 				border-radius: 50%;
 				position: relative;
-				.life-sign-icon-image{
+
+				.life-sign-icon-image {
 					position: absolute;
 					top: 0;
 					left: 0;
 					width: 98rpx;
 					height: 98rpx;
 				}
-				.life-sign-icon-text{
+
+				.life-sign-icon-text {
 					position: absolute;
 					top: 0;
 					left: 0;
@@ -595,24 +647,28 @@
 					color: white;
 				}
 			}
-			.life-sign-num{
+
+			.life-sign-num {
 				color: #f79824;
 				font-size: 36rpx;
 				line-height: 30rpx;
 				height: 30rpx;
 				text-shadow: 0 2rpx 2rpx rgba(0, 0, 0, .3);
 			}
-			.life-sign-unit{
+
+			.life-sign-unit {
 				font-weight: bold;
 				color: #f79824;
 				font-size: 30rpx;
 				line-height: 40rpx;
 				text-shadow: 0 2rpx 2rpx rgba(0, 0, 0, .3);
 			}
-			.life-sign-time{
+
-				.time{
+			.life-sign-time {
+				.time {
 					@include flex;
 					align-items: center;
+
 					&__item {
 						color: #333;
 						font-size: 14px;
@@ -620,33 +676,40 @@
 				}
 			}
 		}
-		.life-cover-back{
+
+		.life-cover-back {
 			position: absolute;
 			width: 100%;
 			height: 100%;
 			top: 0;
 			left: 0;
 		}
-		.life-role{
+
+		.life-role {
 			position: absolute;
 			left: 0;
 			bottom: 0;
 			width: 100%;
 			z-index: 99;
 			text-align: center;
-			.life-role-src{
+
+			.life-role-src {
 				width: 400rpx;
 			}
-			.life-role-content{
+
+			.life-role-content {
 				padding-bottom: 50rpx;
 				font-weight: bold;
-				.life-role-nick{
+
+				.life-role-nick {
 					color: #333;
 					font-size: 40rpx;
 				}
-				.life-role-card{
+
+				.life-role-card {
 					padding-top: 10rpx;
-					image{
+
+					image {
 						width: 240rpx;
 					}
 				}

pages/rank/index.vue

@@ -0,0 +1,377 @@
+<template>
+    <view class="rank">
+
+        <view class="rank_top">
+            <view class="rank_top_left">
+                <image class="rank_title" src="../../static/rank/rank_txt.png" mode="widthFix" />
+                <view class="rank_sub_title" @click="toHelp">
+                    共力家族 周会员推荐
+                    <image src="/static/rank/help.png" mode="widthFix" />
+                </view>
+            </view>
+            <image class="rank_top_right" src="../../static/rank/rank.png" mode="widthFix" />
+        </view>
+
+        <view class="rank_type">
+            <view :class="['rank_type_item',type === '1'?'rank_type_item_active':'']" @click="changeType('1')"> 上周加成榜
+            </view>
+            <view :class="['rank_type_item',type === '2'?'rank_type_item_active':'']" @click="changeType('2')">本周推荐榜
+            </view>
+        </view>
+
+        <view class="rank_update_time" v-if="lists.length > 0">
+            <view class="title"> 加成{{type === '1'?'有效':'生效'}}倒计时 : </view>
+            <u-count-down :time="end_timestamp" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
+                <view class="time">
+                    <view class="time__item">
+                        <view class="time__item_no">{{ timeData.days }} </view>天
+                    </view>
+                    <view class="time__item">
+                        <view class="time__item_no">{{ timeData.hours>9?timeData.hours:'0'+timeData.hours}}</view>时
+                    </view>
+                    <view class="time__item">
+                        <view class="time__item_no">{{ timeData.minutes>9?timeData.minutes:'0'+timeData.minutes}}</view>
+                        分
+                    </view>
+                    <view class="time__item">
+                        <view class="time__item_no">{{ timeData.seconds>9?timeData.seconds:'0'+timeData.seconds}}</view>
+                        秒
+                    </view>
+                </view>
+            </u-count-down>
+        </view>
+
+        <view class="list">
+            <block v-if="lists.length>0">
+                <view class="list_item" v-for="(item,index) in lists" :keys='index'>
+                    <view class="no">
+                        <image v-if="index < 3" class="image" :src="'/static/rank/rank-'+(index+1)+'.png'"
+                            mode="widthFix" />
+                        <view v-else class="txt"> {{index + 1}} </view>
+                    </view>
+                    <view class="user_info">
+                        <view class="user">
+                            <image class="avatar" :src="item.avatar" mode="aspectFill" />
+                            <view class="nickname"> {{item.nickname}} </view>
+                            <view class="wight" v-if="type === '1'">+{{item.rate}}%</view>
+                        </view>
+                        <view class="tuijian">
+                            <view class="num"> {{item.number}}</view>
+                            <view class="title">推荐会员</view>
+                        </view>
+                    </view>
+                </view>
+            </block>
+            <block v-else>
+                <view class="vertical pages-empty">
+                    <u-empty icon="http://cdn.uviewui.com/uview/empty/list.png" textColor="#999"
+                        :text="type === '1'?'上周无加成数据':'当前暂无推荐数据'">
+                    </u-empty>
+                </view>
+            </block>
+        </view>
+
+    </view>
+</template>
+
+<script>
+    import {
+        week,
+        week_mul
+    } from '@/apis/interfaces/rank.js'
+    export default {
+        data() {
+            return {
+                end_timestamp: 0,
+                lists: [],
+                timeData: {},
+                type: "1", // 1 加成榜 2推荐榜
+                page_id:'',
+            }
+        },
+        onLoad() {
+            this.getList();
+        },
+
+        methods: {
+            onChange(e) {
+                this.timeData = e
+            },
+            changeType(type) {
+                if (this.type !== type) {
+                    this.type = type;
+
+                    this.getList();
+                }
+            },
+            toHelp() {
+                uni.navigateTo({
+                    url: 'pages/vip/agreement?id=' + this.page_id
+                })
+            },
+            getList() {
+                uni.showLoading({})
+                let urlRequest = ''
+                if (this.type === '1') {
+                    urlRequest = week_mul
+                } else {
+                    urlRequest = week
+                }
+                urlRequest().then(res => {
+                    this.lists = [];
+                    this.lists = res.rand;
+                    this.page_id = res.page_id;
+                    this.end_timestamp = res.end_timestamp * 1000;
+                    uni.hideLoading();
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none',
+                        mask: true
+                    })
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .rank {
+        .rank_top {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            box-sizing: border-box;
+            background-color: #34CE98;
+            padding: 50rpx 30rpx 40rpx 30rpx;
+
+            .rank_top_left {
+                display: flex;
+                flex-direction: column;
+                align-items: flex-start;
+                justify-content: flex-start;
+                box-sizing: border-box;
+
+                .rank_title {
+                    width: 360rpx;
+                }
+
+                .rank_sub_title {
+                    font-size: 28rpx;
+                    font-weight: 500;
+                    color: white;
+                    padding-left: 20rpx;
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+                    margin-top: 10rpx;
+
+                    image {
+                        width: 32rpx;
+                        margin-left: 6rpx;
+                    }
+                }
+            }
+
+            .rank_top_right {
+                width: 280rpx;
+            }
+        }
+
+        .rank_type {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            background-color: #26b398;
+
+
+            .rank_type_item {
+                flex: 1;
+                text-align: center;
+                padding: 40rpx;
+                font-size: 32rpx;
+                font-weight: 400;
+                color: rgba($color: #fff, $alpha: 0.6);
+            }
+
+            .rank_type_item_active {
+                position: relative;
+                color: white;
+
+                &::after {
+                    content: '';
+                    border-bottom: 20rpx solid white;
+                    border-right: 16rpx solid transparent;
+                    border-left: 16rpx solid transparent;
+                    position: absolute;
+                    bottom: 0;
+                    left: 50%;
+                    margin-left: -20rpx;
+                }
+            }
+
+        }
+
+        .rank_update_time {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            padding: 50rpx 30rpx;
+            width: 100%;
+
+            .title {
+                font-size: 28rpx;
+                font-weight: normal;
+                color: #34CE98;
+            }
+
+            .time {
+                padding-left: 20rpx;
+                flex: 1;
+                font-size: 28rpx;
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: center;
+                box-sizing: border-box;
+                color: #333;
+
+
+                .time__item {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+
+                    .time__item_no {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: center;
+                        box-sizing: border-box;
+                        background-color: #34CE98;
+                        color: white;
+                        min-width: 50rpx;
+                        min-height: 50rpx;
+                        border-radius: 4rpx;
+                        margin: 0 16rpx;
+                        font-size: 36rpx;
+                        font-weight: bold;
+                        padding: 2rpx 10rpx;
+                    }
+                }
+            }
+        }
+
+        .list {
+            border-top: 30rpx solid #f9f9f9;
+            padding: 30rpx;
+
+            .list_item {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-between;
+                box-sizing: border-box;
+
+                .no {
+                    width: 80rpx;
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+
+                    .image {
+                        width: 54rpx;
+                    }
+
+                    .txt {
+                        font-weight: 600;
+                        font-size: 34rpx;
+                        color: #333;
+                    }
+                }
+
+                .user_info {
+                    flex: 1;
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: space-between;
+                    box-sizing: border-box;
+                    border-bottom: solid 1rpx #bdc6d7;
+                    padding: 30rpx 20rpx 30rpx 0;
+                    margin-left: 30rpx;
+
+                    .user {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: flex-start;
+                        box-sizing: border-box;
+
+
+                        .avatar {
+                            width: 90rpx;
+                            height: 90rpx;
+                            border-radius: 50%;
+                            margin-right: 30rpx;
+                        }
+
+                        .nickname {
+                            font-size: 30rpx;
+                            color: #333;
+                            max-width: 200rpx;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                            display: flex;
+                            flex-direction: row;
+                            align-items: center;
+                            justify-content: flex-start;
+                            box-sizing: border-box;
+                        }
+
+                        .wight {
+                            font-size: 26rpx;
+                            font-weight: normal;
+                            margin-left: 20rpx;
+                            background-color: #bdc6d7;
+                            color: #fff;
+                            border-radius: 30rpx;
+                            padding: 0 10rpx;
+                        }
+                    }
+                }
+
+                .tuijian {
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+
+                    .num {
+                        color: #999;
+                        font-size: 30rpx;
+                    }
+
+                    .title {
+                        font-size: 22rpx;
+                        color: #999;
+                    }
+                }
+            }
+        }
+
+    }
+</style>

pages/refund/aftersale.vue

@@ -51,7 +51,7 @@
             </view>
         </view>
 
-        <view class=" introduce"><navigator hover-class="none" url="/pages/vip/agreement?id=5"> 退换货说明</navigator> </view>
+        <view class=" introduce"><navigator hover-class="none" url="/pages/vip/agreement?id=5">退换货说明</navigator> </view>
 
     </view>
 </template>

uniCloud-aliyun/cloudfunctions/gl-ad/index.js

@@ -3,9 +3,6 @@
 const crypto = require('crypto');
 
 exports.main = async (event, context) => {
-	//event为客户端上传的参数
-	console.log('event : ', event)
-	
 	const {
 	    path,
 	    queryStringParameters
@@ -21,7 +18,7 @@ exports.main = async (event, context) => {
 		extra: event.extra,
 	}
 	
-	const secret = '892aed71-f840-11ec-adc8-00163e349e98';// uniad 后台开通激励视频回调后生成的 Security key
+	const secret = 'a7b111748f195a68b95b8e1a1560d8de1f79d33210a6b96101c3ced15b5b2121';// uniad 后台开通激励视频回调后生成的 Security key
 	const trans_id = event.trans_id;
 	const sign2 = crypto.createHash('sha256').update(`${secret}:${trans_id}`).digest('hex');
 	

unpackage/dist/dev/app-plus/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

unpackage/dist/dev/app-plus/app-config.js

@@ -1,154 +0,0 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// install a JSONP callback for chunk loading
-/******/ 	function webpackJsonpCallback(data) {
-/******/ 		var chunkIds = data[0];
-/******/ 		var moreModules = data[1];
-/******/ 		var executeModules = data[2];
-/******/
-/******/ 		// add "moreModules" to the modules object,
-/******/ 		// then flag all "chunkIds" as loaded and fire callback
-/******/ 		var moduleId, chunkId, i = 0, resolves = [];
-/******/ 		for(;i < chunkIds.length; i++) {
-/******/ 			chunkId = chunkIds[i];
-/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
-/******/ 				resolves.push(installedChunks[chunkId][0]);
-/******/ 			}
-/******/ 			installedChunks[chunkId] = 0;
-/******/ 		}
-/******/ 		for(moduleId in moreModules) {
-/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
-/******/ 				modules[moduleId] = moreModules[moduleId];
-/******/ 			}
-/******/ 		}
-/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
-/******/
-/******/ 		while(resolves.length) {
-/******/ 			resolves.shift()();
-/******/ 		}
-/******/
-/******/ 		// add entry modules from loaded chunk to deferred list
-/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
-/******/
-/******/ 		// run deferred modules when all chunks ready
-/******/ 		return checkDeferredModules();
-/******/ 	};
-/******/ 	function checkDeferredModules() {
-/******/ 		var result;
-/******/ 		for(var i = 0; i < deferredModules.length; i++) {
-/******/ 			var deferredModule = deferredModules[i];
-/******/ 			var fulfilled = true;
-/******/ 			for(var j = 1; j < deferredModule.length; j++) {
-/******/ 				var depId = deferredModule[j];
-/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
-/******/ 			}
-/******/ 			if(fulfilled) {
-/******/ 				deferredModules.splice(i--, 1);
-/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
-/******/ 			}
-/******/ 		}
-/******/
-/******/ 		return result;
-/******/ 	}
-/******/
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// object to store loaded and loading chunks
-/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
-/******/ 	// Promise = chunk loading, 0 = chunk loaded
-/******/ 	var installedChunks = {
-/******/ 		"app-config": 0
-/******/ 	};
-/******/
-/******/ 	var deferredModules = [];
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/";
-/******/
-/******/ 	var jsonpArray = this["webpackJsonp"] = this["webpackJsonp"] || [];
-/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
-/******/ 	jsonpArray.push = webpackJsonpCallback;
-/******/ 	jsonpArray = jsonpArray.slice();
-/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
-/******/ 	var parentJsonpFunction = oldJsonpFunction;
-/******/
-/******/
-/******/ 	// run deferred modules from other chunks
-/******/ 	checkDeferredModules();
-/******/ })
-/************************************************************************/
-/******/ ([]);

unpackage/dist/dev/app-plus/static/iconfont.css

@@ -1,51 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id 2869797 */
-  src: url('@/static/iconfont.ttf');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-jia:before {
-  content: "\e60a";
-}
-
-.icon-dui:before {
-  content: "\e609";
-}
-
-.icon-gengduo2:before {
-  content: "\e608";
-}
-
-.icon-gengduo:before {
-  content: "\e607";
-}
-
-.icon-saoma:before {
-  content: "\e605";
-}
-
-.icon-tuandui:before {
-  content: "\e606";
-}
-
-.icon-sousuo:before {
-  content: "\e603";
-}
-
-.icon-pinglun:before {
-  content: "\e601";
-}
-
-.icon-shezhi:before {
-  content: "\e602";
-}
-
-
-