From 0b394d7e0634f600c2e1303fc3556bf2d6099792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 25 Oct 2022 10:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                  |  28 +-
 pages/u-picker/u-picker.vue | 563 ------------------------------------
 2 files changed, 14 insertions(+), 577 deletions(-)
 delete mode 100644 pages/u-picker/u-picker.vue

diff --git a/pages.json b/pages.json
index dc759ad..2197011 100644
--- a/pages.json
+++ b/pages.json
@@ -4,20 +4,6 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/homepage/homepage",
-			"style": {
-				"navigationBarTitleText": "泉医到家",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		},{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-				// "enablePullDownRefresh": false
-			}
-		},{
 			"path": "pages/shopping/shopping", //商城
 			"style": {
 				"navigationBarTitleText": "医路优品",
@@ -42,6 +28,13 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		}, {
+			"path": "pages/homepage/homepage",
+			"style": {
+				"navigationBarTitleText": "泉医到家",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},{
 			"path": "pages/information/information",
 			"style": {
 				"navigationBarTitleText": "完善个人信息",
@@ -84,6 +77,13 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
+		}, {
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+				// "enablePullDownRefresh": false
+			}
 		}, {
 			"path": "pages/register/register",
 			"style": {
diff --git a/pages/u-picker/u-picker.vue b/pages/u-picker/u-picker.vue
deleted file mode 100644
index 3005b2a..0000000
--- a/pages/u-picker/u-picker.vue
+++ /dev/null
@@ -1,563 +0,0 @@
-<template>
-	<u-popup :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
-		:safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
-		<view class="u-datetime-picker">
-			<view class="u-picker-header" @touchmove.stop.prevent="">
-				<view class="u-btn-picker u-btn-picker--tips" :style="{ color: cancelColor }" hover-class="u-opacity"
-					:hover-stay-time="150" @tap="getResult('cancel')">{{cancelText}}</view>
-				<view class="u-picker__title">{{ title }}</view>
-				<view class="u-btn-picker u-btn-picker--primary" :style="{ color: moving ? cancelColor : confirmColor }"
-					hover-class="u-opacity" :hover-stay-time="150" @touchmove.stop="" @tap.stop="getResult('confirm')">
-					{{confirmText}}
-				</view>
-			</view>
-			<view class="u-picker-body">
-				<picker-view :value="valueArr" @change="change" class="u-picker-view" @pickstart="pickstart"
-					@pickend="pickend">
-					<picker-view-column v-if="!reset && params.year" style="flex:6">
-						<view class="u-column-item" v-for="(item, index) in years" :key="index">
-							{{ item }}
-							<text class="u-text" v-if="showTimeTag">年</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column v-if="!reset && params.month" style="flex:5">
-						<view class="u-column-item" v-for="(item, index) in months" :key="index">
-							{{ formatNumber(item) }}
-							<text class="u-text" v-if="showTimeTag">月</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column v-if="!reset && params.day" style="flex:5">
-						<view class="u-column-item" v-for="(item, index) in days" :key="index">
-							{{ formatNumber(item) }}
-							<text class="u-text" v-if="showTimeTag">日</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column v-if="!reset && params.hour" style="flex:6">
-						<view class="u-column-item" v-for="(item, index) in hours" :key="index">
-							<view class="" style="font-size:38rpx">
-								{{ formatNumber(item) }}
-							</view>
-							<text class="u-text" v-if="showTimeTag">时</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column v-if="!reset && params.minute" style="flex:6">
-						<view class="u-column-item" v-for="(item, index) in minutes" :key="index">
-							<view class="" style="font-size:38rpx">
-								{{ formatNumber(item) }}
-							</view>
-							<text class="u-text" v-if="showTimeTag">分</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column style="flex:2">
-						<view class="u-column-item">
-							<text class="u-text">至</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column v-if="!reset && params.endhour" style="flex:6">
-						<view class="u-column-item" v-for="(item, index) in endhours" :key="index">
-							<view class="" style="font-size:38rpx">
-								{{ formatNumber(item) }}
-							</view>
-							<text class="u-text" v-if="showTimeTag">时</text>
-						</view>
-					</picker-view-column>
-					<picker-view-column v-if="!reset && params.endminute" style="flex:6">
-						<view class="u-column-item" v-for="(item, index) in endminutes" :key="index">
-							<view class="" style="font-size:38rpx">
-								{{ formatNumber(item) }}
-							</view>
-							<text class="u-text" v-if="showTimeTag">分</text>
-						</view>
-					</picker-view-column>
-				</picker-view>
-			</view>
-		</view>
-	</u-popup>
-</template>
-
-<script>
-	/**
-	 * picker picker弹出选择器
-	 * @description 此选择器有两种弹出模式：一是时间模式，可以配置年，日，月，时，分，秒参数 二是地区模式，可以配置省，市，区参数
-	 * @tutorial https://www.uviewui.com/components/picker.html
-	 * @property {Object} params 需要显示的参数，见官网说明
-	 * @property {String} mode 模式选择，region-地区类型，time-时间类型（默认time）
-	 * @property {String Number} start-year 可选的开始年份，mode=time时有效（默认1950）
-	 * @property {String Number} end-year 可选的结束年份，mode=time时有效（默认2050）
-	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
-	 * @property {Boolean} show-time-tag 时间模式时，是否显示后面的年月日中文提示
-	 * @property {String} cancel-color 取消按钮的颜色（默认#606266）
-	 * @property {String} confirm-color 确认按钮的颜色（默认#2979ff）
-	 * @property {String} default-time 默认选中的时间，mode=time时有效
-	 * @property {String} confirm-text 确认按钮的文字
-	 * @property {String} cancel-text 取消按钮的文字
-	 * @property {String} default-region 默认选中的地区，中文形式，mode=region时有效
-	 * @property {String} default-code 默认选中的地区，编号形式，mode=region时有效
-	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker（默认true）
-	 * @property {String Number} z-index 弹出时的z-index值（默认1075）
-	 * @property {Array} default-selector 数组形式，其中每一项表示选择了range对应项中的第几个
-	 * @property {Array} range 自定义选择的数据，mode=selector或mode=multiSelector时有效
-	 * @property {String} range-key 当range参数的元素为对象时，指定Object中的哪个key的值作为选择器显示内容
-	 * @event {Function} confirm 点击确定按钮，返回当前选择的值
-	 * @event {Function} cancel 点击取消按钮，返回当前选择的值
-	 * @example <u-picker v-model="show" mode="time"></u-picker>
-	 */
-	export default {
-		name: 'u-picker',
-		props: {
-			// picker中需要显示的参数
-			params: {
-				type: Object,
-				default () {
-					return {
-						year: false,
-						month: true,
-						day: true,
-						hour: true,
-						endhour: true,
-						minute: true,
-						endminute: true,
-						second: false,
-					};
-				}
-			},
-			// 当mode=selector或者mode=multiSelector时，提供的数组
-			range: {
-				type: Array,
-				default () {
-					return [];
-				}
-			},
-			// 当mode=selector或者mode=multiSelector时，提供的默认选中的下标
-			defaultSelector: {
-				type: Array,
-				default () {
-					return [0];
-				}
-			},
-			// 当 range 是一个 Array＜Object＞ 时，通过 range-key 来指定 Object 中 key 的值作为选择器显示内容
-			rangeKey: {
-				type: String,
-				default: ''
-			},
-			// 模式选择，region-地区类型，time-时间类型，selector-单列模式，multiSelector-多列模式
-			mode: {
-				type: String,
-				default: 'time'
-			},
-			// 年份开始时间
-			startYear: {
-				type: [String, Number],
-				default: 1950
-			},
-			// 年份结束时间
-			endYear: {
-				type: [String, Number],
-				default: 2050
-			},
-			// "取消"按钮的颜色
-			cancelColor: {
-				type: String,
-				default: '#606266'
-			},
-			// "确定"按钮的颜色
-			confirmColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 默认显示的时间，2025-07-02 || 2025-07-02 13:01:00 || 2025/07/02
-			defaultTime: {
-				type: String,
-				default: ''
-			},
-			// 时间模式时，是否显示后面的年月日中文提示
-			showTimeTag: {
-				type: Boolean,
-				default: true
-			},
-			safeAreaInsetBottom: {
-				type: Boolean,
-				default: false
-			},
-			// 是否允许通过点击遮罩关闭Picker
-			maskCloseAble: {
-				type: Boolean,
-				default: true
-			},
-			// 通过双向绑定控制组件的弹出与收起
-			value: {
-				type: Boolean,
-				default: false
-			},
-			// 弹出的z-index值
-			zIndex: {
-				type: [String, Number],
-				default: 0
-			},
-			// 顶部标题
-			title: {
-				type: String,
-				default: '预约时间'
-			},
-			// 取消按钮的文字
-			cancelText: {
-				type: String,
-				default: '取消'
-			},
-			// 确认按钮的文字
-			confirmText: {
-				type: String,
-				default: '确认'
-			}
-		},
-		data() {
-			return {
-				years: [],
-				months: [],
-				days: [],
-				hours: [],
-				endhours: [],
-				minutes: [],
-				endminutes: [],
-				seconds: [],
-				year: 0,
-				month: 0,
-				day: 0,
-				hour: 0,
-				endhour: 0,
-				minute: 0,
-				endminute: 0,
-				second: 0,
-				reset: false,
-				startDate: '',
-				endDate: '',
-				valueArr: [],
-				moving: false // 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
-			};
-		},
-		mounted() {
-			this.init();
-		},
-		computed: {
-			propsChange() {
-				// 引用这几个变量，是为了监听其变化
-				return `${this.mode}-${this.defaultTime}-${this.startYear}-${this.endYear}-${this.defaultRegion}-${this.areaCode}`;
-			},
-			regionChange() {
-				// 引用这几个变量，是为了监听其变化
-				return `${this.province}-${this.city}`;
-			},
-			yearAndMonth() {
-				return `${this.year}-${this.month}`;
-			},
-			uZIndex() {
-				// 如果用户有传递z-index值，优先使用
-				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-			}
-		},
-		watch: {
-			propsChange() {
-				this.reset = true;
-				setTimeout(() => this.init(), 10);
-			},
-			// 如果地区发生变化，为了让picker联动起来，必须重置this.citys和this.areas
-			regionChange(val) {
-				this.citys = citys[this.province];
-				this.areas = areas[this.province][this.city];
-			},
-			// watch监听月份的变化，实时变更日的天数，因为不同月份，天数不一样
-			// 一个月可能有30，31天，甚至闰年2月的29天，平年2月28天
-			yearAndMonth(val) {
-				if (this.params.year) this.setDays();
-			},
-			// 微信和QQ小程序由于一些奇怪的原因(故同时对所有平台均初始化一遍)，需要重新初始化才能显示正确的值
-			value(n) {
-				if (n) {
-					this.reset = true;
-					setTimeout(() => this.init(), 10);
-				}
-			}
-		},
-		methods: {
-			// 标识滑动开始，只有微信小程序才有这样的事件
-			pickstart() {
-				// #ifdef MP-WEIXIN
-				this.moving = true;
-				// #endif
-			},
-			// 标识滑动结束
-			pickend() {
-				// #ifdef MP-WEIXIN
-				this.moving = false;
-				// #endif
-			},
-			// 对单列和多列形式的判断是否有传入变量的情况
-			getItemValue(item, mode) {
-				// 目前(2020-05-25)uni-app对微信小程序编译有错误，导致v-if为false中的内容也执行，错误导致
-				// 单列模式或者多列模式中的getItemValue同时被执行，故在这里再加一层判断
-				if (this.mode == mode) {
-					return typeof item == 'object' ? item[this.rangeKey] : item;
-				}
-			},
-			// 小于10前面补0，用于月份，日期，时分秒等
-			formatNumber(num) {
-				return +num < 10 ? '0' + num : String(num);
-			},
-			// 生成递进的数组
-			generateArray: function(start, end) {
-				// 转为数值格式，否则用户给end-year等传递字符串值时，下面的end+1会导致字符串拼接，而不是相加
-				start = Number(start);
-				end = Number(end);
-				end = end > start ? end : start;
-				// 生成数组，获取其中的索引，并剪出来
-				return [...Array(end + 1).keys()].slice(start);
-			},
-			getIndex: function(arr, val) {
-				let index = arr.indexOf(val);
-				// 如果index为-1(即找不到index值)，~(-1)=-(-1)-1=0，导致条件不成立
-				return ~index ? index : 0;
-			},
-			//日期时间处理
-			initTimeValue() {
-				// 格式化时间，在IE浏览器(uni不存在此情况)，无法识别日期间的"-"间隔符号
-				let fdate = this.defaultTime.replace(/\-/g, '/');
-				fdate = fdate && fdate.indexOf('/') == -1 ? `2020/01/01 ${fdate}` : fdate;
-				let time = null;
-				if (fdate) time = new Date(fdate);
-				else time = new Date();
-				// 获取年日月时分秒
-				this.year = time.getFullYear();
-				this.month = Number(time.getMonth()) + 1;
-				this.day = time.getDate();
-				this.hour = time.getHours();
-				this.minute = time.getMinutes();
-				this.endhour = time.getHours();
-				this.endminute = time.getMinutes();
-				// this.second = time.getSeconds();
-			},
-			init() {
-				this.valueArr = [];
-				this.reset = false;
-				if (this.mode == 'time') {
-					this.initTimeValue();
-					if (this.params.year) {
-						this.valueArr.push(0);
-						this.setYears();
-					}
-					if (this.params.month) {
-						this.valueArr.push(0);
-						this.setMonths();
-					}
-					if (this.params.day) {
-						this.valueArr.push(0);
-						this.setDays();
-					}
-					if (this.params.hour) {
-						this.valueArr.push(0);
-						this.setHours();
-					}
-					if (this.params.minute) {
-						this.valueArr.push(0);
-						this.setMinutes();
-					}
-					if (this.params.endhour) {
-						this.valueArr.push(0);
-						this.setendHours();
-					}
-					if (this.params.endminute) {
-						this.valueArr.push(0);
-						this.setendMinutes();
-					}
-					// if (this.params.second) {
-					// 	this.valueArr.push(0);
-					// 	this.setSeconds();
-					// }
-				}
-				this.$forceUpdate();
-			},
-			// 设置picker的某一列值
-			setYears() {
-				// 获取年份集合
-				this.years = this.generateArray(this.startYear, this.endYear);
-				// 设置this.valueArr某一项的值，是为了让picker预选中某一个值
-				this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.years, this.year));
-			},
-			setMonths() {
-				this.months = this.generateArray(1, 12);
-				this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.months, this.month));
-			},
-			setDays() {
-				let totalDays = new Date(this.year, this.month, 0).getDate();
-				this.days = this.generateArray(1, totalDays);
-				let index = 0;
-				// 这里不能使用类似setMonths()中的this.valueArr.splice(this.valueArr.length - 1, xxx)做法
-				// 因为this.month和this.year变化时，会触发watch中的this.setDays()，导致this.valueArr.length计算有误
-				if (this.params.year && this.params.month) index = 2;
-				else if (this.params.month) index = 1;
-				else if (this.params.year) index = 1;
-				else index = 0;
-				// 当月份变化时，会导致日期的天数也会变化，如果原来选的天数大于变化后的天数，则重置为变化后的最大值
-				// 比如原来选中3月31日，调整为2月后，日期变为最大29，这时如果day值继续为31显然不合理，于是将其置为29(picker-column从1开始)
-				if (this.day > this.days.length) this.day = this.days.length;
-				this.valueArr.splice(index, 1, this.getIndex(this.days, this.day));
-			},
-			setHours() {
-				this.hours = this.generateArray(0, 23);
-				this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.hours, this.hour));
-			},
-			setMinutes() {
-				this.minutes = this.generateArray(0, 59);
-				this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.minutes, this.minute));
-			},
-			setendHours() {
-				this.endhours = this.generateArray(0, 23);
-				this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.endhours, this.endhour));
-			},
-			setendMinutes() {
-				this.endminutes = this.generateArray(0, 59);
-				this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.endminutes, this.endminute));
-			},
-			// setSeconds() {
-			// 	this.seconds = this.generateArray(0, 59);
-			// 	this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.seconds, this.second));
-			// },
-			close() {
-				this.$emit('input', false);
-			},
-			// 用户更改picker的列选项
-			change(e) {
-				this.valueArr = e.detail.value;
-				console.log(this.valueArr)
-				let i = 0;
-				if (this.mode == 'time') {
-					// 这里使用i++，是因为this.valueArr数组的长度是不确定长度的，它根据this.params的值来配置长度
-					// 进入if规则，i会加1，保证了能获取准确的值
-					if (this.params.year) this.year = this.years[this.valueArr[i++]];
-					if (this.params.month) this.month = this.months[this.valueArr[i++]];
-					if (this.params.day) this.day = this.days[this.valueArr[i++]];
-					if (this.params.hour) this.hour = this.hours[this.valueArr[i++]];
-					if (this.params.minute) this.minute = this.minutes[this.valueArr[i++]];
-					if (this.params.endhour) this.endhour = this.hours[this.valueArr[6]]
-					if (this.params.endminute) this.endminute = this.endminutes[this.valueArr[7]];
-					// if (this.params.second) this.second = this.seconds[this.valueArr[i++]];
-				}
-			},
-			// 用户点击确定按钮
-			getResult(event = null) {
-				// #ifdef MP-WEIXIN
-				if (this.moving) return;
-				// #endif
-				let result = {};
-				// 只返回用户在this.params中配置了为true的字段
-				if (this.mode == 'time') {
-					if (this.params.year) result.year = this.formatNumber(this.year || 0);
-					if (this.params.month) result.month = this.formatNumber(this.month || 0);
-					if (this.params.day) result.day = this.formatNumber(this.day || 0);
-					if (this.params.hour) result.hour = this.formatNumber(this.hour || 0);
-					if (this.params.minute) result.minute = this.formatNumber(this.minute || 0);
-					if (this.params.endhour) result.endhour = this.formatNumber(this.endhour || 0);
-					if (this.params.endminute) result.endminute = this.formatNumber(this.endminute || 0);
-					// if (this.params.second) result.second = this.formatNumber(this.second || 0);
-					// if (this.params.timestamp) result.timestamp = this.getTimestamp();
-				}
-				if (event) this.$emit(event, result);
-				this.close();
-			},
-			// 获取时间戳
-			getTimestamp() {
-				// yyyy-mm-dd为安卓写法，不支持iOS，需要使用"/"分隔，才能二者兼容
-				let time = this.year + '/' + this.month + '/' + this.day + ' ' + this.hour + ':' + this.minute + ':' + this
-					.second;
-				return new Date(time).getTime() / 1000;
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	// 定义混入指令，用于在非nvue环境下的flex定义，因为nvue没有display属性，会报错
-	@mixin vue-flex($direction: row) {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex-direction: $direction;
-		/* #endif */
-	}
-
-	.u-datetime-picker {
-		position: relative;
-		z-index: 999;
-	}
-
-	.u-picker-view {
-		height: 100%;
-		box-sizing: border-box;
-	}
-
-	.u-picker-header {
-		width: 100%;
-		height: 90rpx;
-		padding: 0 40rpx;
-		@include vue-flex;
-		justify-content: space-between;
-		align-items: center;
-		box-sizing: border-box;
-		font-size: 30rpx;
-		background: #fff;
-		position: relative;
-	}
-
-	.u-picker-header::after {
-		content: '';
-		position: absolute;
-		border-bottom: 1rpx solid #eaeef1;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		bottom: 0;
-		right: 0;
-		left: 0;
-	}
-
-	.u-picker__title {
-		color: $u-content-color;
-	}
-
-	.u-picker-body {
-		width: 100%;
-		height: 500rpx;
-		overflow: hidden;
-		background-color: #fff;
-	}
-
-	.u-column-item {
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 30rpx;
-		color: $u-main-color;
-		padding: 0 8rpx;
-	}
-
-	.u-text {
-		font-size: 24rpx;
-		padding-left: 8rpx;
-	}
-
-	.u-btn-picker {
-		padding: 16rpx;
-		box-sizing: border-box;
-		text-align: center;
-		text-decoration: none;
-	}
-
-	.u-opacity {
-		opacity: 0.5;
-	}
-
-	.u-btn-picker--primary {
-		color: $u-type-primary;
-	}
-
-	.u-btn-picker--tips {
-		color: $u-tips-color;
-	}
-</style>