From 92d05778b98fe0f5aeb483b487c82c5281ef16af Mon Sep 17 00:00:00 2001
From: liaodeyun <ldeyun@163.com>
Date: Thu, 27 Nov 2025 17:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=94=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95,=E5=B7=B2=E5=AE=8C=E6=88=90=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                                 |   56 +-
 pages.json                                |   11 +-
 pages/login.vue                           | 1116 ++++++++++-----------
 pages_caltools/components/meterResult.vue |    8 +-
 pages_system/pages/register/index.vue     |  914 +++++++++--------
 5 files changed, 1027 insertions(+), 1078 deletions(-)

diff --git a/config.js b/config.js
index 9c0607f..81dfe32 100644
--- a/config.js
+++ b/config.js
@@ -1,31 +1,31 @@
 // 应用全局配置
 const config = {
-  //  baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'http://localhost/prod-api',
-  baseUrl: 'https://ngtools.cn:8443',
-   //cloud后台网关地址
-  //  baseUrl: 'http://192.168.10.3:8080',
-   // 应用信息
-   appInfo: {
-     // 应用名称
-     name: "ruoyi-app-vue3",
-     // 应用版本
-     version: "1.1.0",
-     // 应用logo
-     logo: "/static/logo.png",
-     // 官方网站
-     site_url: "http://ruoyi.vip",
-     // 政策协议
-     agreements: [{
-         title: "隐私政策",
-         url: "https://ruoyi.vip/protocol.html"
-       },
-       {
-         title: "用户服务协议",
-         url: "https://ruoyi.vip/protocol.html"
-       }
-     ]
-   }
- }
+	//  baseUrl: 'https://vue.ruoyi.vip/prod-api',
+	// baseUrl: 'http://localhost/prod-api',
+	baseUrl: 'https://ngtools.cn:8443',
+	//cloud后台网关地址
+	//  baseUrl: 'http://192.168.10.3:8080',
+	// 应用信息
+	appInfo: {
+		// 应用名称
+		name: "天然气工具箱",
+		// 应用版本
+		version: "1.1.0",
+		// 应用logo
+		logo: "/static/logo.png",
+		// 官方网站
+		site_url: "http://ruoyi.vip",
+		// 政策协议
+		agreements: [{
+				title: "隐私政策",
+				url: "https://ruoyi.vip/protocol.html"
+			},
+			{
+				title: "用户服务协议",
+				url: "https://ruoyi.vip/protocol.html"
+			}
+		]
+	}
+}
 
