更新

api/login.js

@@ -2,57 +2,68 @@ import request from '@/utils/request'
 
 // 登录方法
 export function login(username, password, code, uuid) {
-  const data = {
-    username,
-    password,
-    code,
-    uuid
-  }
-  return request({
-    'url': '/login',
-    headers: {
-      isToken: false
-    },
-    'method': 'post',
-    'data': data
-  })
+	const data = {
+		username,
+		password,
+		code,
+		uuid
+	}
+	return request({
+		'url': '/login',
+		headers: {
+			isToken: false
+		},
+		'method': 'post',
+		'data': data
+	})
 }
 
 // 获取用户详细信息
 export function getInfo() {
-  return request({
-    'url': '/getInfo',
-    'method': 'get'
-  })
+	return request({
+		'url': '/getInfo',
+		'method': 'get'
+	})
 }
 
 // 退出方法
 export function logout() {
-  return request({
-    'url': '/rescue/logout',
-    'method': 'post'
-  })
+	return request({
+		'url': '/rescue/logout',
+		'method': 'post'
+	})
 }
 
 // 获取验证码
 export function getCodeImg() {
-  return request({
-    'url': '/captchaImage',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
+	return request({
+		'url': '/captchaImage',
+		headers: {
+			isToken: false
+		},
+		method: 'get',
+		timeout: 20000
+	})
 }
 
 // 使用租户域名（标识），获得租户编号
 export function getTenantIdByWebsite(website) {
-  return request({
-    url: '/system/tenant/get-by-website',
-    method: 'get',
-    params: {
-      website
-    }
-  })
+	return request({
+		url: '/system/tenant/get-by-website',
+		method: 'get',
+		params: {
+			website
+		}
+	})
+}
+
+// 使用手机号查询所在的租户获得租户编号
+export function getTenantIdByPhone(phone) {
+	return request({
+		url: '/system/auth/getListByPhone',
+		method: 'get',
+		params: {
+			phone
+		}
+	})
 }

components/commonTimeSelect.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="date-range-selector">
+		<u-subsection :list="dateRangeList" keyName="label" :current="selected" @change="handleSubsectionChange" />
+		<uni-datetime-picker :value="internalDateRange" type="daterange" @change="handleDatePickerChange" />
+	</view>
+</template>
+
+<script>
+	import {
+		getDateRange
+	} from "@/utils/utils";
+
+	export default {
+		props: {
+			// Vue2 中使用 value 作为 v-model 的 prop
+			value: {
+				type: Array,
+				required: true
+			},
+			dateRangeList: {
+				type: Array,
+				default: () => [{
+						label: "本日",
+						value: "day"
+					},
+					{
+						label: "本月",
+						value: "month"
+					}
+				]
+			}
+		},
+		data() {
+			return {
+				selected: 0,
+				internalDateRange: this.value
+			};
+		},
+		watch: {
+			value(newVal) {
+				if (JSON.stringify(newVal) !== JSON.stringify(this.internalDateRange)) {
+					this.internalDateRange = newVal;
+					this.resetSelectedIndex();
+				}
+			},
+			internalDateRange(newVal) {
+				this.$emit('input', newVal); // Vue2 中使用 input 事件
+				this.$emit('subsection-change', newVal);
+			}
+		},
+		methods: {
+			handleSubsectionChange(index) {
+				this.selected = index;
+				const {
+					value
+				} = this.dateRangeList[index];
+				this.internalDateRange = getDateRange(value);
+			},
+			handleDatePickerChange(newRange) {
+				this.internalDateRange = newRange;
+			},
+			resetSelectedIndex() {
+				const isPreset = this.dateRangeList.some((item, index) => {
+					const range = getDateRange(item.value);
+					return JSON.stringify(range) === JSON.stringify(this.internalDateRange);
+				});
+
+				if (!isPreset) {
+					this.selected = 0;
+				}
+			}
+		},
+		created() {
+			this.resetSelectedIndex();
+		}
+	};
+</script>
+
+<style scoped>
+	.date-range-selector {
+		/* 可以写样式 */
+	}
+</style>

components/order-list.vue

@@ -7,8 +7,8 @@
 
 		<view class="order-body">
 			<view class="info-row">
-				<text class="label">检测项目:</text>
-				<text class="value">{{ orderData.projectName }}</text>
+				<text class="label">检测类型:</text>
+				<text class="value">{{ orderData.skuName }}</text>
 			</view>
 
 			<view class="info-row">