Browse Source

custom-nav

gcz 4 years ago
parent
commit
5875bcc7f1

+ 5 - 1
common/css/common.css

@@ -1,11 +1,15 @@
 /* 全屏状态栏占位 */
 .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;}
+.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;}
 /* 全屏图片背景 */
 .page-bg-wrap{position: fixed;left: 0;right: 0;top: 0;bottom: 0;}
 .page-bg{width: 100%;max-height: 100%;}
 
 /* 头部图片 */
-.top-img{position: relative;height: 390rpx;overflow: hidden;}
+.top-img{position: relative;height: 390rpx;overflow: hidden;z-index: -1;}
 .top-img .img{width: 100%;height: 100%;position: absolute;left: 0;top: 0;z-index: -1;}
 
 .wrap{margin: 24rpx;}

+ 18 - 1
main.js

@@ -79,9 +79,26 @@ const href = (data,type = 1) =>{
 	})
 };
 
+const goback = () =>{
+	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'){
+		uni.switchTab({
+			url:'/pages/index/index',
+			fail: (err) => {
+				console.log('switchTab',err)
+			}
+		})
+		return;
+	};
+	uni.navigateBack({})
+};
+
 Vue.config.productionTip = false;
 
-Vue.prototype.$api = {msg,http,href};
+Vue.prototype.$api = {msg,http,href,goback};
 Vue.prototype.$getimg = config.imgUrl;
 Vue.prototype.$getInnerImg = config.innerImgUrl;
 Vue.prototype.$onlineImg = config.onlineImg;

+ 2 - 1
pages/use/assignment/assignment.css

@@ -1,5 +1,6 @@
 page{background-color: #4EBC6B;}
-/* .top-img{height: 1130rpx;} */
+.top-img{height: 1330rpx;}
+.content{margin-top: -460rpx;}
 .target{background-color: #fff;border-radius: 16rpx;padding: 24rpx;text-align: center;margin-bottom: 8rpx;}
 .target .year{margin-bottom: 16rpx;font-size: 28rpx;color: #333;line-height: 40rpx;letter-spacing: 1rpx;font-weight: 500;}
 .carbon{display: flex;justify-content: space-between;}

+ 8 - 4
pages/use/assignment/assignment.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="top-img">
 			<!-- <image :src="$getimg + 'use-bg.png'" class="img" mode="widthFix"></image> -->
 			<image :src="$getimg + 'lvyue.jpg'" class="img" mode="widthFix"></image>
@@ -57,7 +61,7 @@
 				<!-- step end -->
 				<view class="status-wrap" v-if="applyStatus == '0'">
 					<view class="main-til">
-						<image :src="$getimg + 'icon-tanpuhui.png'" class="main-til-icon" mode="widthFix"></image>
+						<image :src="$getimg + 'icon-goumai.png'" class="main-til-icon" mode="widthFix"></image>
 						<view class="main-til-text">非碳汇冲抵期</view>
 					</view>
 					<view class="explain">说明:冲抵减排量约需要1000kg碳汇量,您可以在平台进行认购</view>
@@ -69,7 +73,7 @@
 				<!-- status 0 -->
 				<view class="status-wrap active" v-if="applyStatus == '1'">
 					<view class="main-til">
-						<image :src="$getimg + 'icon-tanpuhui.png'" class="main-til-icon" mode="widthFix"></image>
+						<image :src="$getimg + 'icon-goumai.png'" class="main-til-icon" mode="widthFix"></image>
 						<view class="main-til-text">碳汇冲抵期</view>
 					</view>
 					<view class="explain">说明:您的碳汇量可以冲抵1000kg减排量,请于2020年10月1日内提交申请</view>
@@ -81,7 +85,7 @@
 				<!-- status 1 -->
 				<view class="status-wrap finish" v-if="applyStatus == '2'">
 					<view class="main-til">
-						<image :src="$getimg + 'icon-tanpuhui.png'" class="main-til-icon" mode="widthFix"></image>
+						<image :src="$getimg + 'icon-goumai.png'" class="main-til-icon" mode="widthFix"></image>
 						<view class="main-til-text">碳汇冲抵期</view>
 					</view>
 					<view class="explain">说明:您的碳汇量可以冲抵1000kg减排量,请于2020年10月1日内提交申请</view>
@@ -134,7 +138,7 @@
 			},
 			closeModal() {
 				this.modal.visibleModal = false;
-			},
+			}
 
 		}
 	}

+ 2 - 1
pages/use/companyUse/companyUse.css

@@ -1,5 +1,6 @@
 page{background-color: #4EBC6B;}
-/* .top-img{height: 1130rpx;} */
+.top-img{height: 1130rpx;}
+.content{margin-top: -460rpx;}
 
 
 

+ 7 - 3
pages/use/companyUse/companyUse.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="top-img">
 			<!-- <image :src="$getimg + 'use-bg.png'" class="img" mode="widthFix"></image> -->
 			<image :src="$getimg + 'zhonghe-bg.jpg'" class="img" mode="widthFix"></image>
@@ -46,7 +50,7 @@
 				<!-- status 0 -->
 				<view class="status-wrap finish" v-if="applyStatus == '0'">
 					<view class="main-til">
-						<image :src="$getimg + 'icon-tanpuhui.png'" class="main-til-icon" mode="widthFix"></image>
+						<image :src="$getimg + 'icon-goumai.png'" class="main-til-icon" mode="widthFix"></image>
 						<view class="main-til-text">未达碳汇量</view>
 					</view>
 					<view class="explain">说明:实现企业碳中和约需要240000kg碳汇量,您可以在平台进行认购</view>
@@ -57,7 +61,7 @@
 				</view>
 				<view class="status-wrap" v-if="applyStatus == '1'">
 					<view class="main-til">
-						<image :src="$getimg + 'icon-tanpuhui.png'" class="main-til-icon" mode="widthFix"></image>
+						<image :src="$getimg + 'icon-goumai.png'" class="main-til-icon" mode="widthFix"></image>
 						<view class="main-til-text">实现碳中和</view>
 					</view>
 					<view class="explain">说明:可以用碳汇量中和您现在的碳排放量,中和后将可以获得证书</view>
@@ -69,7 +73,7 @@
 				<!-- status 1 -->
 				<view class="status-wrap active" v-if="applyStatus == '2'">
 					<view class="main-til">
-						<image :src="$getimg + 'icon-tanpuhui.png'" class="main-til-icon" mode="widthFix"></image>
+						<image :src="$getimg + 'icon-goumai.png'" class="main-til-icon" mode="widthFix"></image>
 						<view class="main-til-text">获得证书</view>
 					</view>
 					<view class="explain">说明:本年度已完成企业碳中和,中和碳汇量为240000kg</view>

+ 4 - 0
pages/use/use.vue

@@ -3,6 +3,10 @@
 		<view class="hold-status-bar">
 			<!-- 占据了状态栏位置 -->
 		</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>
 		<view class="top-img">
 			<image :src="$getimg + 'use-bg-s1.png'" class="img" mode="widthFix"></image>
 		</view>