Merge branch 'main' of http://123.207.203.228:3000/shang/yfs

pages/shouye/yaoqing_ranking.vue

@@ -16,11 +16,14 @@
 				:style="{top:$sys().statusBarHeight+'px'}" @tap="$c.back(1)" color="#000000"></uni-icons>
 			<view class="" :style="{top:$sys().statusBarHeight+'px'}"
 				style="position: absolute;width: 100%; position: absolute; font-weight: 400; text-align: center; font-size: 37rpx; color: #000000;">
-				邀新排行榜</view>
+				邀请排行榜</view>
 		</view>
 
-		<view class=""
-			style="width: 100%; height: 480rpx; margin-top: 200rpx; display: flex; flex-direction: row;">
+		<image :src="$img('/static/image/reward_rule.png')" style="width: 686rpx; height: 120rpx; margin-top: 232rpx;"
+			@click="$refs.rulePop.getRule(15, '规则说明')" mode=""></image>
+
+
+		<view class="" style="width: 100%; height: 480rpx; margin-top: 20rpx; display: flex; flex-direction: row;">
 
 			<!-- 第二名 -->
 			<view class="common_bg"
@@ -106,12 +109,13 @@
 					<text style="font-size: 20rpx; color: #333333;">{{item.nickname}}</text>
 				</view>
 				<view class="" style="margin-right: 20rpx;">
-					<span style="color: #333333; font-size: 32rpx;">{{item.invitenumber}}<text style="font-size: 16rpx; color: #8A8A8A;">人</text></span>
+					<span style="color: #333333; font-size: 32rpx;">{{item.invitenumber}}<text
+							style="font-size: 16rpx; color: #8A8A8A;">人</text></span>
 				</view>
 
 			</view>
 		</view>
-
+		<rule-pop ref="rulePop"></rule-pop>
 	</view>
 </template>
 

pages/user/index.vue

@@ -40,11 +40,11 @@
 				<image style="width: 206rpx; height: 206rpx; position: absolute; top: -40rpx; right: 8rpx;"
 					:src="$img1('my/ou.png')"></image>
 			</view>
-			
+
 			<!-- <view class="rbtn btn1 flex" @click="$c.to({ url: '/package/index/sign' })">
 				<image class="img100" :src="$img1('my/sign.png')"></image>
 			</view> -->
-			
+
 		</view>
 		<view class="">
 
@@ -52,25 +52,26 @@
 
 		<view class="money-card">
 			<view class="other-num">
+				<view class="other-item" @click="$c.to({ url: '/pages/user/yetx' })">
+					<view class="num">{{ userinfo.money || '0.00' }}</view>
+					<view class="title">{{$config.getAppSetting('balance_name')}}</view>
+				</view>
 				<view class="other-item" @click="$c.to({ url: '/pages/user/bi_jl' })">
 					<view class="num" style="color: #333333;">{{ userinfo.integral || 0 }}</view>
 					<view class="title">{{$config.getAppSetting('currency1_name')}}</view>
 				</view>
 
-				<!-- <view class="other-item" @click="$c.to({ url: '/pages/user/jf_jl' })">
+				<view class="other-item" @click="$c.to({ url: '/pages/user/jf_jl' })">
 					<view class="num" style="color: #333333;">{{ userinfo.money2 || 0 }}</view>
 					<view class="title">{{$config.getAppSetting('currency2_name')}}</view>
-				</view> -->
+				</view>
 
 				<!-- <view class="other-item" @click="$c.to({ url: '/pages/user/my_coupon' })">
 					<view class="num">{{ userinfo.coupon || 0 }}</view>
 					<view class="title">欧气券</view>
 				</view> -->
 
-				<view class="other-item" @click="$c.to({ url: '/pages/user/yetx' })">
-					<view class="num">{{ userinfo.money || '0.00' }}</view>
-					<view class="title">{{$config.getAppSetting('balance_name')}}</view>
-				</view>
+
 
 			</view>
 
@@ -1434,7 +1435,7 @@
 						height: 6rpx;
 						border-radius: 6rpx;
 						// border: 1px solid #111111;
-						
+
 						/deep/.cmd-progress-inner {
 							background: #CCCCCC;
 						}

pages/user/jf_jl.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
-		<uni-nav-bar left-icon="left" title="积分明细" color="#000" backgroundColor="transparent" :fixed="true"
-			:statusBar="true" :border="false" @clickLeft="back"></uni-nav-bar>
-
+		<uni-nav-bar left-icon="left" :title="$config.getAppSetting('currency2_name')+'明细'" color="#000"
+			backgroundColor="transparent" :fixed="true" :statusBar="true" :border="false"
+			@clickLeft="back"></uni-nav-bar>
 		<view class="tab-list align-center">
 			<view @click="getlist(i)" v-for="(item, i) in arr" :key="i" class="tab-list-item flex center"
 				:class="{active: show == i}">