优化月卡购买功能

api/car/carApi.js

@@ -28,12 +28,12 @@ export function getCars(_objData) {
 			success: function(res) {
 				if (res.statusCode == 200) {
 					//将业主信息和房屋信息一起返回
-					let _parkingSpaces = res.data.data;
+					let _cars = res.data.data;
 					if (_parkingSpaces.length == 0) {
-						reject("业主没有房屋信息");
+						reject("业主没有车辆信息");
 						return;
 					}
-					resolve(_parkingSpaces);
+					resolve(_cars);
 				} else {
 					reject("查询车辆失败");
 				}
@@ -45,6 +45,59 @@ export function getCars(_objData) {
 	});
 };
 
+export function queryAppOwnerCars(_objData) {
+	return new Promise((resolve, reject) => {
+		request({
+			url: url.queryAppOwnerCars,
+			method: "GET",
+			data:_objData,
+			success: function(res) {
+				if (res.statusCode == 200) {
+					//将业主信息和房屋信息一起返回
+					let _cars = res.data.data;
+					if (_cars.length == 0) {
+						reject("业主没有车辆信息");
+						return;
+					}
+					resolve(_cars);
+				} else {
+					reject("查询车辆失败");
+				}
+			},
+			fail: function(res) {
+				reject(res);
+			}
+		});
+	});
+};
+export function queryAppCarMonthCard(_objData) {
+	return new Promise((resolve, reject) => {
+		request({
+			url: url.queryAppCarMonthCard,
+			method: "GET",
+			data:_objData,
+			success: function(res) {
+				if (res.statusCode == 200) {
+					//将业主信息和房屋信息一起返回
+					let _cars = res.data.data;
+					if (_cars.length == 0) {
+						reject("业主没有车辆信息");
+						return;
+					}
+					resolve(_cars);
+				} else {
+					reject("查询车辆失败");
+				}
+			},
+			fail: function(res) {
+				reject(res);
+			}
+		});
+	});
+};
+
+
+
 
 export function queryWaitPayFeeTempCar(_objData) {
 	return new Promise((resolve, reject) => {

components/service/service-property.vue

@@ -182,12 +182,12 @@
 						href: '/pages/itemRelease/itemRelease',
 						ownerAuth:true
 					},
-					// {
+					{
-					// 	name: '智能充电',
+						name: '车辆月卡',
-					// 	src: this.imgUrl + '/h5/images/serve/my3.png',
+						src: this.imgUrl + '/h5/images/serve/my3.png',
-					// 	href: '/pages/machine/chargeMachines',
+						href: '/pages/fee/buyeCarMonthCard',
-					// 	ownerAuth:false
+						ownerAuth:false
-					// },
+					},
 					{
 						name: '物业打分',
 						src: this.imgUrl + '/h5/images/serve/my9.png',

constant/url.js

@@ -241,6 +241,10 @@ export default {
 	listInvoiceEvent: baseUrl+"app/invoice.listInvoiceEvent",
 	saveInvoiceApply: baseUrl+"app/invoice.saveInvoiceApply",
 	getNativeQrcodePayment: baseUrl+"app/payment.getNativeQrcodePayment",
+	queryAppOwnerCars: baseUrl+"app/owner.queryAppOwnerCars",
+	queryAppCarMonthCard: baseUrl+"app/carMonth.queryAppCarMonthCard",
+	
+	
 	
 	
 	

manifest.json

@@ -80,12 +80,12 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/app" : {
-                    "target" : "http://192.168.100.108:8088/", //目标接口域名
+                    "target" : "http://127.0.0.1:8008/", //目标接口域名
                     "changeOrigin" : true, //是否跨域
                     "secure" : true // 设置支持https协议的代理
                 },
                 "/callComponent" : {
-                    "target" : "http://192.168.100.108:8088/", //目标接口域名
+                    "target" : "http://127.0.0.1:8008/", //目标接口域名
                     "changeOrigin" : true, //是否跨域
                     "secure" : true // 设置支持https协议的代理
                 }

pages.json

@@ -1029,6 +1029,13 @@
         		"navigationBarTitleText" : "认证记录",
         		"enablePullDownRefresh" : false
         	}
+        },
+        {
+        	"path" : "pages/fee/buyeCarMonthCard",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "车辆月卡"
+        	}
         }
     ],
 	"tabBar": {

pages/fee/buyeCarMonthCard.vue

@@ -0,0 +1,181 @@
+<template>
+	<view>
+		<view class="block__title">购买月卡</view>
+		<view class="cu-list menu">
+			<view class="cu-item">
+				<view class="content">
+					<text class="text-grey">车辆</text>
+				</view>
+				<view class="action">
+					<picker bindchange="PickerChange" :value="carIndex" :range="cars" :range-key="'carNum'" @change="carChange">
+						<view class="picker ">
+							{{carIndex == -1?'请选择': cars[carIndex].carNum}}>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="cu-item" v-if="carNum">
+				<view class="content">
+					<text class="text-grey">到期时间</text>
+				</view>
+				<view class="action">
+					<text class="text-grey text-sm">{{endTime}}</text>
+				</view>
+			</view>
+			<view class="cu-item" v-if="carNum">
+				<view class="content">
+					<text class="text-grey">选择月卡</text>
+				</view>
+				<view class="action">
+					<picker bindchange="PickerChange" :value="cardIndex" :range="cards" :range-key="'cardName'" @change="cardChange">
+						<view class="picker">
+							{{cardIndex == -1?'请选择': cards[cardIndex].cardName}}>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="cu-item" v-if="carNum">
+				<view class="content">
+					<text class="text-grey">支付金额</text>
+				</view>
+				<view class="action">
+					<text class="text-grey text-sm">{{amount}}</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class=" bg-white  border flex justify-end" style="position: fixed;width: 100%;bottom: 0;">
+		
+			<view class="action text-orange margin-right line-height">
+				合计：{{amount}}元
+			</view>
+			<view class="btn-group">
+				<button class="cu-btn bg-red shadow-blur lgplus sharp" @click="onPayFee()">提交订单</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// pages/account/myAccount.js
+	import context from '../../lib/java110/Java110Context.js';
+	import {queryAppOwnerCars,queryAppCarMonthCard} from '../../api/car/carApi.js';
+	import {getCommunityId} from '@/api/community/communityApi.js';
+	import {getUserId} from '../../api/user/userApi.js';
+	
+	import {payFeeApp,payFeeWechat} from '@/api/fee/feeApi.js';
+	export default {
+		data() {
+			return {
+				carIndex:-1,
+				cars:[],
+				carId:'',
+				carNum:'',
+				endTime:'',
+				communityId:'',
+				cardIndex:'-1',
+				cards:[],
+				cardId:'',
+				amount:'0'
+			}
+		},
+		onLoad(options) {
+			this.machineId = options.machineId;
+			this.roomId = options.roomId;
+			this._loadCars();
+		},
+		methods: {
+			_loadCars: function() {
+				let _that = this;
+				queryAppOwnerCars({
+					page:1,
+					row:10,
+					communityId:getCommunityId(),
+				}).then(_data=>{
+					console.log(_data)
+					_that.cars = _data;
+				})
+			},
+			carChange:function(e){
+				this.carIndex = e.detail.value;
+				let _selectCar = this.cars[e.detail.value];
+				this.carNum = _selectCar.carNum;
+				this.endTime = _selectCar.endTime;
+				this.carId = _selectCar.carId;
+				this._loadCarMonthCards();
+			},
+			cardChange:function(e){
+				this.cardIndex = e.detail.value;
+				let _selectCard = this.cards[e.detail.value];
+				this.cardId = _selectCard.cardId;
+				this.amount = _selectCard.cardPrice;
+			},
+			_loadCarMonthCards: function() {
+				let _that = this;
+				queryAppCarMonthCard({
+					page:1,
+					row:50,
+					carId:this.carId,
+					communityId:getCommunityId(),
+				}).then(_data=>{
+					console.log(_data)
+					_that.cards = _data;
+				})
+			},
+			onPayFee: function() {
+				if(!this.cardId){
+					uni.showToast({
+						icon:'none',
+						title:'请选择月卡'
+					});
+					return ;
+				}
+				let _receivedAmount = this.amount;
+				let _tradeType = 'JSAPI';
+				let _objData = {
+					business: "buyCarMonthCard",
+					communityId:getCommunityId(),
+					carId: this.carId,
+					carNum: this.carNum,
+					cardId: this.cardId,
+					feeName: '购买停车月卡',
+					receivedAmount: _receivedAmount,
+					tradeType: _tradeType,
+				};
+				uni.setStorageSync('doing_cashier',_objData);
+				uni.navigateTo({
+					url:'/pages/fee/cashier?money='+_receivedAmount+"&business=buyCarMonthCard&communityId="+getCommunityId()+"&cashierUserId="+getUserId()
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.block__title {
+		margin: 0;
+		font-weight: 400;
+		font-size: 14px;
+		color: rgba(69, 90, 100, .6);
+		padding: 40rpx 30rpx 20rpx;
+	}
+	
+	.button_up_blank {
+		height: 40rpx;
+	}
+	
+	.cu-btn.lgplus {
+		padding: 0 20px;
+		font-size: 18px;
+		height: 100upx;
+	
+	}
+	
+	.cu-btn.sharp {
+		border-radius: 0upx;
+	}
+	
+	.line-height {
+		line-height: 100upx;
+	}
+</style>