fix: 我的规则 增加显示字段

pages/directPromotionList/module/index.rpx.css

@@ -1,6 +1,6 @@
 .item{
     padding: 20rpx 32rpx;
-    background: #b1aeae;
+    background: #ffffff;
     margin-top: 24rpx;
     border-radius: 15rpx;
 }

pages/index/attach/attach.vue

@@ -37,21 +37,19 @@
 			</view>
 		</view>
 
-
-		<view class="flex-row">
-			<view class="flex-col justify-center">
-				<text class="roleSelectLabel">选择规则：</text>
-			</view>
-			<view class="roleSelect">
-				<uni-data-select v-model="value" :localdata="roleBindRuleList" @change="selectChange" :clear="false"></uni-data-select>
-			</view>
-		</view>
-
 		<view class="flex-row justify-center" v-if="showQrCode">
 			<view class="qrView" @click="qrCodePopup">
 				<uv-qrcode ref="qrcode" size="600rpx" :value="qrcodeUrl" :options="options"></uv-qrcode>
 			</view>
 		</view>
+    <view class="flex-row">
+      <view class="flex-col justify-center">
+        <text class="roleSelectLabel">选择规则：</text>
+      </view>
+      <view class="roleSelect">
+        <uni-data-select placement="top" style="width:492rpx;background: #FFFFFF" v-model="value" :localdata="roleBindRuleList" @change="selectChange" :clear="false"></uni-data-select>
+      </view>
+    </view>
 
 		<uni-popup ref="createQrCodePopup" type="center">
 			<view class="createQrCodePopup flex-col justify-center">

pages/index/manager/manager.vue

@@ -46,20 +46,19 @@
 			</view>
 		</view>
 
-		<view class="flex-row">
-			<view class="flex-col justify-center">
-				<text class="roleSelectLabel">选择角色：</text>
-			</view>
-			<view class="roleSelect">
-				<uni-data-select v-model="value" :localdata="roleList" @change="selectChange" :clear="false"></uni-data-select>
-			</view>
-		</view>
-
 		<view class="flex-row justify-center" v-if="showQrCode">
 			<view class="qrView" @click="qrCodePopup">
 				<uv-qrcode ref="qrcode" size="600rpx" :value="qrcodeUrl" :options="options"></uv-qrcode>
 			</view>
 		</view>
+    <view class="flex-row ">
+      <view class="flex-col justify-center">
+        <text class="roleSelectLabel">选择角色：</text>
+      </view>
+      <view class="roleSelect">
+        <uni-data-select style="width:492rpx;background: #FFFFFF" placement="top" v-model="value" :localdata="roleList" @change="selectChange" :clear="false"></uni-data-select>
+      </view>
+    </view>
 
 		<uni-popup ref="createQrCodePopup" type="center">
 			<view class="createQrCodePopup flex-col justify-center">

pages/my/my.vue

@@ -80,7 +80,7 @@
 				<uni-list-item v-if="userInfo.roleTag == 1" :clickable="true" title="购买优惠券" to="/pages/purchaseCoupon/purchaseCoupon" showArrow thumb="/static/my/coupon.png" thumb-size="sm" />
 				<uni-list-item v-if="userInfo.isManager == 1" :clickable="true" title="拓客排行榜" to="/pages/spreadRankingList/spreadRankingList" showArrow thumb="/static/my/ranking.png" thumb-size="sm"/>
 				<uni-list-item v-if="userInfo.isManager == 0" :clickable="true" title="我的规则" to="/pages/myRules/index" showArrow thumb="/static/my/ranking.png" thumb-size="sm"/>
-				<uni-list-item v-if="userInfo.isManager == 1" :clickable="true" title="我的角色" to="/pages/myRole/index" showArrow thumb="/static/my/ranking.png" thumb-size="sm"/>
+				<uni-list-item v-if="userInfo.isManager == 1" :clickable="true" title="拓客规则" to="/pages/myRole/index" showArrow thumb="/static/my/ranking.png" thumb-size="sm"/>
 			</uni-list>
 		</view>
 

pages/myRole/index.vue

@@ -2,14 +2,16 @@
   <view class="page">
     <!-- #ifdef H5-->
     <uni-nav-bar v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"
-                 left-icon="left" title="我的角色" @clickLeft="back"/>
+                 left-icon="left" title="拓客规则" @clickLeft="back"/>
     <!-- #endif -->
     <view class="flex-col item" v-for="(item,index) in list" :key="index" @click="JumpRules(item)">
-      <view class="flex-row">
-        <text class="key">角色名称:</text>
+      <view class="justify-between">
         <view>
           <view class="phone">{{ item.name }}</view>
         </view>
+        <view >
+          <uni-icons type="right" color="#979595" size="20"></uni-icons>
+        </view>
       </view>
     </view>
     <!--#ifdef H5-->

pages/myRules/index.rpx.css

