瀏覽代碼

auto commit

gcz 4 年之前
父節點
當前提交
7bf7a1bcaf

+ 4 - 2
config/config.js

@@ -1,12 +1,14 @@
 const config = {
 	//dev
 	// apiBaseurl:'http://172.16.90.8:21998',//东东
-	apiBaseurl:'http://wx.hw.hongweisoft.com/cqthminapp',//东东
+	// apiBaseurl:'http://wx.hw.hongweisoft.com/cqthminapp',//东东
+	apiBaseurl:'http://47.108.214.98:21998',//东东
 	
 	// 图片占位
 	placeImg:'http://placekitten.com',
 	
-	loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://foresth5test.hw.hongweisoft.com/#/',//登录后跳转到测试链接 东东
+	// loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://foresth5test.hw.hongweisoft.com/#/',//登录后跳转到测试链接 东东
+	
 	
 
 	//版本号:版本号升级将显示引导页

+ 7 - 0
pages.json

@@ -68,6 +68,13 @@
 				"navigationStyle":"custom"
 			}
 		},
+		{
+			"path": "pages/use/companyUse/companyUse",
+			"style": {
+				"navigationBarTitleText": "企业碳中和",
+				"navigationStyle":"custom"
+			}
+		},
 		{
 			"path": "pages/use/assignment/assignmentDetail/assignmentDetail",
 			"style": {

+ 0 - 13
pages/use/assignment/assignment.css

@@ -8,19 +8,6 @@ page{background-color: #4EBC6B;}
 .carbon-item .num{font-size: 56rpx;color: #26D18B;line-height: 74rpx;letter-spacing: 3rpx;}
 .carbon-item .text{font-size: 28rpx;color: #999;line-height: 40rpx;}
 
-.content-down{background-color: #fff;border-radius: 16rpx;padding: 24rpx;}
-.step-text{margin-bottom: 51rpx;}
-.content-down .step-text-item-cn{font-size: 24rpx;}
-.content-down .step-text-item-cn.active{font-size: 28rpx;}
-
-.explain{font-size: 24rpx;color: #333;margin-bottom: 32rpx;line-height: 33rpx;letter-spacing: 1rpx;}
-.status-btn{padding: 24rpx;background:#F2F2F2;border-radius: 8rpx;text-align: center;color: #999;font-weight: 400;}
-.active .status-btn{background: linear-gradient(-45deg, #FD4B35 0%, #FF945B 100%);color: #fff;}
-.finish .status-btn{background: linear-gradient(90deg, #FFF900 0%, #FFD200 100%);color: #333;}
-.active .status-btn .status-btn-small,
-.finish .status-btn .status-btn-small{opacity: 0.5;}
-.status-btn-big{font-size: 34rpx;line-height: 48rpx;}
-.status-btn-small{font-size: 24rpx;line-height: 33rpx;}
 
 
 

+ 1 - 0
pages/use/assignment/assignment.vue

@@ -141,5 +141,6 @@
 </script>
 
 <style>
+	@import url("../useCommon.css");
 	@import url("./assignment.css");
 </style>

+ 27 - 0
pages/use/companyUse/companyUse.css

@@ -0,0 +1,27 @@
+page{background-color: #4EBC6B;}
+/* .top-img{height: 1130rpx;} */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 135 - 0
pages/use/companyUse/companyUse.vue

@@ -0,0 +1,135 @@
+<template>
+	<view class="pages">
+		<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>
+		</view>
+		<view class="aside-tool">
+			<view class="aside-tool-item">
+				<view class="aside-tool-icon green">
+					<image :src="$getimg + 'icon-zhonghe.png'" class="img" mode="widthFix"></image>
+				</view>
+				<view class="aside-tool-text">关于碳中和</view>
+			</view>
+			<view class="aside-tool-item"  @click="randomPop">
+				<view class="aside-tool-icon yellow">
+					<image :src="$getimg + 'icon-tanpuhui.png'" class="img" mode="widthFix"></image>
+				</view>
+				<view class="aside-tool-text">购买碳汇</view>
+			</view>
+		</view>
+		<view class="wrap40 content">
+			
+			
+			<view class="content-down">
+				<view class="step-wrap">
+				<!-- <view class="step-wrap" v-if="applyStatus == 0||applyStatus == 1||applyStatus == 2||applyStatus == 3"> -->
+					<view class="step-item" :class="applyStatus == 0?'active':''"></view>
+					<view class="step-item" :class="applyStatus == 1?'active':''"></view>
+					<view class="step-item" :class="applyStatus == 2?'active':''"></view>
+				</view>
+				<view class="step-text">
+					<view class="step-text-item">
+						<view class="step-text-item-cn">未达碳汇量</view>
+						<view class="step-text-item-en">Step 1</view>
+					</view>
+					<view class="step-text-item">
+						<view class="step-text-item-cn">实现碳中和</view>
+						<view class="step-text-item-en">Step 2</view>
+					</view>
+					<view class="step-text-item">
+						<view class="step-text-item-cn">获得证书</view>
+						<view class="step-text-item-en">Step 3</view>
+					</view>
+				</view>
+				<!-- step end -->
+				<!-- 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>
+						<view class="main-til-text">未达碳汇量</view>
+					</view>
+					<view class="explain">说明:实现企业碳中和约需要240000kg碳汇量,您可以在平台进行认购</view>
+					<view class="status-btn">
+						<view class="status-btn-big">实现碳中和</view>
+						<view class="status-btn-small">实现碳中和后将获得碳汇核证签发证书</view>
+					</view>
+				</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>
+						<view class="main-til-text">实现碳中和</view>
+					</view>
+					<view class="explain">说明:可以用碳汇量中和您现在的碳排放量,中和后将可以获得证书</view>
+					<view class="status-btn">
+						<view class="status-btn-big">实现碳中和</view>
+						<view class="status-btn-small">实现碳中和后将获得碳汇核证签发证书</view>
+					</view>
+				</view>
+				<!-- 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>
+						<view class="main-til-text">获得证书</view>
+					</view>
+					<view class="explain">说明:本年度已完成企业碳中和,中和碳汇量为240000kg</view>
+					<view class="status-btn" @click="$api.href('./assignmentDetail/assignmentDetail')">
+						<view class="status-btn-big">查看签发证书</view>
+						<view class="status-btn-small">点击查看碳汇核证签发证书</view>
+					</view>
+				</view>				
+				<!-- status 2 -->
+			</view>
+		</view>
+		
+		<quick-buy class="quickbuy" ref="quickBuy" @closeModal="closeModal" :visible="modal.visibleModal" v-if="modal.visibleModal"></quick-buy>
+	</view>
+</template>
+
+<script>
+	import quickBuy from 'pages/index/modal/quickBuy';
+	export default {
+		components:{
+			quickBuy,
+		},
+		data() {
+			return {
+				$getimg:this.$getimg,
+				modal: {
+					visibleModal: false
+				},
+				token:'',
+				applyStatus:0,
+				params:{
+					
+				}
+				
+			}
+		},
+		onShow() {
+			
+		},
+		onLoad() {
+
+		},
+		methods: {
+			//开启多株购碳
+			randomPop() {
+				this.modal.visibleModal = true;
+				this.$nextTick(res => {
+					// console.log('this.$refs',this.$refs.quickBuy)
+					this.$refs.quickBuy.openPop();
+				});
+			},
+			closeModal() {
+				this.modal.visibleModal = false;
+			},
+
+		}
+	}
+</script>
+
+<style>
+	@import url("../useCommon.css");
+	@import url("./companyUse.css");
+</style>

+ 5 - 3
pages/use/use.vue

@@ -11,7 +11,7 @@
 					<text class="iconfont icon-jiantou"></text>
 				</view>
 			</view>
-			<view class="use-item" @click="$api.href('/pages/use/assignment/assignment')">
+			<view class="use-item" @click="lvyue">
 				<image :src="$getimg + 'icon-lvyue.png'" class="use-item-img" mode="scaleToFill"></image>
 				<view class="use-item-til">碳履约</view>
 				<view class="use-item-subtil">(仅履约企业)</view>
@@ -46,10 +46,12 @@
 		},
 		methods: {
 			lvyue(){
-				this.$api.msg('暂未开放')
+				this.$api.href('/pages/use/assignment/assignment')
+				// this.$api.msg('暂未开放')
 			},
 			zhonghe(){
-				this.$api.msg('暂未开放')
+				this.$api.href('/pages/use/companyUse/companyUse')
+				// this.$api.msg('暂未开放');				
 			},
 			huodong(){
 				this.$api.msg('暂未开放')

+ 13 - 0
pages/use/useCommon.css

@@ -0,0 +1,13 @@
+.content-down{background-color: #fff;border-radius: 16rpx;padding: 24rpx;}
+.step-text{margin-bottom: 51rpx;}
+.content-down .step-text-item-cn{font-size: 24rpx;}
+.content-down .step-text-item-cn.active{font-size: 28rpx;}
+
+.explain{font-size: 24rpx;color: #333;margin-bottom: 32rpx;line-height: 33rpx;letter-spacing: 1rpx;}
+.status-btn{padding: 24rpx;background:#F2F2F2;border-radius: 8rpx;text-align: center;color: #999;font-weight: 400;}
+.active .status-btn{background: linear-gradient(-45deg, #FD4B35 0%, #FF945B 100%);color: #fff;}
+.finish .status-btn{background: linear-gradient(90deg, #FFF900 0%, #FFD200 100%);color: #333;}
+.active .status-btn .status-btn-small,
+.finish .status-btn .status-btn-small{opacity: 0.5;}
+.status-btn-big{font-size: 34rpx;line-height: 48rpx;}
+.status-btn-small{font-size: 24rpx;line-height: 33rpx;}

+ 1 - 1
pages/usercenter/certificateList/certificate/certificate.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
 		<!-- 画板 -->		
-		<l-painter ref="painter" :board="base"/>
+		<l-painter ref="painter" :board="base" pixel-ratio="2"/>
 		<view class="bottom-btn-wrap">
 			<view class="bottom-btn-wrap-bg">
 				<view class="bottom-btn btn" @click="download">