- export default config
\ No newline at end of file
+export default config
\ No newline at end of file
diff --git a/pages.json b/pages.json
index fb3def2..f64966b 100644
--- a/pages.json
+++ b/pages.json
@@ -261,15 +261,6 @@
 
 			"root": "pages_system/pages",
 			"pages": [{
-					"path": "dict/index"
-				},
-				{
-					"path": "dict/data",
-					"style": {
-						"navigationBarTitleText": "计算工具"
-					}
-				},
-				{
 					"path": "register/index",
 					"style": {
 						"navigationBarTitleText": "注册",
@@ -278,7 +269,7 @@
 					}
 				},
 				{
-					"path": "forgot/index",
+					"path": "forget/index",
 					"style": {
 						"navigationBarTitleText": "忘记密码",
 						"navigationStyle": "custom"
diff --git a/pages/login.vue b/pages/login.vue
index ba4349b..187b660 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,640 +1,612 @@
 <template>
-  <view class="login-container">
-    <view class="login-header">
-      <image class="logo" src="/static/logo.png" mode="aspectFit"></image>
-      <text class="app-name">{{ appName }}</text>
-    </view>
+	<view class="login-container">
+		<view class="login-header">
+			<text class="app-name">{{ appName }}</text>
+		</view>
 
-    <view class="login-content">
-      <!-- 登录方式切换 -->
-      <view class="login-tabs">
-        <view 
-          class="tab-item" 
-          :class="{ active: activeTab === 'account' }"
-          @click="switchTab('account')"
-        >
-          账号登录
-        </view>
-        <view 
-          class="tab-item" 
-          :class="{ active: activeTab === 'phone' }"
-          @click="switchTab('phone')"
-        >
-          手机登录
-        </view>
-      </view>
+		<view class="login-content">
+			<!-- 登录方式切换 -->
+			<view class="login-tabs">
+				<view class="tab-item" :class="{ active: activeTab === 'account' }" @click="switchTab('account')">
+					账号登录
+				</view>
+				<view class="tab-item" :class="{ active: activeTab === 'phone' }" @click="switchTab('phone')">
+					手机登录
+				</view>
+			</view>
 
-      <!-- 账号密码登录 -->
-      <view v-if="activeTab === 'account'" class="login-form">
-        <view class="form-item">
-          <text class="label">账号</text>
-          <input 
-            v-model="accountForm.username" 
-            class="input" 
-            placeholder="请输入用户名/手机号/邮箱"
-            placeholder-class="placeholder"
-          />
-        </view>
-        
-        <view class="form-item">
-          <text class="label">密码</text>
-          <input 
-            v-model="accountForm.password" 
-            class="input" 
-            password 
-            placeholder="请输入密码"
-            placeholder-class="placeholder"
-            @confirm="handleAccountLogin"
-          />
-        </view>
+			<!-- 账号密码登录 -->
+			<view v-if="activeTab === 'account'" class="login-form">
+				<view class="form-item">
+					<text class="label">账号</text>
+					<input v-model="accountForm.username" class="input" placeholder="请输入用户名/手机号/邮箱"
+						placeholder-class="placeholder" />
+				</view>
 
-        <view class="form-item" v-if="accountForm.showCaptcha">
-          <text class="label">验证码</text>
-          <view class="captcha-input">
-            <input 
-              v-model="accountForm.code" 
-              class="input" 
-              placeholder="请输入验证码"
-              placeholder-class="placeholder"
-            />
-            <image 
-              :src="accountForm.captchaImg" 
-              class="captcha-img" 
-              @click="getCaptcha"
-              mode="aspectFit"
-            ></image>
-          </view>
-        </view>
+				<view class="form-item">
+					<text class="label">密码</text>
+					<input v-model="accountForm.password" class="input" password placeholder="请输入密码"
+						placeholder-class="placeholder" @confirm="handleAccountLogin" />
+				</view>
 
-        <view class="form-options">
-          <text class="forget-pwd" @click="goForgetPwd">忘记密码?</text>
-        </view>
+				<view class="form-item">
+					<text class="label">验证码</text>
+					<view class="captcha-input">
+						<input v-model="accountForm.code" class="input" placeholder="请输入验证码"
+							placeholder-class="placeholder" />
+						<image :src="accountForm.captchaImg" class="captcha-img" @click="getCaptcha" mode="aspectFit">
+						</image>
+					</view>
+				</view>
 
-        <button class="login-btn" @click="handleAccountLogin" :disabled="accountLogining">
-          {{ accountLogining ? '登录中...' : '登录' }}
-        </button>
-      </view>
+				<view class="form-options">
+					<text class="forget-pwd" @click="goForgetPwd">忘记密码?</text>
+				</view>
 
-      <!-- 手机验证码登录 -->
-      <view v-if="activeTab === 'phone'" class="login-form">
-        <view class="form-item">
-          <text class="label">手机号</text>
-          <input 
-            v-model="phoneForm.phone" 
-            class="input" 
-            type="number" 
-            placeholder="请输入手机号"
-            placeholder-class="placeholder"
-          />
-        </view>
+				<button class="login-btn" @click="handleAccountLogin" :disabled="accountLogining">
+					{{ accountLogining ? '登录中...' : '登录' }}
+				</button>
+			</view>
 
-        <view class="form-item">
-          <text class="label">验证码</text>
-          <view class="code-input">
-            <input 
-              v-model="phoneForm.code" 
-              class="input" 
-              type="number" 
-              placeholder="请输入验证码"
-              placeholder-class="placeholder"
-            />
-            <button 
-              class="send-code-btn" 
-              :disabled="phoneForm.countdown > 0"
-              @click="handlesendPhoneCode"
-            >
-              {{ phoneForm.countdown > 0 ? `${phoneForm.countdown}s` : '获取验证码' }}
-            </button>
-          </view>
-        </view>
+			<!-- 手机验证码登录 -->
+			<view v-if="activeTab === 'phone'" class="login-form">
+				<view class="form-item">
+					<text class="label">手机号</text>
+					<input v-model="phoneForm.phone" class="input" type="number" placeholder="请输入手机号"
+						placeholder-class="placeholder" />
+				</view>
 
-        <button class="login-btn" @click="handlePhoneLogin" :disabled="phoneLogining">
-          {{ phoneLogining ? '登录中...' : '登录' }}
-        </button>
-      </view>
+				<view class="form-item">
+					<text class="label">验证码</text>
+					<view class="code-input">
+						<input v-model="phoneForm.code" class="input" type="number" placeholder="请输入验证码"
+							placeholder-class="placeholder" />
+						<button class="send-code-btn" :disabled="phoneForm.countdown > 0" @click="handlesendPhoneCode">
+							{{ phoneForm.countdown > 0 ? `${phoneForm.countdown}s` : '获取验证码' }}
+						</button>
+					</view>
+				</view>
 
-      <!-- 快捷登录方式 -->
-      <view class="quick-login">
-        <view class="divider">
-          <text class="divider-text">快捷登录</text>
-        </view>
-        
-        <view class="login-methods">
-          <view class="method-item" @click="handleOneClickLogin">
-            <view class="method-icon one-click">
-              <text class="iconfont">⚡</text>
-            </view>
-            <text class="method-text">本机一键登录</text>
-          </view>
-          
-          <view class="method-item" @click="handleWechatLogin">
-            <view class="method-icon wechat">
-              <text class="iconfont">💬</text>
-            </view>
-            <text class="method-text">微信登录</text>
-          </view>
-        </view>
-      </view>
+				<button class="login-btn" @click="handlePhoneLogin" :disabled="phoneLogining">
+					{{ phoneLogining ? '登录中...' : '登录' }}
+				</button>
+			</view>
 
-      <!-- 注册链接 -->
-      <view class="register-link">
-        <text>还没有账号? </text>
-        <text class="link" @click="goRegister">立即注册</text>
-      </view>
-    </view>
-  </view>
+			<!-- 快捷登录方式 -->
+			<view class="quick-login">
+				<view class="divider">
+					<text class="divider-text">快捷登录</text>
+				</view>
+
+				<view class="login-methods">
+					<view class="method-item" @click="handleOneClickLogin">
+						<view class="method-icon one-click">
+							<text class="iconfont">⚡</text>
+						</view>
+						<text class="method-text">本机一键登录</text>
+					</view>
+
+					<view class="method-item" @click="handleWechatLogin">
+						<view class="method-icon wechat">
+							<text class="iconfont">💬</text>
+						</view>
+						<text class="method-text">微信登录</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 注册链接 -->
+			<view class="register-link">
+				<text>还没有账号? </text>
+				<text class="link" @click="goRegister">立即注册</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
-import { onLoad, onShow } from '@dcloudio/uni-app'
-import modal from '@/plugins/modal'
-import { getCodeImg, login, sendPhoneCode, verifyPhoneCode } from '@/api/login'
-import { getWxCode } from '@/utils/geek'
-import { wxLogin } from '@/api/oauth'
-import useUserStore from '@/store/modules/user'
-import { setToken } from '@/utils/auth'
-import config from '@/config.js'
+	import {
+		ref,
+		reactive,
+		onMounted
+	} from 'vue'
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app'
+	import modal from '@/plugins/modal'
+	import {
+		getCodeImg,
+		login,
+		sendPhoneCode,
+		verifyPhoneCode
+	} from '@/api/login'
+	import {
+		getWxCode
+	} from '@/utils/geek'
+	import {
+		wxLogin
+	} from '@/api/oauth'
+	import useUserStore from '@/store/modules/user'
+	import {
+		setToken
+	} from '@/utils/auth'
+	import config from '@/config.js'
 
-const userStore = useUserStore()
-const appName = config.appName || '系统名称'
+	const userStore = useUserStore()
+	const appName = config.appInfo.name || '天然气工具箱'
 
-// 响应式数据
-const activeTab = ref('account')
-const accountLogining = ref(false)
-const phoneLogining = ref(false)
+	// 响应式数据
+	const activeTab = ref('account')
+	const accountLogining = ref(false)
+	const phoneLogining = ref(false)
 
-// 账号登录表单
-const accountForm = reactive({
-  username: '',
-  password: '',
-  code: '',
-  captchaImg: '',
-  uuid: '',
-  showCaptcha: false
-})
+	// 账号登录表单
+	const accountForm = reactive({
+		username: '',
+		password: '',
+		code: '',
+		captchaImg: '',
+		uuid: '',
+		showCaptcha: false
+	})
 
-// 手机登录表单
-const phoneForm = reactive({
-  phone: '',
-  code: '',
-  countdown: 0,
-  timer: null
-})
+	// 手机登录表单
+	const phoneForm = reactive({
+		phone: '',
+		code: '',
+		countdown: 0,
+		timer: null
+	})
 
-// 切换登录方式
-const switchTab = (tab) => {
-  activeTab.value = tab
-  if (tab === 'account' && !accountForm.captchaImg) {
-    getCaptcha()
-  }
-}
+	// 切换登录方式
+	const switchTab = (tab) => {
+		activeTab.value = tab
+		if (tab === 'account' && !accountForm.captchaImg) {
+			getCaptcha()
+		}
+	}
 
-// 获取验证码
-const getCaptcha = async () => {
-  try {
-    const res = await getCodeImg()
-    accountForm.captchaImg = 'data:image/gif;base64,' + res.img
-    accountForm.uuid = res.uuid
-    accountForm.showCaptcha = true
-  } catch (error) {
-    modal.alert('验证码获取失败')
-  }
-}
+	// 获取验证码
+	const getCaptcha = async () => {
+		try {
+			const res = await getCodeImg()
+			accountForm.captchaImg = 'data:image/gif;base64,' + res.img
+			accountForm.uuid = res.uuid
+			accountForm.showCaptcha = true
+		} catch (error) {
+			modal.alert('验证码获取失败')
+		}
+	}
 
-// 发送手机验证码
-const handlesendPhoneCode = async () => {
-  if (!phoneForm.phone) {
-    modal.alert('请输入手机号')
-    return
-  }
-  
-  if (!/^1[3-9]\d{9}$/.test(phoneForm.phone)) {
-    modal.alert('请输入正确的手机号')
-    return
-  }
+	// 发送手机验证码
+	const handlesendPhoneCode = async () => {
+		if (!phoneForm.phone) {
+			modal.alert('请输入手机号')
+			return
+		}
 
-  try {
-    await sendPhoneCode({ phone: phoneForm.phone }, 'login')
-    modal.alert('验证码已发送')
-    
-    // 开始倒计时
-    phoneForm.countdown = 60
-    phoneForm.timer = setInterval(() => {
-      phoneForm.countdown--
-      if (phoneForm.countdown <= 0) {
-        clearInterval(phoneForm.timer)
-      }
-    }, 1000)
-  } catch (error) {
-    modal.alert(error.message || '验证码发送失败')
-  }
-}
+		if (!/^1[3-9]\d{9}$/.test(phoneForm.phone)) {
+			modal.alert('请输入正确的手机号')
+			return
+		}
 
-// 账号密码登录
-const handleAccountLogin = async () => {
-  if (!accountForm.username) {
-    modal.alert('请输入账号')
-    return
-  }
-  
-  if (!accountForm.password) {
-    modal.alert('请输入密码')
-    return
-  }
-  
-  if (accountForm.showCaptcha && !accountForm.code) {
-    modal.alert('请输入验证码')
-    return
-  }
+		try {
+			await sendPhoneCode({
+				phone: phoneForm.phone
+			}, 'login')
+			modal.alert('验证码已发送')
 
-  accountLogining.value = true
-  
-  try {
-    const params = {
-      username: accountForm.username,
-      password: accountForm.password
-    }
-    
-    if (accountForm.showCaptcha) {
-      params.code = accountForm.code
-      params.uuid = accountForm.uuid
-    }
-    
-    const res = await login(params.username, params.password, params.code, params.uuid)
-    
-    if (res.token) {
-      setToken(res.token)
-      await userStore.getInfo()
-      modal.alert('登录成功', () => {
-        uni.reLaunch({
-          url: '/pages/index'
-        })
-      })
-    }
-  } catch (error) {
-    // 如果需要验证码，重新获取
-    if (error.code === 401 || error.message?.includes('验证码')) {
-      getCaptcha()
-    }
-    modal.alert(error.message || '登录失败')
-  } finally {
-    accountLogining.value = false
-  }
-}
+			// 开始倒计时
+			phoneForm.countdown = 60
+			phoneForm.timer = setInterval(() => {
+				phoneForm.countdown--
+				if (phoneForm.countdown <= 0) {
+					clearInterval(phoneForm.timer)
+				}
+			}, 1000)
+		} catch (error) {
+			modal.alert(error.message || '验证码发送失败')
+		}
+	}
 
-// 手机验证码登录
-const handlePhoneLogin = async () => {
-  if (!phoneForm.phone) {
-    modal.alert('请输入手机号')
-    return
-  }
-  
-  if (!phoneForm.code) {
-    modal.alert('请输入验证码')
-    return
-  }
+	// 账号密码登录
+	const handleAccountLogin = async () => {
+		if (!accountForm.username) {
+			modal.alert('请输入账号')
+			return
+		}
 
-  phoneLogining.value = true
-  
-  try {
-    // 验证验证码
-    await verifyPhoneCode({
-      phone: phoneForm.phone,
-      code: phoneForm.code
-    }, 'login')
-    
-    // 验证成功后执行登录
-    const res = await login(phoneForm.phone, '', '', '')
-    
-    if (res.token) {
-      setToken(res.token)
-      await userStore.getInfo()
-      modal.alert('登录成功', () => {
-        uni.reLaunch({
-          url: '/pages/index'
-        })
-      })
-    }
-  } catch (error) {
-    modal.alert(error.message || '登录失败')
-  } finally {
-    phoneLogining.value = false
-  }
-}
+		if (!accountForm.password) {
+			modal.alert('请输入密码')
+			return
+		}
 
-// 本机一键登录
-const handleOneClickLogin = async () => {
-  try {
-    // 这里需要调用uni的一键登录API
-    // 由于不同平台实现不同，这里使用模拟实现
-    modal.confirm('是否使用本机号码一键登录?', async () => {
-      try {
-        // 获取本机号码（实际项目中需要调用运营商SDK）
-        const phoneNumber = '' // 从SDK获取
-        
-        if (!phoneNumber) {
-          modal.alert('无法获取本机号码')
-          return
-        }
-        
-        // 执行一键登录
-        const res = await login(phoneNumber, '', '', '')
-        
-        if (res.token) {
-          setToken(res.token)
-          await userStore.getInfo()
-          modal.alert('登录成功', () => {
-            uni.reLaunch({
-              url: '/pages/index'
-            })
-          })
-        }
-      } catch (error) {
-        modal.alert(error.message || '一键登录失败')
-      }
-    })
-  } catch (error) {
-    modal.alert('一键登录功能暂不可用')
-  }
-}
+		if (accountForm.showCaptcha && !accountForm.code) {
+			modal.alert('请输入验证码')
+			return
+		}
 
-// 微信登录
-const handleWechatLogin = async () => {
-  try {
-    const code = await getWxCode()
-    const res = await wxLogin('miniapp', code)
-    
-    if (res.token) {
-      setToken(res.token)
-      await userStore.getInfo()
-      modal.alert('登录成功', () => {
-        uni.reLaunch({
-          url: '/pages/index'
-        })
-      })
-    }
-  } catch (error) {
-    if (error.code === 400) {
-      // 需要绑定微信
-      modal.confirm('首次使用微信登录，需要绑定账号', () => {
-        uni.navigateTo({
-          url: '/pages_system/pages/login/bind-account'
-        })
-      })
-    } else {
-      modal.alert(error.message || '微信登录失败')
-    }
-  }
-}
+		accountLogining.value = true
 
-// 跳转注册页面
-const goRegister = () => {
-  uni.navigateTo({
-    url: '/pages_system/pages/register/index'
-  })
-}
+		try {
+			const params = {
+				username: accountForm.username,
+				password: accountForm.password
+			}
 
-// 跳转忘记密码页面
-const goForgetPwd = () => {
-  uni.navigateTo({
-    url: '/pages_system/pages/forget/index'
-  })
-}
+			if (accountForm.showCaptcha) {
+				params.code = accountForm.code
+				params.uuid = accountForm.uuid
+			}
 
-// 生命周期
-onMounted(() => {
-  getCaptcha()
-})
+			const res = await login(params.username, params.password, params.code, params.uuid)
 
-onLoad(() => {
-  // 检查是否有token，如果有则直接跳转
-  const token = uni.getStorageSync('token')
-  if (token) {
-    uni.reLaunch({
-      url: '/pages/index'
-    })
-  }
-})
+			if (res.token) {
+				setToken(res.token)
+				await userStore.getInfo()
+				uni.switchTab({
+					url: '/pages/index'
+				});
+
+			}
+		} catch (error) {
+			// 如果需要验证码，重新获取
+			if (error.code === 401 || error.message?.includes('验证码')) {
+				getCaptcha()
+			}
+			modal.alert(error.message || '登录失败')
+		} finally {
+			accountLogining.value = false
+		}
+	}
+
+	// 手机验证码登录
+	const handlePhoneLogin = async () => {
+		if (!phoneForm.phone) {
+			modal.alert('请输入手机号')
+			return
+		}
+
+		if (!phoneForm.code) {
+			modal.alert('请输入验证码')
+			return
+		}
+
+		phoneLogining.value = true
+
+		try {
+			// 验证验证码
+			await verifyPhoneCode({
+				phone: phoneForm.phone,
+				code: phoneForm.code
+			}, 'login')
+
+			// 验证成功后执行登录
+			const res = await login(phoneForm.phone, '', '', '')
+
+			if (res.token) {
+				setToken(res.token)
+				await userStore.getInfo()
+				uni.switchTab({
+					url: '/pages/index'
+				});
+			}
+		} catch (error) {
+			modal.alert(error.message || '登录失败')
+		} finally {
+			phoneLogining.value = false
+		}
+	}
+
+	// 本机一键登录
+	const handleOneClickLogin = async () => {
+		try {
+			// 这里需要调用uni的一键登录API
+			// 由于不同平台实现不同，这里使用模拟实现
+			modal.confirm('是否使用本机号码一键登录?', async () => {
+				try {
+					// 获取本机号码（实际项目中需要调用运营商SDK）
+					const phoneNumber = '' // 从SDK获取
+
+					if (!phoneNumber) {
+						modal.alert('无法获取本机号码')
+						return
+					}
+					// 执行一键登录
+					const res = await login(phoneNumber, '', '', '')
+
+					if (res.token) {
+						setToken(res.token)
+						await userStore.getInfo()
+						uni.switchTab({
+							url: '/pages/index'
+						});
+					}
+				} catch (error) {
+					modal.alert(error.message || '一键登录失败')
+				}
+			})
+		} catch (error) {
+			modal.alert('一键登录功能暂不可用')
+		}
+	}
+
+	// 微信登录
+	const handleWechatLogin = async () => {
+		try {
+			const code = await getWxCode()
+			const res = await wxLogin('miniapp', code)
+
+			if (res.token) {
+				setToken(res.token)
+				await userStore.getInfo()
+				uni.switchTab({
+					url: '/pages/index'
+				});
+			}
+		} catch (error) {
+			if (error.code === 400) {
+				// 需要绑定微信
+				modal.confirm('首次使用微信登录，需要绑定账号', () => {
+					uni.navigateTo({
+						url: '/pages_system/pages/login/bind-account'
+					})
+				})
+			} else {
+				modal.alert(error.message || '微信登录失败')
+			}
+		}
+	}
+
+	// 跳转注册页面
+	const goRegister = () => {
+		uni.navigateTo({
+			url: '/pages_system/pages/register/index'
+		})
+	}
+
+	// 跳转忘记密码页面
+	const goForgetPwd = () => {
+		uni.navigateTo({
+			url: '/pages_system/pages/forget/index'
+		})
+	}
+
+	// 生命周期
+	onMounted(() => {
+		getCaptcha()
+	})
+
+	onLoad(() => {
+		// 检查是否有token，如果有则直接跳转
+		const token = uni.getStorageSync('token')
+		if (token) {
+			uni.reLaunch({
+				url: '/pages/index'
+			})
+		}
+	})
 </script>
 
 <style scoped>
-.login-container {
-  min-height: 100vh;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  padding: 60rpx 40rpx;
-}
+	.login-container {
+		min-height: 100vh;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		padding: 60rpx 40rpx;
+	}
 
-.login-header {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 80rpx;
-}
+	.login-header {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-bottom: 80rpx;
+	}
 
-.logo {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 20rpx;
-  margin-bottom: 20rpx;
-}
+	.logo {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+	}
 
-.app-name {
-  font-size: 36rpx;
-  color: #fff;
-  font-weight: bold;
-}
+	.app-name {
+		font-size: 36rpx;
+		color: #fff;
+		font-weight: bold;
+	}
 
-.login-content {
-  background: #fff;
-  border-radius: 20rpx;
-  padding: 40rpx;
-  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
-}
+	.login-content {
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 40rpx;
+		box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
+	}
 
-.login-tabs {
-  display: flex;
-  margin-bottom: 40rpx;
-  border-bottom: 2rpx solid #f0f0f0;
-}
+	.login-tabs {
+		display: flex;
+		margin-bottom: 40rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
 
-.tab-item {
-  flex: 1;
-  text-align: center;
-  padding: 20rpx;
-  font-size: 32rpx;
-  color: #999;
-  position: relative;
-}
+	.tab-item {
+		flex: 1;
+		text-align: center;
+		padding: 20rpx;
+		font-size: 32rpx;
+		color: #999;
+		position: relative;
+	}
 
-.tab-item.active {
-  color: #007aff;
-  font-weight: bold;
-}
+	.tab-item.active {
+		color: #007aff;
+		font-weight: bold;
+	}
 
-.tab-item.active::after {
-  content: '';
-  position: absolute;
-  bottom: -2rpx;
-  left: 50%;
-  transform: translateX(-50%);
-  width: 60rpx;
-  height: 4rpx;
-  background: #007aff;
-  border-radius: 2rpx;
-}
+	.tab-item.active::after {
+		content: '';
+		position: absolute;
+		bottom: -2rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 60rpx;
+		height: 4rpx;
+		background: #007aff;
+		border-radius: 2rpx;
+	}
 
-.form-item {
-  margin-bottom: 30rpx;
-}
+	.form-item {
+		margin-bottom: 30rpx;
+	}
 
-.label {
-  display: block;
-  font-size: 28rpx;
-  color: #333;
-  margin-bottom: 10rpx;
-}
+	.label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 10rpx;
+	}
 
-.input {
-  width: 100%;
-  height: 80rpx;
-  border: 2rpx solid #e0e0e0;
-  border-radius: 10rpx;
-  padding: 0 20rpx;
-  font-size: 28rpx;
-  box-sizing: border-box;
-}
+	.input {
+		width: 100%;
+		height: 80rpx;
+		border: 2rpx solid #e0e0e0;
+		border-radius: 10rpx;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+		box-sizing: border-box;
+	}
 
-.placeholder {
-  color: #ccc;
-}
+	.placeholder {
+		color: #ccc;
+	}
 
-.captcha-input, .code-input {
-  display: flex;
-  align-items: center;
-  gap: 20rpx;
-}
+	.captcha-input,
+	.code-input {
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+	}
 
-.captcha-img {
-  width: 200rpx;
-  height: 80rpx;
-  border-radius: 10rpx;
-  border: 2rpx solid #e0e0e0;
-}
+	.captcha-img {
+		width: 200rpx;
+		height: 80rpx;
+		border-radius: 10rpx;
+		border: 2rpx solid #e0e0e0;
+	}
 
-.send-code-btn {
-  width: 200rpx;
-  height: 80rpx;
-  background: #007aff;
-  color: #fff;
-  border: none;
-  border-radius: 10rpx;
-  font-size: 24rpx;
-  white-space: nowrap;
-}
+	.send-code-btn {
+		width: 200rpx;
+		height: 80rpx;
+		background: #007aff;
+		color: #fff;
+		border: none;
+		border-radius: 10rpx;
+		font-size: 24rpx;
+		white-space: nowrap;
+	}
 
-.send-code-btn[disabled] {
-  background: #ccc;
-}
+	.send-code-btn[disabled] {
+		background: #ccc;
+	}
 
-.form-options {
-  display: flex;
-  justify-content: flex-end;
-  margin-bottom: 40rpx;
-}
+	.form-options {
+		display: flex;
+		justify-content: flex-end;
+		margin-bottom: 40rpx;
+	}
 
-.forget-pwd {
-  color: #007aff;
-  font-size: 26rpx;
-}
+	.forget-pwd {
+		color: #007aff;
+		font-size: 26rpx;
+	}
 
-.login-btn {
-  width: 100%;
-  height: 88rpx;
-  background: #007aff;
-  color: #fff;
-  border: none;
-  border-radius: 44rpx;
-  font-size: 32rpx;
-  margin-bottom: 40rpx;
-}
+	.login-btn {
+		width: 100%;
+		height: 88rpx;
+		background: #007aff;
+		color: #fff;
+		border: none;
+		border-radius: 44rpx;
+		font-size: 32rpx;
+		margin-bottom: 40rpx;
+	}
 
-.login-btn[disabled] {
-  background: #ccc;
-}
+	.login-btn[disabled] {
+		background: #ccc;
+	}
 
-.quick-login {
-  margin-bottom: 40rpx;
-}
+	.quick-login {
+		margin-bottom: 40rpx;
+	}
 
-.divider {
-  position: relative;
-  text-align: center;
-  margin: 40rpx 0;
-}
+	.divider {
+		position: relative;
+		text-align: center;
+		margin: 40rpx 0;
+	}
 
-.divider::before {
-  content: '';
-  position: absolute;
-  top: 50%;
-  left: 0;
-  right: 0;
-  height: 1rpx;
-  background: #e0e0e0;
-}
+	.divider::before {
+		content: '';
+		position: absolute;
+		top: 50%;
+		left: 0;
+		right: 0;
+		height: 1rpx;
+		background: #e0e0e0;
+	}
 
-.divider-text {
-  background: #fff;
-  padding: 0 20rpx;
-  color: #999;
-  font-size: 24rpx;
-}
+	.divider-text {
+		background: #fff;
+		padding: 0 20rpx;
+		color: #999;
+		font-size: 24rpx;
+	}
 
-.login-methods {
-  display: flex;
-  justify-content: center;
-  gap: 80rpx;
-}
+	.login-methods {
+		display: flex;
+		justify-content: center;
+		gap: 80rpx;
+	}
 
-.method-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
+	.method-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 
-.method-icon {
-  width: 100rpx;
-  height: 100rpx;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 10rpx;
-  font-size: 40rpx;
-}
+	.method-icon {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-bottom: 10rpx;
+		font-size: 40rpx;
+	}
 
-.method-icon.one-click {
-  background: #ff9500;
-  color: #fff;
-}
+	.method-icon.one-click {
+		background: #ff9500;
+		color: #fff;
+	}
 
-.method-icon.wechat {
-  background: #07c160;
-  color: #fff;
-}
+	.method-icon.wechat {
+		background: #07c160;
+		color: #fff;
+	}
 
-.method-text {
-  font-size: 24rpx;
-  color: #666;
-}
+	.method-text {
+		font-size: 24rpx;
+		color: #666;
+	}
 
-.register-link {
-  text-align: center;
-  font-size: 26rpx;
-  color: #666;
-}
+	.register-link {
+		text-align: center;
+		font-size: 26rpx;
+		color: #666;
+	}
 
-.link {
-  color: #007aff;
-}
+	.link {
+		color: #007aff;
+	}
 </style>
\ No newline at end of file
diff --git a/pages_caltools/components/meterResult.vue b/pages_caltools/components/meterResult.vue
index eb80271..1bf611c 100644
--- a/pages_caltools/components/meterResult.vue
+++ b/pages_caltools/components/meterResult.vue
@@ -7,14 +7,14 @@
 				<!-- 标况体积流量m³/s -->
 				<uni-forms-item :style="{ width: selectWidth + 'px' }" label="标况体积流量m³/s" name="dVFlowb">
 					<a-yjly-inputunit :modelValue="meterResult.dVFlowb" :unit-type="'volumeflow'"
-						v-model:unitOrder="meterResult.dVFlowUnit" :show-english-only="true" :decimal-places="5"
+						v-model:unitOrder="meterResult.dVFlowUnit" :show-english-only="true" :decimal-places="6"
 						:width="selectWidth" :input-disable="true" />
 				</uni-forms-item>
 
 				<!-- 工况体积流量 -->
 				<uni-forms-item :style="{ width: selectWidth + 'px' }" label="工况体积流量" name="dVFlowf">
 					<a-yjly-inputunit :modelValue="meterResult.dVFlowf" :unit-type="'volumeflow'"
-						v-model:unitOrder="meterResult.dVFlowWorkUnit" :show-english-only="true" :decimal-places="5"
+						v-model:unitOrder="meterResult.dVFlowWorkUnit" :show-english-only="true" :decimal-places="6"
 						:input-disable="true" :width="selectWidth" />
 				</uni-forms-item>
 
@@ -22,13 +22,13 @@
 				<uni-forms-item :style="{ width: selectWidth + 'px' }" label="标况质量流量" name="dMFlowb">
 					<a-yjly-inputunit :modelValue="meterResult.dMFlowb" :unit-type="'massflow'"
 						v-model:unitOrder="meterResult.dMFlowUnit" :input-disable="true" :show-english-only="true"
-						:decimal-places="5" :width="selectWidth" />
+						:decimal-places="6" :width="selectWidth" />
 				</uni-forms-item>
 
 				<!-- 标况能量流量 -->
 				<uni-forms-item :style="{ width: selectWidth + 'px' }" label="标况能量流量" name="dEFlowb">
 					<a-yjly-inputunit :modelValue="meterResult.dEFlowb" :unit-type="'energyflow'"
-						v-model:unitOrder="meterResult.dEFlowUnit" :show-english-only="true" :decimal-places="5"
+						v-model:unitOrder="meterResult.dEFlowUnit" :show-english-only="true" :decimal-places="6"
 						:width="selectWidth" :input-disable="true" />
 				</uni-forms-item>
 				<!-- 求超压缩因子 E -->
diff --git a/pages_system/pages/register/index.vue b/pages_system/pages/register/index.vue
index 393557d..11ce592 100644
--- a/pages_system/pages/register/index.vue
+++ b/pages_system/pages/register/index.vue
@@ -1,524 +1,510 @@
 <template>
-  <view class="register-container">
-    <view class="register-header">
-      <text class="back-btn" @click="goBack">‹</text>
-      <text class="title">用户注册</text>
-      <view class="placeholder"></view>
-    </view>
+	<view class="register-container">
+		<view class="register-header">
+			<text class="back-btn" @click="goBack">‹</text>
+			<text class="title">用户注册</text>
+			<view class="placeholder"></view>
+		</view>
 
-    <view class="register-content">
-      <view class="register-form">
-        <view class="form-item">
-          <text class="label">用户名</text>
-          <input 
-            v-model="registerForm.username" 
-            class="input" 
-            placeholder="请输入用户名"
-            placeholder-class="placeholder"
-          />
-        </view>
+		<view class="register-content">
+			<view class="register-form">
+				<view class="form-item">
+					<text class="label">用户名</text>
+					<input v-model="registerForm.username" class="input" placeholder="请输入用户名"
+						placeholder-class="placeholder" />
+				</view>
 
-        <view class="form-item">
-          <text class="label">手机号</text>
-          <input 
-            v-model="registerForm.phone" 
-            class="input" 
-            type="number" 
-            placeholder="请输入手机号"
-            placeholder-class="placeholder"
-          />
-        </view>
+				<view class="form-item">
+					<text class="label">手机号</text>
+					<input v-model="registerForm.phone" class="input" type="number" placeholder="请输入手机号"
+						placeholder-class="placeholder" />
+				</view>
 
-        <view class="form-item">
-          <text class="label">验证码</text>
-          <view class="code-input">
-            <input 
-              v-model="registerForm.code" 
-              class="input" 
-              type="number" 
-              placeholder="请输入验证码"
-              placeholder-class="placeholder"
-            />
-            <button 
-              class="send-code-btn" 
-              :disabled="countdown > 0"
-              @click="sendCode"
-            >
-              {{ countdown > 0 ? `${countdown}s` : '获取验证码' }}
-            </button>
-          </view>
-        </view>
+				<view class="form-item">
+					<text class="label">验证码</text>
+					<view class="code-input">
+						<input v-model="registerForm.code" class="input" type="number" placeholder="请输入验证码"
+							placeholder-class="placeholder" />
+						<button class="send-code-btn" :disabled="countdown > 0" @click="sendCode">
+							{{ countdown > 0 ? `${countdown}s` : '获取验证码' }}
+						</button>
+					</view>
+				</view>
 
-        <view class="form-item">
-          <text class="label">密码</text>
-          <input 
-            v-model="registerForm.password" 
-            class="input" 
-            password 
-            placeholder="请输入密码"
-            placeholder-class="placeholder"
-          />
-        </view>
+				<view class="form-item">
+					<text class="label">密码</text>
+					<input v-model="registerForm.password" class="input" password placeholder="请输入密码"
+						placeholder-class="placeholder" />
+				</view>
 
-        <view class="form-item">
-          <text class="label">确认密码</text>
-          <input 
-            v-model="registerForm.confirmPassword" 
-            class="input" 
-            password 
-            placeholder="请再次输入密码"
-            placeholder-class="placeholder"
-          />
-        </view>
+				<view class="form-item">
+					<text class="label">确认密码</text>
+					<input v-model="registerForm.confirmPassword" class="input" password placeholder="请再次输入密码"
+						placeholder-class="placeholder" />
+				</view>
 
-        <view class="form-item" v-if="registerForm.showEmail">
-          <text class="label">邮箱</text>
-          <input 
-            v-model="registerForm.email" 
-            class="input" 
-            type="email" 
-            placeholder="请输入邮箱(选填)"
-            placeholder-class="placeholder"
-          />
-        </view>
+				<view class="form-item" v-if="registerForm.showEmail">
+					<text class="label">邮箱</text>
+					<input v-model="registerForm.email" class="input" type="email" placeholder="请输入邮箱(选填)"
+						placeholder-class="placeholder" />
+				</view>
 
-        <view class="agreement">
-          <checkbox-group @change="toggleAgreement">
-            <label class="checkbox-label">
-              <checkbox :checked="agreed" color="#007aff" />
-              <text class="agreement-text">我已阅读并同意</text>
-            </label>
-          </checkbox-group>
-          <text class="agreement-link" @click="showAgreement">《用户协议》</text>
-          <text class="agreement-link" @click="showPrivacy">《隐私政策》</text>
-        </view>
+				<view class="agreement">
+					<checkbox-group @change="toggleAgreement">
+						<label class="checkbox-label">
+							<checkbox :checked="agreed" color="#007aff" />
+							<text class="agreement-text">我已阅读并同意</text>
+						</label>
+					</checkbox-group>
+					<text class="agreement-link" @click="showAgreement">《用户协议》</text>
+					<text class="agreement-link" @click="showPrivacy">《隐私政策》</text>
+				</view>
 
-        <button class="register-btn" @click="handleRegister" :disabled="registering">
-          {{ registering ? '注册中...' : '注册' }}
-        </button>
+				<button class="register-btn" @click="handleRegister" :disabled="registering">
+					{{ registering ? '注册中...' : '注册' }}
+				</button>
 
-        <view class="login-link">
-          <text>已有账号? </text>
-          <text class="link" @click="goLogin">立即登录</text>
-        </view>
-      </view>
+				<view class="login-link">
+					<text>已有账号? </text>
+					<text class="link" @click="goLogin">立即登录</text>
+				</view>
+			</view>
 
-      <!-- 第三方注册 -->
-      <view class="third-register">
-        <view class="divider">
-          <text class="divider-text">第三方注册</text>
-        </view>
-        
-        <view class="register-methods">
-          <view class="method-item" @click="handleWechatRegister">
-            <view class="method-icon wechat">
-              <text class="iconfont">💬</text>
-            </view>
-            <text class="method-text">微信注册</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+			<!-- 第三方注册 -->
+			<view class="third-register">
+				<view class="divider">
+					<text class="divider-text">第三方注册</text>
+				</view>
+
+				<view class="register-methods">
+					<view class="method-item" @click="handleWechatRegister">
+						<view class="method-icon wechat">
+							<text class="iconfont">💬</text>
+						</view>
+						<text class="method-text">微信注册</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue'
-import { onLoad, onShow } from '@dcloudio/uni-app'
-import modal from '@/plugins/modal'
-import { getCodeImg, login, sendPhoneCode, verifyPhoneCode } from '@/api/login'
-import { getWxCode } from '@/utils/geek'
-import { wxLogin } from '@/api/oauth'
-import useUserStore from '@/store/modules/user'
-import { setToken } from '@/utils/auth'
-import config from '@/config.js'
-const userStore = useUserStore()
+	import {
+		ref,
+		reactive
+	} from 'vue'
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app'
+	import modal from '@/plugins/modal'
+	import {
+		getCodeImg,
+		login,
+		sendPhoneCode,
+		verifyPhoneCode
+	} from '@/api/login'
+	import {
+		getWxCode
+	} from '@/utils/geek'
+	import {
+		wxLogin
+	} from '@/api/oauth'
+	import useUserStore from '@/store/modules/user'
+	import {
+		setToken
+	} from '@/utils/auth'
+	import config from '@/config.js'
+	const userStore = useUserStore()
 
-// 响应式数据
-const registering = ref(false)
-const agreed = ref(false)
-const countdown = ref(0)
-let countdownTimer = null
+	// 响应式数据
+	const registering = ref(false)
+	const agreed = ref(false)
+	const countdown = ref(0)
+	let countdownTimer = null
 
-// 注册表单
-const registerForm = reactive({
-  username: '',
-  phone: '',
-  code: '',
-  password: '',
-  confirmPassword: '',
-  email: '',
-  showEmail: false
-})
+	// 注册表单
+	const registerForm = reactive({
+		username: '',
+		phone: '',
+		code: '',
+		password: '',
+		confirmPassword: '',
+		email: '',
+		showEmail: false
+	})
 
-// 发送验证码
-const sendCode = async () => {
-  if (!registerForm.phone) {
-    modal.alert('请输入手机号')
-    return
-  }
-  
-  if (!/^1[3-9]\d{9}$/.test(registerForm.phone)) {
-    modal.alert('请输入正确的手机号')
-    return
-  }
+	// 发送验证码
+	const sendCode = async () => {
+		if (!registerForm.phone) {
+			modal.alert('请输入手机号')
+			return
+		}
 
-  try {
-    await sendPhoneCode({ phone: registerForm.phone }, 'register')
-    modal.alert('验证码已发送')
-    
-    // 开始倒计时
-    countdown.value = 60
-    countdownTimer = setInterval(() => {
-      countdown.value--
-      if (countdown.value <= 0) {
-        clearInterval(countdownTimer)
-      }
-    }, 1000)
-  } catch (error) {
-    modal.alert(error.message || '验证码发送失败')
-  }
-}
+		if (!/^1[3-9]\d{9}$/.test(registerForm.phone)) {
+			modal.alert('请输入正确的手机号')
+			return
+		}
 
-// 处理注册
-const handleRegister = async () => {
-  if (!validateForm()) return
+		try {
+			await sendPhoneCode({
+				phone: registerForm.phone
+			}, 'register')
+			modal.alert('验证码已发送')
 
-  registering.value = true
-  
-  try {
-    // 验证验证码
-    await verifyPhoneCode({
-      phone: registerForm.phone,
-      code: registerForm.code
-    }, 'register')
-    
-    // 执行注册
-    const params = {
-      username: registerForm.username,
-      password: registerForm.password,
-      phonenumber: registerForm.phone
-    }
-    
-    if (registerForm.email) {
-      params.email = registerForm.email
-    }
-    
-    const res = await register(params)
-    
-    if (res.token) {
-      setToken(res.token)
-      await userStore.getInfo()
-      modal.alert('注册成功', () => {
-        uni.reLaunch({
-          url: '/pages/index'
-        })
-      })
-    }
-  } catch (error) {
-    modal.alert(error.message || '注册失败')
-  } finally {
-    registering.value = false
-  }
-}
+			// 开始倒计时
+			countdown.value = 60
+			countdownTimer = setInterval(() => {
+				countdown.value--
+				if (countdown.value <= 0) {
+					clearInterval(countdownTimer)
+				}
+			}, 1000)
+		} catch (error) {
+			modal.alert(error.message || '验证码发送失败')
+		}
+	}
 
-// 表单验证
-const validateForm = () => {
-  if (!registerForm.username) {
-    modal.alert('请输入用户名')
-    return false
-  }
-  
-  if (!registerForm.phone) {
-    modal.alert('请输入手机号')
-    return false
-  }
-  
-  if (!/^1[3-9]\d{9}$/.test(registerForm.phone)) {
-    modal.alert('请输入正确的手机号')
-    return false
-  }
-  
-  if (!registerForm.code) {
-    modal.alert('请输入验证码')
-    return false
-  }
-  
-  if (!registerForm.password) {
-    modal.alert('请输入密码')
-    return false
-  }
-  
-  if (registerForm.password.length < 6) {
-    modal.alert('密码长度不能少于6位')
-    return false
-  }
-  
-  if (registerForm.password !== registerForm.confirmPassword) {
-    modal.alert('两次输入的密码不一致')
-    return false
-  }
-  
-  if (!agreed.value) {
-    modal.alert('请同意用户协议和隐私政策')
-    return false
-  }
-  
-  return true
-}
+	// 处理注册
+	const handleRegister = async () => {
+		if (!validateForm()) return
 
-// 微信注册
-const handleWechatRegister = async () => {
-  try {
-    const code = await getWxCode()
-    const res = await wxRegister('miniapp', code)
-    
-    if (res.token) {
-      setToken(res.token)
-      await userStore.getInfo()
-      modal.alert('注册成功', () => {
-        uni.reLaunch({
-          url: '/pages/index'
-        })
-      })
-    }
-  } catch (error) {
-    modal.alert(error.message || '微信注册失败')
-  }
-}
+		registering.value = true
 
-// 切换协议同意状态
-const toggleAgreement = (e) => {
-  agreed.value = e.detail.value.length > 0
-}
+		try {
+			// 验证验证码
+			await verifyPhoneCode({
+				phone: registerForm.phone,
+				code: registerForm.code
+			}, 'register')
 
-// 显示用户协议
-const showAgreement = () => {
-  uni.navigateTo({
-    url: '/pages_system/pages/login/agreement?type=user'
-  })
-}
+			// 执行注册
+			const params = {
+				username: registerForm.username,
+				password: registerForm.password,
+				phonenumber: registerForm.phone
+			}
 
-// 显示隐私政策
-const showPrivacy = () => {
-  uni.navigateTo({
-    url: '/pages_system/pages/login/agreement?type=privacy'
-  })
-}
+			if (registerForm.email) {
+				params.email = registerForm.email
+			}
 
-// 返回登录页面
-const goBack = () => {
-  uni.navigateBack()
-}
+			const res = await register(params)
 
-const goLogin = () => {
-  uni.redirectTo({
-    url: '/pages/login'
-  })
-}
+			if (res.token) {
+				setToken(res.token)
+				await userStore.getInfo()
+				uni.switchTab({
+					url: '/pages/login'
+				});
+			}
+		} catch (error) {
+			modal.alert(error.message || '注册失败')
+		} finally {
+			registering.value = false
+		}
+	}
 
-// 清理计时器
-import { onUnmounted } from 'vue'
-onUnmounted(() => {
-  if (countdownTimer) {
-    clearInterval(countdownTimer)
-  }
-})
+	// 表单验证
+	const validateForm = () => {
+		if (!registerForm.username) {
+			modal.alert('请输入用户名')
+			return false
+		}
+
+		if (!registerForm.phone) {
+			modal.alert('请输入手机号')
+			return false
+		}
+
+		if (!/^1[3-9]\d{9}$/.test(registerForm.phone)) {
+			modal.alert('请输入正确的手机号')
+			return false
+		}
+
+		if (!registerForm.code) {
+			modal.alert('请输入验证码')
+			return false
+		}
+
+		if (!registerForm.password) {
+			modal.alert('请输入密码')
+			return false
+		}
+
+		if (registerForm.password.length < 6) {
+			modal.alert('密码长度不能少于6位')
+			return false
+		}
+
+		if (registerForm.password !== registerForm.confirmPassword) {
+			modal.alert('两次输入的密码不一致')
+			return false
+		}
+
+		if (!agreed.value) {
+			modal.alert('请同意用户协议和隐私政策')
+			return false
+		}
+
+		return true
+	}
+
+	// 微信注册
+	const handleWechatRegister = async () => {
+		try {
+			const code = await getWxCode()
+			const res = await wxRegister('miniapp', code)
+
+			if (res.token) {
+				setToken(res.token)
+				await userStore.getInfo()
+				modal.alert('注册成功', () => {
+					uni.reLaunch({
+						url: '/pages/index'
+					})
+				})
+			}
+		} catch (error) {
+			modal.alert(error.message || '微信注册失败')
+		}
+	}
+
+	// 切换协议同意状态
+	const toggleAgreement = (e) => {
+		agreed.value = e.detail.value.length > 0
+	}
+
+	// 显示用户协议
+	const showAgreement = () => {
+		uni.navigateTo({
+			url: '/pages_system/pages/login/agreement?type=user'
+		})
+	}
+
+	// 显示隐私政策
+	const showPrivacy = () => {
+		uni.navigateTo({
+			url: '/pages_system/pages/login/agreement?type=privacy'
+		})
+	}
+
+	// 返回登录页面
+	const goBack = () => {
+		uni.navigateBack()
+	}
+
+	const goLogin = () => {
+		uni.redirectTo({
+			url: '/pages/login'
+		})
+	}
+
+	// 清理计时器
+	import {
+		onUnmounted
+	} from 'vue'
+	onUnmounted(() => {
+		if (countdownTimer) {
+			clearInterval(countdownTimer)
+		}
+	})
 </script>
 
 <style scoped>
-.register-container {
-  min-height: 100vh;
-  background: #f5f5f5;
-}
+	.register-container {
+		min-height: 100vh;
+		background: #f5f5f5;
+	}
 
-.register-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 40rpx 30rpx;
-  background: #fff;
-  border-bottom: 1rpx solid #e0e0e0;
-}
+	.register-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 40rpx 30rpx;
+		background: #fff;
+		border-bottom: 1rpx solid #e0e0e0;
+	}
 
-.back-btn {
-  font-size: 50rpx;
-  color: #333;
-  width: 60rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-  text-align: center;
-}
+	.back-btn {
+		font-size: 50rpx;
+		color: #333;
+		width: 60rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+	}
 
-.title {
-  font-size: 36rpx;
-  color: #333;
-  font-weight: bold;
-}
+	.title {
+		font-size: 36rpx;
+		color: #333;
+		font-weight: bold;
+	}
 
-.placeholder {
-  width: 60rpx;
-}
+	.placeholder {
+		width: 60rpx;
+	}
 
-.register-content {
-  padding: 40rpx;
-}
+	.register-content {
+		padding: 40rpx;
+	}
 
-.register-form {
-  background: #fff;
-  border-radius: 20rpx;
-  padding: 40rpx;
-  margin-bottom: 40rpx;
-  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-}
+	.register-form {
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 40rpx;
+		margin-bottom: 40rpx;
+		box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+	}
 
-.form-item {
-  margin-bottom: 30rpx;
-}
+	.form-item {
+		margin-bottom: 30rpx;
+	}
 
-.label {
-  display: block;
-  font-size: 28rpx;
-  color: #333;
-  margin-bottom: 10rpx;
-}
+	.label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 10rpx;
+	}
 
