11-21

pages.json

@@ -451,8 +451,13 @@
 		{
 			"path": "pages/user/yue",
 			"style": {
-				"navigationBarTitleText": "我的余额",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 			}
 		},
 		{

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/user/award.vue

@@ -3,10 +3,10 @@
 		<view class="content-money">
 			<view class="status_bar"><!-- 这里是状态栏 --></view>
 			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<!-- <view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view> -->
 				<view class="header">我的佣金</view>
 			</view>
-			<view class="content-bg"><image src="https://smbs.qiniu1314.com/static/img/tg-bg.png" mode=""></image></view>
+			<view class="content-bg"><image src="/static/img/u-bg.png" mode=""></image></view>
 			<view class="money-box">
 				<view class="money">{{ yj || 0 }}</view>
 				<view>我的佣金</view>
@@ -234,6 +234,7 @@ export default {
 </script>
 
 <style lang="scss">
+	$base-color: #fff;
 page {
 	background: #f1f1f1;
 	height: 100%;

pages/user/user.vue

@@ -22,35 +22,41 @@
 				{{user.group_level_name}}
 			</view>
 		</view>
-		<view class="flex info-wrap">
+<!-- 		<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 || 0}}
 				</view>
 			</view>
 			<view class="info">
-				<view class="info-tit">
+				<view class="info-tit"  @click="navTo('/pages/user/award')">
 					<text>我的佣金</text>
 					<image src="/static/icon/goto.png" mode=""></image>
 				</view>
 				<view class="info-value">
-					500
+					{{userInfo.brokerage_price || 0}}
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="user-money flex">
+			
+			<view class="user-money-item" @click="navTo('/pages/user/yue')">
+				<view class="user-money-font">我的余额</view>
+				<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-font">我的积分</view>
-				<view class="user-money-num">{{ userInfo.brokerage_price*1 || 0 }}</view>
+				<view class="user-money-num">{{ userInfo.integral*1 || 0 }}</view>
 			</view>
 			<view class="user-xian"></view>
-			<view class="user-money-item" @click="navTo('/pages/user/yue')">
-				<view class="user-money-font">优惠券</view>
-				<view class="user-money-num">{{ userInfo.now_money*1 || 0 }}</view>
+			<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="main-box">
@@ -102,7 +108,7 @@
 					<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>
@@ -645,7 +651,7 @@
 		padding: 20rpx 0;
 
 		.user-money-item {
-			width: 48%;
+			width: 30%;
 			display: flex;
 			flex-direction: column;
 			justify-content: center;

pages/user/yue.vue

@@ -4,10 +4,10 @@
 			<view class="content-money">
 				<view class="status_bar"><!-- 这里是状态栏 --></view>
 				<view class="body-title">
-					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<!-- <view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view> -->
 					<view class="header">我的余额</view>
 				</view>
-				<view class="content-bg"><image src="https://smbs.qiniu1314.com/static/img/tg-bg.png" mode=""></image></view>
+				<view class="content-bg"><image src="/static/img/u-bg.png" mode=""></image></view>
 				<view class="money-box">
 					<view class="money">{{ userInfo.now_money}}</view>
 					<view>余额</view>
@@ -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>
@@ -225,7 +226,8 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	$base-color: #fff;
 page {
 	background: #f2f5f4;
 	height: 100%;