-YbBFNXGNvU0Y$Guz&WOYRN@o@Ix=nh+1ErRHN
zJJCi2G+qnl>*%UJ+ABvdE|~NtZs0<*&R13_I4dLIbBSfWCm;0n>1%1v?-zPK*S(DE
zm;KA}?dT1@a6cDQ>FX>5hLWShr^r)-*oAf<_l+WY+!<5b|NbfS*7g~`B*GB4VfqUn
zs%=w@S}f2%4N7d{O!Ge=yKhMkZ&jR8!RXf9ss*O=gTpW{th3))qu@G7=7%QGf-WM3
zPmR2Fv)2t@2e3{@*yogB7=T-649_(Gq0Z!p+NPOYziKTT3<-6&N;5+Y+Q4nIls(!k
vz@=@s@YJ=)eqbzGG;=dV5f7Mt#BRR=b~`ewI;|*u00000NkvXXu0mjfa_lEi
literal 0
HcmV?d00001
diff --git a/src/static/goods/date-icon.png b/src/static/goods/date-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f02917ebe79e5b2071e652b560e282450d495656
GIT binary patch
literal 450
zcmeAS@N?(olHy`uVBq!ia0vp^fRY|mt10Vx4uDIjKGU|zt;zzn1rL1GJ-;Ie`XnBi<;kisv)2NHqGbUa-g
zLo5WB1{?Y@8w%X{7%Oym_qAP}_ch2BNo
zxWiG~o_d$G&;I)E+?iW(`hh#ntjRlKez}X+(0Q^(+EuT)Hx5l?TI1dA)KUDe;GDVC
z6x*OFYSs~}1MP)A?wQJLGcj%ruSjf!|I{e=YY!Bc3N84ksL=IjVW@BCrwvhOrb5@+<&Nvp{kc3&>+&_N)x$o(8a$fa+{_0P%zHC{!&mS$?-tjlb
Yp84ivnX0UV`k?UhboFyt=akR{006V5ga7~l
literal 0
HcmV?d00001
diff --git a/src/stores/modules/member.js b/src/stores/modules/member.js
index 1f42716..b9260d5 100644
--- a/src/stores/modules/member.js
+++ b/src/stores/modules/member.js
@@ -5,7 +5,7 @@ export const useMemberStore = defineStore(
'member',
() => {
// 定义用户信息
- const userInfo = ref({ token: '', userName: '' })
+ const userInfo = ref({})
const token = ref('')
// 存储用户信息
const setUserInfo = (val) => {
diff --git a/src/style/vant.scss b/src/style/vant.scss
index 49433a7..dfeb991 100644
--- a/src/style/vant.scss
+++ b/src/style/vant.scss
@@ -7,6 +7,13 @@
}
+.h5-container {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ background-color: $uni-bg-color-grey;
+}
+
.flex-row-start {
display: flex;
align-items: center;
diff --git a/src/uni.scss b/src/uni.scss
index a52424d..8d7f15f 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -29,7 +29,8 @@ $uni-text-color-placeholder: #808080;
$uni-text-color-disable: #c0c0c0;
/* 背景颜色 */
-$uni-bg-color: #eeeff6;
+$uni-bg-color: #fff;
+$uni-navbar-bg-color: #bde1d4;
$uni-bg-color-grey: #f8f8f8;
$uni-bg-color-hover: #f1f1f1; // 点击状态颜色
$uni-bg-color-mask: rgba(0, 0, 0, 0.4); // 遮罩颜色
diff --git a/src/utils/http.js b/src/utils/http.js
index 3f882af..95f95f8 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -6,8 +6,7 @@ import { useMemberStore } from '@/stores'
* baseURL 设置请求ip地址和端口
*/
const ENV = process.env.NODE_ENV
-export const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***'
-// export const baseURL = ENV === 'development' ? '/api' : '***'
+export const baseURL = ENV === 'development' ? '/api' : '***'
/**
* httpInterceptor 分别拦截 request 和 uploadFile 请求
*/
@@ -32,8 +31,6 @@ const httpInterceptor = {
// 4. 增加 token 请求头标识
const memberStore = useMemberStore()
const token = memberStore.token
-
- // const token = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjQ2NDdmYjlkLWI5OTItNDRiNy05MTdkLTMwZjg0ZjUxYzM5MCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.9xM5bFhrmHK09-4ZgL5SS8WraNIJjIijuB-1P0lJF-n0KlVM5Bglvyjltk1NQbdqgi1hwRocZS1OU41cLiwuig"
if (token) {
options.header.Authorization = token
}
diff --git a/vite.config.js b/vite.config.js
index d8c2176..d2444f7 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,6 +1,5 @@
import { defineConfig } from 'vite'
import uni from '@dcloudio/vite-plugin-uni'
-// import styleImport, { VantResolve } from 'vite-plugin-style-import'
import AutoImport from 'unplugin-auto-import/vite'
import Components from 'unplugin-vue-components/vite'
import { VantResolver } from '@vant/auto-import-resolver'
@@ -32,9 +31,7 @@ export default defineConfig({
proxy: {
// 在此处编写代理规则
'/api': {
- // target: 'http://192.168.2.76:18080',
- // target: 'http://192.168.2.246:18080',
- target: 'http://localhost:18080',
+ target: 'ttp://192.168.0.244:28580',
changeOrigin: true,
rewrite: (path) => {
return path.replace(/\/api/, '')