From cb0a6fafa332bc647a4f75fc8f0c2059f33b0f2f Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Tue, 18 Aug 2020 17:42:26 +0800
Subject: [PATCH] upgrade version 8.18

---
 common/api/user.js                     |   6 ++
 components/shop/special-shop/index.vue |  16 ++--
 pageC/spike/index.vue                  |   2 +-
 pageE/mine/ArticleDetails.vue          | 101 +++--------------------
 pageE/setting/Index.vue                |   3 +-
 pageE/setting/updateVersion.vue        |  53 ++++++++++++
 pageE/setting/version.vue              | 108 +++++++++++++++++++++++++
 pageE/tool/WashOrder.vue               |  31 ++++++-
 pages.json                             |  36 ++++++---
 9 files changed, 240 insertions(+), 116 deletions(-)
 create mode 100644 pageE/setting/updateVersion.vue
 create mode 100644 pageE/setting/version.vue

diff --git a/common/api/user.js b/common/api/user.js
index 4f08ebe..e2706d2 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -353,6 +353,12 @@ export default {
 					code: code,
 				});
 			},
+			// 获取可送洗商品
+			getSendOrderList({ page }) {
+				return vm.$u.post('member/getSendOrderList', {
+					page: page,
+				});
+			},
 			// 送洗列表-平台订单 实体店订单
 			sendLaundryOrderList({ type, page }) {
 				return vm.$u.post('member/sendLaundryOrderList', {
diff --git a/components/shop/special-shop/index.vue b/components/shop/special-shop/index.vue
index 96749f5..0ae0014 100644
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -1,26 +1,26 @@
 <template>
 	<view class="special">
-		<view v-if="type == 'spike'">
-			<image :src="item.groupbuy_image1" @click="spikeGoods"></image>
+		<view v-if="type == 'spike'" @click="spikeGoods">
+			<image :src="item.groupbuy_image1"></image>
 			<view class="right">
-				<view class="name u-line-1" @click="spikeGoods">{{ item.goods_name }}</view>
+				<view class="name u-line-1">{{ item.goods_name }}</view>
 				<view class="price">
 					<view class="groupbuy-price">￥{{ item.groupbuy_price }}</view>
 					<view class="goods-price">￥{{ item.goods_price }}</view>
 				</view>
 				<view class="buy">
 					<view class="num">剩余{{ item.inventory }}件</view>
-					<view class="btn" @click="spikeGoods">立即购买</view>
+					<view class="btn">立即购买</view>
 				</view>
 			</view>
 		</view>
-		<view v-if="type == 'group'">
-			<image :src="item.pintuan_image" @click="toDetailsPage"></image>
+		<view v-if="type == 'group'" @click="toDetailsPage">
+			<image :src="item.pintuan_image"></image>
 			<view class="right">
-				<view class="name u-line-1" @click="toDetailsPage">{{ item.pintuan_goods_name }}</view>
+				<view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
 				<view class="price group">
 					<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
-					<view class="btn" @click="toDetailsPage">立即拼团</view>
+					<view class="btn">立即拼团</view>
 				</view>
 			</view>
 		</view>
diff --git a/pageC/spike/index.vue b/pageC/spike/index.vue
index 7a055a4..d6a5d47 100644
--- a/pageC/spike/index.vue
+++ b/pageC/spike/index.vue
@@ -23,7 +23,7 @@
 	</view>
 </template>
 <script>
-import SpecialGoods from "../../components/shop/special-shop/index"
+import SpecialGoods from "@/components/shop/special-shop/index"
 export default {
 	data() {
 		return {
diff --git a/pageE/mine/ArticleDetails.vue b/pageE/mine/ArticleDetails.vue
index 9732be0..975a34a 100644
--- a/pageE/mine/ArticleDetails.vue
+++ b/pageE/mine/ArticleDetails.vue
@@ -1,26 +1,6 @@
 <template>
-	<view>
-		<view class="header" v-if="type == 2">
-				<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
-				<view class="title">德铭阳光</view>
-				<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
-		</view>
-		<rich-text :nodes="nodes" v-if="type != 2"></rich-text>
-		<view class="main" v-if="type == 2">
-			<view @click="show = true">
-				<text>产品介绍</text>
-				<u-icon name="arrow-right" color="#999"></u-icon>
-			</view>
-			<view>
-				<text>版本更新</text>
-				<text class="tips">已是最新版本</text>
-			</view>
-		</view>
-        <u-popup v-model="show" v-if="type == 2" mode="left" width="100%">
-            <view class="u-content">
-                <rich-text :nodes="nodes"></rich-text>
-            </view>
-        </u-popup>
+	<view class="article-details">
+		<rich-text :nodes="nodes"></rich-text>
 	</view>
 </template>
 <script>
@@ -28,11 +8,7 @@ import common from '@/static/js/common.js'
 export default {
 	data() {
 		return {
-			type: 1,
 			nodes: "",
-			version: "",
-			show: false,
-			phone_type: "",
 		}
 	},
 	onLoad(option) {
@@ -41,17 +17,6 @@ export default {
 		if(option.id) this.getUseHelpInfo(option.id);
 		if(option.type == 1) this.certificateInfo();
 		if(option.type == 2) this.getAboutUsInfo();
-		this.type = option.type;
-		this.getVersion();
-		this.phone_type = this.$u.os();
-	},
-	onBackPress() {
-		if (this.show) {
-				this.show = !this.show;
-		} else {
-				return false;
-		}
-		return true;
 	},
 	onNavigationBarButtonTap(e) {
 		console.log(e);
@@ -88,64 +53,16 @@ export default {
 				}
 			})
 		},
-		// 检查版本号
-		getVersion() {
-			this.$u.post("Specialci/checkVersion",{app_version: 1}).then(res => {
-				console.log(res);
-				this.version = res.data.app_version;
-			})
-		}
 	},
 }
 </script>
 <style lang="scss" scoped>
-page {
-	background-color: #f2f2f2;
-}
-.header {
-	width: 500rpx;
-	margin: 0 auto;
-	padding: 30rpx;
-	text-align: center;
-    .tit-img {
-			width: 200rpx;
-			height: 200rpx;
-		}
-		.title {
-			margin: 18rpx 0;
-			font-weight: bold;
-			font-size: 26rpx;
-			letter-spacing: 2rpx;
-		}
-		.tit-info {
-			font-size: 22rpx;
-			color: #666;
-		}
-}
-.main {
-	margin: 20rpx 0;
-	& > view {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		width: 100%;
-		height: 100rpx;
-		padding: 0 20rpx;
-		line-height: 100rpx;
-		color: #333;
-		font-size: 30rpx;
-		background-color: #fff;
-		border-bottom: 1px solid #f2f2f2;
-	}
-	.tips {
-		color: #999;
-		font-size: 22rpx;
-	}
-}
-.u-content {
-    padding: 20rpx;
-    font-size: 30rpx;
-    text-indent: 1rem;
-    line-height: 1.2;
+// page {
+// 	background-color: #ECECEC;
+// }
+.article-details {
+	min-height: calc(100vh - var(--window-top));
+	background: #ECECEC;
+	padding: 20rpx 35rpx 0;
 }
 </style>
\ No newline at end of file
diff --git a/pageE/setting/Index.vue b/pageE/setting/Index.vue
index 979ece8..3a43596 100644
--- a/pageE/setting/Index.vue
+++ b/pageE/setting/Index.vue
@@ -64,7 +64,8 @@
 					},
 					{
 						title: '关于我们',
-						link: '../mine/ArticleDetails?type=2'
+						// link: '../mine/ArticleDetails?type=2'
+						link: '/pageE/setting/version'
 					},
 					{
 						title: '帮助与反馈',
diff --git a/pageE/setting/updateVersion.vue b/pageE/setting/updateVersion.vue
new file mode 100644
index 0000000..b43c469
--- /dev/null
+++ b/pageE/setting/updateVersion.vue
@@ -0,0 +1,53 @@
+<template>
+	<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
+		<view class="u-update-content">
+			<rich-text :nodes="content"></rich-text>
+		</view>
+	</u-modal>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: true,
+				// 传递给uni-app"rich-text"组件的内容，可以使用"<br>"进行换行
+				content: `
+					1. 新增几个bug<br>
+					2. 新增Modal模态框组件<br>
+					3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
+				`,
+			}
+		},
+		onReady() {
+			this.show = true;
+		},
+		methods: {
+			cancel() {
+				this.closeModal();
+			},
+			confirm() {
+				this.closeModal();
+			},
+			closeModal() {
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page{
+		background-color: rgba(0,0,0,0);
+	}
+	.u-full-content {
+		background-color: #00C777;
+	}
+	
+	.u-update-content {
+		font-size: 26rpx;
+		color: $u-content-color;
+		line-height: 1.7;
+		padding: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pageE/setting/version.vue b/pageE/setting/version.vue
new file mode 100644
index 0000000..9fc76db
--- /dev/null
+++ b/pageE/setting/version.vue
@@ -0,0 +1,108 @@
+<template>
+	<view class="version">
+		<view class="header">
+			<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
+			<view class="title">德铭阳光</view>
+			<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
+		</view>
+		<view class="main">
+			<view @click="viewAboutUs">
+				<text class="title">产品介绍</text>
+				<u-icon name="arrow-right" color="#999"></u-icon>
+			</view>
+			<view class="version-view">
+				<text class="title">版本更新</text>
+				<text class="tips" v-if="0">已是最新版本</text>
+				<text class="tips" v-else @click="updateVersion">1.1.10</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			version: "",
+			phone_type: "",
+		}
+	},
+	onLoad() {
+		this.getVersion();
+		this.phone_type = this.$u.os();
+	},
+	methods: {
+		// 检查版本号
+		getVersion() {
+			this.$u.post("Specialci/checkVersion",{ app_version: 1 }).then(res => {
+				// console.log(res);
+				this.version = res.data.app_version;
+			})
+		},
+		viewAboutUs() {
+			this.$u.route('/pageE/mine/ArticleDetails', {
+				type: 2
+			});
+		},
+		updateVersion() {
+			this.$u.route('/pageE/setting/updateVersion');
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.header {
+	width: 500rpx;
+	margin: 0 auto;
+	padding: 30rpx;
+	text-align: center;
+    .tit-img {
+			width: 200rpx;
+			height: 200rpx;
+		}
+		.title {
+			margin: 18rpx 0;
+			font-weight: bold;
+			font-size: 26rpx;
+			letter-spacing: 2rpx;
+		}
+		.tit-info {
+			font-size: 22rpx;
+			color: #666;
+		}
+}
+.main {
+	margin: 20rpx 0;
+	& > view {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100rpx;
+		padding: 0 20rpx;
+		line-height: 100rpx;
+		color: #333;
+		font-size: 30rpx;
+		background-color: #fff;
+		border-bottom: 1px solid #f2f2f2;
+		.title {
+			width: 200rpx;
+		}
+	}
+	.tips {
+		color: #999;
+		font-size: 22rpx;
+	}
+	.version-view {
+		.tips {
+			flex: 1;
+			text-align: right;
+		}
+	}
+}
+.u-content {
+    padding: 20rpx;
+    font-size: 30rpx;
+    text-indent: 1rem;
+    line-height: 1.2;
+}
+</style>
\ No newline at end of file
diff --git a/pageE/tool/WashOrder.vue b/pageE/tool/WashOrder.vue
index 002a278..8f890a2 100644
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -160,7 +160,7 @@
 					<text>选择订单</text>
 					<u-icon name="close" color="#A29FA3" size="32" @click="showPopup=false"></u-icon>
 				</view>
-				<scroll-view scroll-y class="order-list">
+				<scroll-view scroll-y class="order-list" @scrolltolower="onreachBottom">
 					<u-radio-group v-model="value" @change="radioChange">
 						<view v-for="(items, index) in orderList" :key="index" class="order-item">
 							<view class="store">
@@ -195,6 +195,7 @@
 							</view>
 						</view>
 					</u-radio-group>
+					<u-loadmore :status="loadStatu" bgColor="#FFFFFF" font-size="14" margin-top="20" margin-bottom="20"></u-loadmore>
 				</scroll-view>
 				<view class="order-btn" @click="confirm">确认</view>
 			</view>
@@ -222,7 +223,7 @@ export default {
 			}],
 			typeList: [], // 商品类型列表
 			orderList: [], // 商品列表
-			page: 0,
+			page: 1,
 			current: 0,
 			swiperCurrent: 0,
 			areaList: [], //　地址列表
@@ -244,6 +245,8 @@ export default {
 				name: 'common', // 其他图片
 			},
 			debounce: true,
+			timer: true,
+			loadStatu: 'loadmore'
 		}
 	},
 	onShow() {
@@ -284,17 +287,37 @@ export default {
 			// console.log(e);
 			this.type = e[0];
 		},
+		onreachBottom() {
+			if(!this.timer) return false;
+			this.timer = false;
+			this.loadStatu = "loading";
+			this.page++;
+			this.getOrderList({ load: 'loadmore' }).then(length => {
+				this.loadStatu = "nomore";
+				if(length == 0) this.page--;
+			}).catch(() => {
+				this.loadStatu = "nomore";
+				this.page--;
+			})
+		},
 		async getOrderList({ load = 'reload' } = {}) {
+			// const res = await this.$u.api.getSendOrderList({
+			// 	page: this.page,
+			// })
 			const res = await this.$u.api.getOrderList({
 				page: this.page,
-				// type: '40',
 			})
 			this.timer = true;
+			// if(res.errCode == 0) {
+			// 	if(load == 'reload') this.orderList = res.data.order_list;
+			// 	else this.orderList.push(...res.data.order_list);
+			// }
+			// return res.data.order_list.length;
 			if(res.errCode == 0) {
 				if(load == 'reload') this.orderList = res.data;
 				else this.orderList.push(...res.data);
 			}
-			return res;
+			return res.data.length;
 		},
 		submitImage() {
 			// console.log(222);
diff --git a/pages.json b/pages.json
index 8c36d72..d1616ea 100644
--- a/pages.json
+++ b/pages.json
@@ -610,16 +610,7 @@
 							"titleSize": "36px",
 							"titleNView": {
 								"titleColor": "#333333",
-								"backgroundColor": "#FFFFFF",
-                                "buttons": [
-                                	{
-                                        "width": "0",
-                                		"type":"none",
-                                		"text":"关闭",
-                                		"float":"right",
-                                		"fontSize":"14"
-                                	}
-                                ]
+								"backgroundColor": "#FFFFFF"
 							}
 						}
 					}
@@ -1002,6 +993,31 @@
 						}
 					}
 				},
+				{
+					"path": "setting/version",
+					"style": {
+						"navigationBarTitleText": "关于我们",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "setting/updateVersion",
+					"style": {
+						"navigationStyle": "custom",  // 取消本页面的导航栏
+						"app-plus": {
+							"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
+							"background": "transparent", // 背景透明
+							"backgroundColor": "rgba(0,0,0,0)", // 背景透明
+							"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
+						}
+					}
+				},
 				{
 					"path": "order/Index",
 					"style": {