1-5-3

components/top-title/top-title.vue

@@ -45,16 +45,18 @@
 
 <style lang="scss">
 	.top-title {
-
+		padding-left: 25rpx;
 		width: 100%;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		// line-height: 50rpx;
+		align-items: flex-start;
 		.title-before {
 			// display: inline-block;
 			// background-color: #F0433C;
-			width: 30rpx;
-			height: 30rpx;
+			width: 45rpx;
+			height: 50rpx;
 			margin-right: 16rpx;
 			// border-radius: 4rpx;
 			border-radius: 50%;

pages.json

@@ -324,7 +324,7 @@
 		{
 			"path": "pages/user/JDcool",
 			"style": {
-				"navigationBarTitleText": "金豆池",
+				"navigationBarTitleText": "基金池",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -401,7 +401,7 @@
 		{
 			"path": "pages/money/wallet",
 			"style": {
-				"navigationBarTitleText": "我的佣金",
+				"navigationBarTitleText": "红利券",
 				"app-plus": {
 					"titleNView": false
 				}

pages/index/index.vue

@@ -58,13 +58,68 @@
 		<!-- 金豆专区 -->
 		<golden-bean :data='jdList'></golden-bean>
 		<!-- 批发专区 -->
-		<wholesale></wholesale>
-		<!-- 为你推荐 -->
-		<recommend :data='bastList'></recommend>
+		<wholesale></wholesale>
+		<!-- 公司简介 -->
+		<view class="jj-tit" v-if="gsjjList.length > 0">
+			<view class="left">
+				<image src="../../static/icon/gsjj.png" mode="" class="jj-log"></image>
+				<view class="jj-title">
+					公司简介
+				</view>
+			</view>
+			<view class="right">
+				<view class="jj-more-tit">
+					更多
+				</view>
+				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
+			</view>
+		</view>
+		<view class="jj-wrap" v-if="gsjjList.length > 0">
+			<view class="jj" v-for="item in 1">
+				<view class="jj-img"></view>
+				<view class="jj-info">
+					<view class="jj-tit-tit clamp">
+						哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈
+					</view>
+					<view class="jj-val clamp2">
+						体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 产品简介 -->
+		<view class="jj-tit" style="margin-top: 20rpx;" v-if="cpjjList.length > 0">
+			<view class="left">
+				<image src="../../static/icon/cpjj.png" mode="" class="jj-log"></image>
+				<view class="jj-title">
+					产品简介
+				</view>
+			</view>
+			<view class="right">
+				<view class="jj-more-tit">
+					更多
+				</view>
+				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
+			</view>
+		</view>
+		<view class="jj-wrap" v-if="cpjjList.length > 0">
+			<view class="jj" v-for="item in 1">
+				<view class="jj-img"></view>
+				<view class="jj-info">
+					<view class="jj-tit-tit clamp">
+						哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈
+					</view>
+					<view class="jj-val clamp2">
+						体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
-<script>
+<script>
+	import topTitle from '../../components/top-title/top-title.vue';
 	import {
 		getProducts
 	} from '@/api/product.js';
@@ -92,7 +147,8 @@
 		components: {
 			goldenBean,
 			wholesale,
-			recommend
+			recommend,
+			topTitle
 		},
 		data() {
 			return {
@@ -107,7 +163,9 @@
 				bastList: [], //商品
 				jdList: [], //金豆商品
 				page: 1,
-				limit: 3,
+				limit: 3,
+				gsjjList: [],
+				cpjjList: []
 			};
 		},
 		computed: {
@@ -439,5 +497,79 @@
 		line-height: 1;
 		font-size: $font-base;
 		border-radius: 10rpx;
+	}
+	.jj-tit {
+		display: flex;
+		// height: 50rpx;
+		justify-content: space-between;
+		background-color: #fff;
+		padding-top: 20rpx;
+		.left {
+			padding-left: 20rpx;
+			display: flex;
+			.jj-log {
+				width: 45rpx;
+				height: 45rpx;
+			}
+			.jj-title {
+				font-weight: bold;
+				font-size: 32rpx;
+				padding-left: 15rpx;
+			}
+		}
+		.right {
+			display: flex;
+			width: 200rpx;
+			font-size: 22rpx;
+			// justify-content: sp;
+			justify-content: flex-end;
+			align-items: center;
+			padding-right: 20rpx;
+			color: #999;
+			.jj-more {
+				margin-left: 10rpx;
+				width: 15rpx;
+				height: 22rpx;
+			}
+		}
+	}
+	.jj-wrap {
+		background-color: #fff;
+		// margin: 20rpx 0;
+		.jj {
+			margin: auto;
+			width: 689rpx;
+			height: 202rpx;
+			border-bottom: 1px solid #999;
+			padding: 20rpx;
+			padding-left: 0;
+			display: flex;
+			&:last-of-type {
+				border-bottom: none;
+			}
+			.jj-img {
+				flex-shrink: 0;
+				width: 222rpx;
+				height: 158rpx;
+				background-color: #bfa;
+				border-radius: 10rpx;
+			}
+			.jj-info {
+				width: 450rpx;
+				// flex-shrink: 0;
+				padding: 10rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+				
+				.jj-tit-tit {
+					
+				}
+				.jj-val {
+					padding-top: 20rpx;
+					font-size: 28rpx;
+					font-weight: 500;
+				}
+			}
+		}
 	}
 </style>

pages/money/wallet.vue

@@ -3,7 +3,7 @@
 		<view class="content-money">
 			<view class="money-box">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
-				<view class="header">我的佣金</view>
+				<view class="header">红利券</view>
 				<image class="money_bg" src="../../static/img/anchor12.png"></image>
 				<view class="money">{{ userInfo.brokerage_price | getMoneyStyle }}</view>
 			</view>

pages/product/common/productContent.vue

@@ -5,6 +5,9 @@
 			<view class="price">
 				{{ goodsObjact.price }}
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
+			</view>
+			<view class="" v-if="isgold == 1" style="color: #ffac60;">
+				可获金豆{{goodsObjact.price}}
 			</view>
 		</view>
 		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
@@ -21,7 +24,11 @@ export default {
 					percent:1
 				};
 			}
-		}
+		},
+		isgold: {
+			type: Number,
+			default: 0
+		},
 	},
 	filters: {
 		parseIntTo(percent) {

pages/product/product.vue

@@ -3,7 +3,7 @@
 		<!-- 轮播图 -->
 		<top-swiper :imgList="imgList"></top-swiper>
 		<!-- 标题 -->
-		<product-content :goodsObjact="goodsObjact"></product-content>
+		<product-content :goodsObjact="goodsObjact" :isgold="is_gold" :gold="gold"></product-content>
 		<view class="c-list">
 			<view class="c-row b-b" @click="toggleSpec">
 				<text class="tit">购买数量</text>

pages/user/user.vue

@@ -85,7 +85,7 @@
 							<view class="icon icon-b">
 								<image class="icon-img" src="/static/user/yue.png" mode="aspectFit"></image>
 							</view>
-							<view class="order-font">我的奖金</view>
+							<view class="order-font">红利券</view>
 						</view>
 						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
 							:hover-stay-time="50">
@@ -116,7 +116,7 @@
 						<uni-list-item title="批发订单" @click="navTo('/pages/user/myWholesale')"
 							thumb="/static/user/u1.png"></uni-list-item>
 							
-						<uni-list-item title="金豆池" @click="navTo('/pages/user/JDcool')" thumb="/static/user/u2.png">
+						<uni-list-item title="基金池" @click="navTo('/pages/user/JDcool')" thumb="/static/user/u2.png">
 						</uni-list-item>
 						<uni-list-item title='我的推广' @click="navTo('/pages/user/team')"
 							thumb="/static/user/tuiguang1.png">	</uni-list-item>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.b5a57242.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.28975970.js></script></body></html>