代码提交

pages.json

@@ -451,6 +451,13 @@
 				"navigationBarTitleText": "提现",
 				 "enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/referral/extractList",
+			"style": {
+				"navigationBarTitleText": "提现明细",
+				 "enablePullDownRefresh": true
+			}
 		}
     ],
 	"tabBar": {

pages/index/index.vue

@@ -269,7 +269,8 @@
 			this.shopId=ext.shopId;
 			this.url=ext.url;
 			this.unionId=ext.unionId
-			//this.unionId="EF7981B9-2D1D-4006-9C0A-66CE7177134D"
+			//this.unionId="26A1039A-DB10-4D0E-BBA2-541C06274EED";
+			//this.ext.appId="wxffd2502e67d37908"
 			// uni.setStorage({
 			// 	key: 'extdata',
 			// 	data: {
@@ -413,9 +414,14 @@
 							});
 						}
 					}else if(item.bizType==1){ //紧急救援
-						uni.navigateTo({
-							url:'rescue'
-						})
+						// uni.navigateTo({
+						// 	url:'rescue'
+						// })
+						uni.showToast({
+							 title: '敬请期待',
+							 icon:'none',
+							 duration: 3000
+						});
 					}else if(item.bizType==2){ //钣金喷漆
 						uni.navigateTo({
 							url:'paint'

pages/referral/extract.vue

@@ -2,7 +2,7 @@
 	<view class="box">
 		<view class="tixiancs">
 			<view class="tixiancsLeft">本月已提现2次</view>
-			<view class="tixiancsRight">提现明细</view>
+			<view class="tixiancsRight" @click="goRouter('extractList')">提现明细</view>
 		</view>
 		<view class="header">
 			<view class="title">提现金额</view>
@@ -18,7 +18,18 @@
 		</view>
 
 		<view class="tishi" style="padding: 20rpx 44rpx;">
-			
+			<view class="tishiLine">
+				<view class="tishiY"></view>
+				<view class="tishiTxt">提现冻结天数：7天</view>
+			</view>
+			<view class="tishiLine">
+				<view class="tishiY"></view>
+				<view class="tishiTxt">最小提现金额：2元</view>
+			</view>
+			<view class="tishiLine">
+				<view class="tishiY"></view>
+				<view class="tishiTxt">每月可提现次数：7次</view>
+			</view>
 		</view>
 
 		<view class="sureBtn" @click="sure">申请提现</view>
@@ -44,6 +55,11 @@
 			this.getDetailData()
 		},
 		methods: {
+			goRouter(url){
+				uni.navigateTo({
+					url:url
+				})
+			},
 			getDetailData() {
 				uni.showLoading({
 					title: '加载中'
@@ -168,6 +184,18 @@
 		background: #F4F5F7;
 		padding-top: 20rpx;
 	}
+	.tishiLine{
+		display: flex;
+	}
+	.tishiY{
+		width: 10rpx;
+		height: 10rpx;
+		background: #DDDDDD;
+		margin-top: 16rpx;
+	}
+	.tishiTxt{
+		padding-left: 18rpx;
+	}
 .tixiancs{
 	display: flex;
 	justify-content: space-between;
@@ -270,8 +298,7 @@
 		margin: 20rpx 30rpx;
 		border-radius: 37rpx;
 		height: 74rpx;
-
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+        background: #D53533;
 		color: #FFFFFF;
 		font-size: 30rpx;
 		text-align: center;

pages/referral/extractList.vue

@@ -0,0 +1,111 @@
+<template>
+<view class="box">
+	<view style="height: 20rpx;"></view>
+ <view class="line" v-for="(item,index) in 3">
+	 <view class="linetop">
+		 <view class="name">提现</view>
+		 <view class="nickNameBox">
+			 <view class="amount">￥999</view>
+		 </view>
+	 </view>
+	 <view class="lineCOnt">
+		 <view class="lineline">
+		 	<view class="lineContLeft">
+				 <view class="lineContLeftMs">申请时间：2020-06-20 09:3</view>
+		 	</view>
+			<view class="lineTIme">审核拒绝</view>
+		 </view>
+		
+	 </view>
+ </view>
+</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		
+		data() {
+			return {
+				
+				themeColor:'',
+				userInfo:'',
+			}
+		},
+		onLoad(opt) {
+			this.themeColor = uni.getStorageSync("themeColor");
+			this.userInfo = uni.getStorageSync("userInfo");
+			
+		},
+		onShow() {
+			
+		},
+		methods: {
+			
+			
+		}
+	}
+</script>
+
+<style scoped lang="less">
+.box {
+	width: 100vw;
+	min-height: 100vh;
+	background: #F4F5F7;
+}
+.nickNameBox{
+	display: flex;
+	
+}
+.nickName{
+	font-weight: 400;
+	color: #999999;
+	font-size: 24rpx;
+	line-height: 30rpx;
+	padding-left: 10rpx;
+}
+.lineContLeftImg{
+	width: 30rpx;
+	height: 30rpx;
+	margin-right: 10rpx;
+}
+.line{
+	width: 702rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	margin-bottom: 20rpx;
+	margin-left: 24rpx;
+}
+.linetop{
+	display: flex;
+	justify-content: space-between;
+	font-size: 30rpx;
+	padding: 20rpx;
+	padding-bottom: 0;
+}
+.lineline{
+	display: flex;
+	justify-content: space-between;
+	padding: 20rpx;
+	font-weight: 400;
+	color: #999999;
+	font-size: 24rpx;
+	line-height: 30rpx;
+}
+.lineContLeft{
+	display: flex;
+}
+.name{
+	font-weight: 500;
+	color: #3C3C3C;
+}
+.amount{
+	color: #FF0000;
+}
+.nickNameImg{
+	width: 30rpx;
+	height: 30rpx;
+}
+</style>

pages/user/reportDetail.vue

@@ -13,9 +13,11 @@
 				
 			}
 		},
-		onLoad(opt) {
-			
-			this.urlStr = 'http://dms.32che.cn/#/carOwner/Report/' + opt.id + '?noAuth=true&hideHeader=true'
+		onLoad(opt) {
+			console.log(this.$request.webUrl)
+			this.urlStr = this.$request.webUrl+'#/carOwner/Report/' + opt.id + '?noAuth=true&hideHeader=true'
+			//this.urlStr = 'http://webwx.66km.com/#/carOwner/Report/' + opt.id + '?noAuth=true&hideHeader=true'
+			//this.urlStr = 'http://dms.32che.cn/#/carOwner/Report/' + opt.id + '?noAuth=true&hideHeader=true'
 			console.log('urlstr=+',this.urlStr);
 		},
 		methods: {

pages/user/user.vue

@@ -167,7 +167,7 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-			<view class="rowBox" @click="gonavigateTo('../partner/partner')">
+			 <!-- <view class="rowBox" @click="gonavigateTo('../partner/partner')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me7.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">车主合伙人</view>
@@ -180,7 +180,7 @@
 					<view class="rowTitle">客户转介绍</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view>
+			</view> -->
 
 			<!-- 先隐藏 -->
 			<!-- <view class="rowBox" @click="gonavigateTo('')">

utils/common.js

@@ -72,7 +72,13 @@ function noMultipleClicks(methods, info) {
 
 function getExtStoreId(type){
 	try{
-		const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'}
+		var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
+		// extConfig={
+		// 	"shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
+		// 	"url":"http://api.dms.66km.com.cn",
+		// 	"unionId":"EEADACCD-8A19-499D-8AD7-6975D2C93243",
+		// 	"appId":"wx33053a645546ec31"
+	 //    }
 		console.log(extConfig,'extJson对象');
 		//return extConfig[type];
 		return extConfig

utils/request.js

@@ -10,6 +10,10 @@ const extConfig = uni.getExtConfigSync();
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
 //wx2c6f04c0dcd15984正式  wx33053a645546ec31
+//测试地址
+//const webUrl = 'http://dms.32che.cn/'
+//正式
+const webUrl = 'http://webwx.66km.com/'
 const http = (url = '', date = {}, type = 'POST', header = {
 }) => {
     return new Promise((resolve, reject) => {
@@ -51,7 +55,13 @@ const http = (url = '', date = {}, type = 'POST', header = {
 			}else if(res.data.code==409){
 				 // getToken(url,date,type,header)
 			}
-			
+			if(res.data.code==1){
+				  uni.showToast({
+				      title: res.data.msg,
+				  	 icon:'none',
+				      duration: 3000,
+				  });
+			}
             resolve(res.data);
         }).catch(error => {
             let [err, res] = error;
@@ -169,5 +179,5 @@ function refresh(url,date,type,header){
 }
 
 export default {
-	http,baseUrl,httpBinary
+	http,baseUrl,httpBinary,webUrl
 }