Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MeetMateApp

pages.json

@@ -43,7 +43,8 @@
 			"path": "pages/w3/ucenter",
 			"style": {
 				"navigationBarTitleText": "会员中心",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/my/my",
@@ -319,33 +320,38 @@
 			"path": "pages/w3/invite",
 			"style": {
 				"navigationBarTitleText": "邀请战队成员",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/w3/friendsList",
 			"style": {
 				"navigationBarTitleText": "我的战队",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/w3/teamProfit",
 			"style": {
 				"navigationBarTitleText": "战队奖励",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/w3/X_bank",
 			"style": {
 				"navigationBarTitleText": "暗物质宝库",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/w3/tran",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "传送",
 				"navigationBarBackgroundColor": "#161616",
 				"app-plus": {
@@ -364,26 +370,31 @@
 			"path": "pages/w3/tranRecord",
 			"style": {
 				"navigationBarTitleText": "记录",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/w3/share_img",
 			"style": {
 				"navigationBarTitleText": "邀请战队成员",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/w3/levRule",
 			"style": {
 				"navigationBarTitleText": "晋升规则",
-				"navigationBarBackgroundColor": "#161616"
+				"navigationBarBackgroundColor": "#161616",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/w3/box",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "燃料中心",
 				"navigationBarBackgroundColor": "#161616",
 				"navigationBarTextStyle": "white",
+				
 				"app-plus": {
 					"titleNView": {
 						"buttons": [{
@@ -392,6 +403,7 @@
 							"text": "记录"
 						}]
 					}
+					
 				}
 			}
 		}, {

pages/article/article.scss

@@ -1,12 +1,11 @@
 page {
 	background-color: #161616;
 	width: 100%;
-	height: 100%;
 }
 .page {
 	background-color: #161616;
 	width: 100%;
-	height:100vh;
+	min-height:100vh;
 }
 .header {
 	display: flex;

pages/article/article.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="header">
 			<view class="left">
-				<image class="img" mode="widthFix" src="../../static/article/name.png"></image>
+				<image class="img" mode="aspectFill" src="../../static/article/name.png"></image>
 			</view>
 			<view class="right">
 				<view class="btn" @click="goFabu">发动态</view>
@@ -13,7 +13,7 @@
 			<block v-for="(item,index) in list" :key="index">
 				<view class="item">
 					<view class="avator" @click="goHome(item.userID)">
-						<image class="icon" :src="item.avator" mode="widthFix">
+						<image class="icon" :src="item.avator" mode="aspectFill">
 						</image>
 					</view>
 					<view class="tit">
@@ -22,12 +22,12 @@
 								{{item.nickname}}
 							</view>
 							<view class="sex2" v-if="item.sex == 2">
-								<image class="icon" src="../../static/icon/woman.png" mode="widthFix">
+								<image class="icon" src="../../static/icon/woman.png" mode="aspectFill">
 								</image>
 								{{item.age}}
 							</view>
 							<view class="sex1" v-else>
-								<image class="icon" src="../../static/icon/man.png" mode="widthFix">
+								<image class="icon" src="../../static/icon/man.png" mode="aspectFill">
 								</image>
 								{{item.age}}
 							</view>
@@ -42,23 +42,23 @@
 				<view class="content">
 					{{item.content}}
 				</view>
-				<view class="photo_list" @click="previewOpen(item.images)">
-					<view class="img" v-for="(item2,index2) in toArr(item.images)" :key="index2" v-if="item2 != ''">
+				<view class="photo_list">
+					<view class="img" v-for="(item2,index2) in toArr(item.images)" :key="index2" @click="previewOpen(item.images,index2)" v-if="item2 != ''">
 						<image class="icon" :src="item2" mode="aspectFill"></image>
 					</view>
 				</view>
 				<view class="desc">
 					<view class="addr">{{item.city}}</view>
 					<view class="img" @click="ZhanTA(item,index)" v-if="item.is_like < 1">
-						<image class="icon" src="../../static/icon/zan.png" mode="widthFix"></image>
+						<image class="icon" src="../../static/icon/zan.png" mode="aspectFill"></image>
 						{{item.num_like}}
 					</view>
 					<view class="img" v-else>
-						<image class="icon" src="../../static/icon/like.png" mode="widthFix"></image>
+						<image class="icon" src="../../static/icon/like.png" mode="aspectFill"></image>
 						{{item.num_like}}
 					</view>
 					<view class="img" v-if="false">
-						<image class="icon" src="../../static/icon/reply.png" mode="widthFix"></image>
+						<image class="icon" src="../../static/icon/reply.png" mode="aspectFill"></image>
 						{{item.num_comment}}
 					</view>
 
@@ -114,7 +114,7 @@
 				return arr;
 			},
 			//打开预览e
-			previewOpen(imgs1) {
+			previewOpen(imgs1,index) {
 				this.imgs = imgs1.split("|");
 				// this.descs = [];
 				// for (var i = 0; i < this.imgs.length; i++) {
@@ -123,7 +123,7 @@
 				// var param = e.currentTarget.dataset.src;
 				// console.log(param);
 				// this.imgs = ['../../static/home/avator.png', '../../static/me/sex_2.png', '../../static/home/avator.png'];
-				this.$refs.previewImage.open(1); // 传入当前选中的图片地址或序号
+				this.$refs.previewImage.open(index || 1); // 传入当前选中的图片地址或序号
 				return; //如需测试和uni原生预览差别可注释这两行
 			},
 			loadData() {

pages/index/peopleHome.vue

@@ -79,9 +79,9 @@
 					<view class="content">
 						{{item.content}}
 					</view>
-					<view class="photo_list" @click="previewOpen(item.images)">
-						<view class="img" v-for="(item2,index2) in toArr(item.images)" :key="index2" v-if="item2 != ''">
-							<image class="icon" :src="item2" mode="widthFix"></image>
+					<view class="photo_list">
+						<view class="img" v-for="(item2,index2) in toArr(item.images)" :key="index2"  @click="previewOpen(item.images,index2)" v-if="item2 != ''">
+							<image class="icon" :src="item2" mode="aspectFill"></image>
 						</view>
 					</view>
 					<view class="desc">
@@ -219,9 +219,9 @@
 				let arr = imgs.split("|");
 				return arr;
 			},
-			previewOpen(imgs1) {
+			previewOpen(imgs1,index) {
 				this.imgs = imgs1.split("|");
-				this.$refs.previewImage.open(1); // 传入当前选中的图片地址或序号
+				this.$refs.previewImage.open(index || 1); // 传入当前选中的图片地址或序号
 				return; //如需测试和uni原生预览差别可注释这两行
 			},
 			loadWishData() {

pages/w3/X_bank.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="page">
-
+		<cl-topbar title="暗物质宝库" fixed background-color="#24234B" color="#FFFFFF" show-back :border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="list_info">
 			<view style="margin-top: 24rpx;" class="numlist">
 				<view class="left">
@@ -17,11 +19,13 @@
 			<view class="mingxiList" v-if="false">
 				<view class="left">
 					<text style="font-size: 28rpx;color: #FFFFFF;">{{$t('txt.明细类型')}}</text>
-					<image class="icon" src="http://c.yujianmate.com/images/v1/me/arrow_down_gray.png" mode="heightFix" />
+					<image class="icon" src="http://c.yujianmate.com/images/v1/me/arrow_down_gray.png"
+						mode="heightFix" />
 				</view>
 				<view class="right">
 					<text style="font-size: 28rpx;color: #FFFFFF;">{{$t('txt.开始时间-结束时间')}}</text>
-					<image class="icon" src="http://c.yujianmate.com/images/v1/me/arrow_down_gray.png" mode="heightFix" />
+					<image class="icon" src="http://c.yujianmate.com/images/v1/me/arrow_down_gray.png"
+						mode="heightFix" />
 				</view>
 			</view>
 

pages/w3/box.scss

@@ -1,72 +1,83 @@
-page {
-	background-color: #0F0F1D;
-	width: 100%;
+page {
+	background-color: #0F0F1D;
+	width: 100%;
 	height: 100vh;
-}
+}
 .page {
 	width: 750rpx;height:1624rpx;
 	background: linear-gradient( 180deg, #24234B 0%, #0F0F1D 100%);
 	border-radius: 0rpx 0rpx 0rpx 0rpx;
-	background-repeat: repeat-y;
-}
-.thread {
-	height: 20rpx;
-}
-
-.thread2 {
-	height: 60rpx;
-}
-.tabMain {
-	display: flex;flex-direction: row;justify-content: space-between;align-items: center;
-	width:710rpx;margin: 0rpx auto;padding-top:20rpx;
-	.menu {
-		width:334rpx;height:84rpx;
-		background: url('http://c.yujianmate.com/images/v1/w3/rule/tab_bg.png');
-		background-size: 334rpx 84rpx;margin:0 auto;
-		display: flex;flex-direction: row;justify-content: center;align-items: center;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #999999;
-	}
+	background-repeat: repeat-y;
+}
+.thread {
+	height: 20rpx;
+}
+
+.thread2 {
+	height: 60rpx;
+}
+.tabMain {
+	display: flex;flex-direction: row;justify-content: space-between;align-items: center;
+	width:710rpx;margin: 0rpx auto;padding-top:20rpx;
+	.menu {
+		width:334rpx;height:84rpx;
+		background: url('http://c.yujianmate.com/images/v1/w3/rule/tab_bg.png');
+		background-size: 334rpx 84rpx;margin:0 auto;
+		display: flex;flex-direction: row;justify-content: center;align-items: center;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #999999;
+	}
 	.active {
-		background: url('http://c.yujianmate.com/images/v1/w3/rule/tab_bg_sel.png');
+		background: url('http://c.yujianmate.com/images/v1/w3/rule/tab_bg_sel.png');
+		background-size: 334rpx 84rpx;
+		background-repeat: no-repeat;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+	.active2 {
+		background: url('http://c.yujianmate.com/images/v1/w3/rule/tab_bg2_sel.png');
 		background-size: 334rpx 84rpx;
+		background-repeat: no-repeat;
 		font-weight: bold;
 		font-size: 32rpx;
 		color: #FFFFFF;
-	}
-}
-.tabMain2 {
-	display: flex;flex-direction: row;justify-content: space-around;align-items: center;
-	width:690rpx;margin: 20rpx auto;
-	.menu {
-		width:230rpx;height:52rpx;margin:0 auto;
-		display: flex;flex-direction: row;justify-content: center;align-items: center;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-	}
-	.active {
-		background: url('http://c.yujianmate.com/images/v1/w3/rule/bg_blank.png');
+	}
+}
+.tabMain2 {
+	display: flex;flex-direction: row;justify-content: space-around;align-items: center;
+	width:690rpx;margin: 20rpx auto;
+	.menu {
+		width:230rpx;height:52rpx;margin:0 auto;
+		display: flex;flex-direction: row;justify-content: center;align-items: center;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #999999;
+	}
+	.active {
+		background: url('http://c.yujianmate.com/images/v1/w3/rule/bg_blank.png');
 		background-size: 78rpx 8rpx;
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #FFFFFF;
-	}
+		background-repeat: no-repeat;
+		background-position: bottom;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #FFFFFF;
+	}
 }
-.list_item {
-	width:690rpx;height:268rpx;display: flex;flex-direction: column;justify-content: flex-start;align-items: center;
-	background: url('http://c.yujianmate.com/images/v1/w3/bg_box2.png');
-	background-size: 690rpx 268rpx;margin:0 auto;
+.list_item {
+	width:690rpx;height:268rpx;display: flex;flex-direction: column;justify-content: flex-start;align-items: center;
+	background: url('http://c.yujianmate.com/images/v1/w3bg_box2.png');
+	background-size: 690rpx 268rpx;margin:0 auto;
 	margin-top: 24rpx;
-	.item2 {
-		width:690rpx;height:268rpx;
+	.item2 {
+		width:690rpx;height:268rpx;
 		display: flex;flex-direction: row;justify-content: space-between;align-items: center;
-		.left {
-			width:220rpx;height:268rpx;
+		.left {
+			width:220rpx;height:268rpx;
 			display: flex;flex-direction: column;justify-content: center;align-items: center;
-			image {
-				width:220rpx;
+			image {
+				width:220rpx;
 			}
 			.price{
 				width:220rpx;height:48rpx;
@@ -76,21 +87,21 @@ page {
 				font-size: 28rpx;
 				text-align: center;
 				color: #FFFFFF;
-			}
-			.name {
-				font-weight: bold;margin-top: 14rpx;text-align: left;
-				font-size: 28rpx;
-				color: #FFFFFF;
-			}
-			.time {
-				font-weight: 400;margin-top: 14rpx;text-align: left;
-				font-size: 24rpx;
-				color: #999999;
-			}
-		}
-		.right {
-			width:470rpx;
-			display: flex;flex-direction: column;justify-content: space-around;align-items: center;
+			}
+			.name {
+				font-weight: bold;margin-top: 14rpx;text-align: left;
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+			.time {
+				font-weight: 400;margin-top: 14rpx;text-align: left;
+				font-size: 24rpx;
+				color: #999999;
+			}
+		}
+		.right {
+			width:470rpx;
+			display: flex;flex-direction: column;justify-content: space-around;align-items: center;
 			.item1 {
 				width:470rpx;height:32rpx;
 				display: flex;flex-direction: row;justify-content: space-between;align-items: center;
@@ -107,13 +118,13 @@ page {
 					color: #FFFFFF;
 				}
 			}
-			.content {
+			.content {
 				font-weight: 400;font-size: 24rpx;color: #FFFFFF;
-				padding-left:24rpx;padding-right:24rpx;
-			}
-			.act {
+				padding-left:24rpx;padding-right:24rpx;
+			}
+			.act {
 				width:100%;display: flex;flex-direction: row;justify-content: flex-end;align-items: center;
-				padding-right: 24rpx;padding-bottom:20rpx;
+				padding-right: 24rpx;padding-bottom:20rpx;
 				.btn {
 					width:136rpx;height:60rpx;border-radius: 20rpx;
 					background: url('http://c.yujianmate.com/images/v1/w3/tansuo.png');
@@ -124,46 +135,46 @@ page {
 					text-align: center;
 					font-style: normal;
 					color: #FFFFFF;
-				}
-				.sign_name {
-					font-weight: normal;
-					font-size: 24rpx;
-					color: #fff;margin-bottom: 16rpx;
+				}
+				.sign_name {
+					font-weight: normal;
+					font-size: 24rpx;
+					color: #fff;margin-bottom: 16rpx;
 				}
 				.state_name {
 					font-weight: bold;
 					font-size: 28rpx;
 					color: #FF4655;margin-bottom: 16rpx;
-				}
-			}
-		}
-	}
+				}
+			}
+		}
+	}
 }
-
-.state12 {
-	width:690rpx;height:388rpx;display: flex;flex-direction: column;justify-content: flex-start;align-items: center;
-	background: url('http://c.yujianmate.com/images/v1/w3/bg_box2.png');
-	background-size: 690rpx 388rpx;margin:0rpx auto;margin-bottom: 20rpx;
-	.item1 {
-		.right {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #FF4655;
-		}
-	}
-	.item2 {
-		width:690rpx;height:318rpx;
-		.left {
-			width:280rpx;height:318rpx;
-		}
-		.right {
-			width:410rpx;
-			display: flex;flex-direction: column;justify-content: space-between;align-items: center;
-			.content {
-				height:128rpx;
-			}
-			.act {
-				width:100%;display: flex;flex-direction: column;justify-content: flex-end;align-items: flex-end;padding-right: 30rpx;
+
+.state12 {
+	width:690rpx;height:388rpx;display: flex;flex-direction: column;justify-content: flex-start;align-items: center;
+	background: url('http://c.yujianmate.com/images/v1/w3bg_box2.png');
+	background-size: 690rpx 388rpx;margin:0rpx auto;margin-bottom: 20rpx;
+	.item1 {
+		.right {
+			font-weight: bold;
+			font-size: 28rpx;
+			color: #FF4655;
+		}
+	}
+	.item2 {
+		width:690rpx;height:318rpx;
+		.left {
+			width:280rpx;height:318rpx;
+		}
+		.right {
+			width:410rpx;
+			display: flex;flex-direction: column;justify-content: space-between;align-items: center;
+			.content {
+				height:128rpx;
+			}
+			.act {
+				width:100%;display: flex;flex-direction: column;justify-content: flex-end;align-items: flex-end;padding-right: 30rpx;
 				.state_name {
 					font-weight: bold;
 					font-size: 28rpx;
@@ -174,10 +185,10 @@ page {
 					font-size: 24rpx;
 					color: #fff;margin-bottom: 16rpx;
 				}
-				image {
-					height:32rpx;
-				}
-			}
-		}
-	}
-}
+				image {
+					height:32rpx;
+				}
+			}
+		}
+	}
+}

pages/w3/box.vue

@@ -1,11 +1,18 @@
 <template>
 	<view class="page">
-
+		<cl-topbar title="燃料中心" fixed background-color="#24234B" color="#FFFFFF" show-back :border='false'>
+			<template #append>
+				<view style="margin-right: 28rpx;" @click="navToTranRecord">
+					<image src="http://c.yujianmate.com/images/v1/w3/rule/jilu-btn.png" style="width: 136rpx; height: 52rpx;" mode=""></image>
+				</view>
+			</template>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="tabMain">
 			<view class="menu" :class="tab==1?'active':''" @click="selTab(1)">
 				日常探索
 			</view>
-			<view class="menu" :class="tab==2?'active':''" @click="selTab(2)">
+			<view class="menu" :class="tab==2?'active2':''" @click="selTab(2)">
 				探索奖励
 			</view>
 		</view>
@@ -115,6 +122,7 @@
 
 			}
 		},
+		
 		onLoad() {
 			let self = this;
 			// try {
@@ -133,10 +141,7 @@
 			// this.showBottomPlayer();
 		},
 		methods: {
-			onNavigationBarButtonTap: function(e) {
-				console.log(e);
-				// e的返回格式为json对象：{fontSize: "15px", text: "记录", color: "#fff", fontWeight: "normal", index: 0}
-
+			navToTranRecord(){
 				uni.navigateTo({
 					url: "/pages/w3/tranRecord?stype=ad",
 				})

pages/w3/friendsList.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="page">
+		<cl-topbar title="我的战队" fixed background-color="#24234B" color="#FFFFFF" show-back
+			:border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="topBody">
 			<view class="header">
 			</view>

pages/w3/invite.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="page">
+		<cl-topbar title="邀请战队成员" fixed background-color="#24234B" color="#FFFFFF" show-back
+			:border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="topBody">
 			<view class="header">
 			</view>

pages/w3/levRule.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="page">
+		<cl-topbar title="使命规则" fixed background-color="#24234B" color="#FFFFFF" show-back
+			:border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="top">
 			<view class="bgnum">
 				{{myinfo.num_gmb}}

pages/w3/share_img.scss

@@ -1,63 +1,50 @@
 page {
 	background-color: #0F0F1D;
-	width: 100%;
+	width: 100vw;
 	height: 100vh;
 }
 .page {
-	width: 750rpx;height:1624rpx;
 	background: linear-gradient( 180deg, #24234B 0%, #0F0F1D 100%);
 	border-radius: 0rpx 0rpx 0rpx 0rpx;
-	background-repeat: repeat-y;
 }
-.topbg {
-}
-.topBody {
-	width:750rpx;
-}
-.header {
-	display: flex;flex-direction: row;justify-content: space-between;align-items: center;color:$title;
 
-	.title {
-		font-size: 34rpx;
-	}
-}
-.thread {
-	height:210rpx;
-	padding:50rpx;font-size: 52rpx;color:#6E6A6A;padding-top: 80rpx;
-}
-.myinfo {
-	width: 690rpx;display:flex;flex-direction: column;margin:30rpx 30rpx 60rpx;
-	justify-content: center;align-items: center;
+.topBody {
+	width: 100vw;
+	height: calc(100vh - 88rpx);
+	position: relative;
 	.img {
-		border-radius: 10rpx;width:650rpx;
+		width: 100%;
+		height: 100%;
 	}
-	
 	.numlist {
-		display: flex;flex-direction: row;justify-content: space-around;align-items: center;
-		position: relative;
-		height: 188rpx;
+		width: 100%;
+		height: 170rpx;
+		position: absolute; 
+		bottom: 64rpx;
+		display: flex;
+		justify-content: space-evenly;
 		.icon{
 			height: 176rpx;
-			position: absolute;
-			left: 260rpx;
 		}
 		.num {
+			height: 100%;
 			font-weight: bold;
 			font-size: 40rpx;
 			color: #FFFFFF;
-			text-align: center;display: flex;flex-direction: column;justify-content: center;align-items: center;
+			text-align: center;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: center;
 			image {
 				width:120rpx;
 			}
 			.name {
-				font-size: 28rpx;color: #999999;margin-top: 12rpx;font-weight: normal;
+				font-size: 28rpx;color: #FFFFFF;font-weight: normal;
 			}
 
 		}
 	}
 	
 	
-}
-.blankHeight {
-	height:100rpx;
 }

pages/w3/share_img.vue

@@ -1,25 +1,25 @@
 <template>
 	<view class="page">
+		<cl-topbar title="邀请战队成员" fixed background-color="#24234B" color="#FFFFFF" show-back :border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="topBody">
-			<view class="header">
-			</view>
-			<view class="myinfo">
-				<image class="img" :src="myinfo.share_img" mode="widthFix"></image>
-
-				<view style="margin-top: 24rpx;" class="numlist">
-					<view class="num" @click="saveImg">
-						<image src="http://c.yujianmate.com/images/v1/w3/save.png" mode="widthFix"></image>
-						<view class="name">保存</view>
-					</view>
+			<image class="img" :src="myinfo.share_img" mode="aspectFill"></image>
+			<view class="numlist">
+				<view class="num" @click="sharePyq">
+					<image src="http://c.yujianmate.com/images/v1/w3/share_pyq.png" mode="widthFix"></image>
+					<view class="name">朋友圈</view>
+				</view>
+				<view class="num" @click="shareWx">
+					<image src="http://c.yujianmate.com/images/v1/w3/share_wx.png" mode="widthFix"></image>
+					<view class="name">微信好友</view>
+				</view>
+				<view class="num" @click="saveImg">
+					<image src="http://c.yujianmate.com/images/v1/w3/share_down.png" mode="widthFix"></image>
+					<view class="name">下载</view>
 				</view>
-
-
 			</view>
-
-
-			<view class="blankHeight"></view>
 		</view>
-
 		<!-- 提示框 -->
 		<DialogBox ref="DialogBox"></DialogBox>
 	</view>
@@ -87,6 +87,8 @@
 					}
 				});
 			},
+			sharePyq(){},
+			shareWx(){},
 			saveImg() {
 				// #ifdef APP-PLUS
 				let that = this;

pages/w3/teamProfit.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="page">
+		<cl-topbar title="战队奖励" fixed background-color="#24234B" color="#FFFFFF" show-back
+			:border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="topBody">
 			<view class="header">
 			</view>

pages/w3/tran.vue

@@ -1,5 +1,13 @@
 <template>
 	<view class="page">
+		<cl-topbar title="传送" fixed background-color="#24234B" color="#FFFFFF" show-back :border='false'>
+			<template #append>
+				<view style="margin-right: 28rpx;" @click="navToTran">
+					<image src="http://c.yujianmate.com/images/v1/w3/rule/jilu-btn.png" style="width: 136rpx; height: 52rpx;" mode=""></image>
+				</view>
+			</template>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="bodyMain">
 			<view class="bg">
 				<view style="margin-top: 140rpx;" class="item">
@@ -138,12 +146,10 @@
 			// this.showBottomPlayer();
 		},
 		methods: {
-			onNavigationBarButtonTap: function(e) {
+			navToTran: function() {
 				uni.navigateTo({
 					url: "/pages/w3/tranRecord?stype=tran"
 				});
-				// e的返回格式为json对象：{fontSize: "15px", text: "记录", color: "#fff", fontWeight: "normal", index: 0}
-
 			},
 			cancel() {
 				this.title = '录音取消，停止录音';

pages/w3/tranRecord.vue

@@ -1,6 +1,9 @@
 <template>
 	<view class="page">
-
+		<cl-topbar title="记录" fixed background-color="#24234B" color="#FFFFFF" show-back
+			:border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="list_info">
 			<view class="item" v-for="(item,index) in list">
 				<view class="left">

pages/w3/ucenter.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="page">
+		<cl-topbar title="" fixed background-color="#24234B" color="#FFFFFF" show-back
+			:border='false'>
+		</cl-topbar>
+		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="header">
 			<view class="bg">
 				<view class="left">