Merge branch 'dev1.0' of jiandexin/saber_weixin into master

api/home.js

@@ -165,3 +165,12 @@ export function postLinkedUrl(data) {
 	// let url = "?code="+data.code+"&getPhoneNumberCode="+data.getPhoneNumberCode
 	return request.post("v1/linked/getLinkedUser",data);
 }
+
+// 红包排行榜
+export function leaderboard(data) {
+	return request.get('v1/re/leaderboard', data)
+}
+// 红包首页数据-统计
+export function todayStatistics(data) {
+	return request.get('/v1/re/todayStatistics', data)
+}

pages/order_addcart/order_addcart.vue

@@ -3,11 +3,11 @@
 		<view class="order_addcart-header-area">
 			<view class="received" @click="goDetail(item)">
 				<view class="pictrue">
-					<!-- <image src='../../static/order_addcart/qiandai.png'></image> -->
+					<image src='http://wine.gzzzyd.com/wx/order_addcart/qiandai.png'></image>
 				</view>
 				<view class="text-info">
 					<view class="received-count">
-						0.00元
+						{{moneyObj.receiveItemAmount}}
 					</view>
 					<view class="received-info">
 						已领取红包
@@ -17,7 +17,7 @@
 			<view class="loss" @click="goDetail(item)">
 				<view class="text-info">
 					<view class="received-count">
-						0.93元
+						{{moneyObj.lossTotalAmount}}
 					</view>
 					<view class="received-info">
 						已错失红包
@@ -31,44 +31,33 @@
 				当前红包池
 			</view>
 			<view class="loop-count">
-				4498.0.1元
+				{{moneyObj.totalRemainItemAmount}}
 			</view>
-			<!-- <image src='../../static/order_addcart/hongbaochi.png'  mode="widthFix"></image> -->
 		</view>
 
 		<view class="tab-area">
-			<view @click="isactiveTab = 'todayRank'"
+			<view @click="isactiveTab = 'todayRank';leaderboard()"
 				:class="{'tab-area-active1':isactiveTab === 'todayRank','base-tab':true}">
 				<text> 今日红包排行榜</text>
 			</view>
-			<view @click="isactiveTab = 'allRank'"
+			<view @click="isactiveTab = 'allRank';leaderboard()"
 				:class="{'tab-area-active2':isactiveTab === 'allRank','base-tab':true}">
 				<text> 红包领取总榜</text>
 			</view>
 		</view>
 		<view class="rank-list">
-			<view class="rank-list-item">
-				<!-- <img src='../../static/order_addcart/rank1.png' alt=""> -->
-				<text class="nuber"> 15772754677</text>
-				<text class="mosaic"> 1577***4677</text>
+			<view class="rank-list-item" v-for="(src, i) in rankList" :key="src.id">
+				<img v-show="i===0" src='http://wine.gzzzyd.com/wx/order_addcart/rank1.png' alt="">
+				<img v-show="i===1" src='http://wine.gzzzyd.com/wx/order_addcart/rank2.png' alt="">
+				<img v-show="i===2" src='http://wine.gzzzyd.com/wx/order_addcart/rank3.png' alt="">
+				<img v-show="i!==0 && i!==1 && i!==2" :src='src.avatar' alt="">
+				<text class="nuber"> {{src.userName}}</text>
+				<text class="mosaic"> {{src.phone}}</text>
 				<text class="litem-info"> 共领取了</text>
-				<text class="balance"> 31212.40</text>
-			</view>
-			<view class="rank-list-item">
-				<!-- <img src='../../static/order_addcart/rank2.png' alt=""> -->
-				<text class="nuber"> 15772754677</text>
-				<text class="mosaic"> 1577***4677</text>
-				<text class="litem-info"> 共领取了</text>
-				<text class="balance"> 3121.40</text>
-			</view>
-			<view class="rank-list-item">
-				<!-- <img src='../../static/order_addcart/rank3.png' alt=""> -->
-				<text class="nuber"> 15772754677</text>
-				<text class="mosaic"> 1577***4677</text>
-				<text class="litem-info"> 共领取了</text>
-				<text class="balance"> 312.40</text>
+				<text class="balance">{{src.totalAmount}}</text>
 			</view>
 
+
 		</view>
 	</view>
 </template>
