Merge branch 'master' of http://115.29.66.169:10080/qingyunhui/app

assets/iconfont/iconfont.json

@@ -162,7 +162,7 @@
     {
       "icon_id": "566360",
       "name": "箭头",
-      "font_class": "jiantou",
+      "font_class": "jiantou1",
       "unicode": "e64a",
       "unicode_decimal": 58954
     },

assets/iconfont/iconfont.wxss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont2"; /* Project id 5026361 */
-  src: url('/assets/iconfont/iconfont.woff2?t=1759045297361') format('woff2'),
-       url('/assets/iconfont/iconfont.woff?t=1759045297361') format('woff'),
-       url('/assets/iconfont/iconfont.ttf?t=1759045297361') format('truetype');
+  src: url('/assets/iconfont/iconfont.woff2?t=1759048628404') format('woff2'),
+       url('/assets/iconfont/iconfont.woff?t=1759048628404') format('woff'),
+       url('/assets/iconfont/iconfont.ttf?t=1759048628404') format('truetype');
 }
 
 .iconfont2 {
@@ -101,7 +101,7 @@
   content: "\e63c";
 }
 
-.icon-jiantou:before {
+.icon-jiantou1:before {
   content: "\e64a";
 }
 

pages/my/index/index.wxml

@@ -1,7 +1,8 @@
 <!-- pages/my/index/index.wxml -->
 <view class="mycontent" style="background-image: url('/assets/images/user-icon/user-bg.png');">
     <!-- 自定义导航栏 -->
-    <view class="custom-navbar" style="background-image: url('/assets/images/user-icon/user-bg1.png');padding-top:{{statusBarHeightTop}}">
+    <view class="custom-navbar"
+        style="background-image: url('/assets/images/user-icon/user-bg1.png');padding-top:{{statusBarHeightTop}}">
         <view class="navbar-content" style="padding-top:{{statusBarHeightTop}}">
             <view class="navbar-left">
                 <view class="customer-service" bindtap="onCustomerServiceTap">
@@ -18,7 +19,8 @@
             <view class="user-info-container">
                 <view class="user-basic-info">
                     <view class="avatar-section">
-                        <image src='{{userInfo.memberphoto?userInfo.memberphoto:(appAssetsUrl+"images/bz1_nor.png")}}' class="user-avatar" bindtap="onAvatarTap"></image>
+                        <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">
@@ -28,7 +30,9 @@
                             <!-- <view class="gender-icon {{userInfo.gender === 'female' ? 'female' : 'male'}}">
                                     <text>{{userInfo.gender === 'female' ? '♀' : '♂'}}</text>
                                 </view> -->
-                            <image wx:if="{{userInfo.sex}}" mode="aspectFill" src="{{ userInfo.sex == '010' ? appAssetsUrl2+'wjxy/man.png' : appAssetsUrl2+'wjxy/wumen.png'}}" class="sex" />
+                            <image wx:if="{{userInfo.sex}}" mode="aspectFill"
+                                src="{{ userInfo.sex == '010' ? appAssetsUrl2+'wjxy/man.png' : appAssetsUrl2+'wjxy/wumen.png'}}"
+                                class="sex" />
                         </view>
                         <view class="user-id-row">
                             <text class="user-id">ID: {{userInfo.id || ''}}</text>
@@ -45,7 +49,8 @@
                     </view>
                 </view>
                 <!-- 会员升级提示 -->
-                <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap" style="background-image: url('/assets/images/user-icon/vip-upgrade-bg.png');">
+                <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap"
+                    style="background-image: url('/assets/images/user-icon/vip-upgrade-bg.png');">
                     <view class="vip-banner-left" wx:if="{{userInfo.memberState != 0}}">
                         <image src="/assets/images/user-icon/vip-icon.png" class="upgrade-icon"></image>
                         <text class="upgrade-text">青雲慧 {{userInfo.cardno}}</text>
@@ -55,7 +60,7 @@
                         <text class="upgrade-text">升级会员立享更多权益</text>
                     </view>
                     <view class="vip-banner-right">
-                        <text class="upgrade-btn">{{  userInfo.memberState == 0 ? '开通会员' : '升级会员' }}</text>
+                        <text class="upgrade-btn">{{ userInfo.memberState == 0 ? '开通会员' : '升级会员' }}</text>
                         <text class="iconfont icon-jiantou righticon"></text>
                     </view>
                 </view>
@@ -82,8 +87,10 @@
         <view class="my-registration">
             <view class="section-title">我的报名</view>
             <view class="registration-cards">
-                <image src="/assets/images/user-icon/user-job-icon.png" class="card-icon" bindtap="onJobRegistrationTap"></image>
-                <image src="/assets/images/user-icon/user-activity-icon.png" class="card-icon" bindtap="onActivityRegistrationTap"></image>
+                <image src="/assets/images/user-icon/user-job-icon.png" class="card-icon"
+                    bindtap="onJobRegistrationTap"></image>
+                <image src="/assets/images/user-icon/user-activity-icon.png" class="card-icon"
+                    bindtap="onActivityRegistrationTap"></image>
             </view>
         </view>
         <!-- 功能菜单列表 -->

pages/my/myCollection/myCollection.wxml

@@ -51,6 +51,7 @@
 				</view>
 			</view>
 			<view class="txt-con txt-con-fix">
+				<view class="iconfont2 icon-dizhi"></view>
 				<view class="title">{{item.activity.title}}</view>
 				<view class="item">
 					<image mode="widthFix" src="{{appAssetsUrl}}/images/date-icon.png" style="width: 28rpx;" />