From 8b682bf546c2b9a7cacd465318ca7dbdb5e616ca Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Fri, 16 May 2025 21:18:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E5=85=A5=E9=A9=BB=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=BA=90=E7=A0=81=E7=9B=B8=E5=85=B3=E7=9A=84api/utils?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=A7=84=E8=8C=83=E5=8C=96=E5=88=B0src?=
 =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AEvite=E4=BB=A3=E7=90=86api=EF=BC=8Cax?=
 =?UTF-8?q?ios=E6=8E=A5=E5=8F=A3=E6=8B=A6=E6=88=AA=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E4=B8=80=E5=B1=82=EF=BC=8C=E6=B7=BB=E5=8A=A0env.local=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local                               |  1 +
 .gitignore                               |  2 ++
 components.d.ts                          | 10 ---------
 src/App.vue                              | 23 ++++++++++++++++++--
 {api => src/api}/audit.js                |  0
 src/api/content.ts                       | 13 ++++++++++++
 {api => src/api}/login.js                |  0
 {api => src/api}/upload.js               |  0
 src/components/login.vue                 |  2 +-
 src/components/register.vue              |  4 ++--
 src/router/index.ts                      |  8 +++++++
 {utils => src/utils}/http.js             |  8 +++----
 {utils => src/utils}/vue-cookies.js      |  0
 src/views/HeadMenu.vue                   |  2 +-
 src/views/business/agreement/privacy.vue | 27 ++++++++++++++++++++++++
 src/views/feedback/FeedBack.vue          |  2 +-
 src/views/index/slider.vue               |  1 -
 src/views/start/check.vue                |  4 ++--
 src/views/start/start.vue                |  2 +-
 tsconfig.app.json                        |  2 +-
 vite.config.ts                           | 10 +++++++++
 21 files changed, 95 insertions(+), 26 deletions(-)
 create mode 100644 .env.local
 rename {api => src/api}/audit.js (100%)
 create mode 100644 src/api/content.ts
 rename {api => src/api}/login.js (100%)
 rename {api => src/api}/upload.js (100%)
 rename {utils => src/utils}/http.js (84%)
 rename {utils => src/utils}/vue-cookies.js (100%)
 create mode 100644 src/views/business/agreement/privacy.vue

diff --git a/.env.local b/.env.local
new file mode 100644
index 0000000..d780846
--- /dev/null
+++ b/.env.local
@@ -0,0 +1 @@
+VUE_APP_BASE_URL = https://mall.gpxscs.cn
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a19f004..6383ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ docs/_book
 # TODO: where does this rule come from?
 test/
 
+node_modules/
+.history
\ No newline at end of file
diff --git a/components.d.ts b/components.d.ts
index f8fcdde..d02f5e8 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -8,25 +8,15 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElOption: typeof import('element-plus/es')['ElOption']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
     ElStatistic: typeof import('element-plus/es')['ElStatistic']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     FloatingMenu: typeof import('./src/components/floatingMenu.vue')['default']
     Login: typeof import('./src/components/login.vue')['default']
     Register: typeof import('./src/components/register.vue')['default']
diff --git a/src/App.vue b/src/App.vue
index 8768c12..0cd0727 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,6 @@
 <template>
-  <div>
+  <template v-if="!isFullpage">
+    <div>
     <HeadMenu @open-login-form="showLoginForm = true" @open-register-form="showRegisterForm = true" />
     <div class="contain">
       <router-view class="routerView" />
@@ -9,17 +10,35 @@
   </div>
   <Login :isVisible="showLoginForm" @close-login-form="showLoginForm = false" />
   <Register :isVisible="showRegisterForm" @close-register-form="showRegisterForm = false" />
+  </template>
+  <template v-else>
+    <router-view class="routerView" />
+  </template>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, watch, computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+
 import HeadMenu from '@/views/HeadMenu.vue';
+
 import Footer from '@/views/Footer.vue';
 import Login from '@/components/login.vue';
 import Register from '@/components/register.vue'; 
 import Feedback from './components/floatingMenu.vue';
+
+const route = useRoute();
+
 const showLoginForm = ref(false);
 const showRegisterForm = ref(false); // 定义控制注册组件显示的变量
