Browse Source

优化 页面细节

XSXS 1 month ago
parent
commit
1d98ae0ca9

+ 5 - 0
.hbuilderx/launch.json

@@ -4,6 +4,9 @@
     "version" : "0.0",
     "configurations" : [
         {
+            "app" : {
+                "launchtype" : "local"
+            },
             "app-plus" : {
                 "launchtype" : "remote"
             },
@@ -17,6 +20,7 @@
             "type" : "uniCloud"
         },
         {
+            "openVueDevtools" : true,
             "playground" : "standard",
             "type" : "uni-app:app-ios"
         },
@@ -25,6 +29,7 @@
             "type" : "uni-app:app-ios_simulator"
         },
         {
+            "openVueDevtools" : true,
             "playground" : "standard",
             "type" : "uni-app:app-android"
         }

+ 8 - 14
App.vue

@@ -70,7 +70,7 @@ export default {
             if (res.data.login_sms == "yes") { 
               this.setIsSmsLogin(true) 
             }else{  
-              this.setIsSmsLogin(false)
+              this.setIsSmsLogin(true)
             }
             // 请求成功,停止检查
             this.globalData.needStatusCheck = false;
@@ -325,7 +325,9 @@ export default {
 @import "colorui/icon.css";
 @import "style/FontStyle.css";
 @import url("https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css");
-
+view,text{
+  font-family: "PingFang SC-Medium";
+}
 body {
   -webkit-text-size-adjust: none;
   overscroll-behavior-y: contain;
@@ -366,18 +368,10 @@ uni-modal {
   z-index: 997 !important;
 }
 
-.money-add {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 32rpx;
-  height: 32rpx;
-  font-size: 27rpx;
-  color: #fff;
-  border-radius: 50%;
-  font-weight: 600;
-  margin-left: 8rpx;
-  background-color: #1f1f1f;
+.money-add { 
+  width: 28rpx !important;
+  height:28rpx !important;
+  margin-left: 10rpx;
 }
 
 .blick-btn-animation {

+ 312 - 327
components/card/card.vue

@@ -1,369 +1,354 @@
 <template>
-  <view class="waterfall-item" :style="{ width, ...customStyle }">
-    <view
-      class="waterfall-item__image"
-      @click="goWork(item)"
-      :style="{ width, backgroundColor: item.backgroundColor }"
-    >
-      <image
-        :src="item.image"
-        mode="widthFix"
-        style="border-radius: 20rpx"
-      ></image>
-    </view>
-    <view class="waterfall-item__ft">
-      <view class="waterfall-item__ft__title">
-        <text class="value" :style="{ color: textColor }">{{
+	<view class="waterfall-item" :style="{ width, ...customStyle }">
+		<view class="waterfall-item__image" @click="goWork(item)"
+			:style="{ width, backgroundColor: item.backgroundColor }">
+			<image :src="item.image" mode="widthFix" style="border-radius: 20rpx"></image>
+		</view>
+		<view class="waterfall-item__ft">
+			<view class="waterfall-item__ft__title">
+				<text class="value" :style="{ color: titleTextColor||textColor }">{{
           item.title
         }}</text>
-      </view>
-      <view class="waterfall-item__ft__desc" @click="goAuthor(item)">
-        <view class="user">
-          <image :src="item.avator" mode="aspectFill" class="avater"> </image>
-          <text class="name" :style="{ color: textColor }">{{
+			</view>
+			<view class="waterfall-item__ft__desc" style="margin-top: 4rpx;" @click="goAuthor(item)">
+				<view class="user">
+					<image :src="item.avator" mode="aspectFill" class="avater"> </image>
+					<text class="name" :style="{ color: textColor }">{{
             item.nickname
           }}</text>
-        </view>
-        <view class="like" @click="changeLike">
-          <image
-            class="like-icon"
-            :src="
+				</view>
+				<view class="like" @click="changeLike">
+					<image class="like-icon" :src="
               isLike ? '/static/icon/icon-18.png' : '/static/icon/icon-19.png'
-            "
-            mode=""
-          >
-          </image>
-          <text class="value" :style="{ color: textColor }">{{
+            " mode="">
+					</image>
+					<text class="value" :style="{ color: textColor }">{{
             item.num_like
           }}</text>
-        </view>
-      </view>
-      <view class="waterfall-item__ft__btn" v-if="false">
-        <image
-          class="waterfall-item__ft__btn__icon"
-          src="@/static/zhHans-text-icon/text-10.png"
-          mode=""
-        >
-        </image>
-      </view>
-    </view>
-    <view class="waterfall-item__tips" v-if="findType != 'search'">
-      <view class="item">
-        <image
-          class="look-icon"
-          src="@/static/icon/icon-17.png"
-          mode=""
-        ></image>
-        <text class="value" style="color: #fff">{{ item.num_view }}</text>
-      </view>
-      <!-- <view class="item" style="background-color: #1f1f1f"> -->
-      <view class="item" style=" background: url('../../static/home/jingxuan.png') no-repeat center left / 100% 100%;  width: 96rpx; height: 36rpx;padding: 0; padding-left: 42rpx;  ">
-        <text class="value" style="color: #acf934; ">精选</text>
-      </view>
-    </view>
-  </view>
+				</view>
+			</view>
+			<view class="waterfall-item__ft__btn" v-if="false">
+				<image class="waterfall-item__ft__btn__icon" src="@/static/zhHans-text-icon/text-10.png" mode="">
+				</image>
+			</view>
+		</view>
+		<view class="waterfall-item__tips" v-if="findType != 'search'">
+			<view class="item">
+				<image class="look-icon" src="@/static/icon/icon-17.png" mode=""></image>
+				<text class="value" style="color: #fff">{{ item.num_view }}</text>
+			</view>
+			<!-- <view class="item" style="background-color: #1f1f1f"> -->
+			<view class="item"
+				style=" background: url('../../static/home/jingxuan.png') no-repeat center left / 100% 100%;  width: 96rpx; height: 36rpx;padding: 0; padding-left: 42rpx;  ">
+				<text class="value" style="color: #acf934; ">精选</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  name: "card",
-  props: {
-    width: {
-      type: String,
-      default: "",
-    },
-    item: {
-      type: Object,
-      default: () => ({}),
-    },
-    textColor: {
-      type: String,
-      default: "#ff0000",
-    },
-    customStyle: {
-      type: Object,
-      default: () => ({
-        background: "#3F4141",
-      }),
-    },
-    goLink: {
-      type: String,
-      default: "",
-    },
-    findType: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      isLike: false,
-      isLiking: false,
-      localLikeCount: 0,
-    };
-  },
-  created() {
-    this.isLike = this.item.is_like || false;
-    this.localLikeCount = this.item.num_like || 0;
-  },
-  methods: {
-    changeLike(e) {
-      return;
-      e && e.stopPropagation();
+	export default {
+		name: "card",
+		props: {
+			width: {
+				type: String,
+				default: "",
+			},
+			item: {
+				type: Object,
+				default: () => ({}),
+			},
+			textColor: {
+				type: String,
+				default: "#ff0000",
+			},
+			titleTextColor: {
+				type: String,
+				default: "",
+			},
+			customStyle: {
+				type: Object,
+				default: () => ({
+					background: "#3F4141",
+				}),
+			},
+			goLink: {
+				type: String,
+				default: "",
+			},
+			findType: {
+				type: String,
+				default: "",
+			},
+		},
+		data() {
+			return {
+				isLike: false,
+				isLiking: false,
+				localLikeCount: 0,
+			};
+		},
+		created() {
+			this.isLike = this.item.is_like || false;
+			this.localLikeCount = this.item.num_like || 0;
+		},
+		methods: {
+			changeLike(e) {
+				return;
+				e && e.stopPropagation();
 
-      if (this.isLiking) return;
-      this.isLiking = true;
+				if (this.isLiking) return;
+				this.isLiking = true;
 
-      const prevLikeState = this.isLike;
-      const prevLikeCount = this.localLikeCount;
+				const prevLikeState = this.isLike;
+				const prevLikeCount = this.localLikeCount;
 
-      this.isLike = !this.isLike;
-      this.localLikeCount = this.isLike ? prevLikeCount + 1 : prevLikeCount - 1;
-      this.item.num_like = this.localLikeCount;
+				this.isLike = !this.isLike;
+				this.localLikeCount = this.isLike ? prevLikeCount + 1 : prevLikeCount - 1;
+				this.item.num_like = this.localLikeCount;
 
-      if (!getApp().globalData.uuid) {
-        uni.showToast({
-          title: "请先登录",
-          icon: "none",
-        });
-        this.isLike = prevLikeState;
-        this.localLikeCount = prevLikeCount;
-        this.item.num_like = prevLikeCount;
-        this.isLiking = false;
-        return;
-      }
+				if (!getApp().globalData.uuid) {
+					uni.showToast({
+						title: "请先登录",
+						icon: "none",
+					});
+					this.isLike = prevLikeState;
+					this.localLikeCount = prevLikeCount;
+					this.item.num_like = prevLikeCount;
+					this.isLiking = false;
+					return;
+				}
 
-      uni.request({
-        url: this.$apiHost + "/Work/zanTA",
-        data: {
-          uuid: getApp().globalData.uuid,
-          id: this.item.id,
-        },
-        header: {
-          "content-type": "application/json",
-          sign: getApp().globalData.headerSign,
-        },
-        success: (res) => {
-          if (res.data.success === "yes") {
-            uni.showToast({
-              title: this.isLike ? "点赞成功" : "取消点赞",
-              icon: "none",
-            });
-          } else {
-            this.isLike = prevLikeState;
-            this.localLikeCount = prevLikeCount;
-            this.item.num_like = prevLikeCount;
+				uni.request({
+					url: this.$apiHost + "/Work/zanTA",
+					data: {
+						uuid: getApp().globalData.uuid,
+						id: this.item.id,
+					},
+					header: {
+						"content-type": "application/json",
+						sign: getApp().globalData.headerSign,
+					},
+					success: (res) => {
+						if (res.data.success === "yes") {
+							uni.showToast({
+								title: this.isLike ? "点赞成功" : "取消点赞",
+								icon: "none",
+							});
+						} else {
+							this.isLike = prevLikeState;
+							this.localLikeCount = prevLikeCount;
+							this.item.num_like = prevLikeCount;
 
-            uni.showToast({
-              title: res.data.str || "操作失败",
-              icon: "none",
-            });
-          }
-        },
-        fail: (e) => {
-          console.error("点赞失败:", e);
-          this.isLike = prevLikeState;
-          this.localLikeCount = prevLikeCount;
-          this.item.num_like = prevLikeCount;
+							uni.showToast({
+								title: res.data.str || "操作失败",
+								icon: "none",
+							});
+						}
+					},
+					fail: (e) => {
+						console.error("点赞失败:", e);
+						this.isLike = prevLikeState;
+						this.localLikeCount = prevLikeCount;
+						this.item.num_like = prevLikeCount;
 
-          uni.showToast({
-            title: "网络请求失败",
-            icon: "none",
-          });
-        },
-        complete: () => {
-          setTimeout(() => {
-            this.isLiking = false;
-          }, 500);
-        },
-      });
-    },
-    goWork(item) {
-      var url = "/pages/index/workDetail?id=";
-      if (this.goLink) {
-        url = this.goLink;
-      }
-      console.log("goWork", this.goLink);
+						uni.showToast({
+							title: "网络请求失败",
+							icon: "none",
+						});
+					},
+					complete: () => {
+						setTimeout(() => {
+							this.isLiking = false;
+						}, 500);
+					},
+				});
+			},
+			goWork(item) {
+				var url = "/pages/index/workDetail?id=";
+				if (this.goLink) {
+					url = this.goLink;
+				}
+				console.log("goWork", this.goLink);
 
-      // uni.$emit('check_login', () => {
-      uni.navigateTo({
-        url: url + item.id,
-      });
-      // })
-    },
-    goAuthor(item) {
-      console.log("goAuthor", item);
-      uni.$emit("check_login", () => {
-        if (!item.userID) {
-          return;
-        }
-        uni.navigateTo({
-          url: "/pages/my/userHomepage?id=" + item.userID,
-        });
-      });
-    },
-  },
-};
+				// uni.$emit('check_login', () => {
+				uni.navigateTo({
+					url: url + item.id,
+				});
+				// })
+			},
+			goAuthor(item) {
+				console.log("goAuthor", item);
+				uni.$emit("check_login", () => {
+					if (!item.userID) {
+						return;
+					}
+					uni.navigateTo({
+						url: "/pages/my/userHomepage?id=" + item.userID,
+					});
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-.waterfall-item {
-  margin-bottom: 20rpx;
-  border-radius: 30rpx;
-  position: relative;
-  border-radius: 16rpx;
-  overflow: hidden;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
-  }
+	.waterfall-item {
+		margin-bottom: 0rpx;
+		border-radius: 30rpx;
+		position: relative;
+		border-radius: 16rpx;
+		overflow: hidden;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+		// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 
-  // #ifndef APP-NVUE
-  .waterfall-item__image {
-    border-radius: 16rpx;
-    width: 100%;
-    height: auto;
-    box-sizing: border-box;
-    padding: 28rpx 20rpx;
-    transition: all 0.3s ease;
+		&:active {
+			transform: scale(0.98);
+			box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+		}
 
-    &:active {
-      opacity: 0.9;
-    }
+		// #ifndef APP-NVUE
+		.waterfall-item__image {
+			border-radius: 16rpx;
+			width: 100%;
+			height: auto;
+			box-sizing: border-box;
+			padding: 28rpx 20rpx;
+			transition: all 0.3s ease;
 
-    image {
-      width: 100%;
-      height: 100%;
-      transition: all 0.3s ease;
-    }
-  }
+			&:active {
+				opacity: 0.9;
+			}
 
-  // #endif
-  .waterfall-item__tips {
-    position: absolute;
-    top: 10rpx;
-    padding: 0rpx 10rpx;
-    // #ifndef APP-NVUE
-    box-sizing: border-box;
-    // #endif
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
+			image {
+				width: 100%;
+				height: 100%;
+				transition: all 0.3s ease;
+			}
+		}
 
-    .item {
-      // #ifndef APP-NVUE
-      // #endif
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      background: rgba(0, 0, 0, 0.2);
-      padding: 8rpx 14rpx;
-      border-radius: 12rpx;
+		// #endif
+		.waterfall-item__tips {
+			position: absolute;
+			top: 10rpx;
+			padding: 0rpx 10rpx;
+			// #ifndef APP-NVUE
+			box-sizing: border-box;
+			// #endif
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
 
-      .look-icon {
-        width: 26rpx;
-        height: 26rpx;
-        margin-right: 10rpx;
-      }
+			.item {
+				// #ifndef APP-NVUE
+				// #endif
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				background: rgba(0, 0, 0, 0.2);
+				padding: 8rpx 14rpx;
+				border-radius: 12rpx;
 
-      .value {
-        font-size: 20rpx;
-      }
-    }
-  }
+				.look-icon {
+					width: 26rpx;
+					height: 26rpx;
+					margin-right: 10rpx;
+				}
 
-  .waterfall-item__ft {
-    padding: 10rpx 20rpx;
+				.value {
+					font-size: 20rpx;
+				}
+			}
+		}
 
-    &__title {
-      line-height: 48rpx;
-      font-weight: 700;
+		.waterfall-item__ft {
+			padding: 10rpx 20rpx;
+			padding-left: 0; 
 
-      .value {
-        font-size: 30rpx;
-      }
-    }
+			&__title {
+				line-height: 48rpx;
+				font-weight: 700;
 
-    &__desc {
-      width: 100%;
-      // #ifndef APP-NVUE
-      display: flex;
-      // #endif
-      // #ifdef APP-NVUE
-      // #endif
-      flex-direction: row;
-      align-items: center;
-      justify-content: space-between;
-      margin: 20rpx 0;
+				.value {
+					font-size: 30rpx;
+				}
+			}
 
-      .user {
-        // #ifndef APP-NVUE
-        display: flex;
-        // #endif
-        // #ifdef APP-NVUE
-        flex-direction: row;
-        // #endif
-        align-items: center;
+			&__desc {
+				width: 100%;
+				// #ifndef APP-NVUE
+				display: flex;
+				// #endif
+				// #ifdef APP-NVUE
+				// #endif
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				margin: 20rpx 0;
 
-        .avater {
-          width: 36rpx;
-          height: 36rpx;
-          border-radius: 18rpx;
-          margin-right: 10rpx;
-        }
+				.user {
+					// #ifndef APP-NVUE
+					display: flex;
+					// #endif
+					// #ifdef APP-NVUE
+					flex-direction: row;
+					// #endif
+					align-items: center;
 
-        .name {
-          font-size: 24rpx;
-        }
-      }
+					.avater {
+						width: 44rpx;
+						height: 44rpx;
+						border-radius: 50%;
+						margin-right: 10rpx;
+					}
 
-      .like {
-        // #ifndef APP-NVUE
-        display: flex;
-        // #endif
-        // #ifdef APP-NVUE
-        flex-direction: row;
-        // #endif
-        align-items: center;
+					.name {
+						font-size: 24rpx;
+					}
+				}
 
-        .like-icon {
-          width: 30rpx;
-          height: 30rpx;
-          margin-right: 10rpx;
-        }
+				.like {
+					// #ifndef APP-NVUE
+					display: flex;
+					// #endif
+					// #ifdef APP-NVUE
+					flex-direction: row;
+					// #endif
+					align-items: center;
+					font-weight: bold;
+					.like-icon {
+						width: 30rpx;
+						height: 30rpx;
+						margin-right: 10rpx;
+					}
 
-        .value {
-          font-size: 24rpx;
-        }
-      }
-    }
+					.value {
+						font-size: 24rpx;
+					}
+				}
+			}
 
-    &__btn {
-      height: 65rpx;
-      border-radius: 18px;
-      background-image: linear-gradient(to bottom, #bffe9c, #aee75d);
-      // #ifndef APP-NVUE
-      background: linear-gradient(
-        180deg,
-        #bffe9c 0%,
-        #aee75d 62%,
-        #aee75d 100%
-      );
-      display: flex;
-      // #endif
-      justify-content: center;
-      align-items: center;
+			&__btn {
+				height: 65rpx;
+				border-radius: 18px;
+				background-image: linear-gradient(to bottom, #bffe9c, #aee75d);
+				// #ifndef APP-NVUE
+				background: linear-gradient(180deg,
+						#bffe9c 0%,
+						#aee75d 62%,
+						#aee75d 100%);
+				display: flex;
+				// #endif
+				justify-content: center;
+				align-items: center;
 
-      &__icon {
-        width: 155rpx;
-        height: 32rpx;
-      }
-    }
-  }
-}
+				&__icon {
+					width: 155rpx;
+					height: 32rpx;
+				}
+			}
+		}
+	}
 </style>

+ 3 - 3
components/page-navbar/page-navbar.vue

@@ -70,7 +70,7 @@
 				justify-content: flex-start;
 
 			}
-
+			
 			.weather {
 				font-size: 22rpx;
 			}
@@ -80,8 +80,8 @@
 				width: 490rpx;
 
 				.uv-input {
-					height: 70rpx;
-					border: 4rpx solid #000;
+					height: 72rpx;
+					border: 6rpx solid #000;
 					box-sizing: border-box;
 					padding-left: 4rpx;
 					box-sizing: border-box;

+ 1 - 1
components/sortble/sortble.vue

@@ -17,7 +17,7 @@
 			},
 			marginBottom:{
 				type: Number,
-				default: 30
+				default: 15
 			}
 		},
 		onLoad() {

+ 69 - 64
components/w-waterfall/w-waterfall.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="waterfall-list-container">
 		<view class="waterfall-list" v-for="(item, index) in columnCount" :key="index"
-			:style="{ width: width,margin:`0 ${itemGap}rpx`}">
+			:style="{ 
+				width: width,
+				marginLeft: index === 0 ? '0' : `${itemGap}rpx`,
+				marginRight: index === columnCount - 1 ? '0' : `${itemGap}rpx`
+			}">
 			<view v-for="(el, i) in list[index]" :key="i">
 				<slot name="content" :item="el" :width="width" />
 			</view>
@@ -10,77 +14,78 @@
 </template>
 
 <script>
-	export default {
-		name: "w-waterfall",
-		props: {
-			sideGap: {
-				type: Number,
-				default: 20
-			},
-			itemGap: {
-				type: Number,
-				default: 10
-			},
-			columnCount: {
-				type: Number,
-				default: 2,
-			},
-			data: {
-				type: Array,
-				default: () => ([])
-			}
-		},
-		watch: {
-			data: {
-				handler(newV) {
-					if (newV.length != 0) {
-						this.init()
-					}
-				},
-				immediate: true
-			}
+export default {
+	name: "w-waterfall",
+	props: {
+		sideGap: {
+			type: Number,
+			default: 20
 		},
-		mounted() {
-			const screenWidth = uni.getWindowInfo().screenWidth;
-			const screenRate = screenWidth / 750;
-			const gap = ((this.columnCount - 1) * this.itemGap) + this.sideGap;
-			const itemWidth = (screenWidth - gap) / this.columnCount
-			this.width = Math.round(itemWidth * (1 / screenRate)) + 'rpx'
+		itemGap: {
+			type: Number,
+			default: 10
 		},
-		data() {
-			return {
-				width: '',
-				list: []
-			};
+		columnCount: {
+			type: Number,
+			default: 2,
 		},
-		methods: {
-			init() {
-				let list = []
-				for (let i = 0; i < this.columnCount; i++) {
-					list[i] = []
+		data: {
+			type: Array,
+			default: () => ([])
+		}
+	},
+	watch: {
+		data: {
+			handler(newV) {
+				if (newV.length != 0) {
+					this.init()
 				}
-				let i = 0
-				this.data.forEach((el, index) => {
-					if (i > this.columnCount - 1) {
-						i = 0
-					}
-					list[i].push(el)
-					i++
-				})
-				this.list = list
 			},
+			immediate: true
 		}
+	},
+	mounted() {
+		const screenWidth = uni.getWindowInfo().screenWidth;
+		const screenRate = screenWidth / 750;
+		const gap = ((this.columnCount - 1) * this.itemGap) + this.sideGap;
+		const itemWidth = (screenWidth - gap) / this.columnCount
+		this.width = Math.round(itemWidth * (1 / screenRate)) + 'rpx'
+	},
+	data() {
+		return {
+			width: '',
+			list: []
+		};
+	},
+	methods: {
+		init() {
+			let list = []
+			for (let i = 0; i < this.columnCount; i++) {
+				list[i] = []
+			}
+			let i = 0
+			this.data.forEach((el, index) => {
+				if (i > this.columnCount - 1) {
+					i = 0
+				}
+				list[i].push(el)
+				i++
+			})
+			this.list = list
+		},
 	}
+}
 </script>
 
 <style lang="scss">
-	.waterfall-list-container {
-		// #ifdef APP-NVUE
-		// #endif
-		// #ifndef APP-NVUE
-		// #endif
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-	}
+.waterfall-list-container {
+	// #ifdef APP-NVUE
+	// #endif
+	// #ifndef APP-NVUE
+	// #endif
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	padding: 0 20rpx;
+}
 </style>

+ 2 - 2
pages/index/Search.vue

@@ -65,7 +65,7 @@
           <block v-if="followList.length > 0">
             <w-waterfall :data="followList">
               <template v-slot:content="{ item, width }">
-                <card :item="formatItem(item)" findType="search" :width="width" :custom-style="{ background: '#fff' }" textColor="#000">
+                <card :item="formatItem(item)" findType="search" :width="width" :custom-style="{ background: '#fff' }" textColor="#999"  titleTextColor="#000">
                 </card>
               </template>
             </w-waterfall>
@@ -575,7 +575,7 @@ export default {
       height: 72rpx;
       background: #FFFFFF;
       border-radius: 36rpx;
-      border: 4rpx solid #000000;
+      border: 6rpx solid #000000;
       position: relative;
       left: 0;
       top: 0;

+ 24 - 19
pages/index/index.scss

@@ -14,6 +14,7 @@
   display: flex;
   justify-content: flex-start;
   padding: 20rpx 20rpx;
+  // padding-top: 5rpx;
   box-sizing: border-box;
   background: #ffffff;
 
@@ -28,7 +29,7 @@
     left: 0;
     top: 0;
     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 {
       transform: scale(0.95);
@@ -62,12 +63,12 @@
 }
 
 .hot-topics {
-  padding: 20rpx;
-  // background: #fff;
-  margin: 20rpx;
-  border-radius: 16rpx;
+  padding: 20rpx 28rpx;// background: #fff;
+  margin:0 20rpx;
+  margin-top: 0;
+  border-radius: 20rpx;
   border: #000000 solid 2rpx;
-  background: url("../../static/home/hot-topice-bg.png") center/100% 99%
+  background: url("../../static/home/hot-topice-bg.png") center/120% 100%
     no-repeat;
 
   .hot-topics-header {
@@ -85,7 +86,7 @@
   }
 
   .hot-topics-list {
-    padding: 0 26rpx;
+    // padding: 0 26rpx;
     padding-bottom: 0;
     height: 100%;
     display: flex;
@@ -114,6 +115,7 @@
     .hot-topics-left {
       display: flex;
       transition: all 0.3s ease;
+      align-items: center;
       .topic-index {
         width: 30rpx;
         height: 30rpx;
@@ -125,8 +127,9 @@
         color: #fff;
         border-radius: 5rpx;
         margin-right: 18rpx;
-        background: #cecece;
+        background: #c4c4c4;
         transition: all 0.3s ease;
+        border-radius: 8rpx;
         &.topic-index-img {
           background: transparent;
           color: transparent;
@@ -138,8 +141,8 @@
         }
       }
       .topic-content {
-        font-size: 24rpx;
-        max-width: 330rpx;
+        font-size: 28rpx;
+        max-width: 380rpx;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -147,7 +150,7 @@
       }
     }
     .topic-participants {
-      font-size: 20rpx;
+      font-size: 24rpx;
       color: #999;
       transition: all 0.3s ease;
     }
@@ -166,21 +169,23 @@
     margin-top: 20rpx;
 
     .dot {
-      width: 12rpx;
-      height: 12rpx;
-      border-radius: 50%;
-      background: #ffffff;
+      width: 8rpx; 
+      height: 8rpx;
+      border-radius: 6rpx;
+      background: #cecece;
       margin: 0 6rpx;
 
       &.active {
-        background: #808080;
+       width: 20rpx;
+        
+        background: #1f1f1f;
       }
     }
   }
 }
 
 .follow-list {
-  padding: 20rpx;
+  padding: 20rpx 0rpx;
   background: #fff;
   margin: 0rpx;
   border-radius: 0rpx;
@@ -228,14 +233,14 @@
 }
 
 .no-data {
-  text-align: center;
+  text-align: center; 
   padding: 40rpx 0;
   color: #808080;
   font-size: 28rpx;
 }
 
 .news-list {
-  padding: 20rpx;
+  padding: 20rpx 0rpx;
   background: #fff;
 
   .news-grid {

+ 1 - 1
pages/index/index.vue

@@ -145,7 +145,7 @@
 						<view class="explore-list">
 							<view class="hot-topics" v-if="currentTab === 2">
 								<view class="hot-topics-header">
-									<image class="hot-topics-title" src="@/static/home/hot-topics-title.png" mode="">
+									<image class="hot-topics-title" src="@/static/home/hot-topics-title.png" mode="aspectFit">
 									</image>
 								</view>
 								<swiper class="hot-topics-swiper" :current="currentTopicPage"

+ 29 - 14
pages/make/index.scss

@@ -27,7 +27,7 @@ page {
     display: flex;
     gap: 20rpx;
 	align-items: center;
-  min-width: 400rpx;
+  // min-width: 400rpx;
     // width: 260rpx;
     .coin-box,
     .gold-box {
@@ -35,15 +35,21 @@ page {
       align-items: center;
       background: #fff;
       border-radius: 30rpx;
-      box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
-      padding: 4rpx 12rpx 8rpx 8rpx;
+      // box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+      padding: 6rpx 12rpx 6rpx 8rpx;
+      transition: transform 0.2s;
+      &:active {
+        transform: scale(0.98);
+      }
       text{
         display: inline-block;
+        padding-left: 4rpx;
+        line-height: 0;
       }
       image {
         width: 40rpx;
         height: 40rpx;
-        margin-right: 12rpx;
+        // margin-right: 12rpx;
       }
     }
   }
@@ -67,7 +73,7 @@ page {
     "character music"
     "character cube";
   gap: 20rpx;
-  margin-bottom: 40rpx;
+  margin-bottom: 32rpx;
 
   .card {
     @include click-animation; // 添加点击动画
@@ -100,13 +106,16 @@ page {
         }
       }
       .btn-box {
-        font-weight: 400;
+        font-weight: 600;
         font-size: 22rpx;
         color: #1966ed;
         background: #ffffff;
         border-radius: 24rpx;
-        padding: 8rpx 14rpx 6rpx 16rpx;
-        display: inline-block;
+       width: 120rpx;
+       height: 44rpx;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
         position: absolute;
         left: 0rpx;
         bottom: 32rpx;
@@ -140,23 +149,29 @@ page {
     }
 
     &.card-medium {
-      padding:18rpx 30rpx;
+      padding:0 30rpx; 
     }
 
     .card-content {
       height: 100%;
-      position: relative;
-
+      position: relative;  
       .text-area {
         z-index: 1;
-        position: relative;
+        width: 100%; 
+        height: 100%;
+        display: flex;
+        align-items: center;
+        >view{
+          display: flex;
+          flex-direction: column;
+        }
       }
 
       .card-title {
         font-size: 32rpx;
         color: #fff;
         font-weight: bold;
-        margin-bottom: 4rpx;
+        margin-bottom: 8rpx;
       }
 
       .card-desc {
@@ -266,7 +281,7 @@ page {
       line-height: 1.5;
     }
     .tutorial-title {
-      font-weight: 400;
+      font-weight: 200;
       font-size: 34rpx;
       color: #1f1f1f;
 		margin-top: 10rpx;

+ 66 - 55
pages/make/index.vue

@@ -4,29 +4,34 @@
 		<!-- 顶部导航栏 -->
 		<view class="header-box">
 			<text class="title">星球造物</text>
-			<view class="currency-area" >
-				<view class="coin-box" @click="isRecharge ? goPage('/pages/vip/M_purchase')  : ''">
+			<view class="currency-area">
+				<view class="coin-box" @click="isRecharge ? goPage('/pages/vip/M_purchase') : ''">
 					<image src="/static/icon/coin_m.png" mode="aspectFit"></image>
-					<text>{{ myinfo.num_gmm | formatNumberToK}}</text> <view class="money-add" v-if="isRecharge">+</view>
+					<text>{{ myinfo.num_gmm | formatNumberToK }}</text>
+					<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 				</view>
-				<view class="gold-box"  @click="isRecharge ?goPage('/pages/my/job?type=recharge')  : ''">
+				<view class="gold-box" @click="isRecharge ? goPage('/pages/my/job?type=recharge') : ''">
 					<image src="/static/icon/coin_cd.png" mode="aspectFit"></image>
-					<text>{{ myinfo.num_gmd | formatNumberToK}}</text> <view class="money-add" v-if="isRecharge">+</view>
+					<text>{{ myinfo.num_gmd | formatNumberToK }}</text>
+					<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 				</view>
-			 
-					<image style="width: 64rpx ; height: 64rpx;" src="/static/icon/renwu.png" mode="aspectFit"  @click="goPage('/pages/my/job')"></image>
-			 
+
+				<image style="width: 64rpx ; height: 64rpx;" src="/static/icon/renwu.png" mode="aspectFit"
+					@click="goPage('/pages/my/job')"></image>
+
 			</view>
 		</view>
- 
+
 		<!-- 功能卡片区域 -->
 		<view class="card-grid">
 			<!-- AI创角卡片 -->
 			<view class="card card-large character" @click="handleCardClick('character')">
 				<view class="card-content">
-					<view class="text-area">
-						<text class="card-title">AI创角</text>
-						<text class="card-desc">生成独一无二的星球成员</text>
+					<view class="text-area" style="align-items: flex-start;">
+						<view>
+							<text class="card-title">AI创角</text>
+							<text class="card-desc">生成独一无二的星球成员</text>
+						</view>
 					</view>
 					<view class="btn-box">立即查看</view>
 					<!-- <image src="/static/icon/star.png" class="star-icon star-1" mode="aspectFit"></image>
@@ -38,9 +43,12 @@
 			<!-- AI灵感写歌卡片 -->
 			<view class="card card-medium music" @click="handleCardClick('music')">
 				<view class="card-content">
-					<view class="text-area" style="display: flex;flex-direction: column;;">
-						<text class="card-title">AI灵感写歌</text>
-						<text class="card-desc">快速生成专属原创曲目</text>
+					<view class="text-area"   >
+						<view>
+							<text class="card-title">AI灵感写歌</text>
+							<text class="card-desc">快速生成专属原创曲目</text>
+						</view>
+
 					</view>
 					<image src="/static/make/planet.png" class="card-image" mode="aspectFit"></image>
 				</view>
@@ -49,9 +57,11 @@
 			<!-- 萌萌智绘魔方卡片 -->
 			<view class="card card-medium cube" @click="handleCardClick('cube')">
 				<view class="card-content">
-					<view class="text-area" style="display: flex;flex-direction: column;">
-						<text class="card-title">萌萌智绘魔方</text>
-						<text class="card-desc">AI随机生成萌玩原型</text>
+					<view class="text-area"  >
+						<view>
+							<text class="card-title">萌萌智绘魔方</text>
+							<text class="card-desc">AI随机生成萌玩原型</text>
+						</view>
 					</view>
 					<image src="/static/make/book.png" class="card-image" mode="aspectFit"></image>
 				</view>
@@ -61,7 +71,7 @@
 		<view class="guide-title"> 引导教程</view>
 		<!-- 引导教程区域 -->
 		<view class="tutorial">
-			<view class="tutorial-block " @click="goWeb(item.url,item.subheading )" v-for="(item, index) in tutorial"
+			<view class="tutorial-block " @click="goWeb(item.url, item.subheading)" v-for="(item, index) in tutorial"
 				:key="index">
 				<text class="tutorial-btn-box">
 					<view class="tutorial-btn">
@@ -75,7 +85,7 @@
 		</view>
 		<tabbar-view :tabbars="tabbars" :currentIndex="1" ref="tabbar"></tabbar-view>
 		<!-- 新手引导组件 -->
-		<novice-guidance :step="step"  ></novice-guidance>
+		<novice-guidance :step="step"></novice-guidance>
 	</view>
 </template>
 
@@ -96,41 +106,41 @@ export default {
 			step: {
 				name: "make",
 				guideList: [
-				{
-					el: ".currency-area",
-					tips: "积分可在这里查看,每日签到可获得积分!",
-					next: "知道了", 
-				},
-				{
-					el: ".character",
-					tips: "创建星灵,入驻星球",
-					next: "知道了",
-					tipesStyle: "left: 40px;"
-				},
-				{
-					el: ".music",
-					tips: "输入灵感,生成歌曲",
-					next: "知道了",
-				},
-				{
-					el: ".cube",
-					tips: "输入关键词,生成萌玩",
-					next: "完成",
-				}]
+					{
+						el: ".currency-area",
+						tips: "积分可在这里查看,每日签到可获得积分!",
+						next: "知道了",
+					},
+					{
+						el: ".character",
+						tips: "创建星灵,入驻星球",
+						next: "知道了",
+						tipesStyle: "left: 40px;"
+					},
+					{
+						el: ".music",
+						tips: "输入灵感,生成歌曲",
+						next: "知道了",
+					},
+					{
+						el: ".cube",
+						tips: "输入关键词,生成萌玩",
+						next: "完成",
+					}]
 			},
-			tutorial:[
-				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQBj5luSHVkaqpJmL5PTuFfZ?identityId=2HSXOrUAEOx",subheading:"萌萌智绘魔方",content:"教你如何创作内容,激发创作灵感!" },
-				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQDGgIXzR08ssYlwoy2tjiNA?identityId=2HSXOrUAEOx",subheading:"AI灵感写歌",content:"使用AI超能力释放你的无限创造力!"},
-				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQC3yyQj9gK-KnVUZOT6vYmn?identityId=2HSXOrUAEOx",subheading:"星球造物,AI创角",content:"使用自然语言,创建独属于你的智能体"},
+			tutorial: [
+				{ title: "官方教程", url: "https://docs.qingque.cn/d/home/eZQBj5luSHVkaqpJmL5PTuFfZ?identityId=2HSXOrUAEOx", subheading: "萌萌智绘魔方", content: "教你如何创作内容,激发创作灵感!" },
+				{ title: "官方教程", url: "https://docs.qingque.cn/d/home/eZQDGgIXzR08ssYlwoy2tjiNA?identityId=2HSXOrUAEOx", subheading: "AI灵感写歌", content: "使用AI超能力释放你的无限创造力!" },
+				{ title: "官方教程", url: "https://docs.qingque.cn/d/home/eZQC3yyQj9gK-KnVUZOT6vYmn?identityId=2HSXOrUAEOx", subheading: "星球造物,AI创角", content: "使用自然语言,创建独属于你的智能体" },
 			]
 		}
-	}, 
+	},
 	computed: {
 		...mapState('switchingModule', ['isRecharge', 'isGuiding'])
 	},
 	onLoad() {
-	
-	 },
+
+	},
 	onShow() {
 		this.getMyInfo();
 	},
@@ -139,8 +149,9 @@ export default {
 	methods: {
 		goWeb(url, title) {
 			uni.navigateTo({
-				url: `/pages/webview/index?url=${encodeURIComponent(url)}&title=${encodeURIComponent(title)	}`
-			})},
+				url: `/pages/webview/index?url=${encodeURIComponent(url)}&title=${encodeURIComponent(title)}`
+			})
+		},
 		getMyInfo() {
 			uni.request({
 				url: this.$apiHost + '/My/getnum',
@@ -188,8 +199,8 @@ export default {
 			console.log('Tutorial clicked:', index + 1);
 		},
 		goPage(page) {
-			console.log('page: ',page);
-			if (page.includes('/pages/my/job') || page.includes('vip') ) {
+			console.log('page: ', page);
+			if (page.includes('/pages/my/job') || page.includes('vip')) {
 				uni.$emit("check_login", () => {
 					uni.navigateTo({
 						url: page,
@@ -198,10 +209,10 @@ export default {
 			} else {
 				uni.navigateTo({
 					url: page,
-				});	
+				});
 			}
-			
- 
+
+
 		},
 	}
 }

+ 6 - 4
pages/makedetail/makeImgDetail.scss

@@ -77,18 +77,20 @@
         flex-direction: row;
         align-items: center;
         justify-content: center;
-        border-radius: 40rpx;
+        border-radius: 30rpx;
         transition: transform 0.2s, box-shadow 0.2s;
-        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+        // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
         margin-left: 16rpx;
         background: #fff;
-        padding: 4rpx 12rpx 4rpx 8rpx;
+        padding: 6rpx 12rpx 6rpx 8rpx;
         &:active {
           transform: scale(0.98);
         }
 
         text {
-          // padding: 6rpx 15rpx;
+          display: inline-block;
+          padding-left: 4rpx;
+          line-height: 0;
         }
       }
     }

+ 2 - 2
pages/makedetail/makeImgDetail.vue

@@ -12,12 +12,12 @@
 				<view class="coinM" @click="isRecharge ? goPage('/pages/vip/M_purchase') : ''">
 					<image src="/static/icon/coin_m.png" mode="aspectFit"></image>
 					<text>{{ myinfo.num_gmm | formatNumberToK }}</text>
-					<view class="money-add" v-if="isRecharge">+</view>
+						<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 				</view>
 				<view class="coinC" @click="isRecharge ? goPage('/pages/my/job?type=recharge') : ''">
 					<image src="/static/icon/coin_cd.png" mode="aspectFit"></image>
 					<text>{{ myinfo.num_gmd | formatNumberToK }}</text>
-					<view class="money-add" v-if="isRecharge">+</view>
+						<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 				</view>
 			</view>
 		</view>

+ 6 - 4
pages/makedetail/makeMusicDetail.scss

@@ -77,18 +77,20 @@
         flex-direction: row;
         align-items: center;
         justify-content: center;
-        border-radius: 40rpx;
+        border-radius: 30rpx;
         transition: transform 0.2s, box-shadow 0.2s;
-        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+        // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
         margin-left: 16rpx;
         background: #fff;
-        padding: 4rpx 12rpx 4rpx 8rpx;
+        padding: 6rpx 12rpx 6rpx 8rpx;
         &:active {
           transform: scale(0.98);
         }
 
         text {
-          // padding: 6rpx 15rpx;
+          display: inline-block;
+          padding-left: 4rpx;
+          line-height: 0;
         }
       }
     }

+ 2 - 2
pages/makedetail/makeMusicDetail.vue

@@ -12,12 +12,12 @@
 				<view class="coinM" @click="isRecharge ? goPage('/pages/vip/M_purchase')  : ''">
 					<image src="/static/icon/coin_m.png" mode="aspectFit"></image>
 					<text>{{ myinfo.num_gmm | formatNumberToK }}</text>
-					<view class="money-add" v-if="isRecharge">+</view>
+						<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 				</view>
 				<view class="coinC" @click="isRecharge ?goPage('/pages/my/job?type=recharge')  : ''">
 					<image src="/static/icon/coin_cd.png" mode="aspectFit"></image>
 					<text>{{ myinfo.num_gmd | formatNumberToK }}</text>
-					<view class="money-add" v-if="isRecharge">+</view>
+						<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 				</view>
 			</view>
 		</view>

+ 25 - 9
pages/message/mailMessage.scss

@@ -12,11 +12,11 @@
 }
 .mainBody {
   width: 750rpx;
-  padding: 1rpx 20rpx;
+  padding: 1rpx 60rpx;
   z-index: 9;
   display: flex;
   flex-direction: column;
-  border-bottom: solid 2rpx #eeeeee;
+  border-bottom: solid 2rpx #F2F6F2;
   background: #fff;
   padding-top: calc(var(--status-bar-height) + 40rpx);
   padding-bottom: 10rpx;
@@ -54,6 +54,9 @@
       }
       &.active {
         color: #1f1f1f;
+        text{
+          font-family: "PingFang SC-Bold";
+        }
         ::after {
           opacity: 0.7;
         }
@@ -78,16 +81,25 @@
   // top: 50%;
   // transform: translate(-50%, -50%);
   .item {
-    margin-top: 20rpx;
+    // margin-top: 20rpx;
     color: #333;
     font-size: 28rpx;
     display: flex;
     flex-direction: row;
     align-items: center;
     width: 690rpx;
-    height: 200rpx;
-    border-bottom: 2rpx solid #eeeeee;
-
+    height: 200rpx; 
+    position: relative;
+    left: 0;
+    top: 0;
+    .line{
+      width: 100%;
+      height: 2rpx;
+      position: absolute;
+      left:32rpx;
+      bottom: 0;
+      background: #F2F6F2;
+    }
     .avator {
       width: 108rpx;
       height: 108rpx;
@@ -114,15 +126,17 @@
 
         .name {
           font-size: 32rpx;
+          font-family: "PingFang SC-Bold";
+          font-weight: 400;
         }
         .time {
-          font-size: 20rpx;
+          font-size: 24rpx;
           color: #999;
           margin-top: 8rpx;
           max-width: 400rpx;
         }
         .desc {
-          color: #999;
+          color: #1f1f1f;
           font-size: 28rpx;
           margin-top: 12rpx;
           display: -webkit-box;
@@ -141,6 +155,7 @@
         .works-image {
           width: 92rpx;
           height: auto;
+          border-radius: 12rpx;
         }
       }
       .thumbnail {
@@ -301,7 +316,7 @@
   left: 50%;
   transform: translate(-50%, -50%);
 		.tips-title{
-			padding: 50rpx 0;
+			padding: 20rpx 0;
       padding-bottom: 30rpx;
 		}
   > view {
@@ -325,5 +340,6 @@
     font-size: 24rpx;
     font-family: "PingFang SC-Medium";
     color: #999999;
+    text-wrap: nowrap;
   }
 }

+ 4 - 4
pages/message/mailMessage.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page" :style="{ background: bgColor }">
+	<view class="page" :style="{ background: tab == 1 ? '#f2f6f2' : '#ffffff',borderWidth:tab==2?'2rpx':'none' }">
 		<view class="mainBody">
 			<!-- <scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="0"> -->
 			<view class="tabs">
@@ -27,7 +27,7 @@
 								<!--  {{ item.create_time }} -->
 								{{ ' ' + item.tdate }}
 							</view>
-							<view class="desc">{{ item.content }}</view>
+							<view class="desc">{{ item.content }} </view>
 						</view>
 						<view class="right-image">
 							<image class="works-image" mode="widthFix" v-if="item.image" :src="formatImage(item.image)">
@@ -36,6 +36,7 @@
 							</image>
 						</view>
 					</view>
+					<view class="line"></view>
 				</view>
 
 
@@ -67,7 +68,7 @@
 								mode="widthFix"></image>
 							<view class="title one-omit">{{ item.title }} </view>
 							<view class="content">{{ item.content }}</view>
-							<view class="viewDetails" v-if="item.article_id!=0">
+							<view class="viewDetails" v-if="item.article_id != 0">
 								<text>查看详情</text>
 								<image src="../../static/me/wd_icon_jiantou2.png"></image>
 							</view>
@@ -136,7 +137,6 @@ export default {
 				1: "sms",
 				2: "hudong",
 			},
-			bgColor: "#ffffff",
 		};
 	},
 	onLoad() {

+ 1 - 1
pages/my/follow.scss

@@ -16,11 +16,11 @@
     width: 96rpx;
 	height: 48rpx;
     font-size: 32rpx; 
-	  font-family: 'PingFang SC-Bold'; 
       color: #999;
       font-weight: 400;
       transition: all .5s;
     &.active {
+	  font-family: 'PingFang SC-Bold';  
 		color: #1F1F1F;
 		background: url("../../static/me/wd_img_qiehuan.png") center / cover no-repeat;
        

+ 14 - 6
pages/my/my.scss

@@ -252,7 +252,8 @@ page {
       .top-box {
         display: flex;
         justify-content: space-between;
-        padding-top: 8rpx;
+        align-items: center;
+        // padding-top: 8rpx;
         background: url("../../static/me/car-top-bg-center.png") top center/
           146rpx 50rpx no-repeat;
           padding-right: 24rpx;
@@ -280,6 +281,7 @@ page {
         display: flex;
         padding-right: 24rpx;
         padding-left: 24rpx;
+        padding-top: 8rpx;
         .avator {
           width: 120rpx;
           height: 120rpx;
@@ -315,8 +317,8 @@ page {
             }
           }
           .label {
-            height: 55rpx;
-            height: 110rpx;
+            height: 50rpx;
+            // height: 110rpx;
             overflow: hidden;
             > view {
               color: #acf934;
@@ -341,7 +343,7 @@ page {
         padding-left: 24rpx;
         .intro_text {
           color: #1f1f1f;
-          font-size: 28rpx;
+          font-size: 24rpx;
           font-family: "PingFang SC-Bold";
           font-weight: 400;
           padding-right: 0rpx;
@@ -401,7 +403,7 @@ page {
             display: flex;
             align-items: center;
             background: #f2f6f2;
-            border-radius: 238rpx;
+            border-radius: 30rpx;
             padding: 6rpx 12rpx 6rpx 8rpx;
             &:first-child {
               margin-right: 18rpx;
@@ -410,8 +412,14 @@ page {
               width: 40rpx;
               height: 40rpx;
             }
+            text {
+              display: inline-block;
+              padding-left: 4rpx;
+              line-height: 0;
+            }
           }
         }
+        
       }
 
       .follow_info {
@@ -518,7 +526,7 @@ page {
       left: 0;
       top: 0;
       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 {
         transform: scale(0.95);

+ 4 - 4
pages/my/my.vue

@@ -63,13 +63,13 @@
 							<view class="points-box">
 								<view class="points" @click="isRecharge ? goPage('/pages/vip/M_purchase') : ''">
 									<image src="@/static/icon/wd_icon_coin.png" mode=""></image>
-									{{ myinfo.num_gmm | formatNumberToK }}
-									<view class="money-add" v-if="isRecharge">+</view>
+									<text>{{ myinfo.num_gmm | formatNumberToK }}</text>
+										<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 								</view>
 								<view class="points" @click="isRecharge ? goPage('/pages/my/job?type=recharge') : ''">
 									<image src="@/static/icon/coin_cd.png" mode=""></image>
-									{{ myinfo.num_gmd | formatNumberToK }}
-									<view class="money-add" v-if="isRecharge">+</view>
+									<text>{{ myinfo.num_gmd | formatNumberToK }}</text>
+										<image class="money-add" v-if="isRecharge" src="/static/icon/coin_add.png" mode="aspectFit"></image>
 								</view>
 							</view>
 						</view>

BIN
static/icon/coin_add.png