auto commit

pages/index/init.vue

@@ -29,6 +29,8 @@
 			 if (launch&&version==this.config.version&&haslogin) {
 			   // 如果已经有，直接去首页
 				   this.goIndex();				
+			 } else if(launch&&version==this.config.version&&!haslogin){
+				 this.goLogin();				 
 			 } else {
 			   // 没有值，跳到引导页，并存储，下次打开就不会进去引导页
 			   this.goGuide();
@@ -69,6 +71,14 @@
 					}
 				});
 			},
+			goLogin(){
+				uni.redirectTo({
+				    url: '/pages/login/loginType',
+					fail(err) {
+						// console.log(err)
+					}
+				});
+			},
 
 		}
 	}

pages/usercenter/certificateList/certificate/certificate.css

@@ -0,0 +1,38 @@
+.container{position: relative;overflow: hidden;min-height: 100vh;}
+.container .page-bg{position: absolute;left: 0;top: 0;width: 100%;height: 1090rpx;max-height: unset;z-index: -1;}
+.cart-no{margin-top: 333rpx;text-align: center;font-size: 24rpx;color: #26D18B;}
+.cart-text{margin: 10rpx 100rpx;line-height: 40rpx;font-size: 28rpx;color: #666;text-indent: 2em;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pages/usercenter/certificateList/certificate/certificate.vue

@@ -1,16 +1,35 @@
 <template>
 	<view class="pages">
 		<view class="container" id="wrapper">
-		  <text class="title draw" data-text="Hello there">Hello there</text>
+			<view class="image-wrapper draw">
+			  <image :src="$getimg+'cqtanhui-cert.jpg'" class="draw page-bg" mode="scaleToFill"></image>
+			</view>
+			<view class="draw cart-no">证书编号:{{item.credentialNo}}</view>
+			<view class="cart-text cart-name">
+				尊敬的 {{item.customerName}}:
+			</view>
+			<view class="cart-text">
+				感谢您对“碳汇+”生态产品价值实现的支持，您购买了{{item.year}}年度碳汇量{{item.carbonAmount}}kg，您购碳资金{{item.orderAmount}}元，已全额转入{{item.farmerName}}的银行账户。
+			</view>
+			<view class="cart-text">
+				该笔碳汇可用于抵消您的碳排放
+			</view>
+			<view class="cart-text">
+				感谢您为生态文明建设和全球应对气候变化所做出的贡献
+			</view>
+			
+			
+			
+		 <!-- <text class="title draw" data-text="Hello there">Hello there</text>
 		  <text class="info draw" data-text="小程序是一种新的开放能力，开发者可以快速地开发一个小程序。">
 		   小程序是一种新的开放能力，开发者可以快速地开发一个小程序。
 		  </text>
 		  <view class="image-wrapper draw">
 		    <image class="draw" :src="$getimg + 'guide02.png'"/>
 			<image class="draw" src="../../../../static/img/icon_use_active.png"/>
-		  </view>
+		  </view> -->
 		  
-		  <button class="generate-btn" @click="drawCanvas">generate</button>
+		  <!-- <button class="generate-btn" @click="drawCanvas">generate</button> -->
 		</view>
 		<canvas canvas-id="canvas" class="share-canvas"></canvas>
 	</view>
@@ -24,7 +43,7 @@
 				$getimg:this.$getimg,
 				thetoken:'',
 				orderid:'',
-				
+				item:[],
 				params:{
 				}
 				
@@ -48,6 +67,7 @@
 				uni.hideLoading();
 				// this.info = Object.assign(this.info, data);
 				// this.info.url = '/static/html2canvas/index.html?key=' + this.orderid;
+				this.item = res.data.retBody;
 				console.log('res',JSON.parse(JSON.stringify(res.data.retBody)));
 			}).catch(err =>{
 				console.log('err',err)
@@ -96,29 +116,5 @@
 </script>
 
 <style>
-	/* @import url("./index.css"); */
-	.container {
-	  height: 100%;
-	  box-sizing: border-box;
-	  padding: 10px 20px;
-	  display: flex;
-	  flex-direction: column;
-	 
-	} 
-	.container .title {
-	  font-size:36px;
-	  text-align: left;
-	  margin-bottom: 10px;
-	
-	}
-	.container .info {
-	  font-size: 14px;
-	  line-height: 18px;
-	  color: grey;
-	  text-align: left;
-	  margin-bottom: 40px;
-	}
-	.container .image-wrapper image {
-	  width: 100%;
-	}
+	@import url("./certificate.css");
 </style>

pages/usercenter/orderList/orderList.vue

@@ -36,8 +36,8 @@
 							</view>
 							<view class="order-product-carbon">共{{item.orderCarbonAmount}}kg碳汇量</view>
 							<view class="order-btn topay" v-if="item.orderStatus == 1&&item.state==1" @click.stop="pay(item)">立即支付</view>
-							<view class="order-btn" v-if="item.orderStatus == 2" @click.stop="$api.href('/pages/usercenter/certificateList/certificate?orderid='+item.guid)">查看证书</view>	
-							<view class="order-btn" v-if="item.orderStatus == 5" @click.stop="$api.href('/pages/usercenter/certificateList/certificate?orderid='+item.guid)">查看证书</view>							
+							<view class="order-btn" v-if="item.orderStatus == 2" @click.stop="goCertDetails(item.guid)">查看证书</view>	
+							<view class="order-btn" v-if="item.orderStatus == 5" @click.stop="goCertDetails(item.guid)">查看证书</view>							
 						</view>
 					</view>
 				</view>
@@ -295,7 +295,13 @@
 					console.log('pay err',err)
 				})
 
