Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

# Conflicts:
#	src/pages/order/search.vue

src/components/order/noOrder.vue

+<template>
+	<view class="no-order-view">
+		<image class="no-order-image" :src="wudingdanImage"></image>
+		<text>当前暂无订单</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		computed: {
+			wudingdanImage() {
+				return process.uniEnv.qn_base_url + 'wudingdan.png'
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.no-order-view {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #666666;
+		font-size: 28rpx;
+		padding: 30rpx;
+		background-color: #ffffff;
+		border-radius: 12rpx;
+		min-height: 460rpx;
+
+		.no-order-image {
+			width: 374rpx;
+			height: 218rpx;
+			margin-top: 60rpx;
+			margin-bottom: 20rpx;
+		}
+	}
+</style>

src/pages/index/index.vue

@@ -28,8 +28,7 @@
 			<view class="order-list-view" v-if="loaded">
 				<!-- 入驻前-->
 				<view v-if="needSettled" class="tip-view">
-					<view class="tip-title">当前订单（笔）</view>
-					<view class="tip-count">{{ count }}</view>
+					<image :src="weiruzhuImage" class="tip-view-image"></image>
 					<view class="tip-other">入驻通过后平台将向您推荐订单</view>
 					<u-button class="settle-button" type="primary" shape="circle" @click="immediatelyIn"
 						:custom-style="buttonStyle">
@@ -45,8 +44,7 @@
 				</view>
 				<!-- 入驻成功之后无推荐订单 -->
 				<view v-else-if="!needSettled && orderList.length <= 0" class="no-order-view">
-					<image class="no-order-image" :src="wudingdanImage"></image>
-					<text>当前暂无订单</text>
+					<NoOrder/>
 				</view>
 			</view>
 		</view>
@@ -62,14 +60,16 @@
 
 <script>
 	import util from "@/utils/util.js";
-	import TabBarPage from "@/components/tabBarList/index.vue"
+	import TabBarPage from "@/components/tabBarList/index.vue"
+	import NoOrder from "@/components/order/noOrder.vue"
 	const app = getApp();
 	import OrderCell from "@/components/order/index.vue";
 
 	export default {
 		components: {
 			OrderCell,
-			TabBarPage
+			TabBarPage,
+			NoOrder
 		},
 		data() {
 			return {
@@ -120,10 +120,10 @@
 			},
 			shouyeyouImage() {
 				return process.uniEnv.qn_base_url + 'shouyeyou.png'
+			},
+			weiruzhuImage() {
+				return process.uniEnv.qn_base_url + 'weiruzhu.png'
 			},
-			wudingdanImage() {
-				return process.uniEnv.qn_base_url + 'wudingdan.png'
-			}
 		},
 		onLoad() {},
 		onShow() {
@@ -380,26 +380,19 @@
 				padding: 30rpx;
 				background-color: #ffffff;
 				border-radius: 12rpx;
-
-				.tip-title {
-					font-size: 32rpx;
-					font-weight: bold;
-					color: #333333;
-					margin-top: 30rpx;
-				}
-
-				.tip-count {
-					color: #2272ff;
-					font-size: 70rpx;
-					font-weight: bold;
-					margin-top: 50rpx;
-					margin-bottom: 20rpx;
+				min-height: 460rpx;
+				.tip-view-image {
+					width: 328rpx;
+					height: 200rpx;
+					margin-top: 30rpx;
 				}
 
 				.tip-other {
 					font-size: 28rpx;
 					color: #333333;
-					margin-bottom: 56rpx;
+					margin-bottom: 20rpx;
+				}
+				.settle-button {
 				}
 			}
 
@@ -407,28 +400,6 @@
 				background-color: #F4F5F7;
 				border-radius: 12rpx;
 			}
-
-			.no-order-view {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				color: #666666;
-				font-size: 28rpx;
-				padding: 30rpx;
-				background-color: #ffffff;
-				border-radius: 12rpx;
-				min-height: 460rpx;
-
-				.no-order-image {
-					width: 374rpx;
-					height: 218rpx;
-					margin-top: 70rpx;
-					margin-bottom: 20rpx;
-				}
-			}
-
-
 		}
 	}
 

src/pages/order/index.vue

@@ -465,7 +465,7 @@
 			width: 220rpx;
 			background-color: #ffffff;
 			border-radius: 36rpx;
-			color: #666666;
+			color: #999999;
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -473,7 +473,7 @@
 				width: 36rpx;
 				height: 32rpx;
 				flex-shrink: 0;
-				margin-right: 20rpx;
+				margin-right: 24rpx;
 			}
 			.search-btn-text {
 				line-height: 36rpx;