@@ -25,7 +25,7 @@
 }
 .storeName{
 	height: 48rpx;
-	font-size: 28rpx;
+	font-size: 32rpx;
 	font-weight: 400;
 	color: #666666;
 	line-height: 48rpx;

pages/myRules/index.vue

@@ -18,21 +18,45 @@
             <view class="phone">消费现金:{{ item.consumeAmount }}元</view>
             <view class="phone">消费比例:{{ item.consumeRatio * 100 }}%</view>
           </view>
+          <view class="flex-row">
+            <view class="phone">充值现金:{{ item.rechargeAmount }}元</view>
+            <view class="phone">充值比例:{{ item.rechargeRatio * 100 }}%</view>
+          </view>
+          <view class="flex-row">
+            <view class="phone">首消现金:{{ item.firstConsumeAmount }}元</view>
+            <view class="phone">首消比例:{{ item.firstConsumeRatio * 100 }}%</view>
+          </view>
+          <view class="flex-row">
+            <view class="phone">首充现金:{{ item.firstRechargeAmount }}元</view>
+            <view class="phone">首充比例:{{ item.firstRechargeRatio * 100 }}%</view>
+          </view>
         </view>
       </view>
       <view class="flex-row">
         <text class="key">间推:</text>
         <view>
           <view class="flex-row">
-            <view class="phone">间推现金:{{ item.indirectRechargeAmount }}元</view>
-            <view class="phone">间推比例:{{ item.indirectRechargeRatio * 100 }}%</view>
+            <view class="phone">消费现金:{{ item.indirectAmount }}元</view>
+            <view class="phone">消费比例:{{ item.indirectRatio * 100 }}%</view>
+          </view>
+          <view class="flex-row">
+            <view class="phone">充值现金:{{ item.indirectRechargeAmount }}元</view>
+            <view class="phone">充值比例:{{ item.indirectRechargeRatio * 100 }}%</view>
+          </view>
+          <view class="flex-row">
+            <view class="phone">首消现金:{{ item.indirectFirstConsumeAmount }}元</view>
+            <view class="phone">首消比例:{{ item.indirectFirstConsumeRatio * 100 }}%</view>
+          </view>
+          <view class="flex-row">
+            <view class="phone">首充现金:{{ item.indirectFirstRechargeAmount }}元</view>
+            <view class="phone">首充比例:{{ item.indirectFirstRechargeRatio * 100 }}%</view>
           </view>
         </view>
       </view>
       <view class="flex-row" v-for="i in item.strategyList">
         <text class="key">优惠券:</text>
         <view>
-          <view class="phone">{{i.name}} <span style="font-size: 16rpx"> ({{ i.startTime }}至{{ i.endTime }})</span></view>
+          <view class="phone">{{i.name}}</view>
         </view>
       </view>
     </view>

pages/spreadRankingList/module/mescrollUni-item.vue

@@ -7,36 +7,18 @@
     <!-- top的高度等于悬浮菜单tabs的高度 -->
     <mescroll-uni :ref="'mescrollRef' + i" @init="mescrollInit" :height="height" :down="downOption" @down="downCallback"
                   :up="upOption" @up="upCallback" @emptyclick="emptyClick">
-
+<!--      <view class="flex-row justify-between" style="font-size: 28rpx;border-bottom: 2rpx solid #f7f7f7;margin:20rpx ;padding: 20rpx 0">-->
+<!--        <text>排名</text>-->
+<!--        <text>姓名</text>-->
+<!--        <text>人数</text>-->
+<!--      </view>-->
         <view class="flex-col list" v-for="(item,index) in list">
-
-
-            <!--            <view class="flex-row justify-center" v-if="index === 0">-->
-            <!--                <view class="flex-col justify-evenly medal">-->
-            <!--                    <text>第一名：对对对</text>-->
-            <!--                    <text>3000</text>-->
-            <!--                </view>-->
-            <!--            </view>-->
-
-            <!--            <view class="flex-col justify-evenly medal medal2" v-if="index === 1">-->
-            <!--                <text>第二名：滴滴滴</text>-->
-            <!--                <text>2000</text>-->
-            <!--            </view>-->
-
-            <!--            <view class="flex-col justify-evenly medal medal3" v-if="index === 2">-->
-            <!--                <text>第三名：龙傲天</text>-->
-            <!--                <text>1000</text>-->
-            <!--            </view>-->
-
-
-            <view class="flex-row justify-between listItem">
-                <text>{{ index + 1 }}.</text>
+            <view class="flex-row justify-between listItem" style="font-size: 28rpx;color: #999999;margin:10rpx 20rpx ;padding: 20rpx 0;border-bottom: 2rpx solid #f7f7f7;">
+                <text>{{ index + 1 }}</text>
                 <text>{{ item.expandUserName }}</text>
                 <text>{{ item.total }}</text>
             </view>
-
         </view>
-
     </mescroll-uni>
 </template>