2024-1-11

pages/user/index.vue

@@ -424,63 +424,38 @@
 						</view>
 					</block>
 				</view>
-				<view class="menus-list" v-if="userInfo.adminid ||( service_status == 1 && storeMenu.length)">
+				<view class="user-menus" style="margin-top: 25rpx;"
+					v-if="userInfo.adminid ||( service_status == 1 && storeMenu.length)">
 					<!-- <view class="menus-list"> -->
-					<view class="title">员工功能</view>
-					<view class="item acea-row row-between-wrapper" hover-class="none"
-						@click="goMenuPage('/pages/goods/order_list/ygOrder', '我的订单')">
-						<image src="/static/images/staffSq.png"></image>
-						<view class="text acea-row row-between-wrapper">
-							<view>我的订单</view>
-							<view class="iconfont icon-xiangyou"></view>
+					<view class="menu-title">员工功能</view>
+					<view class="list-box">
+						<view class="item" @click="goMenuPage('/pages/goods/order_list/ygOrder', '我的订单')">
+							<image src="/static/images/staffSq.png"></image>
+							<text>我的订单</text>
 						</view>
-					</view>
-					<view class="item acea-row row-between-wrapper" hover-class="none"
-						@click="goMenuPage('/pages/users/user_spread_money/index?type=2', '我的佣金')">
-						<image src="/static/images/staffOrder.png"></image>
-						<view class="text acea-row row-between-wrapper">
+						<view class="item" @click="goMenuPage('/pages/users/user_spread_money/index?type=2', '我的佣金')">
+							<image src="/static/images/staffOrder.png"></image>
 							<view>我的佣金</view>
-							<view class="iconfont icon-xiangyou"></view>
 						</view>
-					</view>
-					<view class="item acea-row row-between-wrapper" hover-class="none"
-						@click="goMenuPage('/pages/users/user_spread_money/index?type=5', '我的股权')">
-						<image src="/static/images/guquan.png"></image>
-						<view class="text acea-row row-between-wrapper">
+						<view class="item" @click="goMenuPage('/pages/users/user_spread_money/index?type=5', '我的股权')">
+							<image src="/static/images/guquan.png"></image>
 							<view>我的股权</view>
-							<view class="iconfont icon-xiangyou"></view>
 						</view>
-					</view>
-					<view class="item acea-row row-between-wrapper" hover-class="none"
-						@click="goMenuPage('/pages/users/user_spread_money/index?type=6', '我的业绩')">
-						<image src="/static/images/myyj.png"></image>
-						<view class="text acea-row row-between-wrapper">
+						<view class="item" @click="goMenuPage('/pages/users/user_spread_money/index?type=6', '我的业绩')">
+							<image src="/static/images/myyj.png"></image>
 							<view>我的业绩</view>
-							<view class="iconfont icon-xiangyou"></view>
 						</view>
-					</view>
-					<view class="item acea-row row-between-wrapper" hover-class="none"
-					  @click="goMenuPage('/pages/users/user_spread_money/index?type=7', '阶梯奖励')">
-					  <image src="/static/images/jtjl.png"></image>
-					  <view class="text acea-row row-between-wrapper">
-					    <view>阶梯奖励</view>
-					    <view class="iconfont icon-xiangyou"></view>
-					  </view>
-					</view>
-					<view class="item acea-row row-between-wrapper" hover-class="none"
-						@click="goMenuPage('/pages/users/user_spread_money/index?type=4', '我的提现')">
-						<image src="/static/images/staffTarget.png"></image>
-						<view class="text acea-row row-between-wrapper">
+						<view class="item" @click="goMenuPage('/pages/users/user_spread_money/index?type=7', '阶梯奖励')">
+							<image src="/static/images/jtjl.png"></image>
+							<view>阶梯奖励</view>
+						</view>
+						<view class="item" @click="goMenuPage('/pages/users/user_spread_money/index?type=4', '我的提现')">
+							<image src="/static/images/staffTarget.png"></image>
 							<view>提现记录</view>
-							<view class="iconfont icon-xiangyou"></view>
 						</view>
-					</view>
-					<view class="item acea-row row-between-wrapper" hover-class="none"
-						@click="goMenuPage('/pages/users/user_cash/index', '立即提现')">
-						<image src="/static/images/staffMoney.png"></image>
-						<view class="text acea-row row-between-wrapper">
+						<view class="item" @click="goMenuPage('/pages/users/user_cash/index', '立即提现')">
+							<image src="/static/images/staffMoney.png"></image>
 							<view>立即提现</view>
-							<view class="iconfont icon-xiangyou"></view>
 						</view>
 					</view>
 				</view>
@@ -2315,4 +2290,4 @@
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
-</style>
+</style>

pages/users/user_spread_money/index.vue

@@ -27,14 +27,16 @@
 			</view>
 			<timeSlot @changeTime="changeTime" v-if="recordType!=5 && recordType!=7"></timeSlot>
 			<view class='sign-record'>