-.input {
-  width: 100%;
-  height: 80rpx;
-  border: 2rpx solid #e0e0e0;
-  border-radius: 10rpx;
-  padding: 0 20rpx;
-  font-size: 28rpx;
-  box-sizing: border-box;
-}
+	.input {
+		width: 100%;
+		height: 80rpx;
+		border: 2rpx solid #e0e0e0;
+		border-radius: 10rpx;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+		box-sizing: border-box;
+	}
 
-.code-input {
-  display: flex;
-  align-items: center;
-  gap: 20rpx;
-}
+	.code-input {
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+	}
 
-.send-code-btn {
-  width: 200rpx;
-  height: 80rpx;
-  background: #007aff;
-  color: #fff;
-  border: none;
-  border-radius: 10rpx;
-  font-size: 24rpx;
-  white-space: nowrap;
-}
+	.send-code-btn {
+		width: 200rpx;
+		height: 80rpx;
+		background: #007aff;
+		color: #fff;
+		border: none;
+		border-radius: 10rpx;
+		font-size: 24rpx;
+		white-space: nowrap;
+	}
 
-.send-code-btn[disabled] {
-  background: #ccc;
-}
+	.send-code-btn[disabled] {
+		background: #ccc;
+	}
 
-.agreement {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  margin: 40rpx 0;
-  font-size: 24rpx;
-}
+	.agreement {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+		margin: 40rpx 0;
+		font-size: 24rpx;
+	}
 
