chengjunhui 3 天之前
父節點
當前提交
6c7431f290

二進制
assets/images/user-icon/icon_10.png


二進制
assets/images/user-icon/icon_11.png


二進制
assets/images/user-icon/icon_12.png


二進制
assets/images/user-icon/icon_6.png


二進制
assets/images/user-icon/icon_7.png


二進制
assets/images/user-icon/icon_8.png


二進制
assets/images/user-icon/icon_9.png


+ 5 - 0
invitationCode/index.js

@@ -79,6 +79,11 @@ Page({
 			}
 		});
 	},
+	handleInvite() {
+		wx.navigateTo({
+			url: "/pages/my/myInvite/myInvite",
+		});
+	},
 	/**
 	 * 生命周期函数--监听页面初次渲染完成
 	 */

+ 2 - 1
invitationCode/index.wxml

@@ -14,8 +14,9 @@
 		</view>
 		<view class="tip">邀请二维码</view>
 	</view>
-	<view class="bottom" style="height: calc(12vh + {{bottomLeft}}px);">
+	<view class="bottom">
 		<button class="btn1" bindtap="downloadQR">保存图片</button>
+		<button class="btn2" style="margin-bottom: 20rpx;" bindtap="handleInvite">我的邀请</button>
 		<button class="btn2" open-type="share">分享</button>
 	</view>
 </view>

+ 1 - 1
invitationCode/index.wxss

