diff --git a/.env.development b/.env.development
index c5628d20..2228066c 100644
--- a/.env.development
+++ b/.env.development
@@ -9,9 +9,12 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
# DEV
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# app入口
#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
#VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
-#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
\ No newline at end of file
+#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
+
+# h5专用地址
+VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
\ No newline at end of file
diff --git a/.env.sit b/.env.sit
index 9623af29..8e8ed9e9 100644
--- a/.env.sit
+++ b/.env.sit
@@ -1,6 +1,5 @@
# SIT环境
ENV = 'sit'
-
# base api
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
diff --git a/src/App.vue b/src/App.vue
index 694860bc..c1d7d7ef 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,13 @@
@@ -381,7 +410,7 @@
width: 146rpx !important;
border-radius: 16rpx;
}
-
+
// 底线样式
.bottom_line {
margin: 0 auto;
@@ -488,6 +517,7 @@
position: relative;
z-index: 0;
overflow-x: hidden;
+
// 背景图
.bg_img {
position: absolute;
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 4c31c094..19e25ca3 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -105,10 +105,11 @@ const login_fun = (): void => {
account: account.value,
password: password.value
});
- // res['mascotState']
- if (false) { // 判断是否跳转到选科技鹿页面
+
+ if (res['mascotState']) { // 判断是否跳转到选科技鹿页面
common.redirectTo('/pages/mascot/mascot_select_list');
} else {
+ common.setValue('mascotState', false) // 清空科技鹿设置
common.msg('登录成功');
const pages = getCurrentPages();
if (pages.length >= 2) {
@@ -142,6 +143,7 @@ onMounted(() => {
password.value = loginAccountData.password;
}
back_state.value = true;
+
});
// 跳进了登录页，禁止返回操作
onBackPress(() => back_state.value);
diff --git a/src/pages/mascot/mascot_select_list.vue b/src/pages/mascot/mascot_select_list.vue
index 42d714ca..021abd2e 100644
--- a/src/pages/mascot/mascot_select_list.vue
+++ b/src/pages/mascot/mascot_select_list.vue
@@ -18,8 +18,7 @@
-
+
@@ -49,10 +48,10 @@
-
+
-
@@ -78,74 +77,12 @@
import {
onLoad
} from '@dcloudio/uni-app';
-
const mascotList = reactive([])
const windowsInfo = uni.getWindowInfo()
const nowWidth = ref(0);
- let initialIndex = 0; // 总轮播项数量
const swiperCount = 4; // 总轮播项数量
- const TRANSITION_RATIO = 0.3;
- const aa = computed(() => Math.floor(nowWidth.value / windowsInfo.screenWidth ));
-
-
- // 计算过渡起点（像素值，取整）：屏幕宽度的20%位置
- const TRANSITION_SUM = windowsInfo.screenWidth
-
- const TRANSITION_START = Math.floor(windowsInfo.screenWidth * TRANSITION_RATIO)
- // 计算过渡终点（像素值，取整）：屏幕宽度的80%位置
- const TRANSITION_END = Math.floor(windowsInfo.screenWidth * (1 - TRANSITION_RATIO))
-
- // 第一张图透明度（0、2索引显示）
- console.log(TRANSITION_SUM, TRANSITION_START, TRANSITION_END);
- const btn1Opacity = computed(() => {
- return 0;
-
- if (initialIndex % 2 === 0) { // 淡入
- if (nowWidth.value <= TRANSITION_START.value) {
- return 0;
- } else {
- return Math.min(1, (nowWidth.value - TRANSITION_START.value) / TRANSITION_SUM.value);
- }
- } else { // 淡出
- // console.log('111我淡出');
- if (nowWidth.value >= TRANSITION_END) {
- return 0;
- } else {
- return Math.max(0, 1 - (TRANSITION_END.value - nowWidth.value) / TRANSITION_SUM.value);
- }
- }
- });
-
- const btn2Opacity = computed(() => {
- const aa = initialIndex
- if (nowWidth.value === windowsInfo.screenWidth) {
- initialIndex++
- console.log('嘻嘻切换。initialIndex');
- }
- if (aa % 2 === 1) { // 淡入
- // if (nowWidth.value <= TRANSITION_START) {
- // console.log(1);
- // return 1;
- // } else {
- // console.log(Math.max(0, 1 - (TRANSITION_END - nowWidth.value) / TRANSITION_SUM));
- // return Math.max(0, 1 - (TRANSITION_END - nowWidth.value) / TRANSITION_SUM);
-
- // }
- } else { // 淡出
- // console.log('222我淡出');
- if (nowWidth.value >= TRANSITION_END) {
- console.log('淡入1', nowWidth.value, TRANSITION_END);
- return 1;
- } else {
- console.log('淡入2', nowWidth.value / TRANSITION_SUM);
- console.log('淡入2', Math.min(1, nowWidth.value / TRANSITION_SUM));
- return Math.min(0, nowWidth.value / TRANSITION_SUM);
- }
- }
- });
-
let swiperIndex = ref(0); // 当前显示第1个（索引0）
const isAnimating = ref(false); // 标记动画是否进行中
@@ -162,15 +99,6 @@
let newIndex = (swiperIndex.value + num + swiperCount) % swiperCount;
swiperIndex.value = newIndex; // 更新当前索引
};
-
- // 当前宽度
- const transition = ({
- detail
- }) => {
- nowWidth.value = Math.abs(detail.dx)
- console.log('宽度', nowWidth.value);
- }
-
const select_it = () => {
const item = mascotList[swiperIndex.value]
common.loading()
@@ -184,6 +112,7 @@
})
common.hideLoading()
common.msg('设置成功')
+ common.setValue('mascotState', false)
setTimeout(() => {
const pages = getCurrentPages();
if (pages.length >= 2) {
@@ -313,7 +242,7 @@
width: 80%;
height: 120rpx;
position: relative;
-
+
.img {
position: absolute;
width: 100%;
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 49b0eeae..44f9d3d1 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -133,6 +133,7 @@
import {
uploadFile
} from '@/api/common'
+ import {setMascot} from "@/common/mascot.js"
import { queryCurrentUser} from '@/api/login.js';
const socketStore = useSocketStore()
const accmTaskCntRef = ref(null);
@@ -202,16 +203,6 @@
const goTest = () => {
console.log('goTest');
common.navigateTo('/pages/test/index');
- // const now = Date.now();
- // if (now - lastClickTime.value > 500) {
- // clickCount.value = 0;
- // }
- // clickCount.value++;
- // lastClickTime.value = now;
- // if (clickCount.value == 6) {
- // common.navigateTo('/pages/test/index');
- // clickCount.value = 0;
- // }
};
@@ -230,6 +221,8 @@
});
};
onShow(() => {
+ setMascot()
+
const user_info_cache = getUserInfo();
Object.assign(user_info, user_info_cache);
console.log('user_info', user_info);
diff --git a/src/pagesOther.json b/src/pagesOther.json
index a5ec24b1..cf7560bd 100644
--- a/src/pagesOther.json
+++ b/src/pagesOther.json
@@ -81,7 +81,7 @@
"height": "70px",
"spacing": "10px",
"midButton": {
- "iconPath": "/static/images/icon/fawn.png",
+ "iconPath": "/static/images/icon/fawn-1.png",
"width": "86px",
"height": "86px",
"iconWidth": "90px"
diff --git a/src/static/images/icon/fawn-1.png b/src/static/images/icon/fawn-1.png
new file mode 100644
index 00000000..a6f27700
Binary files /dev/null and b/src/static/images/icon/fawn-1.png differ
diff --git a/src/static/images/icon/fawn-2.png b/src/static/images/icon/fawn-2.png
new file mode 100644
index 00000000..b897c2a0
Binary files /dev/null and b/src/static/images/icon/fawn-2.png differ
diff --git a/src/static/images/icon/fawn-3.png b/src/static/images/icon/fawn-3.png
new file mode 100644
index 00000000..2c4691cb
Binary files /dev/null and b/src/static/images/icon/fawn-3.png differ
diff --git a/src/static/images/icon/fawn-4.png b/src/static/images/icon/fawn-4.png
new file mode 100644
index 00000000..6c2d27bf
Binary files /dev/null and b/src/static/images/icon/fawn-4.png differ
diff --git a/src/static/images/icon/fawn.png b/src/static/images/icon/fawn-x.png
similarity index 100%
rename from src/static/images/icon/fawn.png
rename to src/static/images/icon/fawn-x.png