2 次代碼提交 4cc9b3db93 ... 209870d420

作者 SHA1 備註 提交日期
  lhl 209870d420 create1 1 周之前
  lhl c5a621a8c8 create1 1 周之前
共有 3 個文件被更改,包括 20 次插入30 次删除
  1. 2 2
      pages/index/index.vue
  2. 5 3
      pages/user/award.vue
  3. 13 25
      pages/user/user.vue

+ 2 - 2
pages/index/index.vue

@@ -27,7 +27,7 @@
 		<view class="hot-wrap">
 			<image class="tit" src="/static/img/ban1.png" mode="heightFix"></image>
 			<view class="hot-list">
-				<good v-for="fitem in bastList" :item="fitem" @goItem="goItem"></good>
+				<good v-for="fitem in goodList" :item="fitem" @goItem="goItem"></good>
 			</view>
 		</view>
 
@@ -233,7 +233,7 @@
 				}
 				obj.loadingType = 'loading'
 				getProducts({
-					is_pack: 1,
+					// is_pack: 1,
 					page: 1,
 					limit: 50,
 				}).then(res => {

+ 5 - 3
pages/user/award.vue

@@ -11,9 +11,11 @@
 				<view class="money">{{ yj || 0 }}</view>
 				<view>我的佣金</view>
 			</view>
-			<view class="moneybtn-box" v-if="auth_status == 0">
-				<view class="money-btn" @click="navto('/pages/user/yjzye?type=1')">佣金转余额</view>
-				<view class="money-btn"  @click="navto('/pages/user/withdrawal')">佣金提现</view>
+			<view class="moneybtn-box" >
+				<!-- 佣金转余额 -->
+				<view class="money-btn" @click="navto('/pages/user/yjzye?type=1')"></view>
+				<!-- 佣金提现 -->
+				<view class="money-btn"  @click="navto('/pages/user/withdrawal')"></view>
 			</view>
 		</view>
 		<!-- <view class="info-box flex">

+ 13 - 25
pages/user/user.vue

@@ -22,26 +22,6 @@
 				{{user.group_level_name}}
 			</view>
 		</view>
-<!-- 		<view class="flex info-wrap">
-			<view class="info">
-				<view class="info-tit" @click="navTo('/pages/user/yue')">
-					<text>我的余额</text>
-					<image src="/static/icon/goto.png" mode=""></image>
-				</view>
-				<view class="info-value">
-					{{userInfo.now_money || 0}}
-				</view>
-			</view>
-			<view class="info">
-				<view class="info-tit"  @click="navTo('/pages/user/award')">
-					<text>我的佣金</text>
-					<image src="/static/icon/goto.png" mode=""></image>
-				</view>
-				<view class="info-value">
-					{{userInfo.brokerage_price || 0}}
-				</view>
-			</view>
-		</view> -->
 		<view class="user-money flex">
 			
 			<view class="user-money-item" @click="navTo('/pages/user/yue')">
@@ -49,10 +29,10 @@
 				<view class="user-money-num">{{ userInfo.now_money*1 || 0 }}</view>
 			</view>
 			<view class="user-xian"></view>
-			<view class="user-money-item" @click="navTo('/pages/user/award')">
+<!-- 			<view class="user-money-item" @click="navTo('/pages/user/award')">
 				<view class="user-money-font">我的积分</view>
 				<view class="user-money-num">{{ userInfo.integral*1 || 0 }}</view>
-			</view>
+			</view> -->
 			<view class="user-xian"></view>
 			<view class="user-money-item" @click="navTo('/pages/user/award')">
 				<view class="user-money-font">我的佣金</view>
@@ -657,7 +637,8 @@
 			justify-content: center;
 			align-items: center;
 			padding: 20rpx 0;
-				font-weight: bold;
+			font-weight: bold;
+
 			.user-money-num {
 				font-size: 36rpx;
 				font-family: PingFang SC;
@@ -667,7 +648,7 @@
 
 			.user-money-font {
 				font-size: $ltl-size-lg;
-				color:#333333;
+				color: #333333;
 			}
 		}
 
@@ -720,6 +701,7 @@
 			padding: 50rpx 0 0rpx;
 			flex-wrap: wrap;
 			justify-content: flex-start;
+
 			.jg {
 				width: 1px;
 				height: 100rpx;
@@ -1014,10 +996,12 @@
 			padding: 5rpx 0;
 		}
 	}
+
 	.info-wrap {
 		justify-content: space-between;
 		width: 690rpx;
-		margin:  0 30rpx 20rpx;
+		margin: 0 30rpx 20rpx;
+
 		.info {
 			width: 338rpx;
 			height: 178rpx;
@@ -1027,17 +1011,21 @@
 			color: #333333;
 			font-weight: bold;
 			padding: 45rpx 0 0 35rpx;
+
 			image {
 				margin-left: 10rpx;
 				width: 12rpx;
 				height: 22rpx;
 			}
+
 			&-tit {
 				padding-bottom: 25rpx;
 			}
+
 			&-value {
 				font-size: 38rpx;
 				color: #00B68E;
+
 				&::before {
 					content: '¥';
 					font-size: 30rpx;