-.checkbox-label {
-  display: flex;
-  align-items: center;
-  margin-right: 10rpx;
-}
+	.checkbox-label {
+		display: flex;
+		align-items: center;
+		margin-right: 10rpx;
+	}
 
-.agreement-text {
-  margin-left: 10rpx;
-  color: #666;
-}
+	.agreement-text {
+		margin-left: 10rpx;
+		color: #666;
+	}
 
-.agreement-link {
-  color: #007aff;
-  margin: 0 5rpx;
-}
+	.agreement-link {
+		color: #007aff;
+		margin: 0 5rpx;
+	}
 
-.register-btn {
-  width: 100%;
-  height: 88rpx;
-  background: #007aff;
-  color: #fff;
-  border: none;
-  border-radius: 44rpx;
-  font-size: 32rpx;
-  margin-bottom: 30rpx;
-}
+	.register-btn {
+		width: 100%;
+		height: 88rpx;
+		background: #007aff;
+		color: #fff;
+		border: none;
+		border-radius: 44rpx;
+		font-size: 32rpx;
+		margin-bottom: 30rpx;
+	}
 
-.register-btn[disabled] {
-  background: #ccc;
-}
+	.register-btn[disabled] {
+		background: #ccc;
+	}
 
-.login-link {
-  text-align: center;
-  font-size: 26rpx;
-  color: #666;
-}
+	.login-link {
+		text-align: center;
+		font-size: 26rpx;
+		color: #666;
+	}
 
