auto commit

common/css/common.css

@@ -1,3 +1,4 @@
+.hold-status-bar{ height: var(--status-bar-height);width: 100%;display: none;}
 /* 全屏图片背景 */
 .page-bg-wrap{position: fixed;left: 0;right: 0;top: 0;bottom: 0;}
 .page-bg{width: 100%;max-height: 100%;}

pages.json

@@ -14,13 +14,15 @@
 			"navigationStyle":"custom"
 			,"style": {
 				"navigationBarBackgroundColor":"#fff",
-				"navigationBarTitleText": "引导页"
+				"navigationBarTitleText": "引导页",
+				"navigationStyle":"custom"
 			}
 		},
 		{
 			"path": "pages/login/loginType",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		},
 		{
@@ -32,7 +34,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		},
 		{
@@ -56,7 +59,8 @@
 		{
 			"path": "pages/usercenter/usercenter",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		},
 		{

pages/confirmOrder/confirmOrder.css

@@ -13,12 +13,12 @@ page{background: #F5F5F8;padding-bottom: 160rpx;}
 .order-list-item .total uni-text{font-size:24rpx;}
 .order-list-item .nums{position:absolute;right:-20rpx;bottom:0;}
 .order-list-item .nums .countNum{display:flex;width:152rpx;height:50rpx;border:1px solid #E5E5E5;margin-left:134rpx;}
-.order-list-item .nums .countNum .countNum-action{width:230rpx;height:100%;line-height:44rpx;color:#65B74E;text-align:center;}
+.order-list-item .nums .countNum .countNum-action{width:230rpx;height:100%;line-height:44rpx;color:#26D18B;text-align:center;}
 .order-list-item .nums .countNum .reduce{border-right:1px solid #E5E5E5;}
 .order-list-item .nums .countNum .add{border-left:1px solid #E5E5E5;}
 .order-list-item .nums .countNum .countNum-input .uni-input{height:100%;text-align:center;}
 .pay-wrap{position: fixed;left: 0;bottom: 0;background: #fff;padding: 31rpx 24rpx;width: 100%;box-sizing: border-box;}
-.pay-wrap .pay-con{height: 98rpx;line-height:98rpx;box-sizing: border-box;background: #65B74E;border-radius: 45rpx;padding: 0 24rpx;}
+.pay-wrap .pay-con{height: 98rpx;line-height:98rpx;box-sizing: border-box;background: #26D18B;border-radius: 45rpx;padding: 0 24rpx;}
 .pay-wrap .pay-con-til{font-size:29rpx;color: #fff;padding-left:28rpx;}
 .pay-wrap .num{float: right;font-size: 36rpx;color: #fff;margin-right: 33rpx;position: relative;padding-right: 45rpx;}
 .pay-wrap .num::after{content: '';width: 30rpx;height: 27rpx;/* background: url(../../static/images/right-arrow.png) no-repeat; */background-size: 30rpx auto;position: absolute;right: 0;top: 39rpx;}

pages/index/guide.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="pages">
+		<view class="hold-status-bar">
+			<!-- 占据了状态栏位置 -->
+		</view>
 		<view class="guide-img">
 			<swiper class="swiper" 
 			:indicator-dots="swiper.indicatorDots" 
@@ -48,7 +51,8 @@
 		},
 		onReady() {
 			// 从本地缓存中同步获取指定 key 对应的内容，用于判断是否是第一次打开应用
-			 const value = uni.getStorageSync('launchFlag');
+			 const launch = uni.getStorageSync('launchFlag');
+			 console.log('launch',launch);
 			 const version = uni.getStorageSync('version');
 			 if(!version){
 				uni.setStorage({
@@ -56,15 +60,15 @@
 				  data: this.config.version
 				});
 			 }
-			 if (value&&version==this.config.version) {
+			 if (launch&&version==this.config.version) {
 			   // 如果已经有，直接去首页
 				this.goIndex();
 			 } else {
 			   // 没有值，跳到引导页，并存储，下次打开就不会进去引导页
-			   uni.setStorage({
-			     key: 'launchFlag',
-			     data: true
-			   });
+			   // uni.setStorage({
+			   //   key: 'launchFlag',
+			   //   data: true
+			   // });
 				// this.lxfEndtime();
 			 }
 			
@@ -75,6 +79,10 @@
 				  key: 'version',
 				  data: this.config.version
 				});
+				uni.setStorage({
+				  key: 'launchFlag',
+				  data: true
+				});
 				uni.redirectTo({
 				    url: '/pages/login/loginType',
 					fail(err) {

pages/index/index.vue

@@ -1,5 +1,8 @@
-<template>
+<template>	
 	<view class="content">
+		<view class="hold-status-bar">
+			<!-- 占据了状态栏位置 -->
+		</view>
 		<view class="home-top">
 			<image :src="$getimg+'home-top-bg.png'" class="home-top-bg" mode="widthFix"></image>
 			<view class="home-top-til">“碳汇+”生态产品价值实现</view>
@@ -114,7 +117,7 @@
 					</view>
 				</view>
 				<!-- rank-top end -->
-				<view class="rank-list-header" v-if="rankList">
+				<view class="rank-list-header" v-if="rankList.length>0">
 					<view class="rank-list-header-rank">排名</view>
 					<view class="rank-list-header-user">用户</view>
 					<view class="rank-list-header-carbon">购买碳汇</view>

pages/index/init.vue

@@ -28,16 +28,12 @@
 			 }
 			 if (launch&&version==this.config.version&&haslogin) {
 			   // 如果已经有，直接去首页
-				   this.goIndex();				
+				   this.goIndex();
 			 } else if(launch&&version==this.config.version&&!haslogin){
 				 this.goLogin();				 
 			 } else {
 			   // 没有值，跳到引导页，并存储，下次打开就不会进去引导页
-			   this.goGuide();
-			   uni.setStorage({
-			     key: 'launchFlag',
-			     data: true
-			   });
+			   this.goGuide();			   
 				// this.lxfEndtime();
 			 }
 			 

pages/index/modal/quickBuy.vue

@@ -57,7 +57,11 @@
 				key:'userInfo',
 				success: function (res) {
 					self.customerType = res.data.customerType;
+					if(!res.data){this.goLogin();};
 				   console.log('userInfo',res);
+				},
+				fail:function(err){
+					this.goLogin();
 				}
 			});
 			console.log('prohelpPeople',this.prohelpPeople);
@@ -156,7 +160,21 @@
 				}).catch( err =>{
 					console.log('err',err)
 				})
-				
+			},
+			goLogin(){
+				uni.showToast({
+				 	title:"没有获取登录信息即将跳转到登录页",
+				 	icon:"none",
+				 	duration:2000
+				});
+				setTimeout(i=>{
+					uni.navigateTo({
+						url: '/pages/login/loginType',
+						fail:function(err){
+							console.log(err)
+						}
+					});
+				},2000);
 			}
 		},
 		watch: {

pages/login/companyLogin.vue

@@ -73,7 +73,7 @@
 					//取得用户信息
 					this.upInfo();
 					uni.switchTab({
-						url: '/pages/usercenter/usercenter'
+						url: '/pages/index/index'
 					});
 				}).catch(err =>{
 					console.log('err',err)

pages/login/loginType.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="pages">
+		<view class="hold-status-bar">
+			<!-- 占据了状态栏位置 -->
+		</view>
 		<view class="page-bg-wrap">
 			<image :src="$getimg+'loginType-bg.png'" class="page-bg" mode="widthFix"></image>
 		</view>
@@ -95,7 +98,7 @@
 							
 							if(serf.backUrl == '' || !serf.backUrl){
 								uni.switchTab({
-									url: '/pages/usercenter/usercenter'
+									url: '/pages/index/index'
 								})
 							}else{
 								uni.navigateTo({
@@ -134,7 +137,7 @@
 							let userKey = uni.getStorageSync('userInfo');
 							if(serf.backUrl == '' || !serf.backUrl){
 								uni.switchTab({
-									url: '/pages/usercenter/usercenter'
+									url: '/pages/index/index'
 								})
 							}else{
 								uni.navigateTo({

pages/offlineBuy/offlineBuy.vue

@@ -4,10 +4,10 @@
 			<image :src="$getimg + 'offlineBuy-bg.png'" class="img" mode="widthFix"></image>
 		</view>
 		<view class="offline-content">
-			<view class="step-wrap" v-if="status == 0||status == 1||status == 2||status == 3">
-				<view class="step-item" data-text="步骤一" :class="status == 0?'active':''"></view>
-				<view class="step-item" data-text="步骤二" :class="status == 1?'active':''"></view>
-				<!-- <view class="step-item" data-text="步骤三" :class="status == 2?'active':''"></view> -->
+			<view class="step-wrap" v-if="applyStatus == 0||applyStatus == 1||applyStatus == 2||applyStatus == 3">
+				<view class="step-item" data-text="步骤一" :class="applyStatus == 0?'active':''"></view>
+				<view class="step-item" data-text="步骤二" :class="applyStatus == 1?'active':''"></view>
+				<!-- <view class="step-item" data-text="步骤三" :class="applyStatus == 2?'active':''"></view> -->
 			</view>
 			<view class="step-text">
 				<view class="step-text-item">
@@ -24,7 +24,7 @@
 				</view> -->
 			</view>
 			<!-- step end -->
-			<view class="step-content" v-if="status == 0">
+			<view class="step-content" v-if="applyStatus == 0">
 				<view class="til">
 					<image :src="$getimg + 'icon-rengou.png'" class="til-img" mode="scaleToFill"></image>
 					步骤一
@@ -33,7 +33,7 @@
 					说明：感谢您的认购，生态环境厅将收到您的申请，请尽快联系生态环境厅（联系电话：84546545）签订认购协议
 				</view>				
 			</view>
-			<view class="step-content" v-if="status == 1">
+			<view class="step-content" v-if="applyStatus == 1">
 				<view class="til">
 					<image :src="$getimg + 'icon-rengou.png'" class="til-img" mode="scaleToFill"></image>
 					步骤二
@@ -42,7 +42,7 @@
 					说明：认购成功，订单已生成，请在2020年11月11日之前，打款完成后等待审核，如有疑问或需开具发票可联系08121212
 				</view>				
 			</view>
-			<!-- <view class="step-content" v-if="status == 2">
+			<!-- <view class="step-content" v-if="applyStatus == 2">
 				<view class="til">
 					<image :src="$getimg + 'icon-rengou.png'" class="til-img" mode="scaleToFill"></image>
 					步骤三
@@ -55,15 +55,15 @@
 		</view>
 		<view class="bottom-btn-wrap">
 			<view class="bottom-btn-wrap-bg">
-				<view class="bottom-btn btn" v-if="status == 0" @click="callnumber(phone01)">
+				<view class="bottom-btn btn" v-if="applyStatus == 0" @click="callnumber(phone01)">
 					联系管理部门
 				</view>
-				<view class="bottom-btn btn" v-if="status == 1">
+				<view class="bottom-btn btn" v-if="applyStatus == 1" @click="goOrderDetails(guid)">
 					查看订单
 				</view>
-				<view class="bottom-btn btn" v-if="status == 2">
+				<!-- <view class="bottom-btn btn" v-if="applyStatus == 2">
 					查看订单
-				</view>
+				</view> -->
 			</view>
 		</view>
 	</view>
@@ -76,7 +76,7 @@
 				thetoken:'',
 				guid:'',
 				$getimg:this.$getimg,
-				status:0,
+				applyStatus:0,
 				time:'2020年11月11日',
 				bankAccount:'6210000000000009900',
 				phone01:'08121224',
@@ -110,11 +110,22 @@
 			},
 			getDetails(){
 				this.$api.http.get(this.config.apiBaseurl+'/carbon-h5/wap/apply/'+this.guid,{header: {Authorization:this.thetoken}}).then( res =>{
-					console.log('this.status',res);
-					this.status = res.data.data.recordStatus;
-					console.log('this.status',this.status)
+					console.log('this.applyStatus',res);
+					this.applyStatus = res.data.data.applyStatus;
+					this.guid = res.data.data.guid;
+					console.log('this.applyStatus1',this.applyStatus)
 				})
-			}
+			},
+			goOrderDetails(id){
+				console.log(id)
+				uni.navigateTo({
+					url: '/pages/usercenter/orderList/orderdetails/orderdetails?orderid=' + id,
+					fail:function(err){
+						console.log('err',err)
+						
+					}
+				});
+			},
 
 		}
 	}

pages/usercenter/orderList/orderList.vue

@@ -17,10 +17,11 @@
 						<view class="order-info-status">
 							<!-- <view class="status" v-if="item.orderStatus == 1" @click="cancelOrder(item)">取消订单</view> -->
 							<!-- <view class="status" v-if="item.orderStatus == 1">待支付</view> -->
+							<view class="status" v-if="item.orderStatus == 1&&item.state == 0">已失效</view>
 							<view class="status" v-if="item.orderStatus == 2">已支付</view>
 							<view class="status" v-if="item.orderStatus == 3">未审核</view>
 							<view class="status" v-if="item.orderStatus == 4">已审核</view>
-							<view class="status" v-if="item.orderStatus == 5">已完成</view>							
+							<view class="status" v-if="item.orderStatus == 5">已完成</view>
 						</view>
 					</view>
 					<!-- order-info end -->

pages/usercenter/orderList/orderdetails/orderdetails.vue

@@ -20,7 +20,7 @@
 					<image :src="$getInnerImg+'icon-vipcard-green.png'" class="status-img" mode="scaleToFill"></image>
 					<text class="status-text">已支付</text>
 				</view>
-				<view class="order-btn topay" v-if="item.orderStatus == 1&&item.state==1" @click.stop="pay">去支付</view>
+				<view class="order-btn topay" v-if="item.orderStatus == 1&&item.state==1" @click.stop="pay(item)">去支付</view>
 				<view class="order-btn done"  v-if="item.orderStatus == 2" @click="goCertDetails(item.guid)">查看证书</view>
 			</view>
 		</view>
@@ -122,19 +122,42 @@
 				
 				done()
 			},
-			pay(){
+			pay(item){
+				let self = this;
+				console.log('pay item',item);
 				let userInfo = uni.getStorageSync("userInfo");
-					let params = {
-						orderId:this.item.id,
-						payType:this.item.payType,
-						openid:userInfo.wxUsers.openid,
-						"tradeType":"test"
-					}
-					this.$pay.wxPay(params).then(res =>{
-						this.getdetails();
-						this.goOrderList(res.data.message);
-						// console.log('payres',res);
-					}).catch(err =>{console.log('err',err);});
+				console.log('userInfo',userInfo);
+				// return
+				let params = {
+					orderId:item.guid,
+					// payType:item.payType,
+					openid:userInfo.wxId,
+					"tradeType":"test"
+				};
+				this.$api.http.post(this.config.apiBaseurl + "/carbon-h5/wechat/pay",params,{
+					header: {
+					Accept:'application/json',
+					Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格
+				},
+				}).then(res=>{
+					uni.requestPayment({
+					    provider: 'wxpay',
+					    timeStamp:res.data.retBody.timeStamp,
+					    nonceStr: res.data.retBody.nonceStr,
+					    package: res.data.retBody.packageValue,
+					    signType: 'MD5',
+					    paySign: res.data.retBody.paySign,
+					    success: function (res) {
+							self.downCallback();
+					        console.log('success:' + JSON.stringify(res));
+					    },
+					    fail: function (err) {
+					        console.log('fail:' + JSON.stringify(err));
+					    }
+					});
+				}).catch( err =>{
+					console.log('pay err',err)
+				})
 			},
 			// 跳转到订单列表
 			goOrderList(msg){

pages/usercenter/question/question.vue

@@ -74,7 +74,7 @@
 		methods: {
 			/*mescroll组件初始化的回调,可获取到mescroll对象 (此处可删,mixins已默认)*/
 			mescrollInit(mescroll) {
-				this.mescroll = mescroll;
+				// this.mescroll = mescroll;
 			},
 			/*下拉刷新的回调, 有三种处理方式:*/
 			downCallback(){			

pages/usercenter/subscribe/subscribe.vue

@@ -15,8 +15,8 @@
 						</view>
 					</view>
 					<view class="subscribe-item-status">
-						<text v-if="item.recordStatus == 0">认购中</text>
-						<text class="done" v-if="item.recordStatus == 1">认购完成</text>
+						<text v-if="item.applyStatus == 0">认购中</text>
+						<text class="done" v-if="item.applyStatus == 1">认购完成</text>
 					</view>
 					<view class="subscribe-item-icon">
 						<text class="iconfont icon-jiantou"></text>

pages/usercenter/usercenter.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="pages">
+		<view class="hold-status-bar">
+			<!-- 占据了状态栏位置 -->
+		</view>
 		<view class="top-img usercenter">
 			<image :src="$getimg + 'usercenter-bg.png'" class="img" mode="widthFix"></image>
 			<view class="usercenter-baseinfo">

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -126,6 +126,7 @@
 .icon-greenleaf:before {
   content: "\edac";
 }
+.hold-status-bar{ height: 25px;width: 100%;display: none;}
 /* 全屏图片背景 */
 .page-bg-wrap{position: fixed;left: 0;right: 0;top: 0;bottom: 0;}
 .page-bg{width: 100%;max-height: 100%;}

unpackage/dist/dev/mp-weixin/pages/index/guide.json

@@ -1,5 +1,6 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTitleText": "引导页",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "",
+  "navigationStyle": "custom",
   "usingComponents": {
     "custom-nodata": "/components/custom-nodata/custom-nodata",
     "uni-popup": "/components/uni-popup/uni-popup",

unpackage/dist/dev/mp-weixin/pages/login/loginType.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/login/loginType.wxss

@@ -152,6 +152,9 @@
 
 
 
+
+
+
 
 
 

unpackage/dist/dev/mp-weixin/pages/usercenter/usercenter.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }