Browse Source

优化显示样式

XSXS 1 month ago
parent
commit
9a30324e51

+ 1 - 1
App.vue

@@ -70,7 +70,7 @@ export default {
             if (res.data.login_sms == "yes") { 
             if (res.data.login_sms == "yes") { 
               this.setIsSmsLogin(true) 
               this.setIsSmsLogin(true) 
             }else{  
             }else{  
-              this.setIsSmsLogin(false)
+              this.setIsSmsLogin(true)
             }
             }
             // 请求成功,停止检查
             // 请求成功,停止检查
             this.globalData.needStatusCheck = false;
             this.globalData.needStatusCheck = false;

+ 1 - 1
components/card/card.vue

@@ -213,7 +213,7 @@ export default {
   border-radius: 16rpx;
   border-radius: 16rpx;
   overflow: hidden;
   overflow: hidden;
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+  // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
   
   
   &:active {
   &:active {
     transform: scale(0.98);
     transform: scale(0.98);

+ 1 - 1
components/cc-comment/cc-comment.vue

@@ -599,7 +599,7 @@ export default {
 		padding: 10rpx 0rpx 10rpx 0rpx;
 		padding: 10rpx 0rpx 10rpx 0rpx;
 		margin-top: 10rpx;
 		margin-top: 10rpx;
 		margin-left: 80rpx;
 		margin-left: 80rpx;
-		background-color: $uni-bg-color-grey;
+		// background-color: $uni-bg-color-grey;
 
 
 		.expand_reply,
 		.expand_reply,
 		.shrink_reply {
 		.shrink_reply {

+ 1 - 1
components/checkIn-popUp-window/checkIn-popUp-window.vue

@@ -4,7 +4,7 @@
 			<image class="close" @click="close()" src="@/static/me/job/rw_icon_guanbi.png"></image>
 			<image class="close" @click="close()" src="@/static/me/job/rw_icon_guanbi.png"></image>
 			<view class="bottomCompatibility">
 			<view class="bottomCompatibility">
 				<view class="left-title">
 				<view class="left-title">
-					<image src="@/static/me/job/rw_wenzi_03.png"></image>
+					<image src="@/static/me/job/rw_wenzi_03.png" mode="aspectFit"></image>
 					<view class="checkInDays">
 					<view class="checkInDays">
 						<view>已签到 {{ signInfo.signDay }} 天
 						<view>已签到 {{ signInfo.signDay }} 天
 							<view v-if="false" class="line"></view> 签到提醒
 							<view v-if="false" class="line"></view> 签到提醒

+ 1 - 1
pages/index/articleDetail.vue

@@ -121,7 +121,7 @@
 		</template>
 		</template>
 		<!-- 评论区域 -->
 		<!-- 评论区域 -->
 		<template v-if="articleInfo.status == 1">
 		<template v-if="articleInfo.status == 1">
-			<CommentSection v-if="userInfo.id != 0" ref="commentSection" @totalNumberOfComments="totalNumberOfComments"
+			<CommentSection style="background: #fff; border-top: #F2F6F2 2rpx solid;" v-if="userInfo.id != 0" ref="commentSection" @totalNumberOfComments="totalNumberOfComments"
 				:articleInfo="articleInfo" :myInfo="myInfo" :userInfo="userInfo" :articleId="arcID" :type="'article'">
 				:articleInfo="articleInfo" :myInfo="myInfo" :userInfo="userInfo" :articleId="arcID" :type="'article'">
 			</CommentSection>
 			</CommentSection>
 		</template>
 		</template>

+ 1 - 1
pages/index/workDetail.vue

@@ -168,7 +168,7 @@
     <previewImage ref="previewImage" :opacity="0.8" :circular="true" :imgs="imgs" :descs="descs"></previewImage>
     <previewImage ref="previewImage" :opacity="0.8" :circular="true" :imgs="imgs" :descs="descs"></previewImage>
 
 
     <!-- 评论区域 -->
     <!-- 评论区域 -->
-    <CommentSection v-if="userInfo.id != 0 && articleInfo.title" ref="commentSection" :myInfo="myInfo"
+    <CommentSection style="background: #fff; border-top-left-radius: 32rpx; border-top-right-radius: 32rpx;" v-if="userInfo.id != 0 && articleInfo.title" ref="commentSection" :myInfo="myInfo"
       :userInfo="userInfo" :articleId="arcID" @totalNumberOfComments="totalNumberOfComments" :articleInfo="articleInfo"  find="work">
       :userInfo="userInfo" :articleId="arcID" @totalNumberOfComments="totalNumberOfComments" :articleInfo="articleInfo"  find="work">
     </CommentSection>
     </CommentSection>
 
 

+ 14 - 3
pages/make/index.vue

@@ -188,9 +188,20 @@ export default {
 			console.log('Tutorial clicked:', index + 1);
 			console.log('Tutorial clicked:', index + 1);
 		},
 		},
 		goPage(page) {
 		goPage(page) {
-			uni.navigateTo({
-				url: page,
-			});
+			console.log('page: ',page);
+			if (page.includes('/pages/my/job') || page.includes('vip') ) {
+				uni.$emit("check_login", () => {
+					uni.navigateTo({
+						url: page,
+					});
+				})
+			} else {
+				uni.navigateTo({
+					url: page,
+				});	
+			}
+			
+ 
 		},
 		},
 	}
 	}
 }
 }

+ 12 - 0
pages/makedetail/makeImgDetail.scss

@@ -105,6 +105,7 @@
     border-radius: 20rpx;
     border-radius: 20rpx;
     padding: 20rpx;
     padding: 20rpx;
     box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
     box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
+    animation: fadeIn 0.5s ease;
     ::v-deep .uni-textarea-textarea,
     ::v-deep .uni-textarea-textarea,
     ::v-deep .uni-input-input {
     ::v-deep .uni-input-input {
       font-size: 28rpx;
       font-size: 28rpx;
@@ -583,3 +584,14 @@
     color: #ff5151;
     color: #ff5151;
   }
   }
 }
 }
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(20rpx);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}

+ 3 - 3
pages/makedetail/makeImgDetail.vue

@@ -48,11 +48,11 @@
 		</view>
 		</view>
 
 
 		<!-- 以下区域在非排队状态下显示 -->
 		<!-- 以下区域在非排队状态下显示 -->
-		<view>
+		<view style=" flex: 1;">
 			<!-- 创作描述输入区 -->
 			<!-- 创作描述输入区 -->
 			<view class="description-section">
 			<view class="description-section">
 				<view class="section-header">
 				<view class="section-header">
-					<text class="section-title">创作描述<text style="display: none;" class="required">*</text></text>
+					<text class="section-title" style="margin-bottom: 0;">创作描述<text style="display: none;" class="required">*</text></text>
 					<view class="clear-text" @click="doYouWantToEdit() ? state() : clearDescription()">
 					<view class="clear-text" @click="doYouWantToEdit() ? state() : clearDescription()">
 						<image src="/static/clear.png" mode="aspectFit"></image>
 						<image src="/static/clear.png" mode="aspectFit"></image>
 						<view class="clear-box">
 						<view class="clear-box">
@@ -100,7 +100,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<!-- 参考风格选择区 -->
 			<!-- 参考风格选择区 -->
-			<view class="style-section">
+			<view class="style-section" >
 				<view class="section-title">选择参考风格<text style="display: none;" class="required">*</text></view>
 				<view class="section-title">选择参考风格<text style="display: none;" class="required">*</text></view>
 				<scroll-view class="style-scroll" scroll-x>
 				<scroll-view class="style-scroll" scroll-x>
 					<view class="style-item" v-for="(item, index) in styleList" :key="index"
 					<view class="style-item" v-for="(item, index) in styleList" :key="index"

+ 1 - 1
pages/makedetail/makeMusicDetail.vue

