修复证书显示bug, 根据企业类型显示不同的购买文字

components/hans-tabbar/hans-tabbar.vue

@@ -26,6 +26,8 @@ export default {
 	},
 	methods: {
 		tabChange(index) {
+			console.log("taprouterIndex",index)
+			console.log("routerAcIndex",this.current)
 			if (index === this.current) {
 				return;
 			}

pages/building/building.vue

@@ -1,104 +1,120 @@
 <!-- https://www.kancloud.cn/dishaxueyuan/uni-app/1358897 onBackPress在小程序不生效 -->
 <template>
 	<view class="pages">
-		<view class="hold-status-bar show">
-			<!-- 占据了状态栏位置 -->
-		</view>
+		<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>
-		
-		<hans-tabber :list="list" style="position:fixed;bottom:0;width:100%;left:0;right:0;" @tabChange="tabChange"></hans-tabber>
+		<view class="building-text">
+			正在建设中
+			<text class="dotting"></text>
+		</view>
+		<hans-tabber 
+			:list="list" 
+			style="position:fixed;bottom:0;width:100%;left:0;right:0;" 
+			@tabChange="tabChange"></hans-tabber>
 	</view>
 </template>
 
 <script>
-	import hansTabber from '../../components/hans-tabbar/hans-tabbar.vue';
-	export default {
-		components:{
-			hansTabber
-		},
-		data() {
-			return {
-				list: [{
-				 "text": "首页",
-				 "iconPath": '/static/img/icon_home.png' ,
-				 "selectedIconPath": '/static/img/icon_home_active.png'
-			   },
-			   {
-				 "text": "价值实现",
-				 "iconPath": '/static/img/icon_use.png',
-				 "selectedIconPath":'/static/img/icon_use_active.png'
-				 },
-				 {
-				   "text": "我的信息",
-				   "iconPath": '/static/img/icon_usercenter.png',
-				   "selectedIconPath": '/static/img/icon_usercenter_active.png'
-				 }],
-				$getimg:this.$getimg,
-				token:'',
-				params:{
-					
+import hansTabber from '../../components/hans-tabbar/hans-tabbar.vue';
+export default {
+	components: {
+		hansTabber
+	},
+	data() {
+		return {
+			list: [
+				{
+					text: '首页',
+					iconPath: '/static/img/icon_home.png',
+					selectedIconPath: '/static/img/icon_home_active.png'
+				},
+				{
+					text: '价值实现',
+					iconPath: '/static/img/icon_use.png',
+					selectedIconPath: '/static/img/icon_use_active.png'
+				},
+				{
+					text: '我的信息',
+					iconPath: '/static/img/icon_usercenter.png',
+					selectedIconPath: '/static/img/icon_usercenter_active.png'
 				}
-				
-			}
-		},
-		onShow() {
-			let self = this;
-			uni.getStorage({
-				key : 'userInfo',
-				success:function(res){
-					if(res.data.customerType =='1'){
-						// console.log('个人用户');
-						self.list[1].text='普惠商城';
-						self.list[1].iconPath='/static/img/icon_mall.png';
-						self.list[1].selectedIconPath='/static/img/icon_mall_active.png';
-					}else{
-						
-					};
+			],
+			$getimg: this.$getimg,
+			token: '',
+			params: {}
+		};
+	},
+	onShow() {
+		let self = this;
+		uni.getStorage({
+			key: 'userInfo',
+			success: function(res) {
+				if (res.data.customerType == '1') {
+					// console.log('个人用户');
+					self.list[1].text = '普惠商城';
+					self.list[1].iconPath = '/static/img/icon_mall.png';
+					self.list[1].selectedIconPath = '/static/img/icon_mall_active.png';
+				} else {
 				}
-			});
-		},
-		onLoad() {
-			// var pages = getCurrentPages();
-			// console.log('pages',pages);
-			// let menuButtonInfo = uni.getMenuButtonBoundingClientRect();//胶囊按钮信息
-			// console.log('menuButtonInfo',menuButtonInfo);
-
-		},
-		methods: {
-			tabChange(index) {
-				console.log(index)
-				switch(index) {
-				     case 0:
-				        uni.switchTab({
-				        	url:'../index/index'
-				        });
-				        break;
-				     case 1:
-				        return
-				        break;
-					case 2:
-					   uni.switchTab({
-					   	url:'../usercenter/usercenter'
-					   });
-					   break;
-				     default:
-				        return
-				} 
 			}
-
+		});
+	},
+	onLoad() {
+		// var pages = getCurrentPages();
+		// console.log('pages',pages);
+		// let menuButtonInfo = uni.getMenuButtonBoundingClientRect();//胶囊按钮信息
+		// console.log('menuButtonInfo',menuButtonInfo);
+	},
+	methods: {
+		tabChange(index) {
+			console.log(index);
+			switch (index) {
+				case 0:
+					uni.switchTab({
+						url: '../index/index'
+					});
+					break;
+				case 1:
+					return;
+					break;
+				case 2:
+					uni.switchTab({
+						url: '../usercenter/usercenter'
+					});
+					break;
+				default:
+					return;
+			}
 		}
 	}
+};
 </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;}
+/* @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/index/index.vue

@@ -160,8 +160,12 @@
 			<!-- 购买排行榜 结束 -->
 		</view>
 		<!-- wrap end -->
-		
-		<quick-buy class="quickbuy" ref="quickBuy" @closeModal="closeModal" :visible="modal.visibleModal" v-if="modal.visibleModal"></quick-buy>
+		<quick-buy 
+			class="quickbuy" 
+			ref="quickBuy" 
+			@closeModal="closeModal" 
+			:visible="modal.visibleModal" 
+			v-if="modal.visibleModal"></quick-buy>
 	</view>
 </template>
 
@@ -174,7 +178,6 @@
 			uniPopup,
 			quickBuy,
 			customNodata
-			
 		},
 		data() {
 			return {

pages/index/modal/quickBuy.vue

@@ -9,12 +9,12 @@
 			</view>
 			<view class="popup-body">
 				<view class="conditions-item input-number">
-					<view class="conditions-item-til">请输入您想认购的碳汇数：</view>
+					<view class="conditions-item-til">{{userInfo.customerType == 2 ? '请输入您想认购的碳汇数' : '请输入购碳数'}}：</view>
 					<view class="num">
 						 <input class="input" type="number" v-model="shoppingNum" placeholder="单次购买不超过1000株" placeholder-style="font-size:20rpx"/>
 					</view>
 				</view>
-				<view class="conditions-item remark-wrap" v-if="productType == 'all'">
+				<view class="conditions-item remark-wrap" v-if="productType == 'all'" v-show="userInfo.customerType == 2">
 					<view class="conditions-item-til">备注说明：</view>
 					<view class="remark">
 						<textarea class="remark-textarea" maxlength="240" v-model="remark" placeholder-style="font-size:30rpx" placeholder="请输入您对认购的碳汇产品要求" />
@@ -39,9 +39,7 @@
 </template>
 
 <script>
-	import {
-		mapMutations
-	} from 'vuex';
+	import { mapState, mapMutations } from 'vuex';
 	import {
 		debounce
 	} from '@/utils/util.js'
@@ -51,6 +49,9 @@
 		components: {
 			uniPopup,
 		},
+		computed: { 
+			...mapState(['userInfo'])
+		},
 		created() {
 			let self = this;
 			uni.getStorage({

pages/use/use.vue

@@ -1,15 +1,11 @@
 <template>
 	<view class="pages">
-		<view class="hold-status-bar">
-			<!-- 占据了状态栏位置 -->
-		</view>
+		<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>
+		<view class="top-img"><image :src="$getimg + 'use-bg-s1.png'" class="img" mode="widthFix"></image></view>
 		<view class="use-wrap">
 			<view class="use-wrap-header">
 				<view class="til">价值实现</view>
@@ -32,77 +28,73 @@
 				<view class="use-item-til">大型活动碳中和</view>
 			</view>
 		</view>
-		
+
 		<hans-tabber :list="list" style="position:fixed;bottom:0;width:100%;left:0;right:0;" @tabChange="tabChange"></hans-tabber>
 	</view>
 </template>
 
 <script>
-	import hansTabber from '../../components/hans-tabbar/hans-tabbar.vue';
-	export default {
-		components:{
-			hansTabber
-		},
-		data() {
-			return {
-				list: [{
-					 "text": "首页",
-					 "iconPath": '/static/img/icon_home.png' ,
-					 "selectedIconPath": '/static/img/icon_home_active.png'
+import hansTabber from '../../components/hans-tabbar/hans-tabbar.vue';
+export default {
+	components: {
+		hansTabber
+	},
+	data() {
+		return {
+			list: [
+				{
+					text: '首页',
+					iconPath: '/static/img/icon_home.png',
+					selectedIconPath: '/static/img/icon_home_active.png'
+				},
+				{
+					text: '价值实现',
+					iconPath: '/static/img/icon_use.png',
+					selectedIconPath: '/static/img/icon_use_active.png'
 				},
 				{
-				 "text": "价值实现",
-				 "iconPath": '/static/img/icon_use.png',
-				 "selectedIconPath":'/static/img/icon_use_active.png'
-				 },
-				 {
-				   "text": "我的信息",
-				   "iconPath": '/static/img/icon_usercenter.png',
-				   "selectedIconPath": '/static/img/icon_usercenter_active.png'
-				 }],
-				$getimg:this.$getimg,
-				token:'',
-				params:{
-					
+					text: '我的信息',
+					iconPath: '/static/img/icon_usercenter.png',
+					selectedIconPath: '/static/img/icon_usercenter_active.png'
+				}
+			],
+			$getimg: this.$getimg,
+			token: '',
+			params: {}
+		};
+	},
+	onShow() {
+		let self = this;
+		uni.getStorage({
+			key: 'userInfo',
+			success: function(res) {
+				console.log('userInfo customerType', res.data.customerType);
+				if (res.data.customerType == '1') {
+					console.log('个人用户');
+					self.$api.href('/pages/mall/mall');
 				}
-				
 			}
+		});
+	},
+	onLoad() {},
+	methods: {
+		lvyue() {
+			this.$api.msg('暂未开放');
 		},
-		onShow() {
-			let self = this;
-			uni.getStorage({
-				key : 'userInfo',
-				success:function(res){
-					console.log('userInfo customerType',res.data.customerType);
-					if(res.data.customerType =='1'){
-						console.log('个人用户');
-						self.$api.href('/pages/mall/mall')
-					};
-				}
-			});
+		zhonghe() {
+			this.$api.msg('暂未开放');
 		},
-		onLoad() {
-
+		huodong() {
+			this.$api.msg('暂未开放');
 		},
-		methods: {
-			lvyue(){
-				this.$api.msg('暂未开放')
-			},
-			zhonghe(){
-				this.$api.msg('暂未开放')
-			},
-			huodong(){
-				this.$api.msg('暂未开放')
-			},
-			useClick(){
-				this.$api.href('/pages/usercenter/question/question')
-				// this.$api.msg('稍后展示')
-			}
-
+		useClick() {
+			this.$api.href('/pages/usercenter/question/question');
+			// this.$api.msg('稍后展示')
 		}
 	}
+};
 </script>
 
 <style>
-	@import url("./use.css");
+@import url('./use.css');
 </style>

pages/usercenter/certificateList/certificate/certificate.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="pages">
-		<web-view :src="certificateUrl
+		<web-view v-if="loadWeb" :src="certificateUrl
 		+'credentialNo='+item.credentialNo
-		+'&customerName='+item.customerName
 		+'&year='+item.year
 		+'&carbonAmount='+item.carbonAmount
 		+'&orderAmount='+item.orderAmount
 		+'&buyDate='+item.buyDate
-		+'&nickName='+item.nickName
-		+'&companyName='+item.companyName
+		+'&farmerName='+item.farmerName	
+		+'&certName='+item.certName
 		+'&isH5=true'
 		">
 		</web-view>
+		</web-view>
 	</view>
 </template>
 
@@ -26,7 +26,8 @@
 				certificateUrl:this.config.certificateUrl,
 				thetoken:'',
 				orderid:'',
-				item:[],
+				item:null,
+				loadWeb:false,
 				path:'',
 				params:{},
 			}
@@ -48,14 +49,19 @@
 			},
 			}).then(res => {
 				uni.hideLoading();
+				this.item = res.data.retBody;
+				this.item.certName = this.item.certType == 1 ? this.item.customerName : this.item.companyName //1普通用户 2企业用户
+				var that = this;
+				setTimeout(function () {
+				  that.loadWeb = true;
+				}, 1000);
 				// this.info = Object.assign(this.info, data);
 				// this.info.url = '/static/html2canvas/index.html?key=' + this.orderid;
-				this.item = res.data.retBody;
-				console.log('this.base.views',this.base.views);
-				this.base.views[1].text = `证书编号:${res.data.retBody.credentialNo}`;
-				this.base.views[2].text = `尊敬的 ${res.data.retBody.customerName}:`;
-				this.base.views[3].text = `感谢您对“碳汇+”生态产品价值实现的支持，您购买了 ${res.data.retBody.year}年度碳汇量${res.data.retBody.carbonAmount}kg，您购碳资金${res.data.retBody.orderAmount}元，已全额转入${res.data.retBody.farmerName}的银行账户。`;
-				console.log('res',JSON.parse(JSON.stringify(res.data.retBody)));
+				// console.log('this.base.views',this.base.views);
+				// this.base.views[1].text = `证书编号:${res.data.retBody.credentialNo}`;
+				// this.base.views[2].text = `尊敬的 ${res.data.retBody.customerName}:`;
+				// this.base.views[3].text = `感谢您对“碳汇+”生态产品价值实现的支持，您购买了 ${res.data.retBody.year}年度碳汇量${res.data.retBody.carbonAmount}kg，您购碳资金${res.data.retBody.orderAmount}元，已全额转入${res.data.retBody.farmerName}的银行账户。`;
+				// console.log('res',JSON.parse(JSON.stringify(res.data.retBody)));
 			}).catch(err =>{
 				console.log('err',err)
 			});

pages/usercenter/usercenter.vue

@@ -13,6 +13,10 @@
 						<text class="iconfont icon-qiyeyonghu"></text>
 						企业用户
 					</view>
+					<view class="tyep" v-if="!userInfo.isCompany">
+						<text class="iconfont icon-qiyeyonghu"></text>
+						个人用户
+					</view>
 				</view>
 			</view>
 			<view class="tool-bar">