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

src/common/index.scss

 page {
 	background-color: #fafafa;
 }
+
+::-webkit-scrollbar {
+width:0;
+height:0;
+color:transparent;
+display:none;
+} 
+
 .btn-share {
 	background-color: transparent;
 

src/pages.json

@@ -7,7 +7,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -210,8 +211,8 @@
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#007AFF",
-		"borderStyle": "black",
-		"backgroundColor": "#F8F8F8",
+		"borderStyle": "white",
+		"backgroundColor": "#FFFFFF",
 		"list": [
 			{
 				"pagePath": "pages/index/index",

src/pages/exam/index.vue

@@ -583,7 +583,8 @@
 		width: 100%;
 		height: 100%;
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;
+		overflow-y:auto;
 	}
 
 	.noticeView {

src/pages/index/index.vue

 <template>
   <view class="content">
-    <view style="width: 700rpx; height: 800rpx">
+    <!-- <view style="width: 700rpx; height: 800rpx"> -->
       <!-- <view class="title-view">充电桩自营平台</view> -->
       <u-navbar
         :is-back="false"
@@ -51,7 +51,7 @@
       </u-sticky>
       <view class="order-view">
         <!-- 入驻成功之后显示推荐订单列表 -->
-        <view class="order-list-view">
+        <view class="order-list-view" v-if="loaded">
           <!-- 入驻前-->
           <view v-if="needSettled" class="tip-view">
             <view class="tip-title">当前订单（笔）</view>
@@ -83,13 +83,19 @@
           <view
             v-else-if="!needSettled && orderList.length <= 0"
             class="no-order-view"
-          >
-            暂无订单
+          >
+		  <image class="no-order-image" :src="wudingdanImage"></image>
+          <text>当前暂无订单</text>
           </view>
         </view>
       </view>
-    </view>
-    <!-- </scroll-view> -->
+    <!-- </view> -->
+    <!-- </scroll-view> -->
+	<view class="bottom-view">
+		<view class="bottom-line-view"></view>
+		<view class="bottom-text">我也是有底线哒</view>
+		<view class="bottom-line-view"></view>
+	</view>
   </view>
 </template>
 
@@ -106,22 +112,8 @@ export default {
   data() {
     return {
       status: 0, // 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
-      triggered: false,
 	  location: [116.3896, 39.91917], // 经纬度
-      // list: [
-      //   {
-      //     image: "https://cdn.uviewui.com/uview/swiper/1.jpg",
-      //   },
-      //   {
-      //     image: "https://cdn.uviewui.com/uview/swiper/2.jpg",
-      //   },
-      //   {
-      //     image: "https://cdn.uviewui.com/uview/swiper/3.jpg",
-      //   },
-      // ],
-      title: false,
-      // mode: "round",
-      // indicatorPos: "bottomCenter",
+      title: false,
       title: "Hello",
       loaded: false,
       needSettled: true,
@@ -129,7 +121,7 @@ export default {
       messageList: [],
       loadStatus: ["more", "loading", "noMore"],
       currentLoadStatus: "loading",
-      orderList: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
+      orderList: [],
       search: {
         token: "",
         pageNumber: 0,
@@ -165,11 +157,12 @@ export default {
 	},
 	shouyeyouImage() {
 		return process.uniEnv.qn_base_url + 'shouyeyou.png'
+	},
+	wudingdanImage() {
+		return process.uniEnv.qn_base_url + 'wudingdan.png'
 	}
   },
   onLoad() {
-    this._freshing = false;
-    this.triggered = false;
   },
   onShow() {
     // 每次进入页面都刷新入驻状态
@@ -179,7 +172,13 @@ export default {
 		// 初始化订单数据
 		this.loadOrderList();
 	}
-  },
+  },
+   onPullDownRefresh() {
+	   // 下拉刷洗
+	   
+	   uni.stopPullDownRefresh() // 结束下拉刷新
+   },
+
   methods: {
 	  handleClick() { // 点击了cell
 		  console.log('点击了cell')
@@ -321,19 +320,13 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+
 .content {
   height: 100vh;
   background-color: #f4f5f7;
-  padding: 0rpx 30rpx 0 30rpx;
-
-  .scroll-view {
-    ::-webkit-scrollbar {
-      /*隐藏滚轮*/
-      display: none;
-    }
-  }
-
+  padding: 0rpx 30rpx 0 30rpx;
+  overflow-y:auto;
   .title-view {
     color: #333333;
     font-weight: bold;
@@ -434,8 +427,8 @@ export default {
 }
 
 .order-view {
-  text-align: center;
-
+  text-align: center;
+  min-height: 460rpx;
   .order-list-view {
     background-color: #ffffff;
     border-radius: 12rpx;
@@ -446,7 +439,19 @@ export default {
     .order-item-view {
     }
 
-    .no-order-view {
+    .no-order-view {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #666666;
+		font-size: 28rpx;
+		.no-order-image {
+			  width: 374rpx;
+			  height: 218rpx;
+			  margin-top: 100rpx;
+			  margin-bottom: 20rpx;
+		}
     }
 
     .tip-view {
@@ -472,5 +477,20 @@ export default {
       }
     }
   }
-}
+}
+ .bottom-view {
+	 display: flex;
+	 align-items: center;
+	 justify-content: space-between;
+	 padding: 20rpx 40rpx 50rpx 40rpx;
+	 .bottom-line-view {
+		 background-color: #D5D5D5;
+		 height: 2rpx;
+		 width: 30%;
+	 }
+	 .bottom-text {
+		 color: #999999;
+		 font-size: 24rpx;
+	 }
+ }
 </style>

src/pages/learn/course-detail.vue

@@ -163,7 +163,8 @@ export default {
   width: 100%;
   height: 100%;
   display: flex;
-  flex-direction: column;
+  flex-direction: column;
+  overflow-y:auto;
 }
 
 .course-video {

src/pages/learn/exam.vue

@@ -226,7 +226,8 @@
 		width: 100%;
 		height: 100%;
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;
+		overflow-y:auto;
 	}
 
 	.exam-head {

src/pages/settle/base.vue

@@ -28,7 +28,7 @@
 							<image class="item-image" :src="mixingImage"></image>
 							<text class="label">电工工龄(年)</text>
 						</view>
-						<p :class="['u-flex-1 u-text-right area', {before: !baseInfo.working_age}]">
+						<p :class="['u-flex-1 u-text-right area', {before: baseInfo.working_age === ''}]">
 							{{ baseInfo.working_age !== '' ? workingAgeTxt : '去选择'}}
 						</p>
 						<u-icon name="arrow-right" color="#2272FF" size="28"></u-icon>
@@ -119,7 +119,7 @@
 			submitStatus() {
 				const baseInfo = this.baseInfo
 				//baseInfo.name && baseInfo.mobile && 
-				const flag = baseInfo.service_area && baseInfo.working_age !== '' && baseInfo.address
+				const flag = baseInfo.service_area.length > 0 && baseInfo.working_age !== '' && baseInfo.address !== ''
 				return flag && !this.saving
 			},
 			cityText() {
@@ -386,7 +386,8 @@
 		width: 100%;
 		height: 100%;
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;
+		overflow-y:auto;
 	}
 
 	.base-list {

src/pages/settle/file.vue

@@ -528,7 +528,8 @@ export default {
 		width: 100%;
 		height: 100%;
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;
+		overflow-y:auto;
 	}
 
 	.base-list {

src/pages/settle/pay-ensure.vue

@@ -230,7 +230,8 @@
 		width: 100%;
 		height: 100%;
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;
+		overflow-y:auto;
 	}
 
 	.base-list {

src/pages/settle/select.vue

@@ -412,7 +412,15 @@
 
 <style lang="scss" scoped>
 	.content {
-		background-color: #F3F3F3;
+		background-color: #F4F5F7;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		overflow-y:auto;
 	}
 	.nav-item,
 	.age-item {
@@ -447,7 +455,7 @@
 			}
 
 			.nav-item.active {
-				background-color: #ededed;
+				background-color: #F4F5F7;
 			}
 		}
 

src/pages/settle/sign-contract.vue

@@ -424,7 +424,8 @@
 		width: 100%;
 		height: 100%;
 		display: flex;
-		flex-direction: column;
+		flex-direction: column;
+		overflow-y:auto;
 	}
 
 	.content-txt {