修改返回上一页逻辑

common/css/common.css

@@ -1,6 +1,7 @@
 /* 全屏状态栏占位 */
 .hold-status-bar{ height: var(--status-bar-height);width: 100%;display: none;}
-.custom-nav{position: fixed;top: var(--status-bar-height);left: 0;right: 0;height: 65rpx;line-height: 65rpx;color: #fff;}
+.hold-status-bar.show{display: block;background-color: #fff;}
+.custom-nav{position: fixed;top: var(--status-bar-height);left: 0;right: 0;height: 65rpx;line-height: 65rpx;color: #fff;z-index: 999;}
 .custom-nav-left{position: absolute;left: 0;top: 0;padding-right: 40rpx;transform: rotate(180deg);}
 .custom-nav-left .iconfont{font-size: 35rpx;}
 .custom-nav-center{text-align: center;}
@@ -54,5 +55,22 @@
 
 .full-search{padding-left: 16rpx;margin-bottom: 24rpx;}
 
+/* css点点点 动画 */
+.dotting {
+display: inline-block; width: 10px; min-height: 2px;
+padding-right: 2px;
+border-left: 2px solid currentColor; border-right: 2px solid currentColor;   
+background-color: currentColor; background-clip: content-box;
+box-sizing: border-box;
+animation: dot 4s infinite step-start both;
+/* *zoom: expression(this.innerHTML = '...'); */ /* IE7 */
+}
+.dotting:before { content: '...'; } /* IE8 */
+.dotting::before { content: ''; }
+:root .dotting { margin-left: 2px; padding-left: 2px; } /* IE9+ */
 
-
+@keyframes dot {
+25% { border-color: transparent; background-color: transparent; }          /* 0个点 */
+50% { border-right-color: transparent; background-color: transparent; }    /* 1个点 */
+75% { border-right-color: transparent; }                                   /* 2个点 */
+}

main.js

@@ -82,11 +82,14 @@ const href = (data,type = 1) =>{
 Vue.config.productionTip = false;
 
 const goback = () =>{
+	// let menuButtonInfo = uni.getMenuButtonBoundingClientRect();//胶囊按钮信息
 	let pages = getCurrentPages();
-	console.log('pages',pages);
-	console.log('pages[0].route',pages[0].route);
-	// if(pages[0].route == 'pages/use/useRouter'){
-	if(pages.length == '2'){
+	let prevPage = pages[pages.length - 2]; //上一个页面
+	// console.log('pages',pages);
+	// console.log('prevPage',prevPage.route);
+	// console.log('pages[0].route',pages[0].route);
+	if(prevPage.route == 'pages/use/useRouter'){
+	// if(pages.length == '2'){
 		uni.switchTab({
 			url:'/pages/index/index',
 			fail: (err) => {

pages.json

@@ -1,11 +1,5 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-	{
-		"path": "pages/buySuccess/buySuccess",
-		"style": {
-			"navigationBarTitleText": "结果页"
-		}
-	},
 		{
 			"path": "pages/index/init",
 			"navigationStyle":"custom"
@@ -47,7 +41,8 @@
 		{
 			"path": "pages/product/product",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		},
 		{
@@ -62,12 +57,19 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		// {
-		// 	"path": "pages/buySuccess/buySuccess",
-		// 	"style": {
-		// 		"navigationBarTitleText": "结果页"
-		// 	}
-		// },
+		{
+			"path": "pages/buySuccess/buySuccess",
+			"style": {
+				"navigationBarTitleText": "结果页"
+			}
+		},
+		{
+			"path": "pages/building/building",
+			"style": {
+				"navigationBarTitleText": "正在建设中"
+				,"navigationStyle":"custom"
+			}
+		},
 		{
 			"path": "pages/use/useRouter",
 			"style": {

pages/building/building.vue

@@ -0,0 +1,58 @@
+<!-- https://www.kancloud.cn/dishaxueyuan/uni-app/1358897 onBackPress在小程序不生效 -->
+<template>
+	<view class="pages">
+		<view class="hold-status-bar show">
+			<!-- 占据了状态栏位置 -->
+		</view>
+		<view class="custom-nav">
+			<view class="custom-nav-left" @click="$api.goback"><text class="iconfont icon-jiantou"></text></view>
+			<view class="custom-nav-center"></view>
+		</view>
+		<image :src="$getimg + 'building.png'" class="building-img" mode="heightFix"></image>
+		<view class="building-text">正在建设中<text class="dotting"></text></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				$getimg:this.$getimg,
+				token:'',
+				params:{
+					
+				}
+				
+			}
+		},
+		onBackPress(options) {  
+			console.log('onBackPress options',options);
+			if (options.from === 'navigateBack') {  
+				return false;  
+			}  
+			this.back();  
+			return true;  
+		}, 
+		onShow() {
+			let serf = this;		
+		},
+		onLoad() {
+			var pages = getCurrentPages();
+			console.log('pages',pages);
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect();//胶囊按钮信息
+			console.log('menuButtonInfo',menuButtonInfo);
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	/* @import url("./building.css"); */
+	page{background-color: #F5F5F5;text-align: center;}
+	.custom-nav{background-color: #fff;color: #333;padding-bottom: 20rpx;}
+	.building-img{margin-top: 408rpx;width: 240rpx;height: 240rpx;margin-bottom: 36rpx;}
+	.building-text{font-size: 30rpx;color: #999;line-height: 45rpx;font-weight: 400;}
+</style>

pages/mall/mall.css

@@ -1,5 +1,4 @@
-.tip{margin-top: 500rpx;font-size: 50rpx;color: #999;text-align: center;}
-.tip .back-index{margin: 50rpx 200rpx;background-color: #26D18B;color: #fff;}
+.custom-nav {color: #333;}
 
 .top-img{height: 340rpx;overflow: visible;padding-top: 200rpx;box-sizing: border-box;}
 .top-img::after{content: '';}

pages/mall/mall.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="pages">
-		<view class="tip">
-			正在建设中
-			<button type="default" @click="goIndex" class="back-index">返回首页</button>
+		<view class="custom-nav">
+			<view class="custom-nav-left" @click="$api.goback"><text class="iconfont icon-jiantou"></text></view>
+			<view class="custom-nav-center"></view>
 		</view>
 		<view class="hold-status-bar">
 			<!-- 占据了状态栏位置 -->

pages/product/product.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="pages">
+		<view class="custom-nav">
+			<view class="custom-nav-left" @click="$api.goback"><text class="iconfont icon-jiantou"></text></view>
+			<view class="custom-nav-center"></view>
+		</view>
 		<view class="swiper-wrap">
 			<swiper class="swiper"
 			:indicator-dots="swiper.indicatorDots" 
@@ -8,7 +12,7 @@
 			:autoplay="swiper.autoplay"
 			:interval="swiper.interval" :duration="swiper.duration">
 				<swiper-item v-for="(item, index) in bannerList" :key="index">
-					<view class="adv-item" ><image :src="$onlineImg +item" class="pic" mode="scaleToFill"></image></view>
+					<view class="adv-item" ><image :src="$onlineImg +item" class="pic" mode="aspectFill"></image></view>
 				</swiper-item>
 			</swiper>
 		</view>

pages/use/useRouter.vue

@@ -22,14 +22,16 @@
 					console.log('userInfo customerType',res.data.customerType);
 					if(res.data.customerType =='1'){
 						console.log('个人用户');
-						self.$api.href('/pages/mall/mall')
+						self.$api.href('/pages/building/building')
+						// self.$api.href('/pages/mall/mall');
 					}else{
 						self.$api.href('/pages/use/use')
 					};
 				}
 			});
 		},
-		onLoad() {
+		onLoad(option) {
+			console.log('this',this)
 
 		},
 		methods: {