From dfc0eb2eecec0a8cc2f805f4132f6c6c5a859ccd Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Mon, 13 May 2024 23:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=90=E7=A7=81=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development              |  2 ++
 .env.production               |  4 +++-
 src/pages.json                |  7 +++++++
 src/pages/login/Layout.vue    | 12 ++++++------
 src/pages/login/LoginForm.vue | 20 +++++++++++++++++++-
 src/pages/webview/index.vue   | 19 +++++++++++++++++++
 6 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/webview/index.vue

diff --git a/.env.development b/.env.development
index 0cc5e9d..e1cf62a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,3 +2,5 @@
 VITE_COMMON_API_PREFIX = /api-base
 
 VITE_COMMON_API_URL = http://store-manage.hmily.club/api
+
+VITE_COMMON_URL = http://store-manage.hmily.club
diff --git a/.env.production b/.env.production
index 696cd0d..9ecd004 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,5 @@
 VITE_COMMON_API_PREFIX = /api-base
 
-VITE_COMMON_API_URL = http://store.manage.zlgj168.com/api
\ No newline at end of file
+VITE_COMMON_API_URL = http://store.manage.zlgj168.com/api
+
+VITE_COMMON_URL = http://store.manage.zlgj168.com
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 9ce25e4..e4f5753 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -15,6 +15,13 @@
         "login": false
       }
     },
+    {
+      "path": "pages/webview/index",
+      "style": {
+        "navigationBarTitleText": "隐私协议",
+        "navigationStyle": "default"
+      }
+    },
     {
       "path": "pages/home/index",
       "style": {
diff --git a/src/pages/login/Layout.vue b/src/pages/login/Layout.vue
index c159ebd..fbec6e7 100644
--- a/src/pages/login/Layout.vue
+++ b/src/pages/login/Layout.vue
@@ -1,20 +1,20 @@
-
-
 <template>
   <view class="w-full flex flex-col">
     <view class="mt-20vh flex-center">
       <image class="w-200rpx h-200rpx" src="@/static/logo.png"></image>
     </view>
-    <view class="text-35rpx text-hex-333333 font-600 mt-80rpx">托管门店助手</view>
+    <view class="text-35rpx text-hex-333333 font-600 mt-80rpx"
+      >托管门店助手</view
+    >
     <view class="text-27rpx text-hex-333333">欢迎登录</view>
     <view class="flex-1 flex flex-col justify-end mt-0rpx">
       <LoginForm></LoginForm>
     </view>
+   
   </view>
 </template>
 <script setup>
 import LoginForm from './LoginForm.vue'
-</script>
-<style scoped lang="scss">
 
-</style>
\ No newline at end of file
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/pages/login/LoginForm.vue b/src/pages/login/LoginForm.vue
index 3e930d4..d60d6d0 100644
--- a/src/pages/login/LoginForm.vue
+++ b/src/pages/login/LoginForm.vue
@@ -29,6 +29,19 @@
           </uv-input>
         </view>
       </uv-form-item>
+      <view class="mt-40rpx">
+        <uv-checkbox-group
+          shape="circle"
+          activeColor="#ff0000"
+          v-model="checkboxValue"
+        >
+          <uv-checkbox :customStyle="{ marginBottom: '8px' }" :name="true">
+            <view @click.stop="handleW" class="text-24rpx"
+              >登录并同意《隐私政策》</view
+            >
+          </uv-checkbox>
+        </uv-checkbox-group>
+      </view>
     </uv-form>
     <view class="mt-115rpx">
       <uv-button block type="primary" shape="circle" @click="onValidate"
@@ -40,7 +53,7 @@
 <script setup>
 import { ref, reactive, computed } from 'vue'
 import { useUserStore } from '@/store/modules/user'
-
+const checkboxValue = ref([false])
 const userStore = useUserStore()
 
 const form = ref({
@@ -67,6 +80,10 @@ const rules = computed(() => {
 
 const formRef = ref(null)
 
+const handleW = () => {
+  uni.navigateTo({ url: '/pages/webview/index' })
+}
+
 const onValidate = () => {
   formRef.value.validate().then(() => {
     handleClick()
@@ -74,6 +91,7 @@ const onValidate = () => {
 }
 
 const handleClick = async () => {
+  checkboxValue.value = [true]
   try {
     const { username, password } = form.value
     await userStore.login({
diff --git a/src/pages/webview/index.vue b/src/pages/webview/index.vue
new file mode 100644
index 0000000..0edcdb6
--- /dev/null
+++ b/src/pages/webview/index.vue
@@ -0,0 +1,19 @@
+<template>
+  <view>
+
+    <web-view :webview-styles="{paddingTop: '44px'}" v-if="url" :src="url"></web-view>
+
+  </view>
+</template>
+
+<script setup>
+import { onLoad } from '@dcloudio/uni-app'
+import { ref } from 'vue'
+import CuNavbar from '@/components/cu-navbar/index'
+
+const url = ref(`${import.meta.env.VITE_COMMON_URL}/privacy`)
+
+onLoad((e) => {
+  if(e.url) url.value = e.url
+})
+</script>