fix：login样式冲突解决

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" />

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;
 
 

config.js

@@ -2,9 +2,9 @@
 const config = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	//cloud后台网关地址
-	baseUrl: 'http://192.168.100.95:9527',//嵘哥
+	// baseUrl: 'http://192.168.100.95:9527',//嵘哥
 	// baseUrl: 'http://192.168.100.101:9527',//龙哥
-	// baseUrl: 'https://zybooks.tech/prod-api',
+	baseUrl: 'https://zybooks.tech/prod-api',
 	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	appName: '金邻助家',
 	// 应用信息

pages/common/orderList/listItem.vue

@@ -18,7 +18,9 @@
                     </text>
                 </view>
                 <view class="item-de">
-                    <img src="/static/serverImg/list/ad2.png" alt="" style="width: 28rpx;height: 28rpx;">
+                    <view style="flex: 1;">
+                        <img src="/static/serverImg/list/ad2.png" alt="" style="width: 28rpx;height: 28rpx;">
+                    </view>
                     {{ data.address }}
                 </view>
                 <view class="item-time">
@@ -111,8 +113,9 @@ function onClick(type) {
             line-height: 39rpx;
             color: rgba(153, 153, 153, 1);
             display: flex;
-            align-items: center;
+            align-items: flex-start;
             justify-content: flex-start;
+            
         }
 
         .item-time {

pages/login.vue

@@ -13,11 +13,7 @@
       <text class="title">金邻助家</text>
     </view>
 
-    <image
-      src="/static/13779@1x.png"
-      mode="widthFix"
-      class="house-illustration"
-    ></image>
+    <image src="/static/13779@1x.png" mode="widthFix" class="house-illustration"></image>
 
     <view class="slogan-content">
       <text class="slogan-text">着力打造全国居家服务行业标准</text>
@@ -27,12 +23,17 @@
     <view class="actions-container">
       <up-button
         custom-style="{ 'background-color': '#623F34', 'color': '#FFFFFF', 'border-radius': '25px', 'height': '50px', 'line-height': '50px', 'fontSize': '18px' }"
-        class="login-button"
-        @click="handleLogin"
-        >微信授权登录</up-button
-      >
+        class="login-button" @click="handleLogin">微信授权登录</up-button>
       <view class="xieyi text-center">
-        <text class="text-grey1">登录即代表同意</text>
+        <up-checkbox
+        label="我已认真阅读、理解并同意"
+        name="agree"
+        usedAlone
+        v-model:checked="checkboxValue"
+        class="text-grey1"
+    >
+    </up-checkbox>
+        <!-- <text class="text-grey1">我已认真阅读、理解并同意</text> -->
         <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
         <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
       </view>
@@ -57,6 +58,8 @@ const loginForm = reactive({
   uuid: '',
 })
 
+const checkboxValue = ref(false)
+
 // const codeUrl = ref(""); // Not used in the new design
 // const captchaEnabled = ref(true); // Not used in the new design
 
@@ -83,6 +86,16 @@ const handleUserAgrement = () => {
 
 // 登录方法
 const handleLogin = async () => {
+  console.log('checkboxValue',checkboxValue);
+  
+  if(!checkboxValue.value){
+    uni.showToast({
+      title: '请先阅读并同意相关协议',
+      icon: 'none',
+    })
+
+    return;
+  }
   uni.showLoading({
     title: '登录中，请耐心等待...',
   }) // 使用uni-app的loading方法替代$modal.loading
@@ -179,6 +192,13 @@ onMounted(() => {
     height: 100%;
   }
 }
+.radio-view{
+
+}
+
+.radio-active {
+
+}
 
 .normal-login-container {
   width: 100%;
@@ -240,7 +260,7 @@ onMounted(() => {
 
 .actions-container {
   width: 100%;
-  padding: 0 80rpx;
+  padding: 0 40rpx;
   position: absolute;
   bottom: 80rpx;
   left: 0;
@@ -260,7 +280,10 @@ onMounted(() => {
   .xieyi {
     margin-top: 24rpx;
     text-align: center;
-
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: center;
     .text-grey1 {
       font-size: 24rpx;
       color: #333333;

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>
 
@@ -111,7 +100,7 @@ const data = ref({
 	orderCount: 0,
 	orderFrozenBalance: 0
 });
-const rateValue = ref(3)
+const rateValue = ref(5)
 const priceList = [{
 	name: '账户余额',
 	key: 'balance',

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 {