@@ -81,12 +70,9 @@
 	let sysHeight = 0
 	// #endif
 	import {
-		getCartList,
-		getCartCounts,
-		changeCartNum,
-		cartDel,
-		getResetCart
-	} from '@/api/order.js';
+		leaderboard,
+		todayStatistics
+	} from '@/api/home.js';
 	import {
 		getProductHot,
 		collectAll,
@@ -112,6 +98,9 @@
 	import {
 		getNavigation
 	} from '@/api/public.js'
+	import {
+		colorChange
+	} from '../../api/api';
 	export default {
 		components: {
 			pageFooter,
@@ -125,6 +114,16 @@
 		data() {
 			return {
 				isactiveTab: 'todayRank',
+				moneyObj: {
+					lossTotalAmount: "0",
+					receiveItemAmount: "0",
+					receiveItemCount: 0,
+					redEnvelopeItemCount: 0,
+					remainItemCount: 0,
+					totalReceivedRedEnvelopeAmount: "0",
+					totalRedEnvelopeAmount: "0",
+					totalRemainItemAmount: "0"
+				},
 				imgHost: HTTP_REQUEST_URL,
 				is_diy: uni.getStorageSync('is_diy'),
 				canShow: false,
@@ -159,6 +158,7 @@
 					productAttr: [],
 					productSelect: {}
 				},
+				rankList: [],
 				productValue: [], //系统属性
 				storeInfo: {},
 				attrValue: '', //已选属性
@@ -173,34 +173,6 @@
 		},
 		computed: mapGetters(['isLogin']),
 		onLoad(options) {
-			// if (this.is_diy) {
-			// 	if (uni.getStorageSync('FOOTER_BAR')) {
-			// 		uni.hideTabBar()
-			// 	} else {
-			// 		this.is_diy_set = true
-			// 	}
-			// 	uni.request({
-			// 		url:'api/mock/navigation',
-			// 		success:res=>{
-			// 			this.newData = res.data
-			// 			if (this.newData.status && this.newData.status.status) {
-			// 				uni.hideTabBar()
-			// 			} else {
-			// 				uni.showTabBar()
-			// 			}
-			// 		}
-			// 	})
-			// 	// getNavigation().then(res => {
-			// 	// 	this.newData = res.data
-			// 	// 	if (this.newData.status && this.newData.status.status) {
-			// 	// 		uni.hideTabBar()
-			// 	// 	} else {
-			// 	// 		uni.showTabBar()
-			// 	// 	}
-			// 	// })
-			// } else {
-			// 	uni.hideTabBar()
-			// }
 			let that = this;
 			if (that.isLogin == false) {
 				toLogin();
@@ -242,7 +214,12 @@
 				this.isShowAuth = false;
 			};
 		},
+		created() {
+			this.leaderboard()
+			this.todayStatistics()
+		},
 		methods: {
+
 			// 授权关闭
 			authColse: function(e) {
 				this.isShowAuth = e;
@@ -293,27 +270,37 @@
 			reElection: function(item) {
 				this.getGoodsDetails(item)
 			},
-			/**
-			 * 获取产品详情
-			 * 
-			 */
-			getGoodsDetails: function(item) {
+
+			leaderboard() {
+				let that = this
 				uni.showLoading({
 					title: this.$t(`加载中`),
 					mask: true
 				});
-				let that = this;
-				that.cartId = item.id;
-				that.product_id = item.product_id;
-				getProductDetail(item.product_id).then(res => {
+				let postData = {
+					flag: this.isactiveTab === 'todayRank' ? 1 : 0
+				}
+				leaderboard(postData).then(res => {
+					if (res.data.length > 0) {
+						that.$set(that, "rankList", res.data)
+					} else {
+						that.$set(that, "rankList", [])
+					}
 					uni.hideLoading();
-					that.attr.cartAttr = true;
-					let storeInfo = res.data.storeInfo;
-					that.$set(that, 'storeInfo', storeInfo);
-					that.$set(that.attr, 'productAttr', res.data.productAttr);
-					that.$set(that, 'productValue', res.data.productValue);
-					that.DefaultSelect();
-				}).catch(err => {
+				})
+			},
+			todayStatistics() {
+				uni.showLoading({
+					title: this.$t(`加载中`),
+					mask: true
+				});
+				let postData = {
+					flag: this.isactiveTab === 'todayRank' ? 1 : 0
+				}
+				todayStatistics().then(res => {
+					if (res.data.length > 0) {
+						this.moneyObj = res.data
+					}
 					uni.hideLoading();
 				})
 			},
@@ -1312,6 +1299,8 @@
 		margin-top: 20rpx;
 		padding-top: 20rpx;
 		padding-bottom: 10rpx;
+		height: 600rpx;
+		overflow: auto;
 
 		.rank-list-item {
 			margin: 20rpx;
@@ -1358,7 +1347,7 @@
 	}
 
 	.loop {
-		// background: url('../../static/order_addcart/hongbaochi.png') no-repeat;
+		background: url('http://wine.gzzzyd.com/wx/order_addcart/hongbaochi.png') no-repeat;
 		width: 100%;
 		height: 250rpx;
 		background-size: 100% 100%;
@@ -1406,13 +1395,13 @@
 		}
 
 		.tab-area-active1 {
-			// background: url('../../static/order_addcart/tab1.png') no-repeat;
+			background: url('http://wine.gzzzyd.com/wx/order_addcart/tab1.png') no-repeat;
 			background-size: 340rpx 120rpx;
 
 		}
 
 		.tab-area-active2 {
-			// background: url('../../static/order_addcart/tab2.png') no-repeat;
+			background: url('http://wine.gzzzyd.com/wx/order_addcart/tab2.png') no-repeat;
 			background-size: 340rpx 120rpx;
 
 		}