create1

pages/index/gift.vue

@@ -40,6 +40,7 @@
 				type: 0,
 				loaded: false,
 				cid: 0,
+				is_wholesale: 0
 			}
 		},
 		onLoad(opt) {
@@ -49,6 +50,9 @@
 					title: opt.tit
 				})
 			}
+			if(opt.is_wholesale) {
+				this.is_wholesale = opt.is_wholesale
+			}
 			this.getGoodList()
 			// #ifdef H5
 			this.shareDate()
@@ -64,6 +68,9 @@
 			this.getGoodList('down')
 		},
 		methods: {
+			goItem(item) {
+				this.navto('/pages/product/product?id=' + item.id)
+			},
 			// #ifdef H5
 			// 加载微信html5页面分享方法
 			shareDate() {
@@ -103,7 +110,8 @@
 				getProducts({
 					page: obj.page,
 					limit: obj.limit,
-					cid: obj.cid
+					cid: obj.cid,
+					is_wholesale: obj.is_wholesale
 				}).then(res => {
 					if (type == 'down') {
 						obj.goodList = []

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 => {

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">

pages/user/user.vue

@@ -24,25 +24,25 @@
 		</view>
 		<view class="flex info-wrap">
 			<view class="info">
-				<view class="info-tit">
+				<view class="info-tit" @click="navTo('/pages/user/yue')">
 					<text>我的余额</text>
 					<image src="/static/icon/goto.png" mode=""></image>
 				</view>
 				<view class="info-value">
-					500
+					{{ userInfo.now_money*1 || 0 }}
 				</view>
 			</view>
-			<view class="info">
+			<view class="info" @click="navTo('/pages/user/award')">
 				<view class="info-tit">
 					<text>我的佣金</text>
 					<image src="/static/icon/goto.png" mode=""></image>
 				</view>
 				<view class="info-value">
-					500
+					{{ userInfo.brokerage_price*1 || 0 }}
 				</view>
 			</view>
 		</view>
-		<view class="user-money flex">
+		<!-- <view class="user-money flex">
 			<view class="user-money-item" @click="navTo('/pages/user/award')">
 				<view class="user-money-font">我的积分</view>
 				<view class="user-money-num">{{ userInfo.brokerage_price*1 || 0 }}</view>
@@ -52,7 +52,7 @@
 				<view class="user-money-font">优惠券</view>
 				<view class="user-money-num">{{ userInfo.now_money*1 || 0 }}</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="main-box">
 			<view class="title flex" @click="navTo('/pages/order/order?state=0')">
 				<view class="title-left">
@@ -102,7 +102,8 @@
 					<image class="oitem-image" src="../../static/user/s4.png" mode=""></image>
 					<view class="oitem-font">联系客服</view>
 				</view>
-				<view class="oitem" @click="openKf()" v-if="userInfo && userInfo.uid && userInfo.is_franchisee == 1">
+				<view class="oitem" @click="navTo('/pages/index/gift?is_wholesale=1')"
+					v-if="userInfo && userInfo.uid && userInfo.is_franchisee == 1">
 					<image class="oitem-image" src="../../static/user/s5.png" mode=""></image>
 					<view class="oitem-font">代理入口</view>
 				</view>
@@ -651,7 +652,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;
@@ -661,7 +663,7 @@
 
 			.user-money-font {
 				font-size: $ltl-size-lg;
-				color:#333333;
+				color: #333333;
 			}
 		}
 
@@ -714,6 +716,7 @@
 			padding: 50rpx 0 0rpx;
 			flex-wrap: wrap;
 			justify-content: flex-start;
+
 			.jg {
 				width: 1px;
 				height: 100rpx;
@@ -1008,10 +1011,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;
@@ -1021,17 +1026,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;

pages/user/yue.vue

@@ -15,7 +15,8 @@
 				<view class="moneybtn-box">
 					<!-- <view class="money-btn" style="text-decoration: underline;" @click="navto('/pages/money/freeze')">冻结记录</view> -->
 					<view class="money-btn" style="text-decoration: underline;"></view>
-					<view class="money-btn" @click="navto('/pages/user/yjzz?type=1')">余额转账</view>
+					<!-- 余额转账 -->
+					<view class="money-btn" @click="navto('/pages/user/yjzz?type=1')"></view>
 				</view>
 			</view>
 		</view>