Merge branch 'inviteDev'

* inviteDev:
  1.调样式
  1.保存图片 到相册
  no message
  保存图片
  1.面对面邀请,图片保存
  1.邀请有礼, 分享, 2. 面对面邀请
  1.邀请有礼
  1.邀请有礼

# Conflicts:
#	common/request.js
#	pages/homePage/homePage.vue

common/request.js

@@ -1,11 +1,12 @@
 //测试地址
- const baseUrl = 'http://58.56.15.138:20201/' 
+const baseUrl = 'http://58.56.15.138:20201/' 
 const burl2='http://58.56.15.138:20201/' 
  
 //正式地址
 /* const baseUrl = 'https://apiclt.66km.com/'
 const burl2='https://apiclt.66km.com/' */
 
+
 import md5 from './MD5.js'
 
 
@@ -94,6 +95,53 @@ const http = (url = '', date = {}, type = 'POST', header = {
         }) 
     });
 }
+// 请求图片流
+const httpBinary = (url = '', date = {}, type = 'POST', header = {
+}) => {
+    return new Promise((resolve, reject) => {
+		console.log(burl2 + url)
+		header={};
+		const logodata = uni.getStorageSync("logodata");
+		header['token']=logodata.token;
+		header['uid']=logodata.uid; 
+		//header['token']='98A9FED8814B457288166BDF623F33D1';
+		//header['uid']='39415962-C9D3-466D-A73F-5B5429A8DB2A'; 
+		header['Content-Type']='application/x-www-form-urlencoded';
+		//console.log(header)
+        uni.request({
+            method: type,
+            url: baseUrl + url,
+            data: date,
+            header: header,
+            dataType: 'json', 
+			responseType: "arraybuffer",
+        }).then((response) => {
+           /* setTimeout(function() {
+                uni.hideLoading();
+            }, 200); */
+            let [error, res] = response;
+		 
+			if(res.data.code==401||res.data.code==403){
+				 uni.showToast({
+				     title: res.data.msg,
+				 	 icon:'none',
+				     duration: 3000,
+				 });
+				 uni.clearStorageSync()
+				 uni.navigateTo({
+					url:'../login/login'
+				}) 
+			}else if(res.data.code==409){
+				 // getToken(url,date,type,header)
+			}
+			
+            resolve(res.data);
+        }).catch(error => {
+            let [err, res] = error;
+            reject(err)
+        }) 
+    });
+}
 
 function getToken(url,date,type,header){
 	var header={};
@@ -156,5 +204,5 @@ function refresh(url,date,type,header){
 }
 
 export default {
-	http,baseUrl
+	http,baseUrl,httpBinary
 }

main.js

@@ -3,7 +3,7 @@ import App from './App'
 import request from 'common/request.js'
 import common from 'common/common.js'
 
-
+Vue.prototype.$httpBinary = request.httpBinary
 Vue.prototype.$http = request.http
 Vue.prototype.$request =request
 Vue.prototype.$common =common

pages.json

@@ -321,6 +321,69 @@
             }
             
         }
