Merge branch 'master' into dev

apis/index.js

@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 
@@ -67,6 +67,7 @@ const request = (parameter, hideLoding = true) => {
 				errToast(res.statusCode)
 			},
 			fail(err) {
+				console.log(err)
 				uni.showToast({
 					title: '网络错误，请检查您设备网络状态',
 					icon : 'none'

apis/interfaces/account.js

@@ -50,6 +50,9 @@ const withdrawsCreate = () => {
 
 // 奖金提现申请
 const withdraws = data => {
+	
+	console.log(data)
+	
 	return request({
 		url: 'withdraws/index',
 		method: 'POST',

pages/account/cash.vue

@@ -64,20 +64,6 @@
 			</view>
 			<u-loadmore v-if="pagesShow" :status="status" />
 		</view>
-		<!-- 筛选时间 -->
-		<!-- <button @click="">打开弹窗</button> -->
-		<!-- <u-calendar
-			v-if="maxDate != ''"
-			:show="dayShow"
-			mode="range"
-			color="#446EFE"
-			:minDate="minDate"
-			:maxDate="maxDate"
-			monthNum="36"
-			title="选择筛选区间"
-			@close="dayShow = false"
-			@confirm="onDay"
-		></u-calendar> -->
 	</view>
 </template>
 

pages/account/withdraws.vue

@@ -48,7 +48,6 @@
 		<view class="withdraws-hint">后台提现管理时间 上午11:00-12:00 下午17:00-18:00</view>
 	</view>
 </template>
-
 <script>
 	import { withdrawsCreate, withdraws } from '@/apis/interfaces/account.js'
 	export default {
@@ -179,7 +178,6 @@
 		}
 	}
 </script>
-
 <style lang="scss">
 	.content{
 		padding: 30rpx;
@@ -315,4 +313,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/work/perfectBasis.vue

@@ -185,7 +185,6 @@
 		</block>
 	</view>
 </template>
-
 <script>
 	import { perfectBase, updPerfectBase, historyBase } from '@/apis/interfaces/order.js'
 	import { region } from '@/apis/interfaces/address.js'
@@ -349,7 +348,6 @@
 		}
 	}
 </script>
-
 <style lang="scss">
 	.content{
 		padding-top: 30rpx;
@@ -450,4 +448,4 @@
 			}
 		}
 	}
-</style>
+</style>

uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue

@@ -452,4 +452,4 @@
 			}
 		}
 	}
-</style>
+</style>