提现按钮

pages/index/index.css

@@ -156,4 +156,16 @@ page {
 	opacity: 1;
 	background-color: #E6E6E6;
 	margin: 30rpx auto;
+}
+
+/* 提现按钮 */
+.tx-btn{
+	width: 136rpx;
+	line-height: 58rpx;
+	background: #FFFFFF;
+	border-radius: 29rpx 29rpx 29rpx 29rpx;
+	text-align: center;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: var(--main);
 }

pages/index/index.vue

@@ -6,9 +6,12 @@
 		</view>
 		<!-- 数据 -->
 		<view class="data-box">
-			<view>
-				<view class="ljsy">{{statisticData.totalProfit?statisticData.totalProfit:0}}</view>
-				<view class="ljsy-label">累计收益（元）</view>
+			<view class="ddflex" style="justify-content: space-between;">
+				<view>
+					<view class="ljsy">{{statisticData.totalProfit?statisticData.totalProfit:0}}</view>
+					<view class="ljsy-label">累计收益（元）</view>
+				</view>
+				<view class="tx-btn" @click="showPop = true">提现</view>
 			</view>
 
 			<view class="jy ddflex">

pages/user/user.css

@@ -93,7 +93,7 @@ page {background: #F0F0F0;}
 
 /* 异常 */
 .yichang-box{
-	margin: -70rpx 30rpx 30rpx;
+	margin: 30rpx 30rpx 30rpx;
 	z-index: 10;
 	position: relative;
 }
@@ -143,3 +143,21 @@ page {background: #F0F0F0;}
 	text-align: center;
 }
 
+/* 我的团 */
+.money-bar{margin: 0 30rpx;display: flex;display: -webkit-flex;padding-bottom: 30rpx;align-items: center;}
+.money-number{width: 122rpx;height: 59rpx;font-size: 40rpx;font-weight: 400;line-height: 59rpx;color: #FB622B;opacity: 1;}
+.money-text{width: 60rpx;height: 45rpx;font-size: 30rpx;font-weight: 400;line-height: 45rpx;color: #999999;}
+.order-bar{margin: 20rpx 30rpx;display: flex;display: -webkit-flex;padding-bottom: 30rpx;align-items: center;}
+.order-bar-item{flex: 1;-webkit-flex:1;padding-left: 35rpx;}
+.order-bar :first-child{padding-left:0;}
+.order-bar-item text{font-size: 24rpx;color: #999999 ;}
+.order-bar-item view{font-size: 32rpx;color: #FB622B ;margin-top: 10rpx;}
+.service-item{margin: 0 30rpx !important;padding: 30rpx 0 !important;display: flex;display: -webkit-flex;}
+.service-item-button{font-size: inherit;color: inherit;}
+.flex-1{flex: 1;-webkit-flex:1;}
+.recharge{font-size: 24rpx; width: 136rpx;height: 58rpx;line-height: 58rpx; background: var(--main);opacity: 1;border-radius: 40rpx;text-align: center;color: #fff;}
+.border-bottom-solid{border-bottom: 1rpx solid #F1F1F1;}
+.border-top-solid{border-top: 1rpx solid #F1F1F1;}
+.border-right-solid{border-right: 1rpx solid #F1F1F1;}
+.service-icon{width: 38rpx;height: 38rpx;margin-right: 40rpx;}
+.service-more{display: block;width: 14rpx;height: 21rpx;margin:auto 0 auto auto}

pages/user/user.vue

@@ -17,8 +17,37 @@
 				
 			</view>
 		</view>
+		
+		<!-- 我的团 管理员，一级帮卖和二级帮卖 -->
+		<view class="order" style="margin-top: -70rpx;" v-if="isLogin&&(userInfos.storeId||userInfos.merchantId)">
+			<view class="tits ddflex">
+				<view class="flex">我的收益</view>
+			</view>
+			<view style="background-color:#f2f2f2;margin:0 30rpx 10rpx;height: 1px;"></view>
+			<view class="money-bar">
+				<view class="flex-1">
+					<view class="money-number">0.00</view>
+					<text class="money-text" style="color: #242323;">我的余额</text>
+				</view>
+				<view class="recharge">提现</view>
+			</view>
+			<view class="order-bar">
+				<view class="order-bar-item ">
+					<text>累计收益</text>
+					<view>￥0.00</view>
+				</view>
+				<view class="order-bar-item ">
+					<text>今日收益</text>
+					<view>￥0.00</view>
+				</view>
+				<view class="order-bar-item">
+					<text>已提现</text>
+					<view>￥0.00</view>
+				</view>
+			</view>
+		</view>
 
-		<view class="yichang-box ddflex">
+		<view class="yichang-box ddflex" :style="(isLogin&&(userInfos.storeId||userInfos.merchantId))?'':'margin-top: -70rpx;'">
 			<view class="yichang-item fflex" @click="jumpUrl('warning/abnormalAlarm/abnormalAlarm')">
 				<view class="yichang-title">异常告警</view>
 				<view class="yichang-data">{{alarmCount}}<text class="symbol">条</text></view>

utils/request.js

@@ -1,11 +1,11 @@
 const app = getApp();
 const env = {
-	NODE_ENV: 'dev',
+	NODE_ENV: 'prd',
 	dev: {
 		apiUrl: 'https://pkapi.zhiqiyun.com'
 	},
 	prd: {
-		apiUrl: 'https://pkapi.zhiqiyun.com'
+		apiUrl: 'https://pkapi.pikadongli.com'
 	},
 	pota: {
 		apiUrl: 'http://192.168.110.182:8098' ,