소스 검색

3-4新增

fxy 3 년 전
부모
커밋
cf106d1e60

+ 122 - 112
pages.json

@@ -503,128 +503,138 @@
 				"navigationBarTextStyle": "white"
 			}
 
+		}, {
+			"path": "pages/index/raise-five-internal-organs/raise-five-internal-organs",
+			"style": {
+				"navigationBarTitleText": "养五脏",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/regulate-six-bowels/regulate-six-bowels",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/good-quality-work/good-quality-work",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/index/seasonal-healthy-food/seasonal-healthy-food",
+			"style": {
+				"navigationBarTitleText": "时令健康养生食品",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/seasonal-healthy-foods-shoppingCart/seasonal-healthy-foods-shoppingCart",
+			"style": {
+				"navigationBarTitleText": "强心长寿粥",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/promotional-picks/promotional-picks",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/index/search/search",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/city/city",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/customize-gift/customize-gift",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/index/sub-health-pool/sub-health-pool",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/index/sub-health-pool-details/sub-health-pool-details",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/index/pay/pay",
+			"style": {
+				"navigationBarTitleText": "付款",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F2F2F2"
+			}
+
+		}, {
+			"path": "pages/my-order/refund-details/refund-details",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/my/my-distribution-apply/my-distribution-apply",
+			"style": {
+				"navigationBarTitleText": "我的分销",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F28A1A",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/my/my-distribution/my-distribution",
+			"style": {
+				"navigationBarTitleText": "我的分销",
+				"enablePullDownRefresh": false
+			}
+
 		}
 	    ,{
-            "path" : "pages/index/raise-five-internal-organs/raise-five-internal-organs",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "养五脏",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/regulate-six-bowels/regulate-six-bowels",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/good-quality-work/good-quality-work",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/seasonal-healthy-food/seasonal-healthy-food",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "时令健康养生食品",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/seasonal-healthy-foods-shoppingCart/seasonal-healthy-foods-shoppingCart",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "强心长寿粥",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/promotional-picks/promotional-picks",
+            "path" : "pages/my/about-us/about-us",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/search/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "关于我们",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/index/city/city",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/customize-gift/customize-gift",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/sub-health-pool/sub-health-pool",
+            "path" : "pages/my/join-hands-with-partners/join-hands-with-partners",
             "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/sub-health-pool-details/sub-health-pool-details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/pay/pay",
-            "style" :                                                                                    
-            {
-               "navigationBarTitleText": "付款",
-               "enablePullDownRefresh": false,
-               "navigationBarBackgroundColor": "#F2F2F2"
-            }
-            
-        }
-        ,{
-            "path" : "pages/my-order/refund-details/refund-details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+            {
+				"navigationBarTitleText": "携手合伙人",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F2501A",
+				"navigationBarTextStyle": "white"
             }
             
         }

+ 1 - 0
pages/my-order/order-details/order-details.vue

@@ -66,6 +66,7 @@
 						<!-- 已完成 -->
 						<!-- <button type="default" class="border-gray">删除订单</button> -->
 					</view>
+					
 					<view class="msg-box">
 						<view class="msg-row-between">
 							<view class="msg-row-left">

+ 1 - 0
pages/my-order/select-service/select-service.css

@@ -235,6 +235,7 @@
 .select-service-name {
 	color: #000000;
 	font-size: 26rpx;
+	margin-bottom: 7rpx;
 }
 
 .select-service-msg {

+ 33 - 0
pages/my/about-us/about-us.vue

@@ -0,0 +1,33 @@
+<!-- 关于我们 -->
+<template>
+	<view class="wrap">
+		平台介绍:中国优质农产品榜单「熊猫指南」品质背书,以甄选天作良物惠及千家万户为价值主张,致力于打造最具创新力的健康、养生食品生态链智能化运营平台。平台故事:
+		40年来的改革开放,我国实现了从“赶上时代”到”引领时代*的伟大跨越,民生的吃不饱早已成为历史,并且从关注食品安全转向食材品质且追求营养健康。在对营养健康的追求上国人的热情只增不减,然而多数人因为缺乏时间精力、经验不足、预算有限等原因,最终都只是深陷消费主义陷阱却连营养健康的边都没摸到,我们发现高品质、真正具有营养健康价值的食材离普通百姓的餐桌还有很长一段距离。这也就成为“携手熊猫*诞生的契机和坚持的动力!在几百万年的演化史中,熊猫凭着刁钻聪明只吃竹笋来满足自己对营养的需求,跑赢了同时代诸多动物群,并保留了原有的古老特征被誉为“活化石”而成为“国宝”。竹笋最有营养,所以从初春开始,熊猫会追着新发芽的竹笋,从低海拔吃到高海拔;夏天竹叶最具营养,熊猫就盯着竹叶吃秋冬营养在竹竿,熊猫开始晴硬货。熊猫穿着一身极地动物才有的黑白皮衣,长着杂食动物的消化系统,保留着食肉动物的熊牙利爪,却挑剔地吃起竹子,过着”宁可食无肉,不可居无竹”的悠然生活,熬过了冰川时代。因此,“只吃最好”的熊猫就成为了我们平台当仁不让的形象代言人!
+		“携手熊猫”旨在探寻与深挖原生物种,我们所整合的是原生态食品,以及珍视丰厚的农耕文化遗产。未来我们期待用实际行动让更多健康、生态、有营养的食品惠及千家万户,促进产业生态发展-起为健康生活持续赋能!
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.wrap{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		font-size: 34rpx;
+		color: #090909;
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+	}
+</style>

+ 132 - 0
pages/my/join-hands-with-partners/join-hands-with-partners.css

@@ -0,0 +1,132 @@
+.wrap {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	position: relative;
+	padding: 20rpx 36rpx;
+	box-sizing: border-box;
+}
+
+.wrap::after {
+	content: "";
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 300rpx;
+	background-color: #F2501A;
+	border-radius: 0 0 60rpx 60rpx;
+}
+
+.module {
+	width: 100%;
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	position: relative;
+	padding: 40rpx 36rpx 24rpx;
+	box-sizing: border-box;
+	margin-bottom: 20rpx;
+}
+
+.module::after {
+	content: "";
+	width: calc(100% - 80rpx);
+	height: 100rpx;
+	position: absolute;
+	top: -20rpx;
+	left: 40rpx;
+	background-color: #FFB39A;
+	border-radius: 20rpx;
+	z-index: -1;
+}
+
+.coumn {
+	display: flex;
+	flex-direction: column;
+	z-index: 100;
+}
+
+.head {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	margin-bottom: 60rpx;
+}
+
+.font-1 {
+	color: #FFFFFF;
+	font-size: 45rpx;
+	margin-bottom: 3rpx;
+}
+
+.font-2 {
+	color: #FFFFFF;
+	font-size: 28rpx;
+}
+
+.module-row {
+	width: 100%;
+	padding: 14rpx 0;
+	border-bottom: 1px solid #F2F2F2;
+	box-sizing: border-box;
+	margin-bottom: 20rpx;
+}
+
+.module-row:last-child {
+	border-bottom: none;
+	margin-bottom: 0;
+}
+
+.module-label {
+	width: 100%;
+	color: #333333;
+	font-size: 30rpx;
+	position: relative;
+	padding: 0 40rpx;
+	box-sizing: border-box;
+	margin-bottom: 15rpx;
+}
+
+.module-label::after {
+	content: "";
+	width: 10rpx;
+	height: 28rpx;
+	background-color: #F2501A;
+	border-radius: 16rpx;
+	position: absolute;
+	left: 0;
+	top: 50%;
+	transform: translate(0, -50%);
+}
+
+.bottom-row {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 0 0 38rpx;
+	box-sizing: border-box;
+}
+
+.placeholder {
+	color: #BFBFBF;
+}
+
+.input {
+	flex: 1;
+	font-size: 30rpx;
+}
+
+.back-icon {
+	width: 20rpx;
+}
+
+.textarea-box {
+	width: 100%;
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+}
+
+.textarea-label {}
+
+.textarea {}

+ 78 - 0
pages/my/join-hands-with-partners/join-hands-with-partners.vue

@@ -0,0 +1,78 @@
+<!-- 携手合伙人 -->
+<template>
+	<view class="wrap">
+		<view class="coumn">
+			<view class="head">
+				<view class="font-1">代理招商申请</view>
+				<view class="font-2">请填写一下资料申请</view>
+			</view>
+			<view class="module">
+				<view class="module-row">
+					<view class="module-label">
+						姓名
+					</view>
+					<view class="bottom-row">
+						<input class="input" type="text" value="" placeholder="请填写您的姓名" placeholder-class="placeholder" />
+					</view>
+				</view>
+				<view class="module-row">
+					<view class="module-label">
+						出生年月
+					</view>
+					<view class="bottom-row">
+						<input class="input" type="text" value="" placeholder="请选择出生年月" placeholder-class="placeholder" />
+						<image src="../../../static/back-icon2.png" mode="widthFix" class="back-icon"></image>
+					</view>
+				</view>
+				<view class="module-row">
+					<view class="module-label">
+						证件类型
+					</view>
+					<view class="bottom-row">
+						<input class="input" type="text" value="" placeholder="请选择" placeholder-class="placeholder" />
+						<image src="../../../static/back-icon2.png" mode="widthFix" class="back-icon"></image>
+					</view>
+				</view>
+				<view class="module-row">
+					<view class="module-label">
+						证件号码
+					</view>
+					<view class="bottom-row">
+						<input class="input" type="text" value="" placeholder="请填写证件号码" placeholder-class="placeholder" />
+						<image src="../../../static/back-icon2.png" mode="widthFix" class="back-icon"></image>
+					</view>
+				</view>
+				<view class="module-row">
+					<view class="module-label">
+						省市区域
+					</view>
+					<view class="bottom-row">
+						<input class="input" type="text" value="" placeholder="请选择省市区域" placeholder-class="placeholder" />
+						<image src="../../../static/back-icon2.png" mode="widthFix" class="back-icon"></image>
+					</view>
+				</view>
+			</view>
+			<view class="textarea-box">
+				<view class="textarea-label">申请理由及自身实力</view>
+				<textarea value="" class="textarea" placeholder-class="placeholder" placeholder="请描述一下申请理由和自身实力吧~" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "./join-hands-with-partners.css";
+</style>

+ 190 - 0
pages/my/my-distribution-apply/my-distribution-apply.css

@@ -0,0 +1,190 @@
+page {
+	background-color: #F28A1A;
+}
+
+.wrap {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 50rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.module-wrap {
+	width: 100%;
+	padding: 16rpx;
+	box-sizing: border-box;
+	background: rgba(255, 255, 255, 0.5);
+	border-radius: 32rpx;
+	margin-bottom: 26rpx;
+}
+
+.module {
+	width: 100%;
+	background-color: #fff;
+	border-radius: 16rpx;
+	padding: 26rpx 24rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: column;
+}
+
+.icon {
+	width: 100%;
+	margin-bottom: 60rpx;
+}
+
+.tag-title {
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: #EB6F2F;
+	font-size: 44rpx;
+	font-weight: 500;
+	padding: 22rpx 0;
+	margin-bottom: 17rpx;
+}
+
+.tag-img {
+	width: 68rpx;
+}
+
+.left {
+	margin-right: 90rpx;
+}
+
+.right {
+	margin-left: 90rpx;
+}
+
+.row {
+	width: calc(100% - 112rpx);
+	height: 76rpx;
+	line-height: 76rpx;
+	display: flex;
+	align-items: center;
+	background-color: #F6F6F6;
+	border-radius: 100rpx;
+	margin: 0 auto 28rpx;
+	padding: 0 20rpx 0 60rpx;
+	box-sizing: border-box;
+}
+
+.row:last-child {
+	margin-bottom: 10rpx;
+}
+
+.input {
+	width: 100%;
+	font-size: 30rpx;
+}
+
+.placeholder {
+	color: #777777;
+}
+
+.module-label {
+	width: 100%;
+	color: #202020;
+	font-size: 30rpx;
+	margin-bottom: 10rpx;
+}
+
+.textarea {
+	width: 100%;
+	height: 420rpx;
+	font-size: 30rpx;
+}
+
+.placeholder2 {
+	color: #BFBFBF;
+}
+
+.msg {
+	width: 100%;
+	color: #777777;
+	font-size: 28rpx;
+	line-height: 48rpx;
+}
+
+.btn-box {
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 80rpx 0 40rpx;
+}
+
+.btn-box button {
+	width: 100%;
+	height: 90rpx;
+	line-height: 90rpx;
+	border-radius: 100rpx;
+	background-color: #fff;
+	color: #F2501A;
+	font-size: 34rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.mask {
+	width: 100%;
+	height: 100vh;
+	background: rgba(0, 0, 0, 0.38);
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999999;
+}
+
+.window {
+	width: 494rpx;
+	background-color: #fff;
+	border-radius: 16rpx;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	z-index: 999999;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 30rpx 0 40rpx;
+}
+
+.window-name {
+	width: 100%;
+	text-align: center;
+	color: #333333;
+	font-size: 28rpx;
+	margin-bottom: 15rpx;
+}
+
+.window-msg {
+	width: 100%;
+	text-align: center;
+	color: #B8B8B8;
+	font-size: 20rpx;
+}
+
+.window-btn {
+	width: 280rpx;
+	height: 64rpx;
+	line-height: 64rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #F2501A;
+	border-radius: 100rpx;
+	color: #fff;
+	font-size: 32rpx;
+	margin-top: 55rpx;
+}
+
+.window-img {
+	width: 350rpx;
+	margin-bottom: 40rpx;
+}

+ 92 - 0
pages/my/my-distribution-apply/my-distribution-apply.vue

@@ -0,0 +1,92 @@
+<!-- 我的分销-申请 -->
+<template>
+	<view class="wrap">
+		<image src="../../../static/icon-24.png" mode="widthFix" class="icon"></image>
+		<view class="module-wrap">
+			<view class="module">
+				<view class="tag-title">
+					<image src="../../../static/tag-left2.png" mode="widthFix" class="tag-img left" />
+					信息填写
+					<image src="../../../static/tag-right2.png" mode="widthFix" class="tag-img right" />
+				</view>
+				<view class="row">
+					<input type="text" value="" class="input" placeholder="请输入姓名" placeholder-class="placeholder" />
+				</view>
+				<view class="row">
+					<input type="text" value="" class="input" placeholder="身份证号" placeholder-class="placeholder" />
+				</view>
+				<view class="row">
+					<input type="text" value="" class="input" placeholder="手机号" placeholder-class="placeholder" />
+				</view>
+				<view class="row">
+					<input type="text" value="" class="input" placeholder="请输入详细地址" placeholder-class="placeholder" />
+				</view>
+			</view>
+		</view>
+
+		<view class="module-wrap">
+			<view class="module">
+				<view class="module-label">
+					申请理由及自身实力
+				</view>
+				<textarea value="" class="textarea" placeholder="请描述一下申请理由和自身实力吧~" placeholder-class="placeholder2" />
+			</view>
+		</view>
+
+		<view class="module-wrap">
+			<view class="module">
+				<view class="module-label">
+					分销条款
+				</view>
+				<view class="msg">
+					分销条款:
+					1、分销等级按其分销金额划分,不同金额区间对应不同级别,后台可设置
+					2、-年内的分销金额累计计算,达到的最高值为等级标准
+					3.一年期限从当前时间往前推算,分销金额超过一年的则视为过期作废
+					4、分销等级数、等级名称、及等级金额区间都可以通过后台设置
+				</view>
+			</view>
+		</view>
+
+		<view class="btn-box">
+			<button type="default" @tap="showWindow">提交申请</button>
+		</view>
+
+		<!-- 提交成功-弹窗 -->
+		<view v-show="isShowWindow">
+			<view class="mask" @tap="closeWindow"></view>
+			<view class="window">
+				<image src="../../../static/icon-25.png" class="window-img" mode="widthFix"></image>
+				<text class="window-name">提交成功</text>
+				<text class="window-msg">您的申请提交成功等待审核</text>
+				<button type="default" class="window-btn">知道了</button>
+			</view>
+		</view>
+		<!-- 提交成功-弹窗  -->
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				//提交成功-弹窗
+				isShowWindow: true
+			}
+		},
+		methods: {
+			//提交成功-弹窗
+			showWindow() {
+				this.isShowWindow = true;
+			},
+			closeWindow() {
+				this.isShowWindow = false;
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "./my-distribution-apply.css";
+</style>

+ 200 - 0
pages/my/my-distribution/my-distribution.css

@@ -0,0 +1,200 @@
+page {
+	min-height: 100%;
+	background: linear-gradient(180deg, #FFFFFF, #F2F2F2);
+}
+
+.wrap {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding: 20rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.card {
+	width: 100%;
+	min-height: 292rpx;
+	background: linear-gradient(43deg, #E77E1E, #FF5E45);
+	border-radius: 24rpx;
+	padding: 24rpx 42rpx 14rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.card-label {
+	color: #FAE6D7;
+	font-size: 28rpx;
+}
+
+.card-middle {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.money {
+	color: #FFFFFF;
+	font-size: 40rpx;
+}
+
+.money text {
+	font-size: 70rpx;
+	font-weight: bold;
+}
+
+.btn {
+	width: 182rpx;
+	height: 64rpx;
+	line-height: 64rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #FFFFFF;
+	border-radius: 100rpx;
+	color: #F2501A;
+	font-size: 28rpx;
+}
+
+.card-bottom {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.card-bottom-row {
+	display: flex;
+	flex-direction: column;
+}
+
+.card-bottom-row-label {
+	font-size: 30rpx;
+	color: rgba(255, 255, 255, 0.8);
+	margin-bottom: 5rpx;
+}
+
+.small-money {
+	color: #fff;
+	font-size: 30rpx;
+}
+
+.small-money text {
+	font-size: 40rpx;
+	font-weight: bold;
+}
+
+.password-msg {
+	color: #FEF2EE;
+	font-size: 24rpx;
+}
+
+.tab-list {
+	width: 100%;
+	white-space: nowrap;
+}
+
+.child {
+	display: inline-block;
+	line-height: 90rpx;
+	font-size: 32rpx;
+	margin-right: 88rpx;
+}
+
+.child:last-child {
+	margin-right: 0;
+}
+
+.child.active {
+	color: #F2501A;
+}
+
+.list {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.item {
+	width: 100%;
+	min-height: 114rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	position: relative;
+	padding: 0 42rpx;
+	box-sizing: border-box;
+	background-color: #fff;
+}
+
+.item::after {
+	content: "";
+	position: absolute;
+	width: calc(100% - 84rpx);
+	height: 1px;
+	left: 50%;
+	transform: translate(-50%, 0);
+	bottom: 0;
+	background-color: #EEEEEE;
+}
+
+.item:first-child {
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+}
+
+.item:last-child {
+	border-bottom-left-radius: 16rpx;
+	border-bottom-right-radius: 16rpx;
+}
+
+.item:last-child::after {
+	background: initial;
+}
+
+.item-sidebar {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+}
+
+.item-name {
+	color: #202020;
+	font-size: 28rpx;
+}
+
+.numadd {
+	color: #202020;
+	font-size: 32rpx;
+	font-weight: bold;
+}
+
+.numless {
+	color: #F2501A;
+	font-size: 32rpx;
+	font-weight: bold;
+}
+
+.item-msg {
+	width: 100%;
+	color: #A7A7A7;
+	font-size: 24rpx;
+	margin-top: 4rpx;
+}
+
+.normal-box {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	color: #999999;
+	font-size: 26rpx;
+	padding: 80rpx 0;
+}
+
+.normal-box image {
+	width: 580rpx;
+	margin-bottom: 12rpx;
+}

+ 100 - 0
pages/my/my-distribution/my-distribution.vue

@@ -0,0 +1,100 @@
+<!-- 我的分销 -->
+<template>
+	<view class="wrap">
+
+		<view class="card">
+			<view class="card-label">我的佣金</view>
+			<view class="card-middle">
+				<view class="money">
+					¥
+					<text>13490.28</text>
+				</view>
+				<button type="default" class="btn">立即提现</button>
+			</view>
+			<view class="card-bottom">
+				<view class="card-bottom-row">
+					<text class="card-bottom-row-label">累计提现</text>
+					<view class="small-money">
+						¥
+						<text>13490.28</text>
+					</view>
+				</view>
+				<view class="password-msg">
+					修改密码
+				</view>
+			</view>
+		</view>
+
+		<scroll-view scroll-x="true" class="tab-list">
+			<view :class="{ 'active' : isActive === index }" class="child" v-for="(item,index) in navList" :key="index"
+				@click="checked(index)">
+				{{item.title}}
+			</view>
+		</scroll-view>
+
+		<view class="list">
+			<view class="item">
+				<view class="item-sidebar">
+					<view class="item-name">
+						商品购买
+					</view>
+					<view class="item-msg">2020-02-24 14:3:23</view>
+				</view>
+				<text :class="[num==true?'numadd':'numless']">{{num==true ? '+' : '-'}}1239.98</text>
+			</view>
+			<view class="item">
+				<view class="item-sidebar">
+					<view class="item-name">
+						商品购买
+					</view>
+					<view class="item-msg">2020-02-24 14:3:23</view>
+				</view>
+				<text :class="[num==true?'numadd':'numless']">{{num==true ? '+' : '-'}}1239.98</text>
+			</view>
+			<view class="item">
+				<view class="item-sidebar">
+					<view class="item-name">
+						商品购买
+					</view>
+					<view class="item-msg">2020-02-24 14:3:23</view>
+				</view>
+				<text :class="[num==true?'numadd':'numless']">{{num==true ? '+' : '-'}}1239.98</text>
+			</view>
+			<!-- 无内容时显示 -->
+			<!-- <view class="normal-box">
+				<image src="../../../static/normal-3.png" mode="widthFix"></image>
+				暂无佣金明细
+			</view> -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				//选项卡
+				isActive: 0,
+				navList: [{
+					index: 0,
+					title: '佣金明细',
+				}, {
+					index: 1,
+					title: "提现明细",
+				}],
+
+				num: true
+			}
+		},
+		methods: {
+			checked(index) {
+				this.isActive = index
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "./my-distribution.css";
+</style>

+ 11 - 12
pages/my/real-name-certification/real-name-certification.vue

@@ -16,7 +16,7 @@
 			<view class="module">
 				<view class="left-sidebar">
 					<text>国徽面</text>
-					<text>上传您的身份证国徽面</text>
+					<text>上传您的身份证国徽面</text> 
 				</view>
 				<view class="right-sidebar" @tap="uploadImg('imgB')">
 					<image v-if="imgB.length === 0" src="../../../static/add-1.png" class="add-img" mode=""></image>
@@ -50,17 +50,16 @@
 			}
 		},
 		methods: {
-			uploadImg() {
-				uni.chooseImage({
-					count: 1, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
-					sourceType: ['album'], //从相册选择
-					success: res => {
-						this.imgA = res.tempFilePaths
-						this.imgB = res.tempFilePaths
-						console.log(JSON.stringify(res.tempFilePaths));
-					}
-				})
+			uploadImg(key){
+				uni.chooseImage({
+					count: 1, // 选择一张
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: (res) => {
+						// console.log(JSON.stringify(res.tempFilePaths));
+						this.$set(this, key, res.tempFilePaths[0]);
+					},
+				});
 			}
 		}
 	}

BIN
static/icon-24.png


+ 0 - 0
static/normal-16.png → static/icon-25.png


BIN
static/tag-left2.png


BIN
static/tag-right2.png