@@ -96,7 +96,7 @@ page{
 	bottom: 24rpx;
 	left: 50%;
 	transform: translateX(-50%);
-	height: 12vh;
+	/* height: 12vh; */
 }
 
 .btn1{

+ 10 - 11
orderRecord/index.wxml

@@ -2,18 +2,17 @@
 <view class="main">
   <view class="body" wx:if="{{listData.length>0}}">
     <view class="card" wx:for="{{listData}}">
-      <view class="title" wx:if="{{item.businessType == 1}}">会员购买:{{item.buyContent}}</view>
-      <view class="title" wx:if="{{item.businessType == 2}}">请教行家:{{item.buyContent}}</view>
-      <view class="title" wx:if="{{item.businessType == 3}}">购买活动:{{item.buyContent}}</view>
-      <view class="title" wx:if="{{item.businessType == -1}}">退款:{{item.buyContent}}</view>
+      <view class="title">订单编号:{{item.payNo}}</view>
       <view class="info">
-        <view class="orderNo">订单编号:{{item.payNo}}</view>
-        <view class="payTime">支付时间:{{item.payTime}}</view>
-        <view class="orderPrice">
-          <view class="priceBox">价格:<text class="price">¥<text>{{item.price}}</text>元</text></view>
-          <view class="deduction">积分抵扣:<text class="price"><text>{{item.pointsDeduction}}</text></text></view>
-        </view>
-        <view class="actually">实付:<text class="price">¥<text>{{item.actuallyPaid}}</text>元</text></view>
+        <view class="orderNo" wx:if="{{item.businessType == 1}}">会员购买:<text class="text">{{item.buyContent}}</text></view>
+        <view class="orderNo" wx:if="{{item.businessType == 2}}">请教行家:<text class="text">{{item.buyContent}}</text></view>
+        <view class="orderNo" wx:if="{{item.businessType == 3}}">购买活动:<text class="text">{{item.buyContent}}</text></view>
+        <view class="orderNo" wx:if="{{item.businessType == -1}}">退款:<text class="text">{{item.buyContent}}</text></view>
+        <view class="orderNo">支付时间:<text class="text">{{item.payTime}}</text></view>
+        <!--<view class="orderPrice"></view>-->
+        <view class="orderNo actually">价格:<text class="price">¥<text>{{item.price}}</text>元</text></view>
+        <view class="orderNo">积分抵扣:<text class="text"><text>{{item.pointsDeduction}}</text></text></view>
+        <view class="orderNo actually">实付:<text class="price">¥<text>{{item.actuallyPaid}}</text>元</text></view>
       </view>
     </view>
   </view>

+ 10 - 6
orderRecord/index.wxss

@@ -1,10 +1,10 @@
 /* orderRecord/index.wxss */
 page {
-  background-color: #f3f3f3;
+  background-color: #f7f8fa;
 }
 .main {
   padding: 30rpx;
-  background-color: #f3f3f3;
+  background-color: #f7f8fa;
 }
 /* .card{
 	padding: 45rpx 22rpx;
@@ -51,9 +51,11 @@ page {
 }
 
 .card .title {
-  padding: 37rpx 0 14rpx 30rpx;
+  padding: 35rpx 24rpx 24rpx 24rpx;
   margin-bottom: 20rpx;
   border-bottom: 1rpx solid #e6e6e6;
+  font-size: 30rpx;
+  font-weight: 700;
 }
 
 .card .info {
@@ -63,9 +65,11 @@ page {
 }
 
 .card .info .orderNo {
-  margin-bottom: 12rpx;
+  margin-bottom: 10rpx;
+}
+.card .info .orderNo .text{
+  color: #808080 !important;
 }
-
 .card .info .payTime {
   margin-bottom: 5rpx;
 }
@@ -86,6 +90,6 @@ page {
 }
 
 .card .info .price text {
-  font-size: 30rpx;
+  font-size: 26rpx;
   font-weight: 500;
 }

+ 19 - 0
pages/home/index/index.js

@@ -100,6 +100,7 @@ Page({
     goodsList0: [],
     goodsList1: [],
     shopList: [],
+    activeTitle: false
   },
   moreHandler() {
     this.experience();
@@ -936,4 +937,22 @@ Page({
     );
   },
   onShareAppMessage: function () { },
+  onPageScroll: function (e) {
+    if (
+      e.scrollTop >= 10 &&
+      this.data.activeTitle == false
+    ) {
+      this.setData({
+        activeTitle: true,
+      });
+    }
+    if (
+      e.scrollTop < 10 &&
+      this.data.activeTitle == true
+    ) {
+      this.setData({
+        activeTitle: false,
+      });
+    }
+  },
 });

+ 1 - 1
pages/match/index.js

@@ -178,7 +178,7 @@ Page({
       height += 4; //android 28px
       mH += 4;
     }
-    height = height + 100;
+    height = height + 60;
     // height = height + 38 + 118;
     // 胶囊高度 32px 下边框6px height 状态栏高度
     this.setData({

+ 3 - 3
pages/match/index.wxml

@@ -2,8 +2,8 @@
 <view class="match-container">
     <!-- 头部横幅区域 -->
     <view class="header-banner">
-        <view class="title {{activeTitle ? 'activeTitle' : ''}}" style="padding-top:{{statusBarHeightTop}}">创业赛事</view>
-        <view class="banner-bg">
+        <view class="title {{activeTitle ? 'activeTitle' : ''}}" style="padding-top:{{statusBarHeightTop}};color: {{imglist.length ? '' : '#000000'}}">创业赛事</view>
+        <view class="banner-bg" wx:if="{{imglist.length}}">
             <!--<image class="character-image" src="/assets/images/tournament-bg.png" mode="widthFix"></image>-->
             <swiper autoplay="{{true}}" current="{{current}}" bindchange="changeSwiper" interval="{{2000}}" duration="{{500}}" class="bg">
                 <block wx:for="{{imglist}}" wx:key="index">
@@ -15,7 +15,7 @@
         </view>
     </view>
     <!-- 赛事列表区域 -->
-    <view class="match-list">
+    <view class="match-list" style="padding-top: {{imglist.length ? 0 : statusBarHeight}}">
         <!-- <view class="section-title">2025年夏季创业大赛季创业大赛</view> -->
         <view class="match-items">
             <view class="match-item" wx:for="{{matchList}}" wx:key="index" bindtap="onMatchItemTap" data-index="{{index}}">

+ 1 - 1
pages/match/index.wxss

@@ -8,7 +8,7 @@
 /* 头部横幅区域 */
 .header-banner {
   position: relative;
-  height: 486rpx;
+  /* height: 486rpx; */
   overflow: hidden;
   flex-shrink: 0;
 }

+ 13 - 10
pages/my/index/index.wxml

@@ -20,8 +20,8 @@
                     <view class="avatar-section">
                         <image src='{{userInfo.memberphoto?userInfo.memberphoto:(appAssetsUrl+"images/bz1_nor.png")}}' class="user-avatar" bindtap="onAvatarTap"></image>
                     </view>
-                    <view class="user-details" wx:if="{{isLogin}}" bindtap="onAvatarTap">
-                        <view class="user-name-row">
+                    <view class="user-details" wx:if="{{isLogin}}">
+                        <view class="user-name-row" bindtap="onAvatarTap">
                             <text class="user-name">{{userInfo.vipname || '--'}}</text>
                             <image class="vip-icon" wx:if="{{userInfo.memberState != 0 &&  userInfo.memberState}}" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
                             <image wx:if="{{userInfo.sex}}" mode="aspectFill" src="{{ userInfo.sex == '010' ? appAssetsUrl2+'wjxy/man.png' : appAssetsUrl2+'wjxy/wumen.png'}}" class="sex" />
@@ -29,6 +29,7 @@
                         <view class="user-id-row">
                             <text class="user-id">ID: {{userInfo.id || ''}}</text>
                             <view class="check-in" bindtap="onDailySignTap">
+                                <image src="/assets/images/user-icon/icon_6.png" class="service-icon"></image>
                                 <text>签到</text>
                             </view>
                         </view>
@@ -100,21 +101,23 @@
             </view>
             <view class="menu-item" bindtap="toOrderRecord">
                 <view class="menu-left">
-                    <image src="/assets/images/user-icon/icon_2.png" class="menu-icon"></image>
+                    <image src="/assets/images/user-icon/icon_7.png" class="menu-icon"></image>
                     <text class="menu-text">订单管理</text>
                 </view>
                 <text class="iconfont icon-jiantou righticon"></text>
             </view>
-            <view class="menu-item" bindtap="handleInvite">
-                <view class="menu-left">
-                    <image src="/assets/images/user-icon/icon_2.png" class="menu-icon"></image>
-                    <text class="menu-text">我的邀请</text>
+            <!--
+                <view class="menu-item" bindtap="handleInvite">
+                    <view class="menu-left">
+                        <image src="/assets/images/user-icon/icon_2.png" class="menu-icon"></image>
+                        <text class="menu-text">我的邀请</text>
+                    </view>
+                    <text class="iconfont icon-jiantou righticon"></text>
                 </view>
-                <text class="iconfont icon-jiantou righticon"></text>
-            </view>
+            -->
             <view class="menu-item" bindtap="handleMsg">
                 <view class="menu-left">
-                    <image src="/assets/images/user-icon/icon_2.png" class="menu-icon"></image>
+                    <image src="/assets/images/user-icon/icon_8.png" class="menu-icon"></image>
                     <text class="menu-text">消息通知</text>
                 </view>
                 <text class="iconfont icon-jiantou righticon"></text>

+ 5 - 0
pages/my/index/index.wxss

@@ -184,6 +184,11 @@
   color: #ffffff;
 }
 
