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

src/App.vue

@@ -106,7 +106,7 @@ export default {
     },
     getSystemInfo() {
       try {
-        let a = wx.getSystemInfoSync();
+        let a = this.$u.sys();
         this.globalData.navHeight =
           (a.statusBarHeight / a.screenWidth) * 750 + 90;
         this.globalData.rpxScreenHeight =
@@ -116,9 +116,6 @@ export default {
       } catch (a) {}
     },
     async getBaseInfo(vm, callBack) {
-      // uni.showLoading({
-      //   title: "加载中……",
-      // });
       const res = await vm.$u.api.getSettleBaseInfo();
       if (res.code !== 200) {
         return false;
@@ -131,7 +128,6 @@ export default {
       if (typeof callBack == "function") {
         callBack(vm, res.data);
       }
-      // uni.hideLoading();
       return res.data;
     },
 

src/pages.json

@@ -322,6 +322,15 @@
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
+				},
+				{
+					"path": "document",
+					"style": {
+						"navigationBarTitleText": "资料文件",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": false
+						// "disableScroll": true
+					}
 				}
 			]
 		},

src/pages/order/document.vue

+<template>
+	<view class="doc-wrap">
+		<u-navbar title="资料文件" :border-bottom="false"/>
+		<view class="filter">
+			<u-icon class="filter-icon" name="bag" label="品牌" label-size="24"/>
+			<u-icon class="filter-icon" name="tags" label="品类" label-size="24"/>
+		</view>
+		<view class="content">
+			<view class="row" v-for="(item, index) in list" :key="index">
+				<view class="icon">
+					<u-icon name="file-text"></u-icon>
+				</view>
+				<view class="item">
+					<view class="title">
+						<view class="name">{{item.name}}</view>
+						<view class="desc">
+							<text>{{item.time | datefmt('YYYY-MM-DD')}}</text>
+							<text class="u-p-l-30">{{'来源：' + (item.from.join('、'))}}</text>
+						</view>
+					</view>
+					<view class="right">
+						<u-icon 
+							class="opt-icon" name="share"
+							label="分享" label-pos="bottom"
+							label-color="#999999" label-size="24">
+						</u-icon>
+						<u-icon 
+							class="opt-icon" name="order" 
+							label="查看" label-pos="bottom" 
+							label-color="#999999" label-size="24">
+						</u-icon>
+					</view>
+				</view>
+			</view>
+			<u-loadmore :status="status" margin-top="30"/>
+			<u-gap height="316"/>
+		</view>
+	</view>
+</template>
+
+<script>
+let now = Date.now()
+export default {
+	data() {
+		return {
+			list: [],
+			status: 'loadmore',
+			total: 0,
+		};
+	},
+	onLoad() {
+		console.log("onLoad===========");
+		this.loadDocuments()
+	},
+	onReachBottom() {
+		if(this.list.length >= this.total) return;
+		console.log("onReachBottom===========");
+		this.status = 'loading';
+		this.loadDocuments()
+	},
+	methods: {
+		loadDocuments() {
+			let data  = [
+				{name: '挚达-广汽-勘察报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-增项收费标准表', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-安装报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-自营平台系统相关的免责协议', url: '', time: now, from: ['挚达','充电桩', '空调', '自营平台']},
+				{name: '挚达-广汽-报装声明', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-勘察报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-增项收费标准表', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-安装报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-自营平台系统相关的免责协议', url: '', time: now, from: ['挚达','充电桩', '空调', '自营平台']},
+				{name: '挚达-广汽-报装声明', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-勘察报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-增项收费标准表', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-安装报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-自营平台系统相关的免责协议', url: '', time: now, from: ['挚达','充电桩', '空调', '自营平台']},
+				{name: '挚达-广汽-报装声明', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-勘察报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-增项收费标准表', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-安装报告', url: '', time: now, from: ['挚达','充电桩']},
+				{name: '挚达-广汽-自营平台系统相关的免责协议', url: '', time: now, from: ['挚达','充电桩', '空调', '自营平台']},
+				{name: '挚达-广汽-报装声明', url: '', time: now, from: ['挚达','充电桩']},
+			]
+			this.total = 100
+			let newList = this.$u.deepMerge(this.list, data);
+			this.list = newList
+			console.log("loadDocuments===========");
+			if(newList.length >= this.total) this.status = 'nomore';
+			else  this.status = 'loadmore';
+		},
+		
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.doc-wrap {
+	background-color: #FFFFFF;
+	.filter {
+		padding-left: 30rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		z-index: 2;
+		.filter-icon {
+			margin-right: 60rpx;
+		}
+	}
+	.content {
+		// height: 100vh;
+		// overflow: auto;
+		.row {
+			display: flex;
+			align-items: center;
+			.icon {
+				margin-left: 30rpx;
+				font-size: 56rpx;
+				color: #2272FF;
+			}
+			.item {
+				margin-left: 20rpx;
+				flex-basis: calc(100%);
+				align-items: center;
+				min-height: 108rpx;
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 2rpx solid #F4F5F7;
+				.title {
+					word-break: break-all;
+					max-width: 460rpx;
+					.name {
+						color: #333333;
+						font-size: 28rpx;
+						font-weight: bold;
+					}
+					.desc {
+						color: #666666;
+						font-size: 24rpx;
+					}					
+				}
+				.right {
+					margin-right: 30rpx;
+					.opt-icon {
+						margin-left: 20rpx;
+						color: #999999;
+					}
+				}
+			}
+		}
+	}
+}
+</style>