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

# Conflicts:
#	pages/index/peopleHome.vue

common/websocketUtil.js

@@ -1,19 +1,19 @@
 class websocketUtil {
-	var is_open_socket = false;
-	var socketStatus = 0 //避免重复连接 0 无连接 1-9连接中 10 已连接
-	var url = '';
-	var data = '';
-	var uuid = '';
-	var timeout = 10000;
-	var heartbeatInterval = null;
-	var reconnectTimeOut = null;
-	var reconnectNum = 0 //重连次数
-	var msgQueue = []
-	var socketTask = null //ws对象
-	var netIsConnected = false
-	var netType = 'none'
+	is_open_socket = false;
+	socketStatus = 0 //避免重复连接 0 无连接 1-9连接中 10 已连接
+	url = '';
+	data = '';
+	uuid = '';
+	timeout = 10000;
+	heartbeatInterval = null;
+	reconnectTimeOut = null;
+	reconnectNum = 0 //重连次数
+	msgQueue = []
+	socketTask = null //ws对象
+	netIsConnected = false
+	netType = 'none'
 
-	var autoFlag = true
+	autoFlag = true
 
 
 	constructor(url, uuid) {
@@ -59,6 +59,50 @@ class websocketUtil {
 		// 	this.reconnect();
 		// }
 	}
+	//重新连接
+	reconnect() {
+		// 失败重连频率
+		const reconnect_time = [3000, 3000, 3000, 3000, 10000, 10000, 10000, 20000, 20000, 50000]
+		// 自身巡检频率
+		let reconnect_timeout = 30000
+		//停止发送心跳
+		this.heartbeatInterval && clearInterval(this.heartbeatInterval)
+		if (this.socketStatus < 10) {
+			// 失败重连
+			if (this.reconnectNum > 50) return;
+			if (this.reconnectNum < this.reconnect_time.length) {
+				reconnect_timeout = reconnect_time[this.reconnectNum]
+			} else {
+				reconnect_timeout = reconnect_time[this.reconnect_time.length - 1]
+			}
+
+			console.log("uniWebsocket 重新连接", this.socketStatus, this.reconnectNum, this.reconnect_timeout)
+
+			this.reconnectNum = this.reconnectNum + 1
+
+			this.reconnectTimeOut = setTimeout(() => {
+				// 连接创建
+				this.connectSocketInit();
+				this.reconnect()
+			}, reconnect_timeout)
+
+			return;
+		}
+		console.log("uniWebsocket 自身巡检", socketStatus, reconnectNum, reconnect_timeout)
+
+		// 自身巡检循环
+		this.reconnectTimeOut = setTimeout(() => {
+			// 连接创建
+			this.connectSocketInit();
+			this.reconnect()
+		}, reconnect_timeout)
+		//如果不是人为关闭的话，进行重连
+		// if (!this.is_open_socket) {
+		// 	this.reconnectTimeOut = setTimeout(() => {
+		// 		this.connectSocketInit();
+		// 	}, 3000)
+		// }
+	}
 	generateSeq() {
 		return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
 			const r = Math.random() * 16 | 0;
@@ -197,17 +241,6 @@ class websocketUtil {
 	stop() {
 		uni.closeSocket();
 	}
-	//重新连接
-	reconnect() {
-		//停止发送心跳
-		clearInterval(this.heartbeatInterval)
-		//如果不是人为关闭的话，进行重连
-		if (!this.is_open_socket) {
-			this.reconnectTimeOut = setTimeout(() => {
-				this.connectSocketInit();
-			}, 3000)
-		}
-	}
 	//外部获取消息
 	getMessage(callback) {
 		this.socketTask.onMessage((res) => {

components/kxj-previewImage/kxj-previewImage.vue

@@ -211,6 +211,7 @@
 			},
 			//打开
 			open(e) {
+				console.log('open');
 				if (e === null || e === '') {
 					console.log('kxj-previewImage:打开参数无效');
 					return;

manifest.json

@@ -2,8 +2,8 @@
 	"name": "遇见玛特",
 	"appid": "__UNI__A59181F",
 	"description": "",
-	"versionName": "1.1.2",
-	"versionCode": 112,
+	"versionName": "1.1.3",
+	"versionCode": 113,
 	"transformPx": false,
 	/* 5+App特有相关 hfhz-mrro-iqmv-igdl storygarden2024@outlook.com*/
 	"app-plus": {

pages.json

@@ -353,18 +353,7 @@
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "传送",
-				"navigationBarBackgroundColor": "#161616",
-				"app-plus": {
-					"bounce": "none",
-					"titleNView": {
-						"buttons": [{
-							"fontSize": "15px",
-							"color": "#fff",
-							"text": "记录"
-						}]
-					}
-				}
-
+				"navigationBarBackgroundColor": "#161616"
 			}
 		}, {
 			"path": "pages/w3/tranRecord",

pages/article/article.vue

@@ -120,9 +120,7 @@
 			//打开预览e
 			previewOpen(imgs1, index) {
 				this.imgs = imgs1.split("|");
-				this.$nextTick(()=>{
-					this.$refs.previewImage.open(index)
-				})
+				setTimeout(()=>this.$refs.previewImage.open(index),0)
 				return; //如需测试和uni原生预览差别可注释这两行
 			},
 			loadData() {

pages/index/ai_pp.vue

@@ -24,7 +24,7 @@
 		onShow() {},
 		methods: {
 			goHome(uid) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/index/peopleHome?uid=' + uid
 				})
 			},

pages/index/peopleHome.vue

@@ -157,8 +157,7 @@
 		<view class="thread2"></view>
 		<view class="thread2"></view>
 
-		<previewImage ref="previewImage" :opacity="0.8" :circular="true" :imgs="imgs" :descs="descs"
-			@longPress="longPress"></previewImage>
+		<previewImage ref="previewImage" :opacity="0.8" :circular="true" :imgs="imgs" :descs="descs"></previewImage>
 	</view>
 </template>
 
@@ -228,9 +227,8 @@
 			},
 			previewOpen(imgs1, index) {
 				this.imgs = imgs1.split("|");
-				this.$nextTick(() => {
-					this.$refs.previewImage.open(index)
-				}) // 传入当前选中的图片地址或序号
+				setTimeout(()=>this.$refs.previewImage.open(index),0)
+				// 传入当前选中的图片地址或序号
 				return; //如需测试和uni原生预览差别可注释这两行
 			},
 			loadWishData() {

pages/index/peopleList.vue

@@ -9,7 +9,7 @@
 		<view class="list">
 			<view class="item" v-for="(item,index) of list" :key="index" @click="goHome(item.uid)">
 				<view class="img">
-					<image class="icon" mode="widthFix" :src="item.avator"></image>
+					<image class="icon" mode="aspectFill" :src="item.avator"></image>
 				</view>
 				<view class="tit">
 					<text class="name">{{item.nickname}}</text>

pages/my/editInfo.vue

@@ -173,14 +173,14 @@
 					}
 					this.sel_tags = tmpTags;
 				} else {
-					if (this.sel_tags.length >= 10) {
+					if(this.sel_tags.length <= 9){
+						this.sel_tags.push(itm);
+					}else{
 						this.$refs['ToastW3'].showToast({
 							title: "最多选择10个标签",
 							animation: 0
 						});
-						return;
 					}
-					this.sel_tags.push(itm);
 				}
 			},
 			sliderChange1(e) {
@@ -221,7 +221,6 @@
 				});
 			},
 			getInfoData() {
-				console.log(this.$apiHost + '/Member/getinfoData');
 				uni.request({
 					url: this.$apiHost + '/Member/getinfoData', //仅为示例，并非真实接口地址。
 					data: {
@@ -231,7 +230,6 @@
 						'content-type': 'application/json' //自定义请求头信息
 					},
 					success: (res) => {
-						console.log("res", res.data)
 						this.nickname = res.data.nickname;
 						this.wechat = res.data.wechat;
 						this.sex = res.data.sex;
@@ -245,7 +243,8 @@
 						if (res.data.avator != "") {
 							this.avator = res.data.avator;
 						}
-						if (res.data.aihao != null) {
+						console.log(res.data.aihao);
+						if (res.data.aihao) {
 							this.sel_tags = res.data.aihao.split(",");
 						}
 					}

pages/my/hudong.vue

@@ -5,7 +5,7 @@
 			<block v-for="(item,index) in list" :key="index">
 				<view class="item">
 					<view class="avator">
-						<image class="icon" :src="item.avator" mode="widthFix">
+						<image class="icon" :src="item.avator" mode="aspectFill">
 						</image>
 					</view>
 					<view class="tit">

pages/my/managePhoto.vue

@@ -112,7 +112,9 @@
 							icon: 'none'
 						});
 						if (res.data.success == "yes") {
-
+							setTimeout(()=>{
+								uni.navigateBack(1)
+							},1500)
 						}
 					}
 				});

pages/my/myArticle.vue

@@ -57,8 +57,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 != ''">
+				<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>
@@ -72,16 +73,20 @@
 						<image class="icon" src="../../static/icon/like.png" mode="widthFix"></image>
 						{{item.num_like}}
 					</view>
-					<view class="img" v-if="false">
+					<!-- <view class="img" >
 						<image class="icon" src="../../static/icon/reply.png" mode="widthFix"></image>
 						{{item.num_comment}}
+					</view> -->
+					<view class="img" @click="delArticle(item)">
+						<image class="icon" src="../../static/icon/del.png" mode="widthFix"></image>
 					</view>
 				</view>
 			</block>
 
 			<view class="blankHeight"></view>
 		</view>
-
+		<DialogBoxW3 ref="DialogBoxW3"></DialogBoxW3>
+		<ToastW3 ref="ToastW3"></ToastW3>
 		<previewImage ref="previewImage" :opacity="0.8" :circular="true" :imgs="imgs" :descs="descs"
 			@longPress="longPress"></previewImage>
 	</view>
@@ -148,6 +153,50 @@
 				btn.innerText = text;
 				// #endif
 			},
+
+			// 删除动态
+
+			delArticle(article) {
+				console.log(article);
+				this.$refs['DialogBoxW3'].confirm({
+					title: '删除动态',
+					content: '请确认是否删除此条动态?',
+					DialogType: 'inquiry',
+					btn1: '取消',
+					btn2: '删除',
+					animation: 0
+				}).then((res) => {
+
+					uni.request({
+						url: this.$apiHost + '/Article/doAct',
+						data: {
+							uuid: getApp().globalData.uuid,
+							act: 'del',
+							id: article.id
+						},
+						header: {
+							"content-type": "application/json",
+							'sign': getApp().globalData.headerSign
+						},
+						success: (res) => {
+							uni.showToast({
+								title: res.data.str,
+								icon: 'none'
+							});
+							if (res.data.success == 'yes') {
+								this.loadData();
+							}
+						},
+						complete: (com) => {
+							// uni.hideLoading();
+						},
+						fail: (e) => {
+							console.log("----e:", e);
+						}
+					});
+
+				})
+			},
 			onClickButton1() {
 				console.log('点击了按钮1')
 			},
@@ -163,7 +212,7 @@
 				let arr = imgs.split("|");
 				return arr;
 			},