+.check-in image{
+  width: 22rpx;
+  height: 22rpx;
+}
+
 .qr-code-section {
   padding: 16rpx;
   text-align: center;

+ 1 - 1
pages/myMember/myMember.js

@@ -372,7 +372,7 @@ Page({
     this.height();
     this.data.params.id = util.getUserId();
     wx.setNavigationBarTitle({
-      title: "无界",
+      title: "青雲慧",
     });
     this.getVipSelect();
 	

+ 11 - 5
pages/myMember/myMember.wxml

@@ -15,11 +15,15 @@
       <view>
         <view class="name">{{detail.vipname}}</view>
         <view class="info-item">
-          <view class="icon-box"><image class='micon img-icon' style="width:36rpx;height:30rpx;margin-right:2rpx;" src='{{appAssetsUrl}}/images/my/diamonds.png'></image></view>
+          <view class="icon-box">
+            <image class='micon img-icon' style="width:30rpx;height:28rpx;margin-right:2rpx;" src='/assets/images/user-icon/icon_11.png'></image>
+          </view>
           <text class="name-text">{{detail.memberState == 0 ? '普通会员' : '青雲慧生长'}}</text>
         </view>
         <view class="info-item">
-          <view class="icon-box"><image class='micon' style="width:25rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/calendar.png'></image></view>
+          <view class="icon-box">
+            <image class='micon' style="width:25rpx;height:23rpx;" src='/assets/images/user-icon/icon_12.png'></image>
+          </view>
           <text wx:if="{{detail.memberState == 0}}">到期时间:未开通</text>
           <text wx:if="{{detail.memberState == 1}}">到期时间:{{detail.expireTime}}</text>
           <text wx:if="{{detail.memberState == 2}}">到期时间:终生有效</text>
@@ -28,7 +32,9 @@
 
         <!-- <view>到期时间:{{detail.memberState == 0 ? '未开通' : detail.expireTime}}</view> -->
         <view class="info-item">
-          <view class="icon-box"><image class='micon' style="width:28rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/cardNo.png'></image></view>
+          <view class="icon-box">
+            <image class='micon' style="width:28rpx;height:22rpx;" src='/assets/images/user-icon/icon_10.png'></image>
+          </view>
           <text>卡号:{{detail.cardno}}</text>
         </view>
       </view>
@@ -39,7 +45,7 @@
 
     <view class="vip-box">
       <view class="{{currentImg == 1 ? 'active-line vip-item' : 'vip-item'}}" style="background: url({{appAssetsUrl2}}wjxy/mine/yearBg.png) no-repeat;background-size: 100% 100%;" data-currentImg="1" bindtap="changeVip">
-        <icon class="icon-small" type="success" size="23" color="#EABC77" class="{{currentImg == 1 ? 'succ-icon' : ''}}" wx:if="{{currentImg == 1}}"></icon>
+        <icon class="icon-small" type="success" size="14" color="#88bb26" class="{{currentImg == 1 ? 'succ-icon' : ''}}" wx:if="{{currentImg == 1}}"></icon>
         <view class="icon-box">
           <image class="vip-img" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
           <text>年度VIP会员</text>
@@ -51,7 +57,7 @@
         </text>
       </view>
       <view class="{{ currentImg == 2 ? 'vip-item lifelongBg active-line' : 'vip-item lifelongBg'}}" style="background: url({{appAssetsUrl2}}wjxy/mine/lifelongBg.png) no-repeat;background-size: 100% 100%;" data-currentImg="2" bindtap="changeVip">
-        <icon class="icon-small" type="success" size="23" color="#EABC77" class="{{currentImg == 2 ? 'succ-icon' : ''}}" wx:if="{{currentImg == 2}}"></icon>
+        <icon class="icon-small" type="success" size="14" color="#88bb26" class="{{currentImg == 2 ? 'succ-icon' : ''}}" wx:if="{{currentImg == 2}}"></icon>
         <view class="icon-box">
           <image class="vip-img" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
           <text>终身VIP会员</text>

+ 3 - 3
pages/myMember/myMember.wxss

@@ -50,8 +50,8 @@
   left: 16rpx;
   top: 8rpx;
   border-radius: 50%;
-  border: 1rpx solid #cf4f51;
-  background-color: #cf4f51;
+  /* border: 1rpx solid #cf4f51;
+  background-color: #cf4f51; */
 }
 
 .all-view {
@@ -143,7 +143,7 @@ page {
   text-align: center;
 }
 .active-line {
-	border: 2rpx solid #CF4F51;
+	border: 2rpx solid #88bb26;
 	border-radius: 18rpx;
 	box-sizing: border-box;
 }