-				<view class="top_num" v-if="recordType != 4 && recordList.length && recordType!=5 && recordType!=6 && recordType!=7">
+				<view class="top_num"
+					v-if="recordType != 4 && recordList.length && recordType!=5 && recordType!=6 && recordType!=7">
 					支出：¥{{expend || 0}} &nbsp;&nbsp;&nbsp; 收入：¥{{income || 0}}
 				</view>
 				<view class="top_num" v-if="recordType==6">
 					销售业绩：{{sale_sum || 0}} &nbsp;&nbsp;&nbsp; 手工业绩：{{craft_sum || 0}}
 				</view>
 				<view class="top_num" v-if="recordType==7">
-					销售业绩：{{ staffInfo.sale_performance || 0}} &nbsp;&nbsp;&nbsp; 手工业绩：{{staffInfo.craft_performance || 0}}
+					销售业绩：{{ staffInfo.sale_performance || 0}} &nbsp;&nbsp;&nbsp;
+					手工业绩：{{staffInfo.craft_performance || 0}}
 				</view>
 				<view class="top_num top_num_2" v-if="recordType == 5">
 					当前股权：{{staffInfo.shareholding}}
@@ -60,7 +62,8 @@
 													v-if="recordType == 4 && item.status == 2">未通过</text>
 											</view>
 											<view class="mark" v-if="recordType == 4 && item.mark && item.status !== 1">
-												{{item.mark}}</view>
+												{{item.mark}}
+											</view>
 											<view v-if="recordType!=5 && recordType!=6">{{item.add_time}}</view>
 											<view v-else>{{item.create_time}}</view>
 										</view>
@@ -93,13 +96,25 @@
 									<view class='itemn1 acea-row row-between-wrapper'>
 										<view class="flex-g">
 											<view class='name line2'>
-												业绩达到{{item.step}},奖励股权{{item.shareholding}}
+												业绩值：{{item.step}}
+											</view>
+											<view>
+												<view>
+												1. 奖励{{item.shareholding}}股权
+												</view>
+												<view>
+												2. 提升{{item.ratio}}%提成比
+												</view>
 											</view>
 										</view>
-										<template>
-											<view class='num ' v-if="sevenType == 51" :class="{'font-color': staffInfo.sale_performance*1 < item.step*1}">{{staffInfo.sale_performance*1 >= item.step*1 ?  '已完成': '未达到'}}</view>
-											<view class='num font-color' v-if="sevenType == 70" :class="{'font-color': staffInfo.craft_performance*1 < item.step*1}">{{staffInfo.craft_performance*1 >= item.step*1 ?  '已完成': '未达到'}}</view>
-										</template>
+										<view class='status ' v-if="sevenType == 51"
+											:class="{'font-color': staffInfo.sale_performance*1 < item.step*1}">
+											{{staffInfo.sale_performance*1 >= item.step*1 ?  '已完成': '未达到'}}
+										</view>
+										<view class='status font-color' v-if="sevenType == 70"
+											:class="{'font-color': staffInfo.craft_performance*1 < item.step*1}">
+											{{staffInfo.craft_performance*1 >= item.step*1 ?  '已完成': '未达到'}}
+										</view>
 									</view>
 								</view>
 							</view>
@@ -222,7 +237,7 @@
 
 				this.getStaffInfo()
 				// this.getYjList()
