chenjj 2 天之前
父节点
当前提交
8be407a417
共有 4 个文件被更改,包括 21 次插入24 次删除
  1. 1 1
      components/Client/new_file.vue
  2. 3 3
      components/CustomTabBar/index.vue
  3. 9 20
      pages/mine.vue
  4. 8 0
      pages_mine/pages/income/index.vue

+ 1 - 1
components/Client/new_file.vue

@@ -5,7 +5,7 @@
 				<view class="serve-title client-title" v-if="userType == 2">注册专区</view>
 				<up-grid :border="false" col="4">
 					<up-grid-item v-for="(item, index) in serveiceList" :key="index"
-						:custom-style="custmoStyle" @click="handleGridClick(item)">
+						 @click="handleGridClick(item)">
 						<view class="grid-box">
 							<view class="grid-icon">
 								<image :src="item.icon" class="service-img" mode="aspectFit" />

+ 3 - 3
components/CustomTabBar/index.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="tab_bar">
         <view class="tabbarBox">
-            <view class="handleBox" v-for="(item, index) in tabBarList" :key="index">
+            <view class="handleBox" v-for="(item) in tabBarList" :key="item.key +'tab_bar'">
                 <view class="menuBox" @click="goPages(item)">
                     <view class="menuIcon">
                         <image v-if="item.key != selectIndex" class="img" :src="item.iconPath"></image>
@@ -144,7 +144,7 @@ export default {
 <style lang="scss">
 .tab_bar {
     width: 100vw;
-    height: 150rpx;
+    height: 160rpx;
     position: fixed;
     bottom: 0rpx;
     /* 模糊大小就是靠的blur这个函数中的数值大小 */
@@ -154,7 +154,7 @@ export default {
 
     .tabbarBox {
         display: flex;
-        margin-top: 10rpx;
+        margin-top: 20rpx;
         justify-content: space-evenly;
 
 

+ 9 - 20
pages/mine.vue

@@ -1,12 +1,11 @@
 <template>
-	<view class="mine-container">
-
-		<view class="mine-header">
+	<view >
+		<view class="mine-container">
+			<view class="mine-header">
 			<up-image width="136rpx" height="136rpx" :show-loading="true" :src="userInfo.avatar"></up-image>
 			<view class="header-info">
 				<text class="info-name">{{ userInfo.nickName }}</text>
 				<up-icon name="setting-fill" size="25" @click="handLsetTing" v-if="userType == 1"></up-icon>
-				<!-- <text class="info-edit" @click="handLsetTing" v-if="userType == 1">设置></text> -->
 			</view>
 		</view>
 
@@ -39,9 +38,8 @@
 				</view>
 			</view>
 
-			<!-- 志愿者 -->
 			<view class="mine-card status-card" >
-				<view class="status-card-item" v-for="(listItem, listIndex) in adminList" :key="listIndex"
+				<view class="status-card-item" v-for="(listItem, listIndex) in adminList" :key="listIndex +'adminList'"
 					@click="onClick(listItem)">
 					<view class="grid-img-box">
 						<up-icon :name="listItem.iconName" color="rgba(51, 51, 51, 1)" size="25"></up-icon>
@@ -49,23 +47,14 @@
 					<text class="grid-text">{{ listItem.name }}</text>
 				</view>
 			</view>
-			<!-- 用户端 -->
-			<!-- <view class="mine-card status-card" v-if="userType == 1">
-				<view class="status-card-item" v-for="(listItem, listIndex) in userList" :key="listIndex"
-					@click="onClick(listItem)">
-					<view class="grid-img-box">
-						<up-icon :name="listItem.iconName" :size="22"></up-icon>
-					</view>
-					<text class="grid-text">{{ listItem.name }}</text>
-				</view>
-			</view> -->
+
 		
 			<view class="mine-card count-card" >
 				<view class="count-title">订单统计</view>
 				<view class="count-list">
-					<view class="count-item" v-for="(item, index) in orderList" :key="index" @click="onClick(item)">
+					<view class="count-item" v-for="(item, index) in orderList" :key="index +'orderList'" @click="onClick(item)">
 						<up-count-to :startVal="0" :endVal="data[item.key]"
-							:color="data[item.key] > 0 && 'rgba(221, 94, 69, 1)'"></up-count-to>
+							:color="data[item.key] > 0? 'rgba(221, 94, 69, 1)':''"></up-count-to>
 						<text class="count-item-text">{{ item.name }}</text>
 					</view>
 				</view>
@@ -83,8 +72,8 @@
 				</view>
 			</view>
 		</view>
-
-		<custom-tab-bar page="mine" />
+		</view>
+		<CustomTabBar page="mine" />
 	</view>
 </template>
 

+ 8 - 0
pages_mine/pages/income/index.vue

@@ -297,9 +297,17 @@ onShow(() => {
             font-weight: 700;
             line-height: 23.44px;
             color: rgba(51, 51, 51, 1);
+
+            
+         
         }
     }
 
+} 
+.card-rigth{
+    display: flex;
+    flex-direction: column;
+    text-align: end;
 }
 
 .scroll-view-class {