-			}
+			},
+			goCertDetails(id){
+				console.log(id)
+				uni.navigateTo({
+					url: '/pages/usercenter/certificateList/certificate/certificate?orderid=' + id,
+				});
+			},
 			
 
 		}

pages/usercenter/orderList/orderdetails/orderdetails.vue

@@ -21,7 +21,7 @@
 					<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 done"  v-if="item.orderStatus == 2">查看证书</view>
+				<view class="order-btn done"  v-if="item.orderStatus == 2" @click="goCertDetails(item.guid)">查看证书</view>
 			</view>
 		</view>
 		<!-- bottom-flex-btn-wrap end -->
@@ -151,7 +151,13 @@
 						}
 					});
 				},1000)
-			}
+			},
+			goCertDetails(id){
+				console.log(id)
+				uni.navigateTo({
+					url: '/pages/usercenter/certificateList/certificate/certificate?orderid=' + id,
+				});
+			},
 
 		}
 	}

pages/usercenter/usercenter.vue

@@ -39,25 +39,25 @@
 			</view>
 			<view class="icon-form-item" @click="$api.href('./orderList/orderList')">
 				<view class="icon-form-item-imgwrap">
-					<image :src="$getimg + 'icon-certificate.png'" class="icon-form-item-img" mode="aspectFit"></image>
+					<image :src="$getimg + 'icon-dingdan.png'" class="icon-form-item-img" mode="aspectFit"></image>
 				</view>				
 				<view class="icon-form-item-text">我的订单</view>
 				<view class="icon-form-item-icon"><text class="iconfont icon-jiantou"></text></view>
 			</view>
-			<view class="icon-form-item full-border" @click="$api.href('./subscribe/subscribe')">
+			<view class="icon-form-item full-border" v-if="userInfo.customerType!=1" @click="$api.href('./subscribe/subscribe')">
 				<view class="icon-form-item-imgwrap">
 					<image :src="$getimg + 'icon-yonghuzhinan.png'" class="icon-form-item-img" mode="aspectFit"></image>
 				</view>				
 				<view class="icon-form-item-text">我的认购</view>
 				<view class="icon-form-item-icon"><text class="iconfont icon-jiantou"></text></view>
 			</view>
-			<view class="icon-form-item" @click="$api.href('/pages/use/use')">
+			<!-- <view class="icon-form-item" @click="$api.href('/pages/use/use')">
 				<view class="icon-form-item-imgwrap">
 					<image :src="$getimg + 'icon-about.png'" class="icon-form-item-img" mode="aspectFit"></image>
 				</view>				
 				<view class="icon-form-item-text">关于我们</view>
 				<view class="icon-form-item-icon"><text class="iconfont icon-jiantou"></text></view>
-			</view>
+			</view> -->
 		</view>
 		<!-- usernav-list end -->
 		<view class="wrap40 question-nav">

unpackage/dist/dev/mp-weixin/pages/usercenter/orderList/orderList.js

@@ -114,34 +114,6 @@ var render = function() {
     }
   })
 
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event, item) {
-      var _temp = arguments[arguments.length - 1].currentTarget.dataset,
-        _temp2 = _temp.eventParams || _temp["event-params"],
-        item = _temp2.item
-
-      var _temp, _temp2
-
-      $event.stopPropagation()
-      return _vm.$api.href(
-        "/pages/usercenter/certificateList/certificate?orderid=" + item.guid
-      )
-    }
-
-    _vm.e1 = function($event, item) {
-      var _temp3 = arguments[arguments.length - 1].currentTarget.dataset,
-        _temp4 = _temp3.eventParams || _temp3["event-params"],
-        item = _temp4.item
-
-      var _temp3, _temp4
-
-      $event.stopPropagation()
-      return _vm.$api.href(
-        "/pages/usercenter/certificateList/certificate?orderid=" + item.guid
-      )
-    }
-  }
-
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -480,6 +452,12 @@ var MescrollBody = function MescrollBody() {Promise.all(/*! require.ensure | com
         console.log('pay err', err);
       });
 
+    },
+    goCertDetails: function goCertDetails(id) {
+      console.log(id);
+      uni.navigateTo({
+        url: '/pages/usercenter/certificateList/certificate/certificate?orderid=' + id });
+
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/usercenter/orderList/orderdetails/orderdetails.js

@@ -297,6 +297,12 @@ __webpack_require__.r(__webpack_exports__);
           } });
 
       }, 1000);
+    },
+    goCertDetails: function goCertDetails(id) {
+      console.log(id);
+      uni.navigateTo({
+        url: '/pages/usercenter/certificateList/certificate/certificate?orderid=' + id });
+
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

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

@@ -115,14 +115,10 @@ var render = function() {
     }
 
     _vm.e4 = function($event) {
-      return _vm.$api.href("/pages/use/use")
-    }
-
-    _vm.e5 = function($event) {
       return _vm.$api.href("/pages/usercenter/question/question")
     }
 
-    _vm.e6 = function($event) {
+    _vm.e5 = function($event) {
       return _vm.$api.href("/pages/login/loginType")
     }
   }