+const fullpageRef = ref(true);
+
+// 计算属性：根据当前路由的 meta 决定是否显示页头页脚
+const isFullpage = computed(() => {
+  return route?.meta?.isFullpage || false;
+});
+
+fullpageRef.value = isFullpage.value
 </script>
 
 <style lang="scss">
diff --git a/api/audit.js b/src/api/audit.js
similarity index 100%
rename from api/audit.js
rename to src/api/audit.js
diff --git a/src/api/content.ts b/src/api/content.ts
new file mode 100644
index 0000000..0232014
--- /dev/null
+++ b/src/api/content.ts
@@ -0,0 +1,13 @@
+import http from '@/utils/http';
+
+export const CONTENT_API =  {
+  getAgreement(params) {
+    const str = new URLSearchParams(params).toString();
+    return  http({
+      method:'GET',
+      url:`/api/mobile/account/login/protocol?${str}`,
+    })
+  }
+}
+
+export default CONTENT_API
\ No newline at end of file
diff --git a/api/login.js b/src/api/login.js
similarity index 100%
rename from api/login.js
rename to src/api/login.js
diff --git a/api/upload.js b/src/api/upload.js
similarity index 100%
rename from api/upload.js
rename to src/api/upload.js
diff --git a/src/components/login.vue b/src/components/login.vue
index 2461353..cc5d2c6 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -35,7 +35,7 @@
 import { ref, defineProps, defineEmits, watch, onMounted, onUnmounted } from 'vue';
 import { useUserStore } from '@/stores/userStore';
 import { useRouter } from 'vue-router';