+        ,{
+            "path" : "pages/me/invite",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "邀请有礼",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/me/extractHistory",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "提现记录",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/me/extract",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "提现",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/me/inviteImg",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "面对面邀请",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/me/commissionHistory",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "累计佣金",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/me/invitePeople",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "邀请人数",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/me/guize",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "活动规则",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/homePage/allDiscountCard.vue

@@ -19,17 +19,19 @@
 							</view>
 
 							<view class="rightView">
-								<view class="firstView">
-									<view class="cardName">{{item.ActName}}</view>
-									<view class="rightBtn" v-if="item.pickNum<=0" @click="lingqu(item, index)">立即领取</view>
+								<view class="firstView">
+									<view class="cardName">{{item.ActName}}</view>
+									<view class="rightBtn" v-if="item.pickNum<=0" @click="lingqu(item, index)">立即领取
+									</view>
 								</view>
 								<!-- 时间截取 -->
 								<view class="valid" v-if="item.EndOffsetDays == -1">
 									{{item.StartTime.slice(0,item.StartTime.length-8)}}至
-									{{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
+									{{item.EndTime.slice(0,item.EndTime.length-8)}}
+								</view>
 								<view class="valid" v-else>领取后 {{item.EndOffsetDays}} 天有效</view>
 							</view>
-							
+
 
 						</view>
 
@@ -44,7 +46,7 @@
 		</view>
 
 		<view class="bottomViewBtn" v-if="itemData.length!=0">
-			<view class="saveCar" @click="alllingqu" v-if="allHave==false">一键领取</view>
+			<view class="saveCar" @click="alllingqu" v-if="allHave==false">一键领取</view>
 			<view class="saveCar" style="background-color: #FF9566;" v-else>已全部领取</view>
 		</view>
 
@@ -67,7 +69,7 @@
 				itemData: [],
 				page: 1,
 				noMoreShow: false,
-				allHave:true,
+				allHave: true,
 			}
 		},
 		onLoad(opt) {
@@ -76,7 +78,7 @@
 
 		},
 		methods: {
-			
+
 			lingqu(item, index) {
 				uni.showLoading({
 					title: '领取中'
@@ -85,36 +87,36 @@
 					couponID: item.ID,
 				}, 'POST').then(res => {
 					uni.hideLoading();
-					if (res.code==0) {
-						var itemData = this.itemData[index]
-						itemData.pickNum = 1
-						console.log('itemData.pickNum',itemData.pickNum);
-						uni.showToast({
-							title: '领取成功',
-							icon: 'success',
-							duration: 2000
-						});
+					if (res.code == 0) {
+						var itemData = this.itemData[index]
+						itemData.pickNum = 1
+						console.log('itemData.pickNum', itemData.pickNum);
+						uni.showToast({
+							title: '领取成功',
+							icon: 'success',
+							duration: 2000
+						});
+					}
+				})
+			},
+			alllingqu() {
+				uni.showLoading({
+					title: '领取中'
+				})
+				this.$http('worldKeepCar/keepCarMy/pickTCouponAll', {
+
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						this.myOrderCoupon()
+						this.allHave = true
+						uni.showToast({
+							title: '领取成功',
+							icon: 'success',
+							duration: 2000
+						});
 					}
 				})
-			},
-			alllingqu() {
-				uni.showLoading({
-					title: '领取中'
-				})
-				this.$http('worldKeepCar/keepCarMy/pickTCouponAll', {
-					
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					if (res.code==0) {
-						this.myOrderCoupon()
-						this.allHave = true
-						uni.showToast({
-							title: '领取成功',
-							icon: 'success',
-							duration: 2000
-						});
-					}
-				})
 			},
 			myOrderCoupon() {
 				uni.showLoading({
@@ -145,18 +147,18 @@
 						this.noMoreShow = true
 					} else {
 						this.noMoreShow = false
-					}
-					
-					if (this.itemData.length != 0) {
-						this.itemData.forEach((item, index) => {
-							if (item.pickNum <= 0) {
-								this.allHave = false
-							}
-						})
-					}
-					
-					
-					
+					}
+
+					if (this.itemData.length != 0) {
+						this.itemData.forEach((item, index) => {
+							if (item.pickNum <= 0) {
+								this.allHave = false
+							}
+						})
+					}
+
+
+
 				})
 			},
 			goDiscountDetail(item) {
@@ -196,8 +198,8 @@
 
 
 	.itemContent {
-		padding: 20rpx 24rpx;
-		
+		padding: 20rpx 24rpx;
+
 	}
 
 	.item {
@@ -229,13 +231,16 @@
 		margin-right: 40rpx;
 
 	}
-	.rightView{
-		flex-grow: 1;
-	}
-	.firstView{
-		display: flex;
-		justify-content: space-between;
+
+	.rightView {
+		flex-grow: 1;
+	}
+
+	.firstView {
+		display: flex;
+		justify-content: space-between;
 	}
+
 	.moneyView {
 		display: flex;
 		justify-content: flex-start;
@@ -257,9 +262,9 @@
 		font-weight: bold;
 		color: #333333;
 		margin-top: 10rpx;
-		margin-bottom: 15rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
+		margin-bottom: 15rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
@@ -302,6 +307,8 @@
 		height: 120rpx;
 		position: fixed;
 		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.saveCar {

pages/index/addCar.vue

@@ -1,480 +1,480 @@
-<template>
-	<view class="content">
-
-		<!-- 填写车辆信息 -->
-		<view class="carMessage">
-
-			<view class="mesView">
-				<view class="leftTitle">车牌号</view>
-				<input class="plateNumber" placeholder-style="color:#999999" placeholder="请输入车牌号" disabled="true"
-					@tap="plateShow=true" v-model.trim="plateNo" />
-				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
-
-
-			</view>
-
-			<view class="mesView" @click="goCarModel()">
-				<view class="leftTitle">车型</view>
-				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
-				<view class="carModBtn selectColor carMod" v-else>{{carModelInfo.value}}</view>
-				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">购车时间</view>
-				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate" :value="time">
-					<view class="uni-input selectColor" v-if="time">{{time}}</view>
-					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
-				</picker>
-				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
-			</view>
-
-			<view class="mesView">
-				<view class="leftTitle">行驶里程</view>
-				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
-					placeholder-style="color:#999999" />
-				<view class="kmStr">km</view>
-			</view>
-
-
-		</view>
-
-
-		<view class="bottomView">
-			<view class="saveCar" @click="saveCar()">
-				<image src="../../static/img/icon_tianjiacheliang.png" mode="" style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
-				<view>保存爱车</view>
-				</view>
-		</view>
-        <view>
-			 <w-picker
-			        :visible.sync="visible"
-			        mode="selector"
-			        value="2"
-			        default-type="value"
-			        :default-props="defaultProps"
-			        :options="sbPlate"
-			        @confirm="onConfirm($event,'selector')"
-			        @cancel="onCancel"
-			        ref="selector" 
-			    ></w-picker>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
-	import wPicker from "@/components/w-picker/w-picker.vue";
-	export default {
-		components: {
-			plateInput,wPicker
-		},
-
-		data() {
-			return {
-
-				plateNo: '',
-				plateShow: false,
-				carModelInfo: '',
-				time: '',
-				mileage: '',
-				carId: '',
-				isEditCar: false,
-				currentdate:'',
-				plate_type:'',
-                sbPlate:[],
-				visible:false,
-				defaultProps:{"label":"value","value":"ids"},
-				vin:'',
-			}
-		},
-		onLoad(opt) {
-			uni.removeStorageSync('carModelInfo');
-			
-			this.getNowFormatDate();	
-			
-			console.log(opt);
-			this.isEditCar = opt.isEditCar
-			this.carId = opt.id
-			if (this.isEditCar == 'true') {
-				
-				this.getEditData()
-				uni.setNavigationBarTitle({
-					title:'编辑爱车'
-				})
-			}
-		},
-		onShow() {
-			var carModelInfo = uni.getStorageSync("carModelInfo");
-			if (carModelInfo) {
-				this.carModelInfo = carModelInfo;
-			}
-		},
-		methods: {
-			onConfirm(e){
-				console.log(e)
-				this.carModelInfo=e.obj
-			},
-			onCancel(){
-				this.visible=false
-			},
-			getNowFormatDate(){
-				
-				var date = new Date();
-				var seperator1 = "-";
-				var year = date.getFullYear();
-				var month = date.getMonth() + 1;
-				var day = date.getDate();
-				if (month >= 1 && month <= 9) {
-					month = "0" + month;
-				}
-				if (day >= 0 && day <= 9) {
-					day = "0" + day;
-				}
-				var currentdate = year + seperator1 + month + seperator1 + day;
-				 this.currentdate = currentdate;
-			},
-			getEditData() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				var carModelInfo = {
-					carModelInfo: {
-
-					}
-				}
-				this.$http('worldKeepCar/worldHome/queryMyTMemberCarDetail', {
-					id: this.carId
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					carModelInfo.carModelInfo.logo = res.data.brandLogo;
-					carModelInfo.carModelInfo.brand = res.data.brand;
-					carModelInfo.carModelInfo.carSeries = res.data.series;
-					carModelInfo.carModelInfo.displacement = res.data.displacement;
-					carModelInfo.carModelInfo.transmissionType = res.data.transmissionType;
-					carModelInfo.carModelInfo.productionYear = res.data.annualmoney;
-					carModelInfo.carModelInfo.carModel = res.data.carModel;
-					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
-					carModelInfo.carModelInfo.engineModel = res.data.engineType;
-					carModelInfo.carModelInfo.nLevelID = res.data.nLevelID;
-					carModelInfo.carModelInfo.salesName = res.data.saleName;
-					
-					
-					// 展示时
-					this.plateNo = res.data.plateNumber;
-					carModelInfo.value = res.data.carModel;
-					if (res.data.acarTime) {
-						this.time = res.data.acarTime.slice(0,res.data.createTime.length-8);
-					}
-					this.mileage = res.data.milage;
-
-					this.carModelInfo = carModelInfo;
-					this.vin = res.data.vIN
-					
-					console.log('this carModelInfo',this.carModelInfo);
-				})
-			},
-			goCarModel() {
-				uni.navigateTo({
-					url: 'carModel'
-				})
-			},
-			setPlate(plate) {
-				console.log(plate)
-				if (plate.length >= 7) this.plateNo = plate;
-				this.plateShow = false;
-				if(plate.length == 7){
-					this.plate_type=2
-				}else{
-					this.plate_type=52
-				}
-				this.queryCarmodelByPlateNumber() 
-			},
-            queryCarmodelByPlateNumber(){
-				uni.showLoading({
-					title: '加载中'
-				})
-				this.$http('worldKeepCar/worldHome/queryCarmodelByPlateNumber', {
-					license_plate: this.plateNo,
-					plate_type: this.plate_type,
-					
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					console.log(res);
-					if (res.data) {
-						this.vin = res.data.vin
-						if (res.data.buyTime) {
-							this.time = res.data.buyTime.slice(0,res.data.buyTime.length-8);
-						}
-						
-					}
-					if(res.data.list&&res.data.list.length>0){
-						this.sbPlate=res.data.list
-						//this.sbPlate=this.sbPlate.concat(this.sbPlate)
-						if(this.sbPlate.length==1){
-							//this.carModelInfo.value=res.data[0].value
-							this.carModelInfo=res.data.list[0]
-						}else{
-							this.visible=true
-						}
-					}
-					
-				})
-			},
-
-			bindChange(e) {
-				console.log(e);
-				this.time = e.target.value
-			},
-
-			saveCar() {
-				uni.showLoading({
-					title: '保存中'
-				})
-				if (this.plateNo == '') {
-					uni.showToast({
-						title: '请填写车牌号',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.carModelInfo == '') {
-					uni.showToast({
-						title: '请选择车型',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.time == '') {
-					uni.showToast({
-						title: '请选择购车时间',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.mileage == '') {
-					uni.showToast({
-						title: '请输入行驶里程',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.isEditCar == 'true') {
-					this.updateTMemberCar()
-				}
-				else {
-					this.addTMemberCar()
-				}
-				
-			},
-			
-			addTMemberCar(){
-				this.$http('worldKeepCar/worldHome/addTMemberCar', {
-					plateNumber: this.plateNo,
-					milage: this.mileage,
-					brand: this.carModelInfo.carModelInfo.brand,
-					displacement: this.carModelInfo.carModelInfo.displacement,
-					series: this.carModelInfo.carModelInfo.carSeries,
-					annualmoney: this.carModelInfo.carModelInfo.productionYear,
-					carModel: this.carModelInfo.value,
-					saleName: this.carModelInfo.carModelInfo.salesName,
-					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
-					model: this.carModelInfo.carModelInfo.carModel,
-					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
-					engineType: this.carModelInfo.carModelInfo.engineModel,
-					brandLogo: this.carModelInfo.carModelInfo.logo,
-					acarTime: this.time,
-					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
-					vIN:this.vin,
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					if (res.code == 0) {
-						uni.showToast({
-							title: '保存成功',
-							icon: 'none',
-							duration: 3000
-						});
-						uni.removeStorageSync('carModelInfo');
-						setTimeout(function() {
-							uni.navigateBack({
-				
-							})
-						}, 3000);
-				
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 3000
-						});
-					}
-				
-				})
-			},
-			updateTMemberCar(){
-				this.$http('worldKeepCar/worldHome/updateTMemberCar', {
-					plateNumber: this.plateNo,
-					milage: this.mileage,
-					brand: this.carModelInfo.carModelInfo.brand,
-					displacement: this.carModelInfo.carModelInfo.displacement,
-					series: this.carModelInfo.carModelInfo.carSeries,
-					annualmoney: this.carModelInfo.carModelInfo.productionYear,
-					carModel: this.carModelInfo.value,
-					saleName: this.carModelInfo.carModelInfo.salesName,
-					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
-					model: this.carModelInfo.carModelInfo.carModel,
-					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
-					engineType: this.carModelInfo.carModelInfo.engineModel,
-					brandLogo: this.carModelInfo.carModelInfo.logo,
-					acarTime: this.time,
-					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
-					vIN:this.vin,
-					id: this.carId,
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					if (res.code == 0) {
-						uni.showToast({
-							title: '保存成功',
-							icon: 'none',
-							duration: 3000
-						});
-						uni.removeStorageSync('carModelInfo');
-						setTimeout(function() {
-							uni.navigateBack({
-				
-							})
-						}, 3000);
-				
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 3000
-						});
-					}
-				
-				})
-			},
-		}
-	}
-</script>
-
-<style>
-	.content {
-		min-height: 100vh;
-		background-color: #F4F5F7;
-		padding-top: 20rpx;
-	}
-
-
-
-	.carMessage {
-		margin: 0rpx 24rpx 40rpx;
-		padding-top: 20rpx;
-		height: 500rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-	.mesView {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		background-color: #FFFFFF;
-	}
-
-	.leftTitle {
-		margin: 28rpx;
-		width: 120rpx;
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-
-	.noSelectColor {
-		color: #999999;
-
-	}
-
-	.selectColor {
-		color: #333333;
-
-	}
-	.carMod{
-		text-overflow: -o-ellipsis-lastline;
-		  overflow: hidden;
-		  text-overflow: ellipsis;
-		  display: -webkit-box;
-		  -webkit-line-clamp: 2;
-		  line-clamp: 2;
-		  -webkit-box-orient: vertical;
-	}
-	.rightArrow {
-		margin-right: 28rpx;
-		width: 14rpx;
-		height: 23rpx;
-
-	}
-
-	.cityBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.plateNumber {
-		width: 55%;
-		font-size: 28rpx;
-	}
-
-
-	.carModBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.timeBtn {
-		width: 65%;
-		font-size: 28rpx;
-	}
-
-	.mileageInput {
-		width: 20%;
-		font-size: 28rpx;
-	}
-
-	.kmStr {
-		font-size: 28rpx;
-		color: #333333;
-
-	}
-
-	.bottomView {
-		background-color: #FFFFFF;
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		bottom: 0rpx;
-	}
-
-	.saveCar {
-
-		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
-		margin: 23rpx 30rpx;
-		height: 74rpx;
-		
-		border-radius: 37rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		font-weight: bold;
-		
-		align-items: center;
-		display: flex;
-		justify-content: center;
-	}
+<template>
+	<view class="content">
+
+		<!-- 填写车辆信息 -->
+		<view class="carMessage">
+
+			<view class="mesView">
+				<view class="leftTitle">车牌号</view>
+				<input class="plateNumber" placeholder-style="color:#999999" placeholder="请输入车牌号" disabled="true"
+					@tap="plateShow=true" v-model.trim="plateNo" />
+				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
+
+
+			</view>
+
+			<view class="mesView" @click="goCarModel()">
+				<view class="leftTitle">车型</view>
+				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
+				<view class="carModBtn selectColor carMod" v-else>{{carModelInfo.value}}</view>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">购车时间</view>
+				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate" :value="time">
+					<view class="uni-input selectColor" v-if="time">{{time}}</view>
+					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
+				</picker>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">行驶里程</view>
+				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
+					placeholder-style="color:#999999" />
+				<view class="kmStr">km</view>
+			</view>
+
+
+		</view>
+
+
+		<view class="bottomView">
+			<view class="saveCar" @click="saveCar()">
+				<image src="../../static/img/icon_tianjiacheliang.png" mode=""
+					style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
+				<view>保存爱车</view>
+			</view>
+		</view>
+		<view>
+			<w-picker :visible.sync="visible" mode="selector" value="2" default-type="value"
+				:default-props="defaultProps" :options="sbPlate" @confirm="onConfirm($event,'selector')"
+				@cancel="onCancel" ref="selector"></w-picker>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			plateInput,
+			wPicker
+		},
+
+		data() {
+			return {
+
+				plateNo: '',
+				plateShow: false,
+				carModelInfo: '',
+				time: '',
+				mileage: '',
+				carId: '',
+				isEditCar: false,
+				currentdate: '',
+				plate_type: '',
+				sbPlate: [],
+				visible: false,
+				defaultProps: {
+					"label": "value",
+					"value": "ids"
+				},
+				vin: '',
+			}
+		},
+		onLoad(opt) {
+			uni.removeStorageSync('carModelInfo');
+
+			this.getNowFormatDate();
+
+			console.log(opt);
+			this.isEditCar = opt.isEditCar
+			this.carId = opt.id
+			if (this.isEditCar == 'true') {
+
+				this.getEditData()
+				uni.setNavigationBarTitle({
+					title: '编辑爱车'
+				})
+			}
+		},
+		onShow() {
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
+		},
+		methods: {
+			onConfirm(e) {
+				console.log(e)
+				this.carModelInfo = e.obj
+			},
+			onCancel() {
+				this.visible = false
+			},
+			getNowFormatDate() {
+
+				var date = new Date();
+				var seperator1 = "-";
+				var year = date.getFullYear();
+				var month = date.getMonth() + 1;
+				var day = date.getDate();
+				if (month >= 1 && month <= 9) {
+					month = "0" + month;
+				}
+				if (day >= 0 && day <= 9) {
+					day = "0" + day;
+				}
+				var currentdate = year + seperator1 + month + seperator1 + day;
+				this.currentdate = currentdate;
+			},
+			getEditData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				var carModelInfo = {
+					carModelInfo: {
+
+					}
+				}
+				this.$http('worldKeepCar/worldHome/queryMyTMemberCarDetail', {
+					id: this.carId
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					carModelInfo.carModelInfo.logo = res.data.brandLogo;
+					carModelInfo.carModelInfo.brand = res.data.brand;
+					carModelInfo.carModelInfo.carSeries = res.data.series;
+					carModelInfo.carModelInfo.displacement = res.data.displacement;
+					carModelInfo.carModelInfo.transmissionType = res.data.transmissionType;
+					carModelInfo.carModelInfo.productionYear = res.data.annualmoney;
+					carModelInfo.carModelInfo.carModel = res.data.carModel;
+					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
+					carModelInfo.carModelInfo.engineModel = res.data.engineType;
+					carModelInfo.carModelInfo.nLevelID = res.data.nLevelID;
+					carModelInfo.carModelInfo.salesName = res.data.saleName;
+
+
+					// 展示时
+					this.plateNo = res.data.plateNumber;
+					carModelInfo.value = res.data.carModel;
+					if (res.data.acarTime) {
+						this.time = res.data.acarTime.slice(0, res.data.createTime.length - 8);
+					}
+					this.mileage = res.data.milage;
+
+					this.carModelInfo = carModelInfo;
+					this.vin = res.data.vIN
+
+					console.log('this carModelInfo', this.carModelInfo);
+				})
+			},
+			goCarModel() {
+				uni.navigateTo({
+					url: 'carModel'
+				})
+			},
+			setPlate(plate) {
+				console.log(plate)
+				if (plate.length >= 7) this.plateNo = plate;
+				this.plateShow = false;
+				if (plate.length == 7) {
+					this.plate_type = 2
+				} else {
+					this.plate_type = 52
+				}
+				this.queryCarmodelByPlateNumber()
+			},
+			queryCarmodelByPlateNumber() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('worldKeepCar/worldHome/queryCarmodelByPlateNumber', {
+					license_plate: this.plateNo,
+					plate_type: this.plate_type,
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					console.log(res);
+					if (res.data) {
+						this.vin = res.data.vin
+						if (res.data.buyTime) {
+							this.time = res.data.buyTime.slice(0, res.data.buyTime.length - 8);
+						}
+
+					}
+					if (res.data.list && res.data.list.length > 0) {
+						this.sbPlate = res.data.list
+						//this.sbPlate=this.sbPlate.concat(this.sbPlate)
+						if (this.sbPlate.length == 1) {
+							//this.carModelInfo.value=res.data[0].value
+							this.carModelInfo = res.data.list[0]
+						} else {
+							this.visible = true
+						}
+					}
+
+				})
+			},
+
+			bindChange(e) {
+				console.log(e);
+				this.time = e.target.value
+			},
+
+			saveCar() {
+				uni.showLoading({
+					title: '保存中'
+				})
+				if (this.plateNo == '') {
+					uni.showToast({
+						title: '请填写车牌号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.carModelInfo == '') {
+					uni.showToast({
+						title: '请选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.time == '') {
+					uni.showToast({
+						title: '请选择购车时间',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.mileage == '') {
+					uni.showToast({
+						title: '请输入行驶里程',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.isEditCar == 'true') {
+					this.updateTMemberCar()
+				} else {
+					this.addTMemberCar()
+				}
+
+			},
+
+			addTMemberCar() {
+				this.$http('worldKeepCar/worldHome/addTMemberCar', {
+					plateNumber: this.plateNo,
+					milage: this.mileage,
+					brand: this.carModelInfo.carModelInfo.brand,
+					displacement: this.carModelInfo.carModelInfo.displacement,
+					series: this.carModelInfo.carModelInfo.carSeries,
+					annualmoney: this.carModelInfo.carModelInfo.productionYear,
+					carModel: this.carModelInfo.value,
+					saleName: this.carModelInfo.carModelInfo.salesName,
+					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
+					model: this.carModelInfo.carModelInfo.carModel,
+					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
+					engineType: this.carModelInfo.carModelInfo.engineModel,
+					brandLogo: this.carModelInfo.carModelInfo.logo,
+					acarTime: this.time,
+					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+					vIN: this.vin,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'none',
+							duration: 3000
+						});
+						uni.removeStorageSync('carModelInfo');
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 3000);
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+
+				})
+			},
+			updateTMemberCar() {
+				this.$http('worldKeepCar/worldHome/updateTMemberCar', {
+					plateNumber: this.plateNo,
+					milage: this.mileage,
+					brand: this.carModelInfo.carModelInfo.brand,
+					displacement: this.carModelInfo.carModelInfo.displacement,
+					series: this.carModelInfo.carModelInfo.carSeries,
+					annualmoney: this.carModelInfo.carModelInfo.productionYear,
+					carModel: this.carModelInfo.value,
+					saleName: this.carModelInfo.carModelInfo.salesName,
+					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
+					model: this.carModelInfo.carModelInfo.carModel,
+					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
+					engineType: this.carModelInfo.carModelInfo.engineModel,
+					brandLogo: this.carModelInfo.carModelInfo.logo,
+					acarTime: this.time,
+					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+					vIN: this.vin,
+					id: this.carId,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'none',
+							duration: 3000
+						});
+						uni.removeStorageSync('carModelInfo');
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 3000);
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.content {
+		min-height: 100vh;
+		background-color: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+
+
+	.carMessage {
+		margin: 0rpx 24rpx 40rpx;
+		padding-top: 20rpx;
+		height: 500rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.mesView {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		background-color: #FFFFFF;
+	}
+
+	.leftTitle {
+		margin: 28rpx;
+		width: 120rpx;
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+
+	.noSelectColor {
+		color: #999999;
+
+	}
+
+	.selectColor {
+		color: #333333;
+
+	}
+
+	.carMod {
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.rightArrow {
+		margin-right: 28rpx;
+		width: 14rpx;
+		height: 23rpx;
+
+	}
+
+	.cityBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.plateNumber {
+		width: 55%;
+		font-size: 28rpx;
+	}
+
+
+	.carModBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.timeBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.mileageInput {
+		width: 20%;
+		font-size: 28rpx;
+	}
+
+	.kmStr {
+		font-size: 28rpx;
+		color: #333333;
+
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.saveCar {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
+
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
 </style>

pages/index/cailist.vue

@@ -64,8 +64,8 @@
 		},
 		methods: {
 			getqueryMyBMemberCar() {
-				uni.showLoading({
-					title: '加载中'
+				uni.showLoading({
+					title: '加载中'
 				})
 				this.loding = false;
 				this.$http('worldKeepCar/worldHome/queryMyTMemberCar', {
@@ -124,8 +124,8 @@
 			},
 			defaultCar(item) {
 				var that = this;
-				uni.showLoading({
-					title: '保存中'
+				uni.showLoading({
+					title: '保存中'
 				})
 				that.$http('worldKeepCar/worldHome/updateTCarIsdefault', {
 					id: item.id
@@ -194,6 +194,8 @@
 		height: 120rpx;
 		position: fixed;
 		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.saveCar {
@@ -253,7 +255,7 @@
 		font-size: 22rpx;
 		margin-left: 20rpx;
 		margin-top: 5rpx;
-		
+
 	}
 
 	.carMS {

pages/me/commissionHistory.vue

@@ -0,0 +1,288 @@
+<template>
+	<view class="box">
+
+
+		<!-- 统计 -->
+		<view class="sumBg">
+			<view class="viewBg">
+				<view class="money" style="color: #FF4F00;">￥{{detailData.totalMoney}}</view>
+				<view class="moneyTitle">累计佣金
+
+				</view>
+			</view>
+
+			<view class="line"></view>
+			<view class="viewBg">
+				<view class="money">￥{{detailData.withdrawalMoney}}</view>
+				<view class="moneyTitle">累计提现
+
+				</view>
+			</view>
+
+			<view class="line"></view>
+			<view class="viewBg">
+				<view class="money">￥{{detailData.cantidatMoney}}</view>
+				<view class="moneyTitle">可提现
+
+				</view>
+			</view>
+		</view>
+
+		<!-- 明细 -->
+		<view class="mingxiBg" v-if="arr.length > 0">
+
+			<view v-for="(item,index) in arr" :key="index">
+				<view class="itemBg">
+					<image :src='item.MemberHeadImg' mode="" style="width: 72rpx; height: 72rpx; border-radius: 36rpx;">
+					</image>
+					<view class="nickName" v-if="item.MemberNickName">{{item.MemberNickName}}</view>
+					<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+					<view class="jine">+{{item.Money}}</view>
+				</view>
+			</view>
+
+
+		</view>
+
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
+
+		<view class="emptyView"></view>
+		<view class="bottomView">
+			<view class="goExtract" @click="gonavigateTo('extract?okMoney='+ detailData.cantidatMoney)">去提现</view>
+		</view>
+
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				page: 1,
+				detailData: {},
+				arr: [],
+				noMoreShow: false,
+			}
+		},
+		onShow() {
+			this.getDetailData();
+			this.page = 1;
+			this.getItemData();
+		},
+		methods: {
+			getDetailData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/worldDistribution/queryDistributionIndexDetail',
+					params = {
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var data = res.data
+
+
+					// 处理 undefined和null转为空白字符串
+
+					for (const key in data) {
+						data[key] = this.$praseStrEmpty(data[key])
+					}
+
+					this.detailData = data
+
+
+
+				})
+			},
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/worldDistribution/listEarningsPage',
+					params = {
+						page: this.page,
+						limit: 10,
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+
+
+					if (this.page == 1) {
+						this.arr = list
+					} else {
+						this.arr = this.arr.concat(list)
+					}
+
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
+					}
+
+
+				})
+			},
+			gonavigateTo(url) {
+
+				uni.navigateTo({
+					url: url
+				})
+			}
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getItemData()
+
+			this.getDetailData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+
+			this.getItemData()
+
+		},
+
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+
+
+	.sumBg {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 0 24rpx 20rpx;
+		padding: 36rpx 50rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.viewBg {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background-color: #FFFFFF;
+	}
+
+	.money {
+		font-size: 38rpx;
+		color: #000000;
+		font-weight: bold;
+	}
+
+	.moneyTitle {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.line {
+		width: 1rpx;
+		height: 73rpx;
+
+		background-color: #EEEEEE;
+	}
+
+	.mingxiBg {
+		margin: 0rpx 24rpx;
+		background-color: #FFFFFF;
+
+		border-radius: 10rpx;
+		padding: 20rpx;
+	}
+
+
+	.itemBg {
+
+		height: 98rpx;
+
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.nickName {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		width: 40%;
+		margin: 0 15rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.time {
+		font-size: 30rpx;
+		color: #999999;
+		
+		width: 27%;
+	}
+
+	.jine {
+		font-size: 32rpx;
+		color: #FF4F00;
+		font-weight: bold;
+		margin: 0 15rpx;
+		
+	}
+	.emptyView {
+		height: 120rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	.bottomView {
+		width: 100%;
+		height: 120rpx;
+
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.goExtract {
+		margin: 23rpx 30rpx;
+		border-radius: 37rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+
+		font-size: 30rpx;
+		color: #FFFFFF;
+		font-weight: bold;
+		height: 74rpx;
+		line-height: 74rpx;
+		text-align: center;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
+</style>

pages/me/extract.vue

@@ -0,0 +1,189 @@
+<template>
+	<view class="box">
+		<view class="header">
+			<view class="title">支付宝提现</view>
+			<view class="moneyView">
+				<text class="icon">￥</text>
+				<input type="digit" class="moneyInput" placeholder-style="color:#999999; font-size:30rpx"
+					placeholder="请输入提现金额" v-model="money" />
+				<view class="allBtn" @click="allBtn">全部提现</view>
+			</view>
+			<view class="zongMoney">可提现金额:￥{{okMoney}}</view>
+
+			<view class="line"></view>
+			<view class="name">
+				<view class="leftTitle">姓名</view>
+				<input type="text" class="Input" placeholder-style="color:#999999; font-size:30rpx" placeholder="支付宝实名"
+					v-model="name" />
+			</view>
+			<view class="line"></view>
+
+			<view class="name">
+				<view class="leftTitle" style="margin-right: 60rpx;">支付宝</view>
+				<input type="text" class="Input" placeholder-style="color:#999999; font-size:30rpx" placeholder="支付宝账户"
+					v-model="account" />
+			</view>
+		</view>
+
+
+		<view class="tishi" style="padding: 20rpx 44rpx;">支付宝账号或姓名输入错误将无法提现到账</view>
+
+		<view class="sureBtn" @click="sure">确认提现</view>
+		<view class="tishi">温馨提示</view>
+		<view class="tishi">1、使用支付宝提现需要您已注册支付宝并在支付宝中实名认证过。</view>
+		<view class="tishi">2、支付宝账号是您注册支付宝的手机号或者邮箱号，您可登录支付宝查看。</view>
+		<view class="tishi">3、如您在提现中遇到其他问题，请在「我的」页面找到「联系我们」。</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				okMoney:'',
+				money: '',
+				name: '',
+				account: '',
+			}
+		},
+		onLoad(opt) {
+			this.okMoney = opt.okMoney
+		},
+		methods: {
+			allBtn(){
+				this.money = this.okMoney
+			},
+			sure(){
+				if (this.money > this.okMoney) {
+					uni.showToast({
+					     title: '提现金额不能大于可提现金额',
+					 	 icon:'none',
+					     duration: 3000,
+					 });
+					 return;
+				}
+				
+				this.postData();
+			},
+			postData() {
+				uni.showLoading({
+					title: '提现中'
+				})
+				let url = 'worldKeepCar/worldDistribution/applyWithdrawal',
+					params = {
+						money:this.money,
+						aliName:this.name,
+						aliPhone:this.account,
+					}
+				this.$http(url, params, 'POST').then(res => {
+					uni.hideLoading();
+					uni.navigateBack({
+						
+					})
+					
+				
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+	.header {
+		background-color: #FFFFFF;
+		margin: 0 24rpx;
+		border-radius: 10rpx;
+		padding: 30rpx 20rpx;
+		padding-bottom: 0;
+	}
+
+	.title {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		font-weight: bold;
+	}
+
+	.moneyView {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 15rpx 0;
+	}
+
+	.icon {
+		font-size: 50rpx;
+		color: #222222;
+		font-weight: bold;
+	}
+
+	.moneyInput {
+		font-size: 70rpx;
+		color: #222222;
+		font-weight: bold;
+		flex-grow: 1;
+		height: 98rpx;
+	}
+
+	.allBtn {
+		font-size: 26rpx;
+		color: #FF4F00;
+		width: 180rpx;
+	}
+
+	.zongMoney {
+		font-size: 26rpx;
+		color: #999999;
+		margin-bottom: 30rpx;
+	}
+
+	.line {
+
+		background-color: #EEEEEE;
+		height: 1rpx;
+	}
+
+	.name {
+		display: flex;
+		justify-content: flex-start;
+		padding: 28rpx 0;
+	}
+
+	.leftTitle {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		margin-right: 90rpx;
+	}
+
+	.Input {
+		font-size: 30rpx;
+		color: #333333;
+
+	}
+
+	.tishi {
+		padding: 0 44rpx;
+		font-size: 26rpx;
+		color: #999999;
+		line-height: 1.5;
+	}
+
+	.sureBtn {
+		width: 690rpx;
+		margin: 20rpx 30rpx;
+		border-radius: 37rpx;
+		height: 74rpx;
+
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		color: #FFFFFF;
+		font-size: 30rpx;
+		text-align: center;
+		line-height: 74rpx;
+	}
+</style>

pages/me/extractHistory.vue

@@ -0,0 +1,205 @@
+<template>
+	<view class="box">
+			<view class="headerView">
+				<view class="leftTitle">累计提现: <text class="rightMoney">￥{{detailData.withdrawalMoney}}</text></view>
+				<view class="leftTitle">提现中: <text class="rightMoney">￥{{detailData.frozenMoney}}</text></view>
+			</view>
+			
+			
+					<view v-for="(item,index) in arr" :key="index" >
+						<view class="itemBg">
+							<view class="first">
+								<view class="time">{{item.createTIme}}</view>
+								<!-- 0待审核1通过2拒绝 -->
+								<view class="state" v-if="item.AuditState == 0" style="color: #F19D01;">待审核</view>
+								<view class="state" v-if="item.AuditState == 1" style="color: #00A040;">审核通过</view>
+								<view class="state" v-if="item.AuditState == 2" style="color: #FF3B30;">审核拒绝</view>
+							</view>
+							<view class="second">
+								<view class="name">{{item.aliName}}  {{item.aliPhone}}</view>
+								<view class="monty">￥{{item.money}}</view>
+							</view>
+							
+							<view class="content" v-if="item.AuditState == 2">拒绝原因：{{item.AuditComment}}</view>
+						</view>
+					</view>
+				
+			<!-- 上拉 加载更多 -->
+			<view class="noMore" v-if="noMoreShow">没有更多数据</view>
+			<!-- 无数据空白页 -->
+			<nodata v-if="arr.length==0"></nodata>
+			
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+		
+		data() {
+			return {
+				arr: [],
+				page: 1,
+				noMoreShow: false,
+				detailData:{},
+			}
+		},
+		onShow() {
+			this.getDetailData();
+			this.page = 1;
+			this.getItemData();
+		},
+		methods: {
+			getDetailData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/worldDistribution/queryDistributionIndexDetail',
+					params = {
+						
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var data = res.data
+					
+					
+					// 处理 undefined和null转为空白字符串
+					
+						for (const key in data) {
+							data[key] = this.$praseStrEmpty(data[key])
+						}
+					
+					this.detailData = data
+					
+					
+					
+				})
+			},
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/worldDistribution/listTSApplySheetPage',
+					params = {
+						page:this.page,
+						limit:10,
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+					
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+					
+					
+					if (this.page == 1) {
+						this.arr = list
+					} else {
+						this.arr = this.arr.concat(list)
+					}
+					
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
+					}
+					
+					
+				})
+			},
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getItemData()
+			
+			this.getDetailData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+		
+			this.getItemData()
+		
+		},
+	}
+</script>
+
+<style>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding-bottom: 20rpx;
+	}
+	.headerView{
+		padding: 20rpx 16rpx;
+		
+		display: flex;
+		justify-content: space-between;
+	}
+	.leftTitle{
+		font-size: 26rpx;
+		color: #999999;
+	}
+	.rightMoney{
+		font-size: 26rpx;
+		color: #3C3C3C;
+		font-weight: bold;
+	}
+	.itemBg{
+		margin: 0 16rpx 20rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		padding: 30rpx 20rpx;
+	}
+	.first{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.second{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 15rpx;
+	}
+	.content{
+		margin-top: 15rpx;
+	}
+	.time{
+		font-size: 28rpx;
+		color: #999999;
+	}
+	.state{
+		font-size: 28rpx;
+	}
+	.name{
+		font-size: 28rpx;
+		color: #3C3C3C;
+	}
+	.monty {
+		
+		font-size: 38rpx;
+		font-weight: bold;
+		color: #000000;
+	}
+	.content{
+		font-size: 28rpx;
+		color: #666666;
+	}
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
+</style>

pages/me/feedBack.vue

@@ -1,265 +1,270 @@
-<template>
-	<view class="content">
-		<view class="main">
-			<!-- 建议 -->
-			<view class="firstView">
-				<view class="title">您的问题或建议</view>
-				<view>
-					<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
-						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
-				</view>
-			</view>
-
-			<!-- 图片 -->
-			<view class="secondView">
-				<view class="title">上传图片</view>
-				<view class="imgBox">
-					<view class="imgLine" v-for="(img,imgindex) in imgArr">
-						<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
-						<image src="../../static/img/icon_del_red.png" mode="" class="delImg"
-							@click="delimg(imgindex)"></image>
-					</view>
-					<view class="imgLine" @click="uploadImg">
-						<image src="../../static/img/btn_pic.png" mode="" class="itemImg"></image>
-					</view>
-				</view>
-			</view>
-
-
-		</view>
-
-		<view class="bottom">
-			<view class="shoreDz" @click="submit">提交</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import nodata from '@/components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata
-		},
-		data() {
-			return {
-				imgArr: [],
-				exeContent: '',
-				
-			}
-		},
-		
-		methods: {
-			feedDone(e) {
-				this.exeContent = e.target.value
-				
-			},
-			uploadImg() {
-
-				var that = this;
-				var length=this.imgArr.length;
-				var num=9;
-				if(length>8){
-					uni.showToast({
-						title: '最多上传9张',
-						icon: 'none',
-						duration: 2000,
-					});
-					return false;
-				}
-				uni.chooseImage({
-					sourceType: ['album','camera'],
-					count:num-length, 
-					success: (chooseImageRes) => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						/* uni.uploadFile({
-				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
-				            filePath: tempFilePaths[0],
-				            name: 'file',
-				            formData: {
-				                'user': 'test'
-				            },
-				            success: (uploadFileRes) => {
-				                console.log(JSON.parse(uploadFileRes.data).data );
-								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
-								
-				            }
-				        }); */
-						tempFilePaths.forEach(v => {
-							console.log(that.$request.baseUrl + 'tuhuUploadFile');
-							uni.uploadFile({
-								url: that.$request.baseUrl + 'tuhuUploadFile',
-								filePath: v,
-								name: 'file',
-								formData: {
-									'user': 'test'
-								},
-								
-								success: (uploadFileRes) => {
-
-									console.log(JSON.parse(uploadFileRes.data).data);
-									that.imgArr = that.imgArr.concat(JSON.parse(
-										uploadFileRes.data).data);
-								}
-							});
-						})
-						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
-							
-						}) */
-					}
-				});
-			},
-			delimg(index) {
-				this.imgArr.splice(index, 1)
-			},
-			submit() {
-				if (!this.exeContent) {
-					uni.showToast({
-						title: '请输入个人意见反馈',
-						icon: 'none',
-						duration: 2000,
-					});
-					return ;
-				}
-				// if (this.imgArr.length == 0) {
-				// 	uni.showToast({
-				// 		title: '请上传图片',
-				// 		icon: 'none',
-				// 		duration: 2000,
-				// 	});
-				// 	return ;
-				// }
-				uni.showLoading({
-					title: '保存中'
-				})
-				var exeImg = this.imgArr.join(',')
-				this.$http('worldKeepCar/keepCarMy/addTMemberSuggest', {
-					
-					contents: this.exeContent,
-					img: exeImg
-				}, 'POST').then(res => {
-					//this.submitSuperCheckSheet()
-					if(res.code==0){
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
-						});
-						setTimeout(function() {
-							uni.navigateBack({
-								
-							})
-						}, 2000); 	
-					}else{
-						uni.showToast({
-							title: '提交失败',
-							icon: 'none',
-							duration: 2000,
-						});
-					}
-					
-					
-
-				})
-			}
-
-		}
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
-	}
-
-	/* #ifdef H5 */
-	.content {
-		background: #F4F5F7;
-		min-height: calc(100vh - 44px);
-
-	}
-
-	/* #endif */
-	.main {
-		background: #F4F5F7;
-		padding: 20rpx 24rpx;
-	}
-
-	.firstView,
-	.secondView {
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-	}
-
-	.firstView {
-		margin-bottom: 20rpx;
-	}
-
-	.title {
-		font-size: 30rpx;
-		color: #3C3C3C;
-		padding: 20rpx;
-	}
-
-	.textareaCont {
-		padding: 20rpx;
-		min-height: 150rpx;
-		width: 95%;
-	}
-
-
-	.imgBox {
-		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx;
-
-	}
-	.imgLine{
-		position: relative;
-		margin-right: 10rpx;
-	}
-	.itemImg {
-		width: 150rpx;
-		height: 150rpx;
-		margin-right: 5rpx;
-	}
-
-	/* .img4 {
-		margin-right: 20rpx;
-		
-	} */
-
-	.delImg {
-		width: 32rpx;
-		height: 32rpx;
-		position: absolute;
-		right: 0rpx;
-		top: 0rpx;
-	}
-
-
-	.bottom {
-		width: 750rpx;
-		height: 120rpx;
-		background: #FFFFFF;
-		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.shoreDz {
-		width: 702rpx;
-		height: 74rpx;
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-		border-radius: 37rpx;
-		text-align: center;
-		line-height: 74rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 24rpx;
-	}
+<template>
+	<view class="content">
+		<view class="main">
+			<!-- 建议 -->
+			<view class="firstView">
+				<view class="title">您的问题或建议</view>
+				<view>
+					<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
+						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
+				</view>
+			</view>
+
+			<!-- 图片 -->
+			<view class="secondView">
+				<view class="title">上传图片</view>
+				<view class="imgBox">
+					<view class="imgLine" v-for="(img,imgindex) in imgArr">
+						<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
+						<image src="../../static/img/icon_del_red.png" mode="" class="delImg" @click="delimg(imgindex)">
+						</image>
+					</view>
+					<view class="imgLine" @click="uploadImg">
+						<image src="../../static/img/btn_pic.png" mode="" class="itemImg"></image>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+
+		<view class="bottom">
+			<view class="shoreDz" @click="submit">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata
+		},
+		data() {
+			return {
+				imgArr: [],
+				exeContent: '',
+
+			}
+		},
+
+		methods: {
+			feedDone(e) {
+				this.exeContent = e.target.value
+
+			},
+			uploadImg() {
+
+				var that = this;
+				var length = this.imgArr.length;
+				var num = 9;
+				if (length > 8) {
+					uni.showToast({
+						title: '最多上传9张',
+						icon: 'none',
+						duration: 2000,
+					});
+					return false;
+				}
+				uni.chooseImage({
+					sourceType: ['album', 'camera'],
+					count: num - length,
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						/* uni.uploadFile({
+				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
+				            filePath: tempFilePaths[0],
+				            name: 'file',
+				            formData: {
+				                'user': 'test'
+				            },
+				            success: (uploadFileRes) => {
+				                console.log(JSON.parse(uploadFileRes.data).data );
+								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+								
+				            }
+				        }); */
+						tempFilePaths.forEach(v => {
+							console.log(that.$request.baseUrl + 'tuhuUploadFile');
+							uni.uploadFile({
+								url: that.$request.baseUrl + 'tuhuUploadFile',
+								filePath: v,
+								name: 'file',
+								formData: {
+									'user': 'test'
+								},
+
+								success: (uploadFileRes) => {
+
+									console.log(JSON.parse(uploadFileRes.data).data);
+									that.imgArr = that.imgArr.concat(JSON.parse(
+										uploadFileRes.data).data);
+								}
+							});
+						})
+						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+							
+						}) */
+					}
+				});
+			},
+			delimg(index) {
+				this.imgArr.splice(index, 1)
+			},
+			submit() {
+				if (!this.exeContent) {
+					uni.showToast({
+						title: '请输入个人意见反馈',
+						icon: 'none',
+						duration: 2000,
+					});
+					return;
+				}
+				// if (this.imgArr.length == 0) {
+				// 	uni.showToast({
+				// 		title: '请上传图片',
+				// 		icon: 'none',
+				// 		duration: 2000,
+				// 	});
+				// 	return ;
+				// }
+				uni.showLoading({
+					title: '保存中'
+				})
+				var exeImg = this.imgArr.join(',')
+				this.$http('worldKeepCar/keepCarMy/addTMemberSuggest', {
+
+					contents: this.exeContent,
+					img: exeImg
+				}, 'POST').then(res => {
+					//this.submitSuperCheckSheet()
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+							duration: 2000,
+						});
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 2000);
+					} else {
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 2000,
+						});
+					}
+
+
+
+				})
+			}
+
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background: #F4F5F7;
+		min-height: calc(100vh - 44px);
+
+	}
+
+	/* #endif */
+	.main {
+		background: #F4F5F7;
+		padding: 20rpx 24rpx;
+	}
+
+	.firstView,
+	.secondView {
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.firstView {
+		margin-bottom: 20rpx;
+	}
+
+	.title {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		padding: 20rpx;
+	}
+
+	.textareaCont {
+		padding: 20rpx;
+		min-height: 150rpx;
+		width: 95%;
+	}
+
+
+	.imgBox {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 20rpx;
+
+	}
+
+	.imgLine {
+		position: relative;
+		margin-right: 10rpx;
+	}
+
+	.itemImg {
+		width: 150rpx;
+		height: 150rpx;
+		margin-right: 5rpx;
+	}
+
+	/* .img4 {
+		margin-right: 20rpx;
+		
+	} */
+
+	.delImg {
+		width: 32rpx;
+		height: 32rpx;
+		position: absolute;
+		right: 0rpx;
+		top: 0rpx;
+	}
+
+
+	.bottom {
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+
+	}
+
+	.shoreDz {
+		width: 702rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+	}
 </style>

pages/me/guize.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="content">
+		<rich-text :nodes="couContent" ></rich-text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				couContent: '',
+			}
+		},
+		onLoad(opt) {
+			console.log('content',opt.couContent);
+			if (opt.couContent) {
+				this.couContent = opt.couContent.replace(/\<p/gi, '<p style="display: inline-block"');
+			}
+		},
+		methods: {
+
+			
+		}
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+		padding: 30rpx 24rpx;
+		
+	}
+	
+	
+</style>

pages/me/invite.vue

@@ -0,0 +1,332 @@
+<template>
+	<view class="box">
+
+		<view class="header">
+			<image :src="detailData.tSSetting.bannerImg" mode="" class="bar"></image>
+			<image src="../../static/img/btn_act@2x.png" mode="" class="guizeBtn" @click="guize"></image>
+		</view>
+
+		<!-- 统计 -->
+		<view class="sumBg">
+			<view class="viewBg" @click="gonavigateTo('commissionHistory')">
+				<view class="money" style="color: #FF4F00;">￥{{detailData.totalMoney}}</view>
+				<view class="moneyTitle">累计佣金
+					<image src="../../static/img/icon_arrow@2x.png" mode="" style="width: 18rpx; height: 18rpx;">
+					</image>
+				</view>
+			</view>
+
+			<view class="line"></view>
+			<view class="viewBg" @click="gonavigateTo('extractHistory')">
+				<view class="money">￥{{detailData.withdrawalMoney}}</view>
+				<view class="moneyTitle">累计提现
+					<image src="../../static/img/icon_arrow@2x.png" mode="" style="width: 18rpx; height: 18rpx;">
+					</image>
+				</view>
+			</view>
+
+			<view class="line"></view>
+			<view class="viewBg" @click="gonavigateTo('invitePeople')">
+				<view class="money">￥{{detailData.shareCount}}</view>
+				<view class="moneyTitle">邀请人数
+					<image src="../../static/img/icon_arrow@2x.png" mode="" style="width: 18rpx; height: 18rpx;">
+					</image>
+				</view>
+			</view>
+		</view>
+
+		<!-- 明细 -->
+		<view class="mingxiBg" v-if="arr.length > 0">
+			<view class="mingxi">
+				<view v-for="(item,index) in arr" :key="index">
+					<view class="itemBg">
+						<image :src='item.MemberHeadImg' mode=""
+							style="width: 72rpx; height: 72rpx; border-radius: 36rpx;"></image>
+						<view class="nickName" v-if="item.MemberNickName">{{item.MemberNickName}}</view>
+						<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+						<view class="jine">+{{item.Money}}</view>
+					</view>
+				</view>
+			</view>
+			<!-- 查看更多 -->
+			<view class="moreView">
+				<view style="color: #3F90F7; font-size: 30rpx;" @click="gonavigateTo('commissionHistory')">查看更多</view>
+				<image src="../../static/img/icon_arrow_blue.png" mode="" style="width: 24rpx; height: 24rpx;"></image>
+			</view>
+		</view>
+		<view class="mingxiBg" v-else>
+			<image :src="emptyImg" mode="" class="emptyImg"></image>
+		</view>
+
+		<view class="emptyView"></view>
+		<view class="bottomView">
+			<view class="bottomImg" @click="gonavigateTo('inviteImg')">
+				<image src="../../static/img/icon_ma@2x.png" mode=""
+					style="width: 30rpx; height: 30rpx; margin-right: 10rpx;">面对面邀请</image>
+			</view>
+			<button class="bottomImg2" open-type="share">立即邀请</button>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				detailData: {},
+				arr: [],
+				emptyImg: 'http://123.56.219.146:10086/keepCar/jqsy.png',
+				uidStr: '',
+				share: {
+					title: '车蓝图4S店养车服务',
+					path: 'pages/homePage/homePage?scene=' + this.uidStr,
+					imageUrl: '',
+					desc: '',
+					content: ''
+				}
+			}
+		},
+		onLoad() {
+			this.uidStr = uni.getStorageSync("logodata").uid.replace(/\-/g, "")
+		},
+		onShow() {
+			this.getDetailData();
+		},
+		methods: {
+			onShareAppMessage: function() {
+
+			},
+			guize() {
+
+				uni.navigateTo({
+					url: 'guize?couContent=' + this.detailData.tSSetting.activityRules
+				})
+			},
+			getDetailData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/worldDistribution/queryDistributionIndexDetail',
+					params = {
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var data = res.data
+
+
+					// 处理 undefined和null转为空白字符串
+
+					for (const key in data) {
+						data[key] = this.$praseStrEmpty(data[key])
+					}
+
+					this.detailData = data
+					this.arr = this.detailData.recentEarnings
+
+
+				})
+			},
+			gonavigateTo(url) {
+
+				uni.navigateTo({
+					url: url
+				})
+			}
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+
+			this.getDetailData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		// onReachBottom() {
+		// 	this.page++;
+
+		// 	this.getItemData()
+
+		// },
+
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+
+	.header {
+		width: 100%;
+		height: 750rpx;
+		position: relative;
+	}
+
+	.bar {
+		width: 100%;
+		height: 750rpx;
+	}
+
+	.guizeBtn {
+		position: absolute;
+
+		left: 580rpx;
+		top: 48rpx;
+		width: 169rpx;
+		height: 56rpx;
+
+	}
+
+	.sumBg {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 20rpx 24rpx;
+		padding: 36rpx 50rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.viewBg {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background-color: #FFFFFF;
+	}
+
+	.money {
+		font-size: 38rpx;
+		color: #000000;
+		font-weight: bold;
+	}
+
+	.moneyTitle {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.line {
+		width: 1rpx;
+		height: 73rpx;
+
+		background-color: #EEEEEE;
+	}
+
+	.mingxiBg {
+		margin: 0rpx 24rpx;
+		background-color: #FFFFFF;
+
+		border-radius: 10rpx;
+	}
+
+	.mingxi {
+		background-image: url('http://123.56.219.146:10086/keepCar/jqsy2.png');
+		background-size: 100%;
+		background-repeat: no-repeat;
+		padding-top: 89rpx;
+
+	}
+
+	.emptyImg {
+
+		height: 493rpx;
+		width: 100%;
+	}
+
+	.itemBg {
+
+		height: 98rpx;
+		margin: 0 20rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.nickName {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		width: 40%;
+		margin: 0 15rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.time {
+		font-size: 30rpx;
+		color: #999999;
+
+		width: 27%;
+	}
+
+	.jine {
+		font-size: 32rpx;
+		color: #FF4F00;
+		font-weight: bold;
+		margin: 0 15rpx;
+
+	}
+
+	.moreView {
+		height: 92rpx;
+
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.emptyView {
+		height: 180rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+
+	.bottomImg {
+
+		background-color: #FFFFFF;
+		border: #FF4F00 1rpx solid;
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		width: 50%;
+		border-radius: 37rpx;
+		color: #FF4F00;
+		font-size: 30rpx;
+
+		text-align: center;
+		line-height: 74rpx;
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
+
+	.bottomImg2 {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		width: 50%;
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+
+		text-align: center;
+	}
+</style>

pages/me/inviteImg.vue

@@ -0,0 +1,152 @@
+<template>
+	<view class="box">
+
+		<view class="maBoximg">
+			
+			<image :src="qrImg" mode="" class="QR"></image>
+		</view>
+		<image src="../../static/img/saveBtn.png" mode="" class="saveBtn" @click="saveEwm"></image>
+
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		
+		data() {
+			return {
+				base64:'',
+				qrImg: '',
+				openSettingBtnHidden: true,//是否授权
+			}
+		},
+		onLoad() {
+			 
+			this.getQR();
+			
+		},
+		methods: {
+
+			getQR() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let uidStr = uni.getStorageSync("logodata").uid.replace(/\-/g, "");
+
+				let url = 'worldKeepCar/worldDistribution/createMiniAppQrCode',
+					params = {
+						path: 'pages/homePage/homePage',
+						scene: uidStr,
+					}
+
+
+				this.$httpBinary(url, params, 'GET').then(res => {
+					uni.hideLoading();
+
+                    this.base64=uni.arrayBufferToBase64(res)
+					this.qrImg = 'data:image/png;base64,' + uni.arrayBufferToBase64(res)
+					
+				})
+			},
+			
+			
+					//微信小程序保存到相册
+					        saveEwm:function(e){
+								let that = this;
+					            //获取相册授权
+					               uni.getSetting({
+					                 success(res) {
+					                   if (!res.authSetting['scope.writePhotosAlbum']) {
+					                     uni.authorize({
+					                       scope: 'scope.writePhotosAlbum',
+					                       success() {
+					                         //这里是用户同意授权后的回调
+					                         
+											 that.saveImage()
+					                       },
+					                       fail() {//这里是用户拒绝授权后的回调
+					                           that.openSettingBtnHidden=false
+					                       }
+					                     })
+					                   } else {//用户已经授权过了
+					                     
+										 that.saveImage()
+					                   }
+					                 }
+					               })
+					        },
+							
+							saveImage(){
+								let base64=this.base64;
+								let fileName = new Date().getTime();
+								 let filePath=wx.env.USER_DATA_PATH + `/hym_pay${fileName}_qrcode.png`;
+								 uni.getFileSystemManager().writeFile({
+								                 filePath:filePath ,  //创建一个临时文件名
+								                 data: base64,    //写入的文本或二进制数据
+								                 encoding: 'base64',  //写入当前文件的字符编码
+								                 success: res => {
+								                     uni.saveImageToPhotosAlbum({
+								                         filePath: filePath,
+								                         success: function(res2) {
+								                             uni.showToast({
+								                                 title: '保存成功',
+								                                 icon:"none",
+								                                 duration:5000
+								                             })
+								                         },
+								                         fail: function(err) {
+								                             // console.log(err.errMsg);
+								                         }
+								                     })
+								                 },
+								                 fail: err => {
+								                     //console.log(err)
+								                 }
+								             })
+							},
+							
+							
+							 
+							
+							
+
+			
+		}
+	}
+</script>
+
+<style>
+	.box {
+		min-height: 100vh;
+		width: 100%;
+		background-image: url('http://123.56.219.146:10086/keepCar/yqyl.png');
+		background-size: 100% 100%;
+
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+	}
+
+	.maBoximg {
+		width: 377rpx;
+		height: 377rpx;
+
+		border-radius: 19rpx;
+		background-color: #FFFFFF;
+		padding: 20rpx;
+
+	}
+	.QR{
+		width: 100%;
+		height: 100%;
+	}
+
+	.saveBtn {
+		width: 411rpx;
+		height: 115rpx;
+		margin-top: 60rpx;
+	}
+</style>

pages/me/invitePeople.vue

@@ -0,0 +1,155 @@
+<template>
+	<view class="box">
+			
+				<!-- 明细 -->
+				<view class="mingxiBg"  v-if="arr.length > 0">
+					
+						<view v-for="(item,index) in arr" :key="index">
+							<view class="itemBg">
+								<image :src='item.headUrl' mode="" style="width: 72rpx; height: 72rpx; border-radius: 36rpx;"></image>
+								<view class="nickName" v-if="item.nickName">{{item.nickName}}</view>
+								<view class="time">{{item.createTime.slice(0,item.createTime.length-8)}}</view>
+								
+							</view>
+						</view>
+					
+					
+					
+				</view>
+				
+			<!-- 上拉 加载更多 -->
+			<view class="noMore" v-if="noMoreShow">没有更多数据</view>
+			<!-- 无数据空白页 -->
+			<nodata v-if="arr.length==0"></nodata>
+			
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+		
+		data() {
+			return {
+				arr: [],
+				page: 1,
+				noMoreShow: false,
+				
+			}
+		},
+		onShow() {
+			
+			this.page = 1;
+			this.getItemData();
+		},
+		methods: {
+			
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/worldDistribution/listSubMemberPage',
+					params = {
+						page:this.page,
+						limit:10,
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+					
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+					
+					
+					if (this.page == 1) {
+						this.arr = list
+					} else {
+						this.arr = this.arr.concat(list)
+					}
+					
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
+					}
+					
+					
+				})
+			},
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getItemData()
+			
+			
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+		
+			this.getItemData()
+		
+		},
+	}
+</script>
+
+<style>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding-top: 20rpx;
+	}
+	.mingxiBg{
+		margin: 0rpx 24rpx;
+		background-color: #FFFFFF;
+		
+		border-radius: 10rpx;
+		padding: 20rpx;
+	}
+	
+	
+	.itemBg {
+	
+		height: 98rpx;
+		
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	
+	.nickName {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		flex-grow: 1;
+		margin: 0 15rpx;
+	}
+	
+	.time {
+		font-size: 30rpx;
+		color: #999999;
+		margin: 0 15rpx;
+	}
+	
+	.jine {
+		font-size: 32rpx;
+		color: #FF4F00;
+		font-weight: bold;
+		margin: 0 15rpx;
+	}
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
+</style>

pages/me/me.vue

@@ -113,15 +113,13 @@
 				</view>
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 			</view>
-			<!-- <view class="grayline"></view> -->
-
-			<!-- <view class="rowBox">
+			<view class="rowBox" v-if="numList.activityState == 1" @click="gonavigateTo('invite')">
 				<view class="leftView">
 					<image src="../../static/img/icon_yaoqing.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">邀请有礼</view>
 				</view>
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
-			</view> -->
+			</view>
 
 		</view>