lhl há 2 anos atrás
pai
commit
a70a9252b9

+ 13 - 0
pages.json

@@ -154,6 +154,12 @@
 						"navigationBarTitleText": "租电"
 					}
 				},
+				{
+					"path": "action",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
 				{
 					"path": "attestation",
 					"style": {
@@ -246,6 +252,13 @@
 						"navigationBarTitleText": "卡券明细"
 					}
 				},
+				{
+					"path": "money/qxq",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "骑行券"
+					}
+				},
 				{
 					"path": "award/account",
 					"style": {

+ 123 - 0
pages/shop/action.vue

@@ -0,0 +1,123 @@
+<template>
+    <view class="content">
+		<image :src="actionImg" mode="widthFix" class="action-img"></image>
+		<view class="action-wrap">
+			<image src="../../static/image/action-top.png" mode="" class="action-top"></image>
+			<view class="">
+				请拍下您与爱车的合照,点击下方按钮上传照片即可获得奖励。
+			</view>
+			<image :src="upimg" mode="widthFix" class="up-img" v-if="upimg" @click="upActionImg"></image>
+			<image src="../../static/image/upimg-g.png" mode="widthFix" class="up-img" v-else @click="upActionImg"></image>
+			<view class="action-btn" @click="joinAction">
+				上传照片
+			</view>
+		</view>
+    </view>
+</template>
+<script>
+	import { upload } from '@/api/order.js'
+export default {
+    data() {
+        return {
+			upimg: '',
+			loading:false
+        };
+    },
+	computed: {
+		actionImg() {
+			return this.$store.state.baseURL + '/static/img/action.png'
+		}
+	},
+    onLoad(opt) {
+
+    },
+    onShow() {
+
+    },
+    onReachBottom() {
+
+    },
+    methods: {
+		upActionImg() {
+			upload().then(res => {
+				this.upimg = res[0].url
+			})
+		},
+		joinAction() {
+			if(this.loading) {
+				return
+			}
+			if(this.upimg == '') {
+				this.$api.msg('请上传合影照片')
+			}
+			this.loading = true
+			joinAction({
+				img: this.upimg
+			}).then(res => {
+				this.loading = false
+				uni.showToast({
+					title: '提交成功',
+					duration: 2000
+				});
+			}).catch(err => {
+				this.loading = false
+			})
+		}
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.content {
+		padding-bottom: 50px;
+	}
+	page {
+		background-color: #fff;
+		height: auto;
+		min-height: 100%;
+	}
+.action-img {
+	width: 750rpx;
+}
+.action-wrap {
+	width: 690rpx;
+	margin:50rpx auto 0;
+	// height: 560rpx;
+	background-color: #dcf4ef;
+	border-radius: 20rpx;
+	padding: 60px 35rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	text-align: justify;
+	color: #333;
+	font-weight: bold;
+	font-size: 28rpx;
+	position: relative;
+	.up-img {
+		width: 160rpx;
+		height: 160rpx;
+		margin: 45rpx auto;
+	}
+	.action-btn {
+		width: 580rpx;
+		height: 90rpx;
+		color: #fff;
+		font-weight: 500;
+		background-color: #ffc43d;
+		text-align: center;
+		border-radius: 45rpx;
+		line-height: 90rpx;
+	}
+	.action-top {
+		width: 345rpx;
+		height: 60rpx;
+		position: absolute;
+		top: -30rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+	}
+}
+
+</style>

+ 3 - 3
pages/shop/rent.vue

@@ -97,7 +97,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="dy-wrap" v-if="selectTc.id && userInfo.battery_deposit  != 1">
+		<view class="dy-wrap" >
 			<view class="top-wrap flex">
 				<view class="top-left">
 					押金服务
@@ -108,7 +108,7 @@
 				</view> -->
 			</view>
 			<view class="contet-list flex">
-				<!-- <view class="tc flex dy">
+				<view class="tc flex dy">
 					<view class="tc-time">
 						<image src="../../static/icon/orderWx.png" mode="heightFix"></image>微信信用免押金
 					</view>
@@ -118,7 +118,7 @@
 					<view class="tc-price">
 						77<text>¥88</text>
 					</view>
-				</view> -->
+				</view>
 				<view class="tc flex dy action">
 					<view class="tc-time">
 						支付押金

+ 3 - 2
pages/user_home/award/award.vue

@@ -254,7 +254,6 @@
 		position: relative;
 		height: 480rpx;
 		color: #ffffff;
-
 		.content-bg {
 			position: absolute;
 			top: 0;
@@ -294,8 +293,10 @@
 			position: fixed;
 			left: 0;
 			top: 0;
+			/* #ifdef MP-WEIXIN */
+			top: 44rpx;
+			/* #endif */
 			width: 100%;
-
 			.header {}
 
 			.goback-box {

+ 477 - 0
pages/user_home/money/qxq.vue

@@ -0,0 +1,477 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar">
+				<!-- 这里是状态栏 -->
+			</view>
+			<view class="body-title flex-center">
+				<view class="goback-box flex-center" @click="toBack">
+					<image class="goback" src="../../../static/icon/next2.png" mode="scaleToFill"></image>
+				</view>
+				<view class="header flex-center">我的骑行券</view>
+			</view>
+			<view class="content-bg">
+				<image src="../../../static/image/awardbg.png" mode="scaleToFill"></image>
+			</view>
+			<view class="money-box">
+				<view class="money">{{ bankData.brokerage_price || 0 }}</view>
+				<view>我的骑行券</view>
+			</view>
+			<!-- <view class="moneybtn-box flex">
+				<view class="money-btn flex" @click="navto('/pages/user_home/award/changeWallet')">
+					<image src="../../../static/icon/award1.png" mode="widthFix" class="tip"></image>
+					<view>
+						卡券转换
+					</view>
+				</view>
+				<view class="money-btn flex" @click="navto('/pages/user_home/award/withdrawal')">
+					<image src="../../../static/icon/award2.png" mode="widthFix" class="tip"></image>
+					<view>
+						佣金提现
+					</view>
+				</view>
+			</view> -->
+		</view>
+		<!-- <view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{bankData.total_brokerage || '0.00'}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{bankData.ext_broerage || '0.00'}}</view>
+			</view>
+		</view> -->
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
+			@change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<!-- #ifdef H5 -->
+					<empty src="../../../static/error/emptyOrder.png"
+						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<empty src="../../static/error/emptyOrder.png"
+						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+					<!-- #endif -->
+					<!-- 订单列表 -->
+					<view>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.title }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"
+						v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	import {
+		mapGetters
+	} from 'vuex';
+	import {
+		extractBank,
+		spreadCommission
+	} from '@/api/wallet.js'
+	export default {
+		filters: {
+			getMoneyStyle
+		},
+		computed: {
+			...mapState('user', ['userInfo'])
+		},
+		onReady(res) {
+			var _this = this;
+			console.log(_this.userInfo)
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		data() {
+			return {
+				height: '',
+				// 头部图高度
+				maxheight: '',
+				tabCurrentIndex: 0,
+				orderStatusSum: 0,
+				recharge: 0,
+				navList: [
+					// {
+					// 	state: 0,
+					// 	text: '全部',
+					// 	loadingType: 'more',
+					// 	orderList: [],
+					// 	page: 1, //当前页数
+					// 	limit: 10 //每次信息条数
+					// },
+					{
+						state: 3,
+						text: '收入',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 4,
+						text: '支出',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				],
+				money: '',
+				bankData:{
+					brokerage_price:'0.00',
+					ext_broerage:'0.00',//累计支出
+					total_brokerage:'0.00',//累计收入
+				}
+			};
+		},
+		onLoad(options) {},
+		onShow() {
+			// this.extractBank()
+			this.loadData();
+		},
+		methods: {
+			extractBank() {
+				extractBank().then(res => {
+					this.bankData = res.data
+				})
+			},
+			toBack() {
+				uni.switchTab({
+					url: '/pages/user/user'
+				});
+			},
+			// 页面跳转
+			navto(e) {
+				uni.navigateTo({
+					url: e
+				});
+			},
+			//获取收入支出信息
+			async loadData(source) {
+				let obj = this;
+				//这里是将订单挂载到tab列表下
+				let index = this.tabCurrentIndex;
+				let navItem = this.navList[index];
+				let state = navItem.state;
+				if (source === 'tabChange' && navItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
+					return;
+				}
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				// 修改当前对象状态为加载中
+				navItem.loadingType = 'loading';
+
+				spreadCommission({
+						page: navItem.page,
+						limit: navItem.limit,
+					},state)
+					.then(({
+						data
+					}) => {
+						if(data.length > 0) {
+							navItem.orderList = navItem.orderList.concat(data[0].list)
+							navItem.page++
+							if (navItem.limit == data.length) {
+								navItem.loadingType = 'more';
+							} else {
+								navItem.loadingType = 'noMore'
+							}
+						}else {
+							navItem.loadingType = 'noMore'
+						}
+						
+						uni.hideLoading();
+						this.$set(navItem, 'loaded', true);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background: #f1f1f1;
+		height: 100%;
+	}
+
+
+	.content-money {
+		position: relative;
+		height: 480rpx;
+		color: #ffffff;
+
+		.content-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			height: 480rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.money-box {
+			position: relative;
+			z-index: 2;
+			padding-top: 230rpx;
+			text-align: center;
+			padding-bottom: 50rpx;
+
+			.money {
+				font-size: 72rpx;
+				font-weight: bold;
+			}
+
+			.text {
+				font-size: $font-lg;
+			}
+		}
+
+		.body-title {
+			height: 80rpx;
+			text-align: center;
+			font-size: 35rpx;
+			z-index: 999;
+			font-weight: bold;
+			position: fixed;
+			left: 0;
+			top: 0;
+			/* #ifdef MP-WEIXIN */
+			top: 44rpx;
+			/* #endif */
+			width: 100%;
+
+			.header {}
+
+			.goback-box {
+				position: absolute;
+				left: 18rpx;
+				bottom: 0;
+				top: 0;
+
+				.goback {
+					width: 34rpx;
+					height: 34rpx;
+					transform: rotate(180deg);
+				}
+			}
+
+		}
+	}
+
+	.info-box {
+		width: 670rpx;
+		height: 186rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: -100rpx auto 0;
+		position: relative;
+		z-index: 2;
+
+		.info-item {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 1;
+
+			.info-font {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #999999;
+			}
+
+			.info-num {
+				margin-top: 30rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #181818;
+			}
+		}
+
+		.shu {
+			width: 2rpx;
+			height: 74rpx;
+			background: #dcdfe6;
+		}
+	}
+
+
+
+	.moneybtn-box {
+		position: relative;
+		padding: 0rpx 50rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+		.money-btn{
+			font-size: $font-lg;
+			.tip{
+				width: 40rpx;
+				height:40rpx;
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	.navbar {
+		margin-top: 20rpx;
+		display: flex;
+		height: 88rpx;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: #999999;
+			position: relative;
+
+			&.current {
+				color: #000;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #fe5b38;
+				}
+			}
+		}
+	}
+
+	//列表
+	.swiper-box {
+		.order-item:last-child {
+			margin-bottom: 60rpx;
+		}
+
+		.order-item {
+			padding: 20rpx 30rpx;
+			line-height: 1.5;
+
+			.title-box {
+				.title {
+					font-size: $font-lg;
+					color: $font-color-base;
+				}
+
+				.time {
+					font-size: $font-base;
+					color: $font-color-light;
+				}
+			}
+
+			.money {
+				color: #fd5b23;
+				font-size: $font-lg;
+				text-align: right;
+
+				.status {
+					color: $font-color-light;
+				}
+			}
+		}
+	}
+
+	.list-scroll-content {
+		background: #ffffff;
+		height: 100%;
+	}
+
+	.content {
+		height: 100%;
+
+		.empty-content {
+			background-color: #ffffff;
+		}
+
+	}
+
+	.btn-box {
+		width: 674rpx;
+		height: 88rpx;
+		background: linear-gradient(0deg, #2e58ff, #32c6ff);
+		border-radius: 44rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
+		text-align: center;
+		line-height: 88rpx;
+		position: fixed;
+		bottom: 48rpx;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
+	}
+</style>

BIN
static/image/action-top.png


BIN
static/image/upimg-g.png


+ 2 - 2
store/index.js

@@ -7,9 +7,9 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		// baseURL:'https://wx.linkaa.cn',//请求地址配置 
+		baseURL:'https://wx.linkaa.cn',//请求地址配置 
 		
-		baseURL:'http://ltzd.frp.liuniu946.com',//请求地址配置 
+		// baseURL:'http://ltzd.frp.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		hasLogin:false,
 		// #ifdef H5