@@ -72,7 +72,7 @@
 			</view>
 			</view>
 
 
 			<!-- 音乐风格选择 -->
 			<!-- 音乐风格选择 -->
-			<view class="style-section">
+			<view class="style-section" style=" animation: fadeIn-data-v-032d5e1e 0.5s ease;">
 				<text class="label">音乐风格</text>
 				<text class="label">音乐风格</text>
 				<view class="tabs">
 				<view class="tabs">
 					<text :class="{ 'active': selectedTab === 'emotion' }" @click="selectTab('emotion')">
 					<text :class="{ 'active': selectedTab === 'emotion' }" @click="selectTab('emotion')">

+ 16 - 4
pages/message/mailMessage.scss

@@ -73,6 +73,10 @@
   // background-color: #fff;
   // background-color: #fff;
   padding: 0 32rpx;
   padding: 0 32rpx;
   box-sizing: border-box;
   box-sizing: border-box;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
   .item {
   .item {
     margin-top: 20rpx;
     margin-top: 20rpx;
     color: #333;
     color: #333;
@@ -163,6 +167,12 @@
   align-items: center;
   align-items: center;
   padding: 0 28rpx;
   padding: 0 28rpx;
   background: #f2f6f2;
   background: #f2f6f2;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+
+
   .item {
   .item {
     margin-top: 20rpx;
     margin-top: 20rpx;
     display: flex;
     display: flex;
@@ -288,15 +298,16 @@
 	    align-items: center;
 	    align-items: center;
 		.tips-title{
 		.tips-title{
 			padding: 50rpx 0;
 			padding: 50rpx 0;
+      padding-bottom: 30rpx;
 		}
 		}
   > view {
   > view {
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
     align-items: center;
     align-items: center;
-    image {
-      width: 380rpx;
-      height: 308rpx;
-    }
+  }
+  image {
+    width: 380rpx;
+    height: 308rpx;
   }
   }
   .tips-title {
   .tips-title {
     font-family: "PingFang SC-Bold";
     font-family: "PingFang SC-Bold";
@@ -309,5 +320,6 @@
     font-weight: 400;
     font-weight: 400;
     font-size: 24rpx;
     font-size: 24rpx;
     font-family: "PingFang SC-Medium";
     font-family: "PingFang SC-Medium";
+    color: #999999;
   }
   }
 }
 }

+ 1 - 1
pages/my/job.scss

@@ -200,7 +200,7 @@ page {
     flex-direction: row;
     flex-direction: row;
     align-items: center;
     align-items: center;
     padding: 20rpx 0;
     padding: 20rpx 0;
-    border-bottom: 1px solid #f0f0f0;
+    // border-bottom: 1px solid #f0f0f0;
     justify-content: space-between;
     justify-content: space-between;
     .task-info {
     .task-info {
       flex: 1;
       flex: 1;

+ 24 - 10
pages/my/my.scss

@@ -225,19 +225,19 @@ page {
   padding-top: 48rpx;
   padding-top: 48rpx;
   background: linear-gradient(225deg, #cdff9f 0%, #acff5f 30%, #d0ffa5 100%);
   background: linear-gradient(225deg, #cdff9f 0%, #acff5f 30%, #d0ffa5 100%);
   min-height: 720rpx;
   min-height: 720rpx;
-  margin-bottom: calc(-135rpx + var(--status-bar-height));
+  margin-bottom: calc(-160rpx + var(--status-bar-height));
   &.header-isvip {
   &.header-isvip {
-    margin-bottom: calc(-215rpx + var(--status-bar-height));
+    margin-bottom: calc(-240rpx + var(--status-bar-height));
   }
   }
   .card-box {
   .card-box {
     width: 100%;
     width: 100%;
-    min-height: 515rpx;
+    min-height: 490rpx;
     position: relative;
     position: relative;
     left: 0;
     left: 0;
     top: 0%;
     top: 0%;
     overflow: hidden;
     overflow: hidden;
     .card-top {
     .card-top {
-      height: 435rpx;
+      height: 410rpx;
       width: 100%;
       width: 100%;
       background: url("../../static/me/my-card-bg.png") top center / 100% auto,
       background: url("../../static/me/my-card-bg.png") top center / 100% auto,
         #fff;
         #fff;
@@ -245,7 +245,7 @@ page {
       top: 0%;
       top: 0%;
       left: 0;
       left: 0;
       z-index: 5;
       z-index: 5;
-      padding: 24rpx;
+      padding: 24rpx 0;
       padding-top: 16rpx;
       padding-top: 16rpx;
       box-sizing: border-box;
       box-sizing: border-box;
       border-radius: 25rpx;
       border-radius: 25rpx;
@@ -255,6 +255,8 @@ page {
         padding-top: 8rpx;
         padding-top: 8rpx;
         background: url("../../static/me/car-top-bg-center.png") top center/
         background: url("../../static/me/car-top-bg-center.png") top center/
           146rpx 50rpx no-repeat;
           146rpx 50rpx no-repeat;
+          padding-right: 24rpx;
+          padding-left: 24rpx;
         .hello-box {
         .hello-box {
           font-family: "CustomFont" !important;
           font-family: "CustomFont" !important;
           font-size: 36rpx;
           font-size: 36rpx;
@@ -276,6 +278,8 @@ page {
         min-height: 120rpx;
         min-height: 120rpx;
         width: 100%;
         width: 100%;
         display: flex;
         display: flex;
+        padding-right: 24rpx;
+        padding-left: 24rpx;
         .avator {
         .avator {
           width: 120rpx;
           width: 120rpx;
           height: 120rpx;
           height: 120rpx;
@@ -322,7 +326,7 @@ page {
               background: #1f1f1f;
               background: #1f1f1f;
               border-radius: 6px 6px 6px 6px;
               border-radius: 6px 6px 6px 6px;
               display: inline-block;
               display: inline-block;
-              margin-left: 10rpx;
+              margin-right: 10rpx;
               margin-bottom: 10rpx;
               margin-bottom: 10rpx;
               padding: 6rpx 16rpx;
               padding: 6rpx 16rpx;
             }
             }
@@ -330,10 +334,11 @@ page {
         }
         }
       }
       }
       .intro_row {
       .intro_row {
-        width: 100%;
-        margin-bottom: 20rpx;
+        width: 100%; 
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
+        padding-right: 24rpx;
+        padding-left: 24rpx;
         .intro_text {
         .intro_text {
           color: #1f1f1f;
           color: #1f1f1f;
           font-size: 28rpx;
           font-size: 28rpx;
@@ -346,10 +351,19 @@ page {
           margin-left: 10rpx;
           margin-left: 10rpx;
         }
         }
       }
       }
+      .line{
+        width: 100%;
+        height: 2rpx;
+        background-color: #F2F6F2;
+        margin:10rpx 0;
+        
+      }
       .bom {
       .bom {
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
         justify-content: space-between;
         justify-content: space-between;
+        padding-right: 24rpx;
+        padding-left: 24rpx;
         .follow_info {
         .follow_info {
           display: flex;
           display: flex;
           align-items: center;
           align-items: center;
@@ -469,8 +483,8 @@ page {
     width: 100%;
     width: 100%;
     height: 2rpx;
     height: 2rpx;
     background: #f0f0f0;
     background: #f0f0f0;
-    margin-bottom: 4rpx;
-    margin-top: 16rpx;
+    margin-bottom: 8rpx;
+    margin-top: 32rpx;
   }
   }
   .subtitle {
   .subtitle {
     display: flex;
     display: flex;

+ 6 - 5
pages/my/my.vue

@@ -33,7 +33,7 @@
 								</view>
 								</view>
 							</view>
 							</view>
 						</view>
 						</view>
-						<view class="intro_row">
+						<view class="intro_row" @click="goPage('/pages/my/editInfo')">
 							<block v-if="myinfo.content == ''">
 							<block v-if="myinfo.content == ''">
 								<text class="intro_text two-omit">添加简介</text>
 								<text class="intro_text two-omit">添加简介</text>
 								<image src="@/static/icon/wd_icon_edit.png" mode="widthFix" class="add_icon"></image>
 								<image src="@/static/icon/wd_icon_edit.png" mode="widthFix" class="add_icon"></image>
@@ -42,6 +42,7 @@
 
 
 							</uv-text>
 							</uv-text>
 						</view>
 						</view>
+						<view class="line"></view>
 						<view class="bom">
 						<view class="bom">
 							<view class="follow_info" @click="navigateToFollow">
 							<view class="follow_info" @click="navigateToFollow">
 								<view class="follow-box">
 								<view class="follow-box">
@@ -84,7 +85,7 @@
 						</view>
 						</view>
 						<!-- <view class=""> -->
 						<!-- <view class=""> -->
 						
 						
-						<image v-if="isRecharge" src="@/static/me/wd_icon_jiantou.png" mode=""></image>
+						<image v-if="isRecharge" src="@/static/me/wd_icon_jiantou.png" mode="aspectFit"></image>
 						<!-- </view> -->
 						<!-- </view> -->
 					</view>
 					</view>
 				</view>
 				</view>
@@ -113,7 +114,7 @@
 							生成中
 							生成中
 						</view>
 						</view>
 					</view>
 					</view>
-					<view class="numlist1" v-if="activeTab === 0" style="margin-top: 30rpx">
+					<view class="numlist1" v-if="activeTab === 0" style="margin-top: 15rpx">
 						<WorkItem v-for="(item, index) in worksList" :secrecy="true" :subtitle="true" :key="index"
 						<WorkItem v-for="(item, index) in worksList" :secrecy="true" :subtitle="true" :key="index"
 							:item="item" @click="goWork(item)" />
 							:item="item" @click="goWork(item)" />
 						<!-- 暂无内容提示 -->
 						<!-- 暂无内容提示 -->
@@ -124,7 +125,7 @@
 							<text class="empty-subtext">快来创作你的第一个作品吧~</text>
 							<text class="empty-subtext">快来创作你的第一个作品吧~</text>
 						</view>
 						</view>
 					</view>
 					</view>
-					<view class="numlist2" v-if="activeTab === 1" style="margin-top: 30rpx">
+					<view class="numlist2" v-if="activeTab === 1" style="margin-top: 15rpx">
 						<view class="item" v-for="(item, index) in worksList" :key="index" style="margin-bottom: 28rpx;">
 						<view class="item" v-for="(item, index) in worksList" :key="index" style="margin-bottom: 28rpx;">
 							<view class="num" @click="goWork(item)" :class="{'clickable': item.status !== 3 && item.status !== 4}">
 							<view class="num" @click="goWork(item)" :class="{'clickable': item.status !== 3 && item.status !== 4}">
 								<WorkItem :item="item" style="margin-bottom: 12rpx" />
 								<WorkItem :item="item" style="margin-bottom: 12rpx" />
@@ -162,7 +163,7 @@
 								</view>
 								</view>
 
 
 								<!-- 显示任务类型标签 -->
 								<!-- 显示任务类型标签 -->
-								<view class="task-type-tag">
+								<view class="task-type-tag" style="position: absolute; left: 14rpx;top: 14rpx;">
 									<image style="width: 120rpx; height: 36rpx" v-if="item.task_type === 1"
 									<image style="width: 120rpx; height: 36rpx" v-if="item.task_type === 1"
 										src="@/static/me/wd_icon_lingganchuangzuo.png"></image>
 										src="@/static/me/wd_icon_lingganchuangzuo.png"></image>
 									<image style="width: 82rpx; height: 36rpx" v-else-if="item.task_type === 2"
 									<image style="width: 82rpx; height: 36rpx" v-else-if="item.task_type === 2"