From 896c971024ba231a7a48466940a3e72b0ea64ed4 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Mon, 6 May 2024 19:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4vue=E6=BC=8F=E6=B4=9E?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Home.js                               |  2 +-
 src/common/globalRequest.js                   |  2 +-
 .../footer-enforcement-nav/index.vue          |  5 +-
 src/components/footer-nav/index.vue           |  5 +-
 src/http/http.js                              |  3 --
 src/http/index.js                             |  4 +-
 src/router/home.js                            | 12 +++--
 src/views/Home.vue                            | 47 ++++++++++---------
 src/views/administrative/appointmentList.vue  |  6 ++-
 src/views/enforce/scanPageTest.vue            |  9 +---
 src/views/login.vue                           | 19 ++++----
 11 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/src/api/Home.js b/src/api/Home.js
index a6a0788..e297747 100644
--- a/src/api/Home.js
+++ b/src/api/Home.js
@@ -2,7 +2,7 @@ import { _get, _post,_form } from "../http/index";
 export const  getCarousel = "/getCarousel"
 export const  boutiqueGoods = "/boutiqueGoods"
 export const  recommendGoods = "/recommendGoods"
-export const userLogin = (params, success, error)  => _form("/appLogin", params, success, error);
+export const userLogin = (params, success, error)  => _post("/appLogin", params, success, error);
 
 //查询字典
 export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error);
