From 69ea24e8fdfb41fc48c3fdb8c444645c13b1bbc4 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期六, 10 六月 2023 13:56:17 +0800
Subject: [PATCH] Merge branch 'release/1.1.2发布'
---
uniapp/pages/mine/mt.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/uniapp/pages/mine/mt.vue b/uniapp/pages/mine/mt.vue
index 3aa525e..a8e5b9b 100644
--- a/uniapp/pages/mine/mt.vue
+++ b/uniapp/pages/mine/mt.vue
@@ -1,9 +1,9 @@
<template>
<view class="elm-wrapper wrapperLayer"
- :style="optionsCurrent==2?'background-color:#62BC00;':'background-color:#FFD100;'">
+ :style="optionsCurrent==2?'background-color:#FFD100;':'background-color:#FFD100;'">
<view class="flexbox borderBox colCen"
- :style="optionsCurrent==2?'background-color:#62BC00;':'background-color:#FFD100;'">
+ :style="optionsCurrent==2?'background-color:#FFD100;':'background-color:#FFD100;'">
<view class="topbarbox"></view>
<view class="leftimgbox rowCenBet" @tap="back()">
<view class="shadow rowCenCen" style="background:rgba(0,0,0,0);">
@@ -21,14 +21,14 @@
</view>
<view class="options-bar-content rowCenCen">
- <!-- <view class="center-container rowCenBet">
+ <view class="center-container rowCenBet">
<block v-for="(items,index) in optionsList" :key="index">
<view class="items-content rowCenCen" @tap="navTap(items.type)" :class="{ 'yellow':items.type == optionsCurrent && [1,3].includes(optionsCurrent), 'green': items.type == optionsCurrent && optionsCurrent ==2 }">
<view>{{items.label}}</view>
</view>
</block>
<div class="items-active" :style="{'transform':'translateX('+(optionsCurrent-1) * 120 +'rpx)'}"></div>
- </view> -->
+ </view>
</view>
<image class="pageBac" :src="pageBac" mode="aspectFill">
@@ -76,9 +76,13 @@
optionsCurrent: 1,
scrollTop: 0,
optionsList: [{
- label: "澶栧崠",
+ label: "缇庡洟",
type: 1
- }
+ },
+ {
+ label: "楗夸簡涔�",
+ type: 2
+ }
/* ,
{
label: "鍟嗚秴",
@@ -138,7 +142,14 @@
navTap(type) {
if (this.optionsCurrent != type) {
this.optionsCurrent = type
- if (this.optionsCurrent == 2) {
+ if(this.optionsCurrent==2)
+ {//璺宠浆楗夸簡涔�
+ uni.redirectTo({
+ url:'./elm'
+ })
+ return;
+ }
+ else if (this.optionsCurrent == 2) {
uni.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: '#62BC00'
@@ -244,7 +255,7 @@
margin-top: 168rpx;
.center-container {
position: relative;
- width: 360rpx;
+ width: 240rpx;
height: 58rpx;
background: rgba(254, 254, 254, 0.3);
border-radius: 29rpx;
--
Gitblit v1.9.3