-.link {
-  color: #007aff;
-}
+	.link {
+		color: #007aff;
+	}
 
-.third-register {
-  background: #fff;
-  border-radius: 20rpx;
-  padding: 40rpx;
-  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-}
+	.third-register {
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 40rpx;
+		box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+	}
 
-.divider {
-  position: relative;
-  text-align: center;
-  margin-bottom: 40rpx;
-}
+	.divider {
+		position: relative;
+		text-align: center;
+		margin-bottom: 40rpx;
+	}
 
-.divider::before {
-  content: '';
-  position: absolute;
-  top: 50%;
-  left: 0;
-  right: 0;
-  height: 1rpx;
-  background: #e0e0e0;
-}
+	.divider::before {
+		content: '';
+		position: absolute;
+		top: 50%;
+		left: 0;
+		right: 0;
+		height: 1rpx;
+		background: #e0e0e0;
+	}
 
-.divider-text {
-  background: #fff;
-  padding: 0 20rpx;
-  color: #999;
-  font-size: 24rpx;
-}
+	.divider-text {
+		background: #fff;
+		padding: 0 20rpx;
+		color: #999;
+		font-size: 24rpx;
+	}
 
-.register-methods {
-  display: flex;
-  justify-content: center;
-}
+	.register-methods {
+		display: flex;
+		justify-content: center;
+	}
 
-.method-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
+	.method-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 
-.method-icon {
-  width: 100rpx;
-  height: 100rpx;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 10rpx;
-  font-size: 40rpx;
-  background: #07c160;
-  color: #fff;
-}
+	.method-icon {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-bottom: 10rpx;
+		font-size: 40rpx;
+		background: #07c160;
+		color: #fff;
+	}
 
-.method-text {
-  font-size: 24rpx;
-  color: #666;
-}
+	.method-text {
+		font-size: 24rpx;
+		color: #666;
+	}
 </style>
\ No newline at end of file