-			previewOpen(imgs1) {
+			previewOpen(imgs1, index) {
 				this.imgs = imgs1.split("|");
 				// this.descs = [];
 				// for (var i = 0; i < this.imgs.length; i++) {
@@ -172,9 +221,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.$nextTick(()=>{
-					this.$refs.previewImage.open(index)
-				})// 传入当前选中的图片地址或序号
+				setTimeout(() => this.$refs.previewImage.open(index), 0) // 传入当前选中的图片地址或序号
 				return; //如需测试和uni原生预览差别可注释这两行
 			},
 			//长按事件

pages/w3/X_bank.vue

@@ -1,8 +1,12 @@
 <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>
+		<uni-nav-bar rightWidth='136rpx' title="暗物质宝库" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view class="list_info">
 			<view style="margin-top: 24rpx;" class="numlist">
 				<view class="left">
@@ -55,8 +59,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				tab: 1,
@@ -98,6 +103,9 @@
 		},
 		onShow() {},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			onBack() {},
 			checkTab(tab) {
 				this.tab = tab;

pages/w3/box.scss

@@ -131,7 +131,9 @@ page {
 					color: #FFFFFF;
 				}
 			}
-			.content {
+			.content {
+				width: 100%;
+				height: 100rpx;
 				font-weight: 400;font-size: 24rpx;color: #FFFFFF;
 				padding-left:24rpx;padding-right:24rpx;
 			}

pages/w3/box.vue

@@ -1,11 +1,15 @@
 <template>
 	<view class="page">
-		<cl-topbar title="燃料中心" fixed background-color="#24234B" color="#FFFFFF" show-back :border='false'>
-			<template #append>
+		<uni-nav-bar rightWidth='136rpx' title="燃料中心" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+			<template #right>
 				<view style="
 				width: 136rpx;
 				height: 52rpx;
-				margin-right: 28rpx; 
 				background: linear-gradient( 130deg, #322D52 20%, #6E47A2 100%);
 				border-radius: 12rpx;
 				text-align: center;
@@ -17,8 +21,8 @@
 					记录
 				</view>
 			</template>
-		</cl-topbar>
-		<view style="width: 100vw;height: 88rpx;"></view>
+		</uni-nav-bar>
+	
 		<view class="tabMain">
 			<view class="menu" :class="tab==1?'active':''" @click="selTab(1)">
 				日常探索
@@ -113,31 +117,29 @@
 				</view>
 			</view>
 		</view>
-
-
-
 		<view class="thread2"></view>
-
-
 		<DialogBoxW3 ref="DialogBoxW3"></DialogBoxW3>
 		<ToastW3 ref="ToastW3"></ToastW3>
 	</view>
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {
+			uniNavBar
+		},
 		data() {
 			return {
 				title: '',
 				tab: 1,
 				tab2: 1,
 				list: [],
-				nodata:true,
+				nodata: true,
 
 			}
 		},
-		
+
 		onLoad() {
 			let self = this;
 			// try {
@@ -156,7 +158,10 @@
 			// this.showBottomPlayer();
 		},
 		methods: {
-			navToTranRecord(){
+			navigateBack(){
+				uni.navigateBack(1)
+			},
+			navToTranRecord() {
 				uni.navigateTo({
 					url: "/pages/w3/tranRecord?stype=ad",
 				})

pages/w3/friendsList.vue

@@ -1,9 +1,12 @@
 <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>
+		<uni-nav-bar rightWidth='136rpx' title="我的战队" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view class="topBody">
 			<view class="header">
 			</view>
@@ -73,8 +76,10 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		
+		components: {uniNavBar},
 		data() {
 			return {
 				title: '',
@@ -105,6 +110,9 @@
 		},
 		onShow() {},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			onBack() {},
 			chkSel() {
 				if (this.sel == 1) {

pages/w3/invite.vue

@@ -1,9 +1,12 @@
 <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>
+		<uni-nav-bar rightWidth='136rpx' title="邀请战队成员" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view class="topBody">
 			<view class="header">
 			</view>
@@ -114,8 +117,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				myinfo: {},
@@ -155,6 +159,9 @@
 			this.loadZtList();
 		},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			onBack() {},
 			chkSel() {
 				if (this.sel == 1) {

pages/w3/levRule.vue

@@ -1,9 +1,12 @@
 <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>
+		<uni-nav-bar rightWidth='136rpx' title="使命规则" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view class="top">
 			<view class="bgnum">
 				{{myinfo.num_gmb}}
@@ -115,8 +118,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				myinfo: {},
@@ -138,6 +142,9 @@
 			// this.showBottomPlayer();
 		},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			loadInfo() {
 				uni.request({
 					url: this.$apiHost + '/My/getlevinfo',

pages/w3/share_img.vue

@@ -1,8 +1,12 @@
 <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>
+		<uni-nav-bar rightWidth='136rpx' title="邀请战队成员" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view class="topBody">
 			<image class="img" :src="myinfo.share_img" mode="aspectFill"></image>
 			<view class="numlist">
@@ -26,8 +30,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				title: '',
@@ -52,6 +57,9 @@
 		},
 		onShow() {},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			onBack() {},
 			chkSel() {
 				if (this.sel == 1) {

pages/w3/teamProfit.vue

@@ -1,9 +1,12 @@
 <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>
+		<uni-nav-bar rightWidth='136rpx' title="战队奖励" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view class="topBody">
 			<view class="header">
 			</view>
@@ -73,8 +76,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				title: '',
@@ -123,6 +127,9 @@
 		},
 		onShow() {},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			onBack() {},
 			chkSel() {
 				if (this.sel == 1) {

pages/w3/tran.vue

@@ -1,11 +1,15 @@
 <template>
 	<view class="page">
-		<cl-topbar title="传送" fixed background-color="#24234B" color="#FFFFFF" show-back :border='false'>
-			<template #append>
+		<uni-nav-bar rightWidth='136rpx' title="传送" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+			<template #right>
 				<view style="
 				width: 136rpx;
 				height: 52rpx;
-				margin-right: 28rpx; 
 				background: linear-gradient( 130deg, #322D52 20%, #6E47A2 100%);
 				border-radius: 12rpx;
 				text-align: center;
@@ -17,8 +21,7 @@
 					记录
 				</view>
 			</template>
-		</cl-topbar>
-		<view style="width: 100vw;height: 88rpx;"></view>
+		</uni-nav-bar>
 		<view class="bodyMain">
 			<view class="bg">
 				<view style="margin-top: 140rpx;" class="item">
@@ -107,8 +110,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				myinfo: {},
@@ -157,6 +161,9 @@
 			// this.showBottomPlayer();
 		},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			navToTran: function() {
 				uni.navigateTo({
 					url: "/pages/w3/tranRecord?stype=tran"

pages/w3/tranRecord.vue

@@ -1,9 +1,12 @@
 <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>
+		<uni-nav-bar rightWidth='136rpx' title="记录" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view class="list_info">
 			<view class="item" v-for="(item,index) in list">
 				<view class="left">
@@ -27,8 +30,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				tab: 1,
@@ -58,6 +62,9 @@
 			this.loadData();
 		},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			onBack() {},
 			checkTab(tab) {
 				this.tab = tab;

pages/w3/ucenter.vue

@@ -1,8 +1,12 @@
 <template>
 	<view class="page">
-		<cl-topbar title="" fixed background-color="#24234B" color="#FFFFFF" show-back
-			:border='false'>
-		</cl-topbar>
+		<uni-nav-bar rightWidth='136rpx' title="" fixed  :border="false" statusBar backgroundColor="#24234B" color="#FFFFFF">
+			<template #left>
+				<view class="cl-topbar__icon" @click="navigateBack">
+					<text class="cl-icon-arrow-left"></text>
+				</view>
+			</template>
+		</uni-nav-bar>
 		<view style="width: 100vw;height: 88rpx;"></view>
 		<view class="header">
 			<view class="bg">
@@ -97,8 +101,9 @@
 </template>
 
 <script>
+	import uniNavBar from '../../components/uni-ui/uni-nav-bar/uni-nav-bar.vue'
 	export default {
-		components: {},
+		components: {uniNavBar},
 		data() {
 			return {
 				title: '',
@@ -140,6 +145,9 @@
 			this.loadBoxList();
 		},
 		methods: {
+			navigateBack(){
+				uni.navigateBack(1)
+			},
 			goPage(page) {
 				uni.navigateTo({
 					url: page,

uni.scss

@@ -12,6 +12,10 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 
+.cl-icon-arrow-left:before {
+	content: "\e7ed";
+}
+
 @import "./uni_modules/cl-uni/theme.scss";
 /* 颜色变量 */
 

uni_modules/cl-uni/components/cl-topbar/cl-topbar.vue

@@ -104,6 +104,7 @@
 
 		computed: {
 			top() {
+				console.log(this.isTop,'----------------',statusBarHeight,platform === "android");
 				return this.isTop ?
 					platform === "android" ?
 					`${statusBarHeight}px` :