diff --git a/components/region-select/index.vue b/components/region-select/index.vue
index a072446..0f5c51f 100644
--- a/components/region-select/index.vue
+++ b/components/region-select/index.vue
@@ -1,16 +1,333 @@
-
+
+
+
+
+
-
+
diff --git a/config/mine.js b/config/mine.js
index aa0214d..d60875e 100644
--- a/config/mine.js
+++ b/config/mine.js
@@ -25,7 +25,9 @@ export const getRegionSelect = () => {
}
// 设置区域
-export const setRegion = params =>
- http.get('/retail-member/api/retail-member/set-region', { params })
+export const setRegion = data =>
+ http.post('/retail-member/api/retail-member/set-region', data)
// 获取可选择区域
+export const getRegionAreaTree = params =>
+ http.get('/retail-member/api/retail-member/region-tree', { params })
diff --git a/config/request.js b/config/request.js
index f7009c6..1f704ab 100644
--- a/config/request.js
+++ b/config/request.js
@@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER
console.log('DEV_SERVER')
- config.baseURL = 'http://localhost:8080'
+ config.baseURL = 'http://192.168.0.102:8080'
//#endif
//#ifdef QA_SERVER
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7988c4f..8cf17b4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -98,6 +98,7 @@
ref="child2"
@childMethodTrigger="callChildMethod"
>
+
@@ -138,7 +131,8 @@
-
+ -->
+
{{ '我的订单' }}
@@ -184,17 +178,19 @@
{{
- regionInfo.province || '-'
+ regionInfo.provinceVal || '-'
}}
{{ '省' }}
- {{ regionInfo.city || '-' }}
+ {{
+ regionInfo.cityVal || '-'
+ }}
{{ '市' }}
{{
- regionInfo.county || '-'
+ regionInfo.countyVal || '-'
}}
{{ '区' }}
@@ -1114,8 +1110,8 @@ export default {
overflow: scroll;
background-image: linear-gradient(
to bottom,
- #005bac 5%,
- #f2f2f2 50%
+ #005bac 25%,
+ #f2f2f2 40%
); // background-position: top;
.topBox {
@@ -1146,17 +1142,18 @@ export default {
color: #ffffff;
display: flex;
flex-direction: column;
- justify-content: space-between;
+ justify-content: center;
+ gap: 12rpx;
.name_box {
display: flex;
align-items: center;
.tTit1 {
- font-size: 28rpx;
+ font-size: 32rpx;
font-family: Source Han Sans CN;
font-weight: bold;
- margin-right: 22rpx;
+ margin-right: 0;
}
.kuang {
@@ -1166,6 +1163,55 @@ export default {
font-size: 20rpx;
}
}
+
+ .level_box {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: 16rpx;
+ }
+
+ .level_tag {
+ background: rgba(255, 255, 255, 0.2);
+ backdrop-filter: blur(10rpx);
+ -webkit-backdrop-filter: blur(10rpx);
+ border: 1rpx solid rgba(255, 255, 255, 0.3);
+ padding: 6rpx 18rpx;
+ border-radius: 50px;
+ display: inline-flex;
+ align-items: center;
+ gap: 10rpx;
+ position: relative;
+ overflow: hidden;
+ }
+
+ .level_tag::after {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: linear-gradient(
+ 100deg,
+ rgba(255, 255, 255, 0) 20%,
+ rgba(255, 255, 255, 0.5) 50%,
+ rgba(255, 255, 255, 0) 80%
+ );
+ transform: translateX(-100%);
+ animation: bling_shimmer 3.5s infinite linear;
+ }
+
+ .level_label {
+ font-size: 20rpx;
+ opacity: 0.9;
+ }
+
+ .level_value {
+ font-size: 22rpx;
+ font-weight: 600;
+ }
}
}
@@ -1182,11 +1228,6 @@ export default {
}
}
- .cmem {
- display: flex;
- align-items: center;
- }
-
.grade_left {
display: flex;
align-items: center;
@@ -1411,4 +1452,13 @@ export default {
color: #333;
font-weight: 600;
}
+
+@keyframes bling_shimmer {
+ from {
+ transform: translateX(-100%);
+ }
+ to {
+ transform: translateX(100%);
+ }
+}