diff --git a/src/common/globalRequest.js b/src/common/globalRequest.js
index 1e5fa77..07a0363 100644
--- a/src/common/globalRequest.js
+++ b/src/common/globalRequest.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import jsonp from "jsonp";
-axios.defaults.withCredentials = true;
+// axios.defaults.withCredentials = true;
 
 const $globalRequestUrl = (params) => {
 	const { VITE_BASE_URL } = import.meta.env;
diff --git a/src/components/footer-enforcement-nav/index.vue b/src/components/footer-enforcement-nav/index.vue
index 61b6c80..cb1a7ad 100644
--- a/src/components/footer-enforcement-nav/index.vue
+++ b/src/components/footer-enforcement-nav/index.vue
@@ -28,7 +28,7 @@
 
 <script setup name="footerNav">
 
-const { useCommon } = $globalStore
+// const { useCommon } = $globalStore
 
 let data = reactive({
 	footerActive: "Home",
@@ -42,9 +42,6 @@ const active = ref(0);
 
     };
 
-const goodsNum = computed(() => {
-	return useCommon.goods_card_num;
-});
 </script>
 <style lang="less" scoped>
 	.footer_nav{
diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index c23e711..3267995 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -16,16 +16,13 @@
 
 <script setup name="footerNav">
 
-const { useCommon } = $globalStore
+// const { useCommon } = $globalStore
 
 let data = reactive({
 	footerActive: "Home",
 	dot: false,
 });
 
-const goodsNum = computed(() => {
-	return useCommon.goods_card_num;
-});
 </script>
 <style lang="less" scoped>
 	.footer_nav{
diff --git a/src/http/http.js b/src/http/http.js
index 409acea..3468e93 100644
--- a/src/http/http.js
+++ b/src/http/http.js
@@ -2,13 +2,10 @@ import axios from 'axios';
 import { $globalStore } from "../common/globalStore"
 // import router from '@/router/home';
 // import {cache} from '@/store/store';
-axios.defaults.withCredentials = true
-const source = axios.CancelToken.source()
 const http =   axios.create({
     traditional: true,
     contentType : "application/json",
     timeout: 1000 * 1000, // 1 秒
-    cancelToken: source.token // 将cancel token添加到option请求中
 });
 const router = useRouter();
 //请求拦截器添加head
diff --git a/src/http/index.js b/src/http/index.js
index 20ee12d..97e1016 100644
--- a/src/http/index.js
+++ b/src/http/index.js
@@ -1,5 +1,6 @@
 import http from "./http";
 import { baseUrl } from "../config/env";
+
 // import qs from "qs";
 // import {cache} from '@/store/store';
 // 通用公用方法
@@ -33,7 +34,7 @@ function request(type, url, params, success, error) {
   let config = {
     method: type,
     url: baseUrl + url,
-    data: params
+    data: params,
   };
   if (type == "GET") {
     config.params = params;
@@ -45,6 +46,7 @@ function request(type, url, params, success, error) {
     config.headers = { "Content-Type": "application/x-www-form-urlencoded" };
     // config.data = qs.stringify(params);
   }
+
   return new Promise((resolve, reject) => {
     http
       .request(config)
diff --git a/src/router/home.js b/src/router/home.js
index 107fa23..2ada058 100644
--- a/src/router/home.js
+++ b/src/router/home.js
@@ -4,16 +4,18 @@ const routes = [
 	{
 		path: "/login",
 		name: "login",
-		component: login,
-		meta: {},
+		component: () => import("@/views/login.vue"),
+		meta: {
+      isKeepAlive: false,
+    },
 	},
   //企业端首页
   {
 		path: "/home",
 		name: "Home",
-		component: Home,
+		component:() => import("@/views/Home.vue"),
 		meta: {
-			isKeepAlive: true,
+			isKeepAlive: false,
 		},
 	},
 	{
@@ -21,7 +23,7 @@ const routes = [
 		name: "goodsDetail",
 		component: () => import("@/views/common/goodsDetail.vue"),
 		meta: {
-			isRouterKeepAlive: true,
+			isRouterKeepAlive: false,
 		},
 	},
   // 企业信息登记
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 1ac9e27..bd25e04 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -126,7 +126,7 @@ const onLoad = () => {
 const generateRandomNumber =() =>{
       const min = 100000;
       const max = 999999;
-      const randomNum = Math.floor(Math.random() * (max - min + 1)) + min;
+      const randomNum = (Math.floor(Math.random() * (max - min + 1)) + min);
       return randomNum.toString().padStart(6, '0');
 }
 onMounted(() => {
@@ -136,7 +136,8 @@ onMounted(() => {
 
   const access_key = '6374106c5eb449a4ad6c2430f30796e6';
   const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
-  const nonce = generateRandomNumber();
+  // generateRandomNumber()
+  const nonce = generateRandomNumber;
   const timestamp = `${Date.now()}`;
 
   const str = [access_secret, nonce, timestamp]
@@ -163,30 +164,30 @@ onMounted(() => {
     console.log("鉴权",err);
   });
 
-  w6s.ready(() => {
-    w6s.szient.getAuthCode({
-      success: function(res) {
-        console.log(res)
-        console.log("认证",res);
-        console.log(res.result.result.code)
-        getSiqLoginAuth({code: res.result.result.code},success =>{
-          console.log(success.data)
-        },error =>{
+//   w6s.ready(() => {
+//     w6s.szient.getAuthCode({
+//       success: function(res) {
+//         console.log(res)
+//         console.log("认证",res);
+//         console.log(res.result.result.code)
+//         getSiqLoginAuth({code: res.result.result.code},success =>{
+//           console.log(success.data)
+//         },error =>{
 
-        })
-      },
-      fail: function(err) {
-        console.log(err)
-        console.log("认证",err);
-      },
-  });
-});
+//         })
+//       },
+//       fail: function(err) {
+//         console.log(err)
+//         console.log("认证",err);
+//       },
+//   });
+// });
 
-  getSiqLoginAuth({code:""},success =>{
-      console.log(success.data)
-  },error =>{
+  // getSiqLoginAuth({code:""},success =>{
+  //     console.log(success.data)
+  // },error =>{
 
-  })
+  // })
   // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
   //       if(!(success.data == null && success.data.length == 0)){
   //         useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 44bb91e..70c062e 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -225,7 +225,10 @@
 
 	const goAdd = () => {
 		router.push({
-			path: "/appointment"
+			path: "/appointment",
+			// query: {
+			// 	enterpriseNumber: "123",
+			// }
 		});
 	}
 
@@ -472,3 +475,4 @@ const formattedTime = (dateTime) =>{
   text-overflow: ellipsis;
 }
 </style>
+
diff --git a/src/views/enforce/scanPageTest.vue b/src/views/enforce/scanPageTest.vue
index 43a769c..ec8cf55 100644
--- a/src/views/enforce/scanPageTest.vue
+++ b/src/views/enforce/scanPageTest.vue
@@ -11,15 +11,13 @@
       <div v-if="!cameraReady">
         loading...
       </div>
-
-
     </qrcode-stream>
     <!-- <audio ref="audioRef" src="/src/assets/Di.mp3"></audio> -->
   </div>
 </template>
 
 <script setup lang="ts">
-import Vconsole from "vconsole";
+// import Vconsole from "vconsole";
 import { QrcodeStream } from "vue-qrcode-reader";
 import {ref} from 'vue'
 const audioRef = ref(null);
@@ -29,7 +27,7 @@ const scanPause = ref(false);
 const reactAngles = ref<any>([]);
 const onCameraOn = function () {
   cameraReady.value = true;
-  new Vconsole();
+  // new Vconsole();
 }
 const handleError =  function (err) {
     errorInfo.value = `[${err.name}]: `
@@ -53,9 +51,6 @@ const handleError =  function (err) {
   console.log(errorInfo.value);
   errorInfo.value = '';
 }
-const created = () =>{
-  new Vconsole();
-}
 
 const paintOutLineAndCenterText = (detectedCodes, ctx) => {
   // 暂停页面
diff --git a/src/views/login.vue b/src/views/login.vue
index 56b30b7..b1ba773 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,9 +9,9 @@
 				</template>
 			</van-nav-bar>
 			<van-form @submit="onSubmit">
-				<van-field v-model="loginParam.username" name="username"  label="用户名" placeholder="用户名"
+				<van-field v-model="loginParam.secretName" name="secretName"  label="用户名" placeholder="用户名"
 					:rules="[{ required: true, message: '请填写用户名' }]" />
-				<van-field v-model="loginParam.password" type="password" name="password" label="密码" placeholder="密码"
+				<van-field v-model="loginParam.secretKey" type="password" name="secretKey" label="密码" placeholder="密码"
 					:rules="[{ required: true, message: '请填写密码' }]" />
 				<div style="margin: 16px">
 					<van-button block type="primary" native-type="submit">登录</van-button>
@@ -28,8 +28,8 @@ import CryptoJS from "crypto-js";
 const { useCommon } = $globalStore;
 const router = useRouter();
 const loginParam = reactive({
-  username:"",
-  password:""
+  secretName:"",
+  secretKey:""
 })
 const userLoginParam = {};
 userLoginParam.username = loginParam.username;
@@ -38,15 +38,16 @@ const onSubmit = async (values) => {
   console.log(values);
 	// await getGoodsnum();
 	// await getLang();
-  values.secretKey = Encrypt(values.password);
+  // values.secretName = values.name;
+  values.secretKey = Encrypt(values.secretKey);
   // return;
   userLogin(values,success=>{
     console.log(success);
-        router.push({ name: "Home" });
-        // router.push({ name: "enforceHome" });
+        // router.push({ name: "Home" });
+        router.push({ name: "enforceHome" });
         //设置全局变量
-        useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
-        useCommon.SET_USER_ID(success.data.userId);
+        // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
+        // useCommon.SET_USER_ID(success.data.userId);
         useCommon.SET_TOKEN(success.data.token);
         // 监听uni-app发送的消息
         window.addEventListener('message', (event) => {