-import { GetLogin, GetSmsCode, GetVerifyCode, GetAccountLogin } from '../../api/login';
+import { GetLogin, GetSmsCode, GetVerifyCode, GetAccountLogin } from '@/api/login';
 import { ElMessage } from 'element-plus/es';
 
 const props = defineProps({
diff --git a/src/components/register.vue b/src/components/register.vue
index 9d8dfdf..ef52c42 100644
--- a/src/components/register.vue
+++ b/src/components/register.vue
@@ -53,8 +53,8 @@
 import { ref, defineProps, defineEmits, onMounted, onUnmounted } from 'vue';
 import { useUserStore } from '@/stores/userStore';
 import { useRouter } from 'vue-router';
-import { GetSmsCode, GetLogin } from '../../api/login';
-import { getApproval_status } from '../../api/login';
+import { GetSmsCode, GetLogin } from '@/api/login';
+import { getApproval_status } from '@/api/login';
 import { ElMessage } from 'element-plus';
 
 
diff --git a/src/router/index.ts b/src/router/index.ts
index dbeb9a0..ca59f58 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -37,6 +37,14 @@ const routes=[
         name:'check',
         component:()=>import('../views/start/check.vue')
     },
+    {
+        path:'/businessAgreementPrivacy',
+        name:'businessAgreementPrivacy',
+        component:()=>import('@/views/business/agreement/privacy.vue'),
+        meta:{
+            isFullpage: true
+        }
+    },
 ];
 const router = createRouter({
     history:createWebHistory(),
diff --git a/utils/http.js b/src/utils/http.js
similarity index 84%
rename from utils/http.js
rename to src/utils/http.js
index 65b0632..8a57c04 100644
--- a/utils/http.js
+++ b/src/utils/http.js
@@ -1,13 +1,13 @@
 import axios from "axios";
 // import store from '@/store'
 
-const baseURL = "https://mall.gpxscs.cn/mobile";
+const baseURL = import.meta.env.VUE_APP_BASE_URL;
 
 const service = axios.create({
   baseURL: baseURL, // url = base url + request url
   headers: {
-    "X-Requested-With": "XMLHttpRequest",
-    "Content-Type": "application/json-patch+json",
+    // "X-Requested-With": "XMLHttpRequest",
+    // "Content-Type": "application/json",
   },
   timeout: 5000, // request timeout
 });
@@ -29,7 +29,7 @@ service.interceptors.request.use(
 // response interceptor
 service.interceptors.response.use(
   (response) => {   
-    return response;
+    return response.data;
   },
   (error) => {
     if (error.response.status === 401) {
diff --git a/utils/vue-cookies.js b/src/utils/vue-cookies.js
similarity index 100%
rename from utils/vue-cookies.js
rename to src/utils/vue-cookies.js
diff --git a/src/views/HeadMenu.vue b/src/views/HeadMenu.vue
index 1985572..bd4446e 100644
--- a/src/views/HeadMenu.vue
+++ b/src/views/HeadMenu.vue
@@ -67,7 +67,7 @@
 import { ref, onMounted, watch, onUnmounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useUserStore } from '@/stores/userStore';
-import { getApproval_status } from '../../api/login';
+import { getApproval_status } from '@/api/login';
 
 const emits = defineEmits(['open-login-form', 'open-register-form']);
 
diff --git a/src/views/business/agreement/privacy.vue b/src/views/business/agreement/privacy.vue
new file mode 100644
index 0000000..09aa24a
--- /dev/null
+++ b/src/views/business/agreement/privacy.vue
@@ -0,0 +1,27 @@
+<template>
+    <div class="container" v-html="html"></div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import CONTENT_API from '@/api/content';
+
+const html = ref("")
+
+const getContentData = async () => {
+    const res = await CONTENT_API.getAgreement({
+        protocols_key: 'joininPrivacyAgreement'
+    });
+    if (res?.status === 200) {
+        html.value = res.data.document;
+    }
+};
+
+getContentData()
+</script>
+
+<style lang="scss" scoped>
+.container{
+    padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/feedback/FeedBack.vue b/src/views/feedback/FeedBack.vue
index 23caf79..f1e1dd0 100644
--- a/src/views/feedback/FeedBack.vue
+++ b/src/views/feedback/FeedBack.vue
@@ -26,7 +26,7 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
 import { Plus } from '@element-plus/icons-vue';
-import { uploadFile } from '../../../api/upload'; // 引入新的 API 方法
+import { uploadFile } from '@/api/upload'; // 引入新的 API 方法
 
 const feedbackObj = reactive({
     describe: '',
diff --git a/src/views/index/slider.vue b/src/views/index/slider.vue
index 1c0dcc6..0ced404 100644
--- a/src/views/index/slider.vue
+++ b/src/views/index/slider.vue
@@ -1,4 +1,3 @@
-clickable Avatar: undefined
 <template>
   <div class="slider">
     <div class="slider-container">
diff --git a/src/views/start/check.vue b/src/views/start/check.vue
index 18ea0c3..1eb264c 100644
--- a/src/views/start/check.vue
+++ b/src/views/start/check.vue
@@ -216,10 +216,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getApproval_status, re_apply } from '../../../api/login';
+import { getApproval_status, re_apply } from '@/api/login';
 import { onMounted, ref, reactive } from 'vue';
 import { ElMessage } from 'element-plus';
-import { GetStoreCategories, transformStoreCategories, GetPostion, GetBank, merchApply, GetMerchDetail } from '../../../api/login';
+import { GetStoreCategories, transformStoreCategories, GetPostion, GetBank, merchApply, GetMerchDetail } from '@/api/login';
 import { useUserStore } from '@/stores/userStore';
 import cityData from '../../stores/cityData';
 import { Plus } from '@element-plus/icons-vue'
diff --git a/src/views/start/start.vue b/src/views/start/start.vue
index bf904ce..dd882a1 100644
--- a/src/views/start/start.vue
+++ b/src/views/start/start.vue
@@ -228,7 +228,7 @@ import type { CityDataStructure } from '../../stores/cityData';
 import { ElMessage } from 'element-plus';
 import { useUserStore } from '@/stores/userStore';
 import { Plus } from '@element-plus/icons-vue'
-import { GetStoreCategories, transformStoreCategories, GetPostion, GetBank, merchApply, GetAppDistrict } from '../../../api/login';
+import { GetStoreCategories, transformStoreCategories, GetPostion, GetBank, merchApply, GetAppDistrict } from '@/api/login';
 
 const active = ref(1);
 const formRef = ref(null);
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 3616388..21e47b3 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -1,6 +1,6 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "api/login.js", "public/xiaofa_font"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/api/login.js", "public/xiaofa_font"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
diff --git a/vite.config.ts b/vite.config.ts
index 33de928..1b27b8e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -82,5 +82,15 @@ export default defineConfig({
       }
     }
   },
+  
+  server: {
+    proxy: {
+      '/api': {
+        target: 'https://mall.gpxscs.cn/',
+        changeOrigin: true,
+        secure: true,
+      },
+    }
+  }
 })