-			} else if(type == 7) {
+			} else if (type == 7) {
 				uni.setNavigationBarTitle({
 					title: "阶梯奖励"
 				});
@@ -252,15 +267,15 @@
 			}
 		},
 		methods: {
-			getJt(type,id) {
-				if(type == 're') {
+			getJt(type, id) {
+				if (type == 're') {
 					this.recordList = []
 				}
-				if(id) {
+				if (id) {
 					this.sevenType = id
 				}
 				getJt({
-					gid:this.sevenType,
+					gid: this.sevenType,
 					page: 1,
 					limit: 100
 				}).then(res => {
@@ -306,43 +321,43 @@
 			// 显示详细
 			showDetail(item) {
 				console.log(item);
-				if(this.type == 6){
-					if(item.recharge){
+				if (this.type == 6) {
+					if (item.recharge) {
 						uni.showModal({
 							title: '充值订单',
 							content: `用户ID：${item.recharge.uid},充值${item.recharge.price}获得销售业绩`,
 							showCancel: false,
 						});
 					}
-					if(item.subscribe){
+					if (item.subscribe) {
 						const info = item.info[0];
 						uni.showModal({
 							title: '服务项目',
-							content:  `订单：${item.order_name},用户：${item.real_name},项目：${info.store_name},支付金额：${info.pay_price}`,
+							content: `订单：${item.order_name},用户：${item.real_name},项目：${info.store_name},支付金额：${info.pay_price}`,
 							showCancel: false,
 						});
 					}
-					if(item.store){
+					if (item.store) {
 						uni.showModal({
 							title: '普通商品',
-							content:`订单：${item.order_id},用户：${item.store.real_name},支付金额：${item.store.pay_price}获得销售业绩`,
+							content: `订单：${item.order_id},用户：${item.store.real_name},支付金额：${item.store.pay_price}获得销售业绩`,
+							showCancel: false,
+						});
+					}
+				} else {
+					if (item.mark) {
+						uni.showModal({
+							title: '详细说明',
+							content: item.mark,
+							showCancel: false,
+						});
+					} else if (item.content) {
+						uni.showModal({
+							title: '详细说明',
+							content: item.content,
 							showCancel: false,
 						});
 					}
-				}else{
-				if (item.mark) {
-					uni.showModal({
-						title: '详细说明',
-						content: item.mark,
-						showCancel: false,
-					});
-				}else if(item.content){
-					uni.showModal({
-						title: '详细说明',
-						content: item.content,
-						showCancel: false,
-					});
-				}
 				}
 			},
 			navto(url) {
@@ -433,17 +448,17 @@
 					getStaffInfo({
 						uid: res.data.uid
 					}).then(ress => {
-						
+
 						ress.data.list.forEach(item => {
-							if(item.uid == res.data.uid) {
+							if (item.uid == res.data.uid) {
 								that.staffInfo = item
 							}
 						})
 						if (that.recordType == 6) {
 							that.getYjList()
 						}
-						if(that.recordType == 7) {
-							that.getJt('re',51)
+						if (that.recordType == 7) {
+							that.getJt('re', 51)
 						}
 					})
 				})
@@ -523,21 +538,35 @@
 		height: 86rpx;
 		padding: 0 30rpx;
 		box-sizing: border-box;
-	}
 
-	.commission-details .search .input {
-		width: 100%;
-		height: 60rpx;
-		border-radius: 50rpx;
-		background-color: #f5f5f5;
-		position: relative;
-	}
+		.input {
+			width: 100%;
+			height: 60rpx;
+			border-radius: 50rpx;
+			background-color: #f5f5f5;
+			position: relative;
 
-	.commission-details .search .input input {
-		height: 100%;
-		font-size: 26rpx;
-		width: 100%;
-		padding-left: 60rpx;
+			input {
+				height: 100%;
+				font-size: 26rpx;
+				width: 100%;
+				padding-left: 60rpx;
+			}
+
+			.placeholder {
+				color: #bbb;
+			}
+
+			.iconfont {
+				position: absolute;
+				left: 28rpx;
+				color: #999;
+				font-size: 28rpx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+
+		}
 	}
 
 	.box {
@@ -546,29 +575,23 @@
 		overflow: hidden;
 	}
 
-	.commission-details .search .input .placeholder {
-		color: #bbb;
-	}
-
-	.commission-details .search .input .iconfont {
-		position: absolute;
-		left: 28rpx;
-		color: #999;
-		font-size: 28rpx;
-		top: 50%;
-		transform: translateY(-50%);
-	}
-
 	.sign-record {
 		margin-top: 20rpx;
 	}
 
-	.commission-details .promoterHeader .headerCon .money {
-		font-size: 36rpx;
-	}
+	.commission-details {
+		.promoterHeader {
+			.headerCon {
+				.money {
+					font-size: 36rpx;
+
+					.num {
+						font-family: 'Guildford Pro';
+					}
+				}
+			}
+		}
 
-	.commission-details .promoterHeader .headerCon .money .num {
-		font-family: 'Guildford Pro';
 	}
 
 	.top_num {
@@ -593,29 +616,42 @@
 		border-radius: 14rpx 14rpx 0 0;
 	}
 
-	.sign-record .list .item .listn .itemn1 {
-		border-bottom: 1rpx solid #eee;
-		padding: 22rpx 24rpx;
-		flex-wrap: nowrap;
-	}
-	.sign-record .list .item .listn .itemn1 .flex-g{
-		flex-grow: 1;
-		padding-right: 30rpx;
-	}
-	.sign-record .list .item .listn .itemn1 .name {
-		font-size: 28rpx;
-		color: #282828;
-		margin-bottom: 10rpx;
-	}
+	.sign-record {
+		.list {
+			.item {
+				.listn {
+					.itemn1 {
+						border-bottom: 1rpx solid #eee;
+						padding: 22rpx 24rpx;
+						flex-wrap: nowrap;
 
-	.sign-record .list .item .listn .itemn1 .num {
-		font-size: 36rpx;
-		font-family: 'Guildford Pro';
-		color: #16ac57;
-	}
+						.flex-g {
+							flex-grow: 1;
+							padding-right: 30rpx;
+							.status{
+								font-size: 28rpx;
+							}
+						}
+
+						.name {
+							font-size: 28rpx;
+							color: #282828;
+							margin-bottom: 10rpx;
+						}
+
+						.num {
+							font-size: 36rpx;
+							font-family: 'Guildford Pro';
+							color: #16ac57;
 
-	.sign-record .list .item .listn .itemn1 .num.font-color {
-		color: #e93323 !important;
+							&.font-color {
+								color: #e93323 !important;
+							}
+						}
+					}
+				}
+			}
+		}
 	}
 
 	.mark {