auto commit

.gitignore

@@ -1,4 +1,14 @@
-# ---> VisualStudioCode
-.settings
-
+.DS_Store
+node_modules/
+unpackage/dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

common/css/common.css

@@ -7,12 +7,15 @@
 .top-img .img{width: 100%;height: 100%;position: absolute;left: 0;top: 0;z-index: -1;}
 
 .wrap{margin: 24rpx;}
+.padding24{padding: 24rpx;}
 .wrap40{margin: 32rpx 40rpx;}
 .full-btn{height: 98rpx;line-height: 98rpx;background-color: #26D18B;border-radius: 8rpx;font-size: 36rpx;color: #fff;text-align: center;}
 
 /* 浮底按钮 */
 .bottom-btn-wrap{height: 146rpx;margin-top: 44rpx;}
-.bottom-btn{height: 98rpx;line-height: 98rpx;position: fixed;left: 24rpx;right: 24rpx;bottom: 24rpx;text-align: center;z-index: 99;}
+.bottom-btn-wrap-bg{position: fixed;left: 0;right: 0;bottom: 0;background-color: #fff;height: inherit;}
+.bottom-btn{height: 98rpx;line-height: 98rpx;position: fixed;left: 24rpx;right: 24rpx;bottom: 24rpx;text-align: center;z-index: 99;border-radius: 8rpx;}
+.bottom-btn.btn{background-color: #26D18B;color: #fff;}
 
 /* 截取隐藏 */
 .f-ellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
@@ -37,7 +40,11 @@
 .icon-form-item-icon{margin-right: 0;width: 68rpx;}
 .icon-form-item-icon .iconfont{font-size: 30rpx;color: #ccc;}
 
-
+/* 头部轮播 */
+.swiper-wrap{margin: 0 auto 32rpx;height: 320rpx;overflow: hidden;position: relative;}
+.swiper{height: 100%;}
+.adv-item{height: 100%;}
+.swiper-wrap .pic{width: 100%;height: 100%;}
 
 
 

components/custom-nodata/custom-nodata.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="nodata">
+		<!-- <image src="../../static/images/order.png" class="orderIcon"></image> -->
+		<text class="notice">{{notice}}</text>
+		<text class="cp">贵州省单株碳汇精准扶贫平台</text>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:'custom-nodata',
+		props:{
+			notice:{
+				type:String,
+				default:'暂无数据'
+			}
+		},
+		data(){
+			return {
+				ntxt:''
+			}
+		},
+		watch:{
+			notice(n,o){
+				this.ntxt = n;
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.nodata{
+		width:560rpx;
+		margin:0 auto;
+		padding:250rpx 0;
+		text-align:center;
+	}
+	.nodata .orderIcon{
+		width:374rpx;
+		height:288rpx;
+		margin:20rpx 0 0rpx 0;
+	}
+	.nodata text{
+		display:block;
+	}
+	.nodata .notice{
+		margin-bottom:15rpx;
+		font-size:36rpx;
+		font-weight:400;
+		color:rgba(51,51,51,1);
+	}
+	.nodata .cp{
+		font-size:26rpx;
+		font-weight:400;
+		color:rgba(153,153,153,1);
+	}
+</style>

config/config.js

@@ -1,6 +1,7 @@
 const config = {
 	//dev
-	apiBaseurl:'http://172.16.90.8:19098',//东东
+	// apiBaseurl:'http://172.16.90.8:21998',//东东
+	apiBaseurl:'http://wx.hw.hongweisoft.com/cqthminapp',//东东
 	
 	// 图片占位
 	placeImg:'http://placekitten.com',
@@ -22,9 +23,15 @@ const config = {
 	
 	
 	//本地图片
-	imgUrl:"../../static/img/",
-	//耳机页面图片
-	innerImgUrl:"../../../static/img/",
+	// imgUrl:"../../static/img/",
+	imgUrl:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
+	//二级页面图片
+	// innerImgUrl:"../../../static/img/",
+	innerImgUrl:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
+	// 云图片(产品)
+	onlineImg:"http://cqth.hw.hongweisoft.com/ht/",
+	// 七牛云
+	qny:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
 }
 export {
 	config

main.js

@@ -15,8 +15,7 @@ http.interceptors.response.use((response) => { /* 对响应成功做点什么
 	 //   });
 	 // };
 	 // console.log('response',response);
-	 // if(response.data.retHead.errCode == 401){
-		//  // console.log('response',response);
+	 // if(response.data.code == 401){
 		// uni.showToast({
 		//  	title:response.data.message + "    即将跳转到登录页",
 		//  	icon:"none",
@@ -24,7 +23,7 @@ http.interceptors.response.use((response) => { /* 对响应成功做点什么
 		// });
 		// setTimeout(i=>{
 		// 	uni.navigateTo({
-		// 		url: '/pages/login/login',
+		// 		url: '/pages/login/loginType',
 		// 		fail:function(err){
 		// 			console.log(err)
 		// 		}
@@ -44,7 +43,7 @@ http.interceptors.response.use((response) => { /* 对响应成功做点什么
   return Promise.reject(response)
 });
 
-// import './utils/filter' 
+import './utils/filter' 
 
 //统一提示方便全局修改
 const msg = (title, duration=1500, mask=false, icon='none')=>{
@@ -80,6 +79,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = {msg,http,href};
 Vue.prototype.$getimg = config.imgUrl;
 Vue.prototype.$getInnerImg = config.innerImgUrl;
+Vue.prototype.$onlineImg = config.onlineImg;
 Vue.prototype.$placeImg = config.placeImg;
 Vue.prototype.$store = store;
 Vue.prototype.config = config;

manifest.json

@@ -65,7 +65,10 @@
             "es6" : true
         },
         "usingComponents" : true,
-        "permission" : {}
+        "permission" : {},
+        "uniStatistics" : {
+            "enable" : false
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -1,20 +1,14 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-{
-			"path": "pages/usercenter/orderList/orderList",
-			"style": {
-				"navigationBarTitleText": "我的订单"
-			}
-		},
-		{
-			"path": "pages/index/init",
-			"navigationStyle":"custom"
-			,"style": {
-				"navigationBarBackgroundColor":"#fff",
-				"navigationBarTitleText": "入口页"//入口页
-				// ,"titleNView": false
-			}
-		},
+		// {
+		// 	"path": "pages/index/init",
+		// 	"navigationStyle":"custom"
+		// 	,"style": {
+		// 		"navigationBarBackgroundColor":"#fff",
+		// 		"navigationBarTitleText": "入口页"//入口页
+		// 		// ,"titleNView": false
+		// 	}
+		// },
 		{
 			"path": "pages/index/guide",
 			"navigationStyle":"custom"
@@ -41,6 +35,18 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/product/product",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/confirmOrder/confirmOrder",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/use/use",
 			"style": {
@@ -59,12 +65,12 @@
 				"navigationBarTitleText": "我的证书"
 			}
 		},
-		// {
-		// 	"path": "pages/usercenter/orderList/orderList",
-		// 	"style": {
-		// 		"navigationBarTitleText": "我的订单"
-		// 	}
-		// },
+		{
+			"path": "pages/usercenter/orderList/orderList",
+			"style": {
+				"navigationBarTitleText": "我的订单"
+			}
+		},
 		{
 			"path": "pages/usercenter/orderList/orderdetails/orderdetails",
 			"style": {
@@ -76,13 +82,24 @@
 			"style": {
 				"navigationBarTitleText": "我的认购"
 			}
+		},
+		{
+			"path": "pages/usercenter/question/question",
+			"style": {
+				"navigationBarTitleText": "常见问题"
+			}
+		}
+		,{
+			"path": "pages/offlineBuy/offlineBuy",
+			"style": {
+				"navigationBarTitleText": "线下认购"
+			}
 		}
 	],
 	"tabBar": {
 	    "color": "#999",
 	    "selectedColor": "#26D18B",
 	    "borderStyle": "white",
-		"height":"134rpx",
 	    "backgroundColor": "#ffffff",
 	    "list": [{
 	        "pagePath": "pages/index/index",

pages/confirmOrder/confirmOrder.css

@@ -0,0 +1,32 @@
+page{background: #F5F5F8;padding-bottom: 160rpx;}
+.order-list{background: #fff;margin-bottom: 30rpx;}
+.order-list-item{padding: 20rpx 50rpx;border-bottom: 1px solid #eee;display: flex;}
+.order-list .order-list-item:last-of-type{border-bottom: 0;}
+.order-list-item .image-content{width: 202rpx;height: 202rpx;padding-right: 60rpx;}
+.order-list-item image{width:100%;height: 100%;background:#DDDDDD;}
+.order-list-item .text-content{flex: 1;position: relative;}
+.order-list-item .title{width:350rpx;font-size:30rpx;margin-bottom:20rpx;overflow: hidden;text-overflow: ellipsis;display: -webkit-box; -webkit-line-clamp:3;-webkit-box-orient: vertical;font-weight:bold;}
+.order-list-item .totalcarbon,
+.order-list-item .oId{font-size: 28rpx;color: #999;font-weight: 300;}
+/* .order-list-item .text-content .price{position:absolute;top:0;right:-20rpx;font-weight: 500;font-size:30rpx;color:#999;} */
+/* .order-list-item .total{position:absolute;left: 0;bottom: 0;width: 100%;font-size:40rpx;} */
+.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 .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-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;}
+.pay-wrap .num uni-text{font-size: 24rpx;}
+.pay-way >>> .uni-list-item__extra-text{font-size:28rpx;}
+
+
+
+
+
+

pages/confirmOrder/confirmOrder.vue

@@ -0,0 +1,218 @@
+<template>
+	<view class="pages confirmOrder">
+		<view class="order-list">
+			<custom-nodata v-if="cartList.length === 0"></custom-nodata>
+			<view class="order-list-item" v-for="(item,index) in cartList" :key="index">
+				<view class="image-content">
+					<image :src="$onlineImg + item.goodsImages | firstImg" mode="aspectFill"></image>
+				</view>
+				<view class="text-content">
+					<view class="title">{{item.goodsName}} </view>
+					<!-- <view class="oId">产品编号: {{ item.oId }}</view> -->
+					<view class="price">{{item.price}}元 / KG</view>
+					<view class="totalcarbon">累计碳汇量{{item.totalcarbon}}kg</view>
+					<view class="total"><text>￥</text>{{item.totalPrice | keepTwoNum}}</view>
+					<view class="nums">
+						 <view class="countNum">
+							 <view class="countNum-action reduce" @click="calcValue('reduce',item)">-</view>
+							 <view class="countNum-input">
+								 <input class="uni-input" v-model="item.total" type="number" @blur="onInput(item)"/>
+							 </view>
+							 <view class="countNum-action add" @click="calcValue('add',item)">+</view>
+						 </view>
+					</view>
+					<!-- {{cartListTmp}} -->
+				</view>
+			</view>
+		</view>
+		<!-- <uni-list class="pay-way">
+		    <uni-list-item title="支付方式" rightText="微信支付"></uni-list-item>
+		</uni-list> -->
+		<view class="pay-wrap" @click="submitOrder">
+			<view class="pay-con">
+				<text class="pay-con-til">立即支付</text>
+				<view class="num">
+					<text>￥</text>
+					{{totalPrice | keepTwoNum}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapMutations } from 'vuex';
+	// import uniList from "@/components/uni-list/uni-list.vue"
+	// import uniListItem from "@/components/uni-list-item/uni-list-item.vue"
+	import customNodata from '@/components/custom-nodata/custom-nodata.vue'
+	import { debounce } from '@/utils/util.js'
+	export default{
+		components:{
+			// uniList,
+			// uniListItem,
+			customNodata
+		},
+		onLoad(options) {
+			let self = this;
+			let arr = this.$store.state.cartListTmp
+			console.log('options',JSON.parse(JSON.stringify(options)));
+			console.log('this.$store.state.cartListTmp',JSON.parse(JSON.stringify(this.$store.state.cartListTmp)));
+			for(let i = 0; i < arr.length; i++){
+				this.cartList.push({
+					goodsName:arr[i].goodsName,
+					goodsImages:arr[i].goodsImages,
+					goodsId:arr[i].guid,
+					price:arr[i].price,
+					carbonVal:arr[i].carbonVal,
+					total:arr[i].carbonSkin,
+					totalPrice:arr[i].carbonSkin * arr[i].price,
+					totalcarbon:arr[i].carbonSkin
+				})
+			};
+			uni.getStorage({
+				key:'accessToken',
+				success: function (res) {
+					self.token = res.data.accessToken;
+				   // console.log('token',res.data.accessToken);
+				}
+			});
+		},
+		onUnload() {
+			//页面卸载购物清单
+			this.clearCart()
+		},
+		data(){
+			return{
+				token:'',
+				requested:true,//是否请求中
+				min:1,
+				cartList:[]
+			}
+		},
+		methods:{
+			...mapMutations(['clearCart']),
+			onInput(item){
+				console.log(item.total)
+				if(!(/(^[1-9]\d*$)/.test(item.total))){
+					item.total = 1
+					if(item.total < this.min){
+						item.total = 1
+					}
+				}
+				item.totalPrice = item.price * item.total
+			},
+			//数量计算
+			calcValue(type,item){
+				if (type === "reduce") {
+					item.total-- 
+					if (item.total < this.min) {
+						item.total = 1
+					}
+					item.totalPrice = item.price * item.total;
+					item.totalcarbon = item.total*10;
+				} else if (type === "add") {
+					// console.log('this.$store.state.cartListTmp',JSON.parse(JSON.stringify(this.$store.state.cartListTmp)));
+					// console.log('this.$store.state.cartListTmp.canSold',this.$store.state.cartListTmp[0].canSold);
+					item.total++
+					item.totalPrice = item.price * item.total
+					item.totalcarbon = item.total*10;
+				}
+			},
+			//提交校验
+			submitOrder(){
+				if(this.requested){
+					this.requested = false;
+					uni.showLoading({
+						title: '订单生成中。'
+					});
+					if(this.cartList.length == 0){
+						this.$api.msg("请先选择产品!")
+						return;
+					}else{ 
+						let userInfo = uni.getStorageSync("userInfo");
+						console.log( uni.getStorageSync("linkType") );
+						let params = {
+							// customerId:userInfo.guid,
+							goods:this.cartList,
+							// linkType: uni.getStorageSync("linkType") || '',
+							// activityId:uni.getStorageSync("togetherId") || ''
+						}
+						this.syncData(params);
+					}					
+				}else{
+					this.$api.msg('请求中,请稍等!', 2500);
+					return
+				};
+				
+			},
+			//订单提交，拿到订单id
+			syncData(data){
+				console.log('data',data);
+				// return
+				this.$api.http.post(this.config.apiBaseurl + "/carbon-h5/wap/order/createOrder",data,{
+					header: {
+					Accept:'application/json',
+					Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格
+				},
+				}).then(res=>{
+					console.log('res',res);
+					this.requested = true;
+					if(res.data.retHead.errCode == 0){
+						this.pullWeichatPay(res.data.retBody)
+					}else{							
+						this.$api.msg(res.data.retHead.errMsg)	
+					}
+					uni.hideLoading()
+				}).catch( err =>{
+					console.log('createOrder err',err)
+				})
+				
+			},
+			//拉起微信支付
+			async pullWeichatPay(id){
+				console.log('订单ID',id);
+				
+				
+				let userInfo = uni.getStorageSync("userInfo");
+				return;
+				let params = {
+					orderId:id,
+					openid:userInfo.wxId
+				}
+				this.$pay.wxPay(params).then(res =>{
+					if(res.code == 0){
+						uni.reLaunch({
+							url: '/pages/buySuccess/buySuccess?orderId=' + params.orderId
+						})
+					}else if(res.code == 1){
+						uni.navigateTo({
+							url: '/pages/userCenter/myOrder/myOrder'
+						})
+					}else if(res.code == 2){
+						this.$api.msg("支付失败，请检查!")
+						setTimeout(()=>{
+							uni.navigateTo({
+								url: '/pages/userCenter/myOrder/myOrder'
+							});
+						},1000)
+					}
+				})
+			}
+		},
+		computed:{
+			//订单总价计算
+			totalPrice:function(){
+				let totalPrice = 0 
+				let len = this.cartList.length
+				for(let i = 0; i < len;i++){
+					totalPrice += this.cartList[i].totalPrice
+				}
+				return totalPrice
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url("confirmOrder.css");
+</style>

pages/index/index.css

@@ -32,7 +32,7 @@ page{background-color: #f5f5f5;}
 .type-nav-item.active .active-bg{width: 78rpx;margin-left: -39rpx;height: 54rpx;margin-top: -27rpx;position: absolute;left: 50%;top: 50%;z-index: -1;}
 
 .product-list{display: flex;justify-content: space-between;flex-wrap: wrap;}
-.product-list-item{width: 200rpx;height: 200rpx;position: relative;margin-bottom: 18rpx;overflow: hidden;border-radius: 16rpx;}
+.product-list-item{width: 200rpx;height: 200rpx;position: relative;margin-bottom: 18rpx;overflow: hidden;border-radius: 16rpx;text-align: center;}
 .product-list-item .product-img{width: 100%;height: 100%;}
 .product-list-item .product-text{position: absolute;left: 0;bottom: 0;right: 0;height: 56rpx;line-height: 56rpx;font-size: 24rpx;color: #fff;padding-left: 16rpx;overflow: hidden;text-overflow: ellipsis;background: rgba(0, 0, 0, 0.4);}
 
@@ -48,8 +48,8 @@ page{background-color: #f5f5f5;}
 .rank-top-photo{width: 144rpx;height: 144rpx;border-radius: 50%;}
 .rank-top-name{font-size: 28rpx;color: #333;line-height: 40rpx;font-weight: 500;}
 .rank-top-carbon{font-size: 20rpx;color: #999;}
-.rank-wrap .rank-top-item:nth-child(2){transform: scale(0.9);}
-.rank-wrap .rank-top-item:nth-child(3){transform: scale(0.8);}
+.rank-wrap .rank-top-item:nth-child(2){transform: scale(0.9);transform-origin: bottom;}
+.rank-wrap .rank-top-item:nth-child(3){transform: scale(0.8);transform-origin: bottom;}
 .my-rank-wrap{flex: unset;position: absolute;top: 24rpx;right: 0;align-items: center;display: flex;}
 .my-rank-photo{width: 80rpx;height: 80rpx;position: relative;right: -30rpx;box-sizing: border-box;border-radius: 50%;overflow: hidden;border: 2rpx solid #fff;}
 .my-rank-photo .photo{width: 100%;height: 100%;}

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="home-top">
-			<image src="../../static/img/home-top-bg.png" class="home-top-bg" mode="widthFix"></image>
+			<image :src="$getimg+'home-top-bg.png'" class="home-top-bg" mode="widthFix"></image>
 			<view class="home-top-til">“碳汇+”生态产品价值实现</view>
 			<view class="home-top-subtil">The value of ecological environment is realized</view>
 		</view>
@@ -31,9 +31,9 @@
 		</view>
 		<view class="wrap40">
 			<view class="title">推荐生态产品</view>
-			<view class="buy-now">
+			<view class="buy-now" @click="randomPop">
 				<view class="buy-now-imgwrap">
-					<image src="../../static/img/home-buy-now-img.png" class="buy-now-img" mode="aspectFit"></image>
+					<image :src="$getimg+'home-buy-now-img.png'" class="buy-now-img" mode="aspectFit"></image>
 				</view>
 				<view class="buy-now-text">
 					<view class="buy-now-text-big">立即购碳</view>
@@ -48,7 +48,7 @@
 				<view class="type-nav-item active">
 					<view class="type-nav-item-til">林业碳汇</view>
 					<view class="type-nav-item-subtil">为您推荐</view>
-					<image src="../../static/img/type-nav-active.png" class="active-bg" mode="aspectFit"></image>
+					<image :src="$getimg+'type-nav-active.png'" class="active-bg" mode="aspectFit"></image>
 				</view>
 				<view class="type-nav-item">
 					<!-- <view class="type-nav-item-til">新能源汽车</view>
@@ -62,20 +62,20 @@
 			<view class="common-content">
 				<view class="common-content-title">
 					<view class="common-content-icon">
-						<image src="../../static/img/icon-tanpuhui.png" class="icon" mode="aspectFit"></image>
+						<image :src="$getimg+'icon-tanpuhui.png'" class="icon" mode="aspectFit"></image>
 					</view>
 					<view class="common-content-til">
 						碳汇产品展示
 					</view>
 					<view class="common-content-right" @click="refreshProductList">
-						<image src="../../static/img/icon-refresh.png" class="icon" mode="aspectFit"></image>
+						<image :src="$getimg+'icon-refresh.png'" class="icon" mode="aspectFit"></image>
 						换一批
 					</view>
 				</view>
 				<view class="product-list">
 					<view class="product-list-item" v-for="(item, index) in productList" :key="index" @click="productClick(item)">
-						<image :src="item.img" class="product-img" mode="heightFix"></image>
-						<view class="product-text">{{item.name}}</view>
+						<image :src="$onlineImg + item.goodsImages | firstImg" class="product-img" mode="heightFix"></image>
+						<view class="product-text">{{item.goodsName}}</view>
 					</view>
 				</view>
 				<view class="common-content-blink">查看更多 ></view>
@@ -94,7 +94,7 @@
 				<view class="rank-top">
 					<view class="rank-top-item" v-for="(item, index) in rankTop" :key="index">
 						<view class="rank-top-imgwrap">
-							<image src="../../static/img/rank-top01.png" class="rank-top-bg" mode="aspectFit"></image>
+							<image :src="$getimg+'rank-top01.png'" class="rank-top-bg" mode="aspectFit"></image>
 							<image :src="item.img" class="rank-top-photo" mode="scaleToFill"></image>
 						</view>
 						<view class="rank-top-name f-ellipsis">{{item.name}}</view>
@@ -131,15 +131,25 @@
 		</view>
 		<!-- wrap end -->
 		
-		
+		<quick-buy class="quickbuy" ref="quickBuy" @closeModal="closeModal" :visible="modal.visibleModal" v-if="modal.visibleModal"></quick-buy>
 	</view>
 </template>
 
 <script>
+	import quickBuy from './modal/quickBuy';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	export default {
+		components:{
+			uniPopup,
+			quickBuy,
+			
+		},
 		data() {
 			return {
 				$getimg:this.$getimg,
+				modal: {
+					visibleModal: false
+				},
 				swiper: {
 					indicatorDots: false,
 					autoplay: true,
@@ -154,14 +164,7 @@
 				],
 				current: 0,
 				swiperCurrent: 0,
-				productList:[
-					{name:'酉阳土家族苗',img:'http://qny.gzsdtfp.com/gzth005/imgupload/39b6b37e61e240c98e4c8ca392c5f3a5.jpg'},
-					{name:'酉阳土家族苗',img:'http://qny.gzsdtfp.com/gzth005/imgupload/39b6b37e61e240c98e4c8ca392c5f3a5.jpg'},
-					{name:'酉阳土家族苗',img:'http://qny.gzsdtfp.com/gzth005/imgupload/39b6b37e61e240c98e4c8ca392c5f3a5.jpg'},
-					{name:'酉阳土家族苗',img:'http://qny.gzsdtfp.com/gzth005/imgupload/39b6b37e61e240c98e4c8ca392c5f3a5.jpg'},
-					{name:'酉阳土家族苗',img:'http://qny.gzsdtfp.com/gzth005/imgupload/39b6b37e61e240c98e4c8ca392c5f3a5.jpg'},
-					{name:'酉阳土家族苗',img:'http://qny.gzsdtfp.com/gzth005/imgupload/39b6b37e61e240c98e4c8ca392c5f3a5.jpg'},
-				],
+				productList:[],
 				rankType:1,
 				rankTop:[
 					{name:'酉阳土家族苗',carbon:1000,img:'http://qny.gzsdtfp.com/gzth005/imgupload/39b6b37e61e240c98e4c8ca392c5f3a5.jpg'},
@@ -179,7 +182,7 @@
 			}
 		},
 		onLoad() {
-			// this.getProductList();
+			this.getProductList();
 		},
 		methods: {
 			swiperChange (e) {
@@ -189,13 +192,14 @@
 				console.log(this.swiperCurrent);
 			},
 			getProductList(){
-				this.$api.http.post(this.config.apiBaseurl + '/goods/searchForIndex',{},{
+				this.$api.http.post(this.config.apiBaseurl + '/carbon-h5/wap/goodsManage/pushGoods',{"pageNo":1,"pageSize":6},{
 					header: {
 					Accept:'application/json',
 					// Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格
 				},
 				}).then(res => {
-					console.log('res',res)
+					this.productList = res.data.retBody;
+					// console.log('res',JSON.parse(JSON.stringify(res.data.retBody)))
 				}).catch(err =>{
 					console.log('err',err)
 				});
@@ -203,13 +207,25 @@
 			refreshProductList(){
 				this.getProductList();
 			},
-			productClick(){
-				
+			productClick(item){
+				let id = item.guid;
+				this.$api.href('/pages/product/product?guid='+id);
 			},
 			rankTab(type){
 				this.rankType = type;
 				console.log(type);
-			}
+			},
+			//开启多株购碳
+			randomPop() {
+				this.modal.visibleModal = true;
+				this.$nextTick(res => {
+					// console.log('this.$refs',this.$refs.quickBuy)
+					this.$refs.quickBuy.openPop();
+				});
+			},
+			closeModal() {
+				this.modal.visibleModal = false;
+			},
 
 		}
 	}

pages/index/modal/quickBuy.css

@@ -0,0 +1,28 @@
+.popup-content{background-color: #fff;border-radius: 16rpx 16rpx 0rpx 0rpx;}
+.popup-head{height: 98rpx;display: flex;padding: 0 40rpx;font-size: 36rpx;color: #333;font-weight: 500;justify-content: space-between;align-items: center;border-bottom: 1px solid #D8D8D8;}
+.conditions-item{padding: 24rpx 40rpx;border-bottom: 9rpx solid #F5F5F8;}
+.conditions-item-til{font-size: 30rpx;color: #666;line-height: 42rpx;margin-bottom: 24rpx;}
+.input-number{display: flex;align-items: center;}
+.input-number .num{width: 298rpx;height: 70rpx;position: relative;}
+.input-number .num::after{content: 'kg';position: absolute;right: 24rpx;top: 14rpx;font-size: 30rpx;color: #666;}
+.input-number .num .input{height: 100%;padding-left: 24rpx;border: 2rpx solid #D8D8D8;border-radius: 8rpx;}
+.input-number .conditions-item-til{margin-bottom: 0;}
+
+.remark{border: 2rpx solid #DFDFDF;padding: 30rpx 24rpx 24rpx;}
+.remark-textarea{font-size: 24rpx;color: #ccc;line-height: 33rpx;height: 100rpx;}
+
+.amount-wrap{display: flex;padding: 32rpx 40rpx;margin-bottom: 12rpx;align-items: center;justify-content: space-between;}
+.amount-flex-wrap{display: flex;align-items: center;}
+.amount-til{font-size: 30rpx;color: #666;font-weight: 600;}
+.amount{color: #FFDA00;font-weight: 600;}
+.amount .rmb{font-size: 54rpx;}
+.amount .num{font-size: 70rpx;}
+.amount-btn{margin-right: 0;height: 98rpx;line-height: 98rpx;padding: 0 22rpx;background-color: #26D18B;border-radius: 6rpx;text-align: center;color: #fff;}
+
+.tip{padding: 0 40rpx 50rpx;font-size: 28rpx;color: #999;}
+
+
+
+
+
+

pages/index/modal/quickBuy.vue

@@ -0,0 +1,147 @@
+<template>
+	<uni-popup ref="randomPop" type="bottom" class="randomPop">
+		<view class="popup-content">
+			<view class="popup-head">
+				线下认购
+				<text class="close iconfont icon-shense" @click="closePop"></text>
+			</view>
+			<view class="popup-body">
+				<view class="conditions-item input-number">
+					<view class="conditions-item-til">请输入您想认购的碳汇数：</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" >
+					<view class="conditions-item-til">备注说明：</view>
+					<view class="remark">
+						<textarea class="remark-textarea" maxlength="240" v-model="remark" placeholder="请输入您对认购的碳汇产品要求" />
+					</view>
+				</view>
+				<view class="amount-wrap">
+					<view class="amount-flex-wrap">
+						<view class="amount-til">预估金额：</view>
+						<view class="amount">
+							<text class="rmb">¥</text>
+							<text class="num">{{totalMoney}}</text>
+						</view>						
+					</view>					
+					<view class="amount-btn"  @click="goCart">提交认购申请</view>
+				</view>
+				<view class="tip">
+					购买{{shoppingNum}}kg，预估金额{{totalMoney}}元，认购期3年
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import {
+		mapMutations
+	} from 'vuex';
+	import {
+		debounce
+	} from '@/utils/util.js'
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	export default {
+		name: 'quickBuy',
+		components: {
+			uniPopup,
+		},
+		created() {
+			let self = this;
+			this.shoppingNum = 1;
+			uni.getStorage({
+				key:'userInfo',
+				success: function (res) {
+					self.customerType = res.data.customerType;
+				   // console.log('userInfo',res);
+				}
+			});
+		},
+		props: {
+			visible: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				customerType:null,
+				shoppingNum:'',
+				remark:'',
+				totalMoney:0,
+				price:3,
+				helpPeople:[],
+				// goodsId:'',
+				// carbonVal:''
+			}
+		},
+		methods: {
+			...mapMutations(['addCart']),
+			getHelpPeople:debounce(function(num){
+				this.helpPeople = []
+				this.loading = true
+				this.$api.http.get(this.config.apiBaseurl + '/carbon-h5/wap/goodsManage/getGoodsInfoByCarbonNum?carbonNum='+this.shoppingNum,{
+					header: {
+					Accept:'application/json',
+					Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格
+				},
+				}).then(res =>{
+					// this.loading = false
+					console.log('getHelpPeople',res);
+					this.helpPeople = res.data.retBody;
+				})
+			},200),
+			refreshfarmer(){
+				this.getHelpPeople(this.shoppingNum);
+			},
+			goCart(){
+				console.log('customerType',this.customerType);
+				if(this.customerType!=1){
+					this.$api.href('/pages/offlineBuy/offlineBuy');
+					return;
+				};
+				if(this.helpPeople === undefined || this.helpPeople.length == 0){
+					this.$api.msg("请等待农户数据加载完毕!")
+					return 
+				}else{
+					this.$refs.randomPop.close()
+					this.$emit('closeModal',true)
+					this.addCart(this.helpPeople);
+					this.$api.href('/pages/confirmOrder/confirmOrder')
+				}
+			},
+			openPop() {
+				this.$refs.randomPop.open();
+				if(this.customerType!=1){					
+					return;
+				};
+				this.getHelpPeople(this.shoppingNum);
+			},
+			closePop() {
+				Object.assign(this.$data, this.$options.data.call(this))
+				this.$refs.randomPop.close()
+				this.$emit('closeModal', true)
+			},
+		},
+		watch: {
+			//碳汇购入量计算
+			shoppingNum(n, o) {
+				if (n > 1000) {
+					this.$api.msg("单次购买不得超过1000KG!")
+					setTimeout(res => {
+						this.shoppingNum = 1000
+					}, 200)
+				}
+				this.getHelpPeople(n)
+				this.totalMoney = this.price * n;
+			}
+		}
+	}
+</script>
+
+<style>
+@import url("./quickBuy.css");
+</style>

pages/login/companyLogin.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="pages">
-		<image src="../../static/img/logo.png" class="logo" mode="widthFix"></image>
+		<image :src="$getimg+'logo.png'" class="logo" mode="widthFix"></image>
 		<view class="title">企业用户登陆</view>
 		<view class="login-form">
 			<view class="login-form-item">
@@ -30,9 +30,12 @@
 	export default {
 		data() {
 			return {
+				$getimg:this.$getimg,
 				params:{
+					// loginStr:'66432356',
 					loginStr:'64676376',
 					pwd:'123456',
+					
 				},
 				rules: {
 					loginStr: {rule: /^[A-Za-z0-9]+$/,msg: "填写用户名"},
@@ -62,13 +65,16 @@
 				// 	Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格
 				// },
 				}).then(res => {
-					console.log('res',res)
-					const token = {accessToken: res.data.retBody.token};
+					// console.log('res.data.retBody.token',res.data.retBody)
+					const token = res.data.retBody;
 					//保存token
 					// console.log('this.login',this.login);
 					this.login(token);
 					//取得用户信息
 					this.upInfo();
+					uni.switchTab({
+						url: '/pages/usercenter/usercenter'
+					});
 				}).catch(err =>{
 					console.log('err',err)
 				});

pages/login/loginType.vue

@@ -1,15 +1,16 @@
 <template>
 	<view class="pages">
 		<view class="page-bg-wrap">
-			<image src="../../static/img/loginType-bg.png" class="page-bg" mode="widthFix"></image>
+			<image :src="$getimg+'loginType-bg.png'" class="page-bg" mode="widthFix"></image>
 		</view>
 		<view class="login-out">
-			<view class="login-wrap">
-				<view class="login-item" @click="personLogin">
+			<view class="login-wrap" v-if="!hasLogin">
+				<view class="login-item" open-type="getUserInfo" @getuserinfo="personLogin">
 					<view class="login-item-icon">
 						<text class="iconfont icon-gerenyonghu"></text>
 					</view>
 					<view class="login-item-text">个人用户</view>
+					<button type="default" class="wxlogin-btn" open-type="getUserInfo" @getuserinfo="personLogin">登录</button>
 				</view>
 				<view class="login-item" @click="companyLogin">
 					<view class="login-item-icon">
@@ -18,30 +19,129 @@
 					<view class="login-item-text">企业用户</view>
 				</view>
 			</view>
+			<view class="getphone" v-if="hasLogin&&havePhone==false">
+				<button type="default" class="getPhoneNumber" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber">绑定手机号</button>
+				<view class="tip">
+					为获取更好的服务,请绑定手机号
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import { mapState, mapMutations } from 'vuex';
 	export default {
 		data() {
 			return {
-				params:{
-					token:'',
-				}
-				
+				$getimg:this.$getimg,
+				backUrl:'',
+				havePhone:false,
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onShow() {
-	
+			console.log('this.hasLogin',this.hasLogin);
+			if(this.hasLogin){
+				uni.switchTab({
+					url:'../index/index',
+					fail: (err) => {
+						console.log(err)						
+					}
+				})				
+			}	
 		},
-		onLoad() {
-
+		onLoad(options) {
+			this.backUrl = options.backUrl;
 		},
 		methods: {
-			personLogin(){
+			...mapMutations(['login','upInfo']),
+			personLogin(e){
+				let serf = this;
+				let userinfo = e.detail;
+				// console.log('e',e);
+				uni.login({
+					provider:'weixin',
+					success(res){
+						let code = res.code;
+						// console.log('loginres',res);
+						let params = {
+							code:code,							
+							encryptedData:userinfo.encryptedData,
+							iv:userinfo.iv,
+							rawData:userinfo.rawData,
+						};						
+						serf.$api.http.post(serf.config.apiBaseurl+"/carbon-h5/wechat/app/login",params).then(res=>{
+							console.log('res',res)
+							if(res.data.code == 1){
+								serf.$api.msg(res.data.msg);
+								return false;
+							};
+							serf.login(res.data.retBody);
+							serf.upInfo();
+							let userKey = uni.getStorageSync('userInfo');
+							// console.log('userKey',userKey.phone);
+							if(userKey.phone){
+								serf.havePhone = true;
+							}else{
+								// console.log('hasLogin',serf.hasLogin);
+								// console.log('havePhone==false',serf.havePhone==false);
+								return;
+							}
+							if(serf.backUrl == '' || !serf.backUrl){
+								uni.switchTab({
+									url: '/pages/usercenter/usercenter'
+								})
+							}else{
+								uni.navigateTo({
+									url:serf.backUrl
+								})
+							}
+						})
+					},
+				})
 				
 			},
+			onGetPhoneNumber(e){
+				let serf = this;
+				let userinfo = e.detail;
+				let token = uni.getStorageSync('accessToken').accessToken;
+				console.log('token',token);
+				console.log('e',e);
+				uni.login({
+					provider:'weixin',
+					success(res){
+						let code = res.code;
+						console.log('loginres',res);
+						let params = {
+							code:code,
+							encryptedData:userinfo.encryptedData,
+							iv:userinfo.iv,
+							rawData:userinfo.rawData,
+						}
+						serf.$api.http.post(serf.config.apiBaseurl+"/carbon-h5/wechat/app/login/phone",params,{
+							header: {
+							Accept:'application/json',
+							Authorization: 'Bearer '+ token, //注意Bearer后面有一空格
+						},
+						}).then(res=>{
+							serf.upInfo();
+							let userKey = uni.getStorageSync('userInfo');
+							if(serf.backUrl == '' || !serf.backUrl){
+								uni.switchTab({
+									url: '/pages/usercenter/usercenter'
+								})
+							}else{
+								uni.navigateTo({
+									url:serf.backUrl
+								})
+							}
+						})
+					}
+				})				
+			},
 			companyLogin(){
 				uni.navigateTo({
 					url:'/pages/login/companyLogin'
@@ -56,8 +156,11 @@
 	/* @import url("./index.css"); */
 .login-out{position: fixed;left: 0;right: 0;bottom: 144rpx;}
 .login-wrap{display: flex;align-items: center;text-align: center;}
-.login-item{flex: 1;}
+.login-item{flex: 1;position: relative;}
 .login-item-icon{display: flex;margin: 0 auto 14rpx;align-items: center;justify-content: center;width: 151rpx;height: 151rpx;border-radius: 50%;background: linear-gradient(139deg, #43D394 0%, #18C197 100%);}
 .login-item-icon .iconfont{color: #fff;font-size: 64rpx;}
 .login-item-text{font-size: 28rpx;color: #666;line-height: 40rpx;}
+.wxlogin-btn{position: absolute;left: 0;top: 0;right: 0;bottom: 0;opacity: 0;}
+.getPhoneNumber{margin: 0 24rpx;}
+.getphone .tip{text-align: center;margin: 24rpx;font-size: 24rpx;color: #666;}
 </style>

pages/offlineBuy/offlineBuy.css

@@ -0,0 +1,43 @@
+page{background-color: #F5F5F5;}
+.offline-content{min-height: 500rpx;box-sizing: border-box;padding: 32rpx 24rpx;margin: 32rpx 40rpx;background-color: #fff;box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);border-radius: 16rpx;}
+
+.step-wrap{padding: 43rpx 86rpx 12rpx 74rpx;margin-bottom: 12rpx;display: flex;}
+.step-item{position: relative;flex: 1;height: 2rpx}
+.step-item::before{content: '';width: 16rpx;height: 16rpx;background-color: #E5E5E5;border-radius: 50%;position: absolute;left: 0;top: -8rpx;}
+.step-item.active::before{background-color: #26D18B;}
+.step-item::after{content: '';position: absolute;height: 1px;left: 22rpx;right: 6rpx;background-color: #E5E5E5;top: 0;}
+.step-wrap .step-item:last-of-type{flex: unset;width: 0;}
+.step-wrap .step-item:last-of-type::after{height: 0;}
+.step-text{margin:0 -30rpx 49rpx;display: flex;justify-content: space-between;}
+.step-text-item{flex: 1;text-align: center;}
+.step-text-item-cn{font-size: 28rpx;color: #333;line-height: 40rpx;}
+.step-text-item-en{font-size: 24rpx;color: #999;line-height: 33rpx;}
+
+.til{display: flex;align-items: center;font-size: 32rpx;color: #333;line-height: 45rpx;letter-spacing: 2rpx;margin-bottom: 28rpx;}
+.til-img{width: 36rpx;height: 36rpx;margin-right: 10rpx;}
+.con{font-size: 28rpx;color: #333;line-height: 40rpx;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pages/offlineBuy/offlineBuy.vue

@@ -0,0 +1,114 @@
+<template>
+	<view class="pages">
+		<view class="top-img">
+			<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>
+			<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 -->
+			<view class="step-content" v-if="status == 0">
+				<view class="til">
+					<image :src="$getimg + 'icon-rengou.png'" class="til-img" mode="scaleToFill"></image>
+					步骤一
+				</view>
+				<view class="con">
+					说明：感谢您的认购，生态环境厅将收到您的申请，请尽快联系生态环境厅（联系电话：{{phone01}}）签订认购协议
+				</view>				
+			</view>
+			<view class="step-content" v-if="status == 1">
+				<view class="til">
+					<image :src="$getimg + 'icon-rengou.png'" class="til-img" mode="scaleToFill"></image>
+					步骤二
+				</view>
+				<view class="con">
+					说明：认购成功，请在{{time}}之前，打款到指定账户{{bankAccount}}，完成购买，如有疑问可联系
+				</view>				
+			</view>
+			<view class="step-content" v-if="status == 2">
+				<view class="til">
+					<image :src="$getimg + 'icon-rengou.png'" class="til-img" mode="scaleToFill"></image>
+					步骤三
+				</view>
+				<view class="con">
+					说明：完成购买，如需开具发票可联系：{{phone03}}
+				</view>				
+			</view>
+			
+		</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>
+				<view class="bottom-btn btn" v-if="status == 1">
+					查看订单
+				</view>
+				<view class="bottom-btn btn" v-if="status == 2">
+					查看订单
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				$getimg:this.$getimg,
+				status:0,
+				time:'2020年11月11日',
+				bankAccount:'6210000000000009900',
+				phone01:'08121224',
+				phone01:'08121212',
+				phone03:'84546545',
+			}
+		},
+		onShow() {
+	
+		},
+		onLoad() {
+
+		},
+		methods: {
+			//打电话
+			callnumber(number){
+				if(!number){
+					uni.showToast({
+						icon:'none',
+						mask:true,
+						title:`手机号码为空`,
+						duration: 2000
+					});
+					return;
+				};
+				uni.makePhoneCall({
+				    phoneNumber: number 
+				});				
+			},
+
+		}
+	}
+</script>
+
+<style>
+	@import url("./offlineBuy.css");
+</style>

pages/product/product.css

@@ -0,0 +1,38 @@
+page{background-color: #F5F5F5;}
+.goods-name{display: flex;align-items: center;justify-content: space-between;padding: 24rpx;background-color: #fff;border-bottom: 1px solid #ddd;}
+.goods-name .name{font-size: 30rpx;font-weight: 600;line-height: 40rpx;}
+.goods-name .type{font-size: 24rpx;color: #999;}
+
+.goods-base-info{position: relative;margin-bottom: 24rpx;background-color: #fff;}
+.goods-base-info-item{font-size: 28rpx;color: #666;line-height: 40rpx;}
+.goods-base-info .goods-price{flex: unset;position: absolute;right: 24rpx;bottom: 24rpx;color: #26D18B;}
+.goods-base-info .goods-price .price{font-size: 30rpx;font-weight: bold;}
+
+.main-body{margin-bottom: 24rpx;background-color: #fff;}
+.main-body-til{display: flex;justify-content: space-between;align-items: center;padding: 24rpx;border-bottom: 1px solid #ddd;}
+.main-body-til .til{font-size: 30rpx;font-weight: 600;color: #333;}
+.main-body-til .con{display: flex;align-items: center;font-size: 24rpx;color: #666;}
+.main-body-info{display: flex;padding: 24rpx;align-items: center;}
+.main-body-info-img{width: 200rpx;height: 200rpx;margin-right: 24rpx;}
+.main-body-info-text{flex: 1;font-size: 28rpx;color: #666;line-height: 40rpx;}
+.text-item{margin-bottom: 16rpx;}
+.text-item .text + .text{margin-left: 24rpx;}
+
+.product-info-item{width: 50%;margin-bottom: 24rpx;font-size: 28rpx;color: #333;box-sizing: border-box;}
+.product-info .main-body-info{flex-wrap: wrap;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pages/product/product.vue

@@ -0,0 +1,130 @@
+<template>
+	<view class="pages">
+		<view class="swiper-wrap">
+			<swiper class="swiper"
+			:indicator-dots="swiper.indicatorDots" 
+			:indicator-color="swiper.indicatorColor"  
+			:indicator-active-color="swiper.indicatorActiveColor" 
+			:autoplay="swiper.autoplay"
+			:interval="swiper.interval" :duration="swiper.duration">
+				<swiper-item v-for="(item, index) in bannerList" :key="index">
+					<view class="adv-item" @click="swiperClick"><image :src="'http://cqth.hw.hongweisoft.com/ht/' +item" class="pic" mode="scaleToFill"></image></view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="goods-name">
+			<view class="name">{{product.goodsName ||'重庆市渝中区解放碑街道民生路成片林'}}</view>
+			<view class="type">类别:{{product.goodsType || "T001"}}</view>
+		</view>
+		<view class="goods-base-info padding24">
+			<view class="goods-base-info-item">产品编号:{{product.goodsCode || 'G0119000000000005468'}}</view>
+			<view class="goods-base-info-item">认购期:{{time}}</view>
+			<view class="goods-base-info-item">预估总释放量：{{product.carbonVal || "49330"}}kg</view>
+			<view class="goods-price">
+				<text class="rmb">￥</text>
+				<text class="price">{{product.price || "3.00"}}/kg</text>
+			</view>			
+		</view>
+		<view class="main-body">
+			<view class="main-body-til">
+				<view class="til">碳汇研发主体</view>
+				<view class="con">
+					<text>青龙村</text>
+					<text class="iconfont icon-jiantou"></text>
+				</view>
+			</view>
+			<view class="main-body-info">
+				<image :src="$getimg+'home-buy-now-img.png'" class="main-body-info-img" mode="scaleToFill"></image>
+				<view class="main-body-info-text">
+					<view class="text-item">
+						<text class="text">家庭成员:5人</text>
+						<text class="text">涉及产品数:3</text>
+					</view>
+					<view class="main-body-info-text">地址:重庆市渝中区解放碑街道民生路</view>
+				</view>
+			</view>
+		</view>
+		<view class="main-body product-info">
+			<view class="main-body-til">
+				<view class="til">产品信息</view>
+			</view>
+			<view class="main-body-info">
+				<view class="product-info-item">
+					产品类型:
+				</view>
+				<view class="product-info-item">
+					村小组:
+				</view>
+				<view class="product-info-item">
+					造林主体:
+				</view>
+				<view class="product-info-item">
+					小地名:
+				</view>
+			</view>
+		</view>
+		<view class="bottom-btn-wrap">
+			<view class="bottom-btn-wrap-bg">
+				<view class="bottom-btn btn">
+					立即购碳
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				$getimg:this.$getimg,
+				token:this.config.testToken,
+				params:{
+					goodsId:'',
+				},
+				bannerList:[],
+				swiper: {
+					indicatorDots: true,
+					autoplay: true,
+					interval: 9000,
+					duration: 500,
+					indicatorColor:"rgba(255, 255, 255, 0.7)",
+					indicatorActiveColor:"rgba(255, 255, 255, 1)",
+				},
+				product:[],
+				time:'2020',
+				
+				
+			}
+		},
+		onShow() {
+			
+		},
+		onLoad(option) {
+			console.log('option',option);
+			this.params.goodsId = option.guid;
+			this.getdetails();
+		},
+		methods: {
+			getdetails(){
+				this.$api.http.get(this.config.apiBaseurl + '/carbon-h5/wap/goods/getById?goodsId='+this.params.goodsId,{
+					header: {
+					Accept:'application/json',
+					Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格
+				},
+				}).then(res => {
+					this.bannerList = res.data.retBody.goodsImages.split(';');
+					this.product = res.data.retBody;
+					console.log('res',JSON.parse(JSON.stringify(res.data.retBody)));
+				}).catch(err =>{
+					console.log('err',err)
+				});
+			},
+
+		}
+	}
+</script>
+
+<style>
+	@import url("./product.css");
+</style>

pages/usercenter/certificateList/certificateList.vue

@@ -43,9 +43,10 @@
 						tip: '暂无相关数据'
 					}
 				},
+				tokenhead:'Bearer',
+				token:'',
 				params:{
-					tokenhead:'',
-					token:'',
+					
 				},
 				certificateList:[
 					{
@@ -61,28 +62,13 @@
 			}
 		},
 		onShow() {
-			let serf = this;
+			this.token = this.$store.state.token;
 			//检查登录,获取token
 			// let loginRes = this.checkLogin('/pages/index/index', '2');
 			// if(!loginRes){return false;}
 			// serf.params.token=loginRes[0];			
 		},
 		onLoad() {
-			let self = this;
-			uni.getStorage({
-				key:'token',
-				success: function (res) {
-					self.params.token = res.data;
-				   // console.log(res.data);
-				}
-			});
-			uni.getStorage({
-				key:'tokenhead',
-				success: function (res) {
-					self.params.tokenhead = res.data;
-				   // console.log(res.data);
-				}
-			});
 
 		},
 		methods: {
@@ -101,9 +87,9 @@
 				let pageNum = page.num; // 页码, 默认从1开始
 				let pageSize = page.size; // 页长, 默认每页10条
 				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});				
-				let thetoken = this.params.tokenhead + this.params.token;
+				let thetoken = this.tokenhead + ' ' + this.token;
 				console.log('thetoken',thetoken);
-				this.$api.http.get(this.config.apiBaseurl+'/pre/own',{params:this.params,header: {Authorization:thetoken}}).then(data => {
+				this.$api.http.get(this.config.apiBaseurl+'/carbon-h5/wap/order/searchCredentialList',{params:this.params,header: {Authorization:thetoken}}).then(data => {
 					console.log('1111111111',data);
 					// 接口返回的当前页数据列表 (数组)
 					let curPageData = data.data.data.list; 

pages/usercenter/orderList/orderList.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="pages">
 		<view class="status-bar">
-			<view class="status-bar-item" :class="params.status == -1?'active':''" @click="changestatus(-1)">全部</view>
-			<view class="status-bar-item" :class="params.status == 0?'active':''" @click="changestatus(0)">未完成</view>
-			<view class="status-bar-item" :class="params.status == 1?'active':''" @click="changestatus(1)">已完成</view>
+			<view class="status-bar-item" :class="params.orderStatus != 1&&params.orderStatus != 5&&params.orderStatus != 2?'active':''" @click="changestatus()">全部</view>
+			<view class="status-bar-item" :class="params.orderStatus == 1?'active':''" @click="changestatus(1)">未支付</view>
+			<view class="status-bar-item" :class="params.orderStatus == 2?'active':''" @click="changestatus(2)">已支付</view>
+			<view class="status-bar-item" :class="params.orderStatus == 5?'active':''" @click="changestatus(5)">已完成</view>
 		</view>
 		<mescroll-body class="" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
 			<view class="orders">
@@ -14,13 +15,12 @@
 							<view class="order-info-text-item">订单时间：{{item.createTime}}</view>
 						</view>
 						<view class="order-info-status">
-							<view class="status" v-if="item.status == 0" @click="cancelOrder(item)">取消订单</view>
-							<view class="status topay" v-if="item.status == 0">待付款</view>							
-							<view class="status" v-if="item.orderStatus == 1">待发货</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 == 1" @click="cancelOrder(item)">取消订单</view>					
+							<!-- <view class="status" v-if="item.orderStatus == 1">待支付</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>
 					</view>
 					<!-- order-info end -->
@@ -35,8 +35,9 @@
 								<text class="amount">{{item.orderAmount}}</text>
 							</view>
 							<view class="order-product-carbon">共{{item.orderCarbonAmount}}kg碳汇量</view>
-							<view class="order-btn topay" v-if="item.status == 0" @click.stop="pay(item)">立即支付</view>
-							<view class="order-btn" v-if="item.status == 3" @click.stop="$api.href('/pages/usercenter/certificateList/certificate?id='+item.id)">查看证书</view>							
+							<view class="order-btn topay" v-if="item.orderStatus == 1" @click.stop="pay(item)">立即支付</view>
+							<view class="order-btn" v-if="item.orderStatus == 2" @click.stop="$api.href('/pages/usercenter/certificateList/certificate?id='+item.id)">查看证书</view>	
+							<view class="order-btn" v-if="item.orderStatus == 5" @click.stop="$api.href('/pages/usercenter/certificateList/certificate?id='+item.id)">查看证书</view>							
 						</view>
 					</view>
 				</view>
@@ -82,18 +83,14 @@
 						tip: '暂无相关数据'
 					}
 				},
-				tokenhead:'',
-				token:this.config.testToken,				
+				tokenhead:'Bearer',
+				token:'',
 				params:{
-					status:-1,
+					orderStatus:'',
 					// tokenhead:'',
 					// token:'',
 				},
-				orderlist:[
-					{orderNo:'10383902903920',time:'2020-5-14 09:00',image:'http://placekitten.com/202/202',amount:'55555',tyepNum:'3',saleNum:'60',status:'0'},
-					{orderNo:'10383902903920',time:'2020-5-14 09:00',image:'http://placekitten.com/202/202',amount:'55555',tyepNum:'3',saleNum:'60',status:'3'},
-					{orderNo:'10383902903920',time:'2020-5-14 09:00',image:'http://placekitten.com/202/202',amount:'55555',tyepNum:'3',saleNum:'60',status:'5'}
-				],
+				orderlist:[],
 				cancelId:null,
 				receiveId:null,
 				popupContent:'',
@@ -102,29 +99,9 @@
 			}
 		},
 		onShow() {
-			let serf = this;
-			//检查登录,获取token
-			// let loginRes = this.checkLogin('/pages/index/index', '2');
-			// if(!loginRes){return false;}
-			// serf.params.token=loginRes[0];			
+			this.token = this.$store.state.token;
 		},
 		onLoad() {
-			let self = this;
-			uni.getStorage({
-				key:'token',
-				success: function (res) {
-					self.token = res.data;
-				   // console.log(res.data);
-				}
-			});
-			uni.getStorage({
-				key:'tokenhead',
-				success: function (res) {
-					self.tokenhead = res.data;
-				   // console.log(res.data);
-				}
-			});
-
 		},
 		methods: {
 			/*mescroll组件初始化的回调,可获取到mescroll对象 (此处可删,mixins已默认)*/
@@ -136,13 +113,53 @@
 				// 第2种: 下拉刷新和上拉加载调同样的接口, 那么不用第1种方式, 直接mescroll.resetUpScroll()即可
 				this.mescroll.resetUpScroll(); // 重置列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
 			},
+			getList(page,token){
+				this.$api.http.post(this.config.apiBaseurl + '/carbon-h5/wap/order/searchByPage',this.params,{
+					header: {
+					Accept:'application/json',
+					Authorization: 'Bearer '+ token, //注意Bearer后面有一空格
+				},
+				}).then(data => {
+					// console.log(data);
+					// 接口返回的当前页数据列表 (数组)
+					let curPageData = data.data.retBody; 
+					// console.log('curPageData',curPageData);
+					// 接口返回的当前页数据长度 (如列表有26个数据,当前页返回8个,则curPageLen=8)
+					let curPageLen = curPageData.length; 
+					// 接口返回的总页数 (如列表有26个数据,每页10条,共3页; 则totalPage=3)
+					// let totalPage = data.xxx; 
+					// 接口返回的总数据量(如列表有26个数据,每页10条,共3页; 则totalSize=26)
+					let totalSize = data.data.retHead.total; 
+					// this.mescrollList = curPageData;
+					// 接口返回的是否有下一页 (true/false)
+					// let hasNext = data.xxx; 
+					
+					//设置列表数据
+					if(page.num == 1) this.orderlist = []; //如果是第一页需手动置空列表
+					this.orderlist = this.orderlist.concat(curPageData); //追加新数据
+					// console.log('page.num',page.num);
+					console.log('this.orderlist',JSON.parse(JSON.stringify(this.orderlist)));
+					
+					//方法二(推荐): 后台接口有返回列表的总数据量 totalSize
+					this.mescroll.endBySize(curPageLen, totalSize); 
+							
+					// setTimeout(()=>{
+					// 	this.mescroll.endSuccess(curPageLen)
+					// },20)
+				
+				}).catch(err => {
+					this.mescroll.endErr()
+					console.log(err)
+				
+				});
+				
+			},
 			/*上拉加载的回调*/
 			upCallback(page) {
+				let self = this;
 				let pageNum = page.num; // 页码, 默认从1开始
 				let pageSize = page.size; // 页长, 默认每页10条
-				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});				
-				let thetoken = 'Bearer ' + this.token;
-				// console.log('thetoken',thetoken);
+				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});
 				this.$api.http.post(this.config.apiBaseurl + '/carbon-h5/wap/order/searchByPage',this.params,{
 					header: {
 					Accept:'application/json',
@@ -171,7 +188,7 @@
 					
 					//方法二(推荐): 后台接口有返回列表的总数据量 totalSize
 					this.mescroll.endBySize(curPageLen, totalSize); 
-			
+							
 					// setTimeout(()=>{
 					// 	this.mescroll.endSuccess(curPageLen)
 					// },20)
@@ -232,7 +249,7 @@
 				done()
 			},
 			changestatus(status){
-				this.params.status  = status;
+				this.params.orderStatus  = status;
 				this.downCallback();
 			},
 			goOrderDetails(id){
@@ -242,17 +259,44 @@
 				});
 			},
 			pay(item){
+				console.log('pay item',item);
 				let userInfo = uni.getStorageSync("userInfo");
-					let params = {
-						orderId:item.id,
-						payType:item.payType,
-						openid:userInfo.wxUsers.openid,
-						"tradeType":"test"
-					}
-					this.$pay.wxPay(params).then(res =>{
-						this.downCallback();
-						// 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) {
+					        console.log('success:' + JSON.stringify(res));
+					    },
+					    fail: function (err) {
+					        console.log('fail:' + JSON.stringify(err));
+					    }
+					});
+				}).catch( err =>{
+					console.log('pay err',err)
+				})
+					
+					// this.$pay.wxPay(params).then(res =>{
+					// 	this.downCallback();
+					// 	// console.log('payres',res);
+					// }).catch(err =>{console.log('err',err);});
 			},
 
 		}

pages/usercenter/orderList/orderdetails/orderdetails.css

@@ -1,12 +1,13 @@
 page{background-color: #FBFBFC;}
 .order{margin: 24rpx 0;padding: 35rpx 30rpx 35rpx 50rpx;background-color: #fff;font-size: 28rpx;color: #999;}
-
-
-
-
-
-
-
+.order-info{line-height: 40rpx;}
+.order-status{display: flex;justify-content: space-between;align-items: center;margin-top: 45rpx;}
+.order-status .status{display: flex;align-items: center;}
+.order-status .status-img{width:48rpx;height: 48rpx;margin-right: 12rpx;}
+.order-status .status-text{font-size: 30rpx;color: #666;}
+.order-btn{text-align: center;height: 58rpx;line-height: 58rpx;}
+.order-btn.topay{width: 138rpx;border-radius: 6rpx;border: 1px solid #FFDA00;color: #FFDA00;}
+.order-btn.done{width: 168rpx;border: 1px solid #26D18B;color: #26D18B;border-radius: 34rpx;}
 
 
 

pages/usercenter/orderList/orderdetails/orderdetails.vue

@@ -2,9 +2,21 @@
 	<view class="page">
 		<view class="order">
 			<view class="order-info">订单编号：{{item.orderNo}}</view>
-			<view class="order-info">下单时间：{{item.createTime}}</view>
+			<view class="order-info">下单时间：{{item.createTime | formatDateTime}}</view>
 			<view class="order-info">支付方式：线下认购</view>
-			<view class="order-info">支付流水号：29830843045809</view>
+			<view class="order-info" v-if="item.payNo">支付流水号：{{item.payNo}}</view>
+			<view class="order-status">
+				<view class="status">
+					<image :src="$getInnerImg+'icon-vipcard.png'" class="status-img" mode="scaleToFill"></image>
+					<text class="status-text">待付款</text>
+				</view>
+				<view class="status">
+					<image :src="$getInnerImg+'icon-vipcard-green.png'" class="status-img" mode="scaleToFill"></image>
+					<text class="status-text">已支付</text>
+				</view>
+				<view class="order-btn topay" @click.stop="pay">去支付</view>
+				<view class="order-btn done">查看证书</view>
+			</view>
 		</view>
 		<!-- bottom-flex-btn-wrap end -->
 		<uni-popup ref="popup" type="dialog">
@@ -23,6 +35,7 @@
 		},
 		data() {
 			return {
+				$getInnerImg:this.$getInnerImg,
 				token:this.config.testToken,
 				tokenhead:'',
 				params: {

pages/usercenter/question/question.css

@@ -0,0 +1,62 @@
+page{background-color: #F5F5F5;}
+.questions-item{padding: 24rpx;margin-bottom: 24rpx;box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);border-radius: 16rpx;background-color: #fff;}
+.questions-item-til{display: flex;margin-bottom: 12rpx;align-items: center;}
+.questions-item-img{width: 44rpx;height: 48rpx;margin-right: 24rpx;}
+.questions-item-text{font-size: 28rpx;color: #333;line-height: 40rpx;font-weight: 500;letter-spacing: 1rpx;}
+.questions-item-con{padding-left: 68rpx;font-size: 24rpx;color: #666;line-height: 33rpx;letter-spacing: 1rpx;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pages/usercenter/question/question.vue

@@ -0,0 +1,137 @@
+<template>
+	<view class="pages">
+		<mescroll-body class="" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
+			<view class="questions wrap40">
+				<view class="questions-item" v-for="(item,index) in questionlist" :key="index">
+					<view class="questions-item-til">
+						<image :src="$getInnerImg + 'icon-questions.png'" class="questions-item-img" mode="scaleToFill"></image>
+						<view class="questions-item-text">{{item.title}}</view>
+					</view>
+					<view class="questions-item-con">{{item.content}}</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	// 引入mescroll-mixins.js
+	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";	
+	// 引入mescroll-body组件 (如已在main.js注册全局组件,则省略此步骤)
+	import MescrollBody from "@/components/mescroll-uni/mescroll-body.vue"; // 注意.vue后缀不能省
+	
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		components: {
+			MescrollBody,
+		},
+		data() {
+			return {
+				$getInnerImg:this.$getInnerImg,
+				params:{},
+				mescroll: null, // mescroll实例对象 (此行可删,mixins已默认)
+				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
+				downOption: { 
+					// ...
+				},
+				// 上拉加载的配置(可选, 绝大部分情况无需配置)
+				upOption: {
+					page: {
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 3, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						tip: '暂无相关数据'
+					}
+				},
+				questionlist:[
+					{title:'1.如何获得碳积分',content:'如何获得碳积分'},
+					{title:'2.如何获得碳积分',content:'如何获得碳积分'},
+				],
+				
+			}
+		},
+		onShow() {
+		},
+		onLoad() {
+			let self = this;
+			uni.getStorage({
+				key:'token',
+				success: function (res) {
+					self.token = res.data;
+				   // console.log(res.data);
+				}
+			});
+			uni.getStorage({
+				key:'tokenhead',
+				success: function (res) {
+					self.tokenhead = res.data;
+				   // console.log(res.data);
+				}
+			});
+
+		},
+		methods: {
+			/*mescroll组件初始化的回调,可获取到mescroll对象 (此处可删,mixins已默认)*/
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			/*下拉刷新的回调, 有三种处理方式:*/
+			downCallback(){			
+				// 第2种: 下拉刷新和上拉加载调同样的接口, 那么不用第1种方式, 直接mescroll.resetUpScroll()即可
+				this.mescroll.resetUpScroll(); // 重置列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
+			},
+			/*上拉加载的回调*/
+			upCallback(page) {
+				let pageNum = page.num; // 页码, 默认从1开始
+				let pageSize = page.size; // 页长, 默认每页10条
+				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});				
+				let thetoken = 'Bearer ' + this.token;
+				// console.log('thetoken',thetoken);
+				this.$api.http.post(this.config.apiBaseurl + '/carbon-h5/wap/order/searchByPage',this.params,{
+					header: {
+					Accept:'application/json',
+					Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格
+				},
+				}).then(data => {
+					// console.log(data);
+					// 接口返回的当前页数据列表 (数组)
+					let curPageData = data.data.retBody; 
+					// console.log('curPageData',curPageData);
+					// 接口返回的当前页数据长度 (如列表有26个数据,当前页返回8个,则curPageLen=8)
+					let curPageLen = curPageData.length; 
+					// 接口返回的总页数 (如列表有26个数据,每页10条,共3页; 则totalPage=3)
+					// let totalPage = data.xxx; 
+					// 接口返回的总数据量(如列表有26个数据,每页10条,共3页; 则totalSize=26)
+					let totalSize = data.data.retHead.total; 
+					// this.mescrollList = curPageData;
+					// 接口返回的是否有下一页 (true/false)
+					// let hasNext = data.xxx; 
+					
+					//设置列表数据
+					if(page.num == 1) this.questionlist = []; //如果是第一页需手动置空列表
+					this.questionlist = this.questionlist.concat(curPageData); //追加新数据
+					// console.log('page.num',page.num);
+					console.log('this.questionlist',JSON.parse(JSON.stringify(this.questionlist)));
+					
+					//方法二(推荐): 后台接口有返回列表的总数据量 totalSize
+					this.mescroll.endBySize(curPageLen, totalSize); 
+			
+					// setTimeout(()=>{
+					// 	this.mescroll.endSuccess(curPageLen)
+					// },20)
+				
+				}).catch(err => {
+					this.mescroll.endErr()
+					console.log(err)
+				
+				});
+			},
+
+		}
+	}
+</script>
+
+<style>
+	@import url("./question.css");
+</style>

pages/usercenter/subscribe/subscribe.css

@@ -0,0 +1,38 @@
+page{background-color: #F5F5F8;}
+.subscribe{margin: 24rpx;}
+.subscribe-item{display: flex;align-items: center;background-color: #fff;padding: 24rpx 24rpx 29rpx;margin-bottom: 24rpx;border-radius: 16rpx;}
+.subscribe-item-info{flex: 1;}
+.subscribe-item-info .time{margin-bottom: 17rpx;font-size: 26rpx;color: #666;line-height: 30rpx;}
+.subscribe-item-info .carbon{font-size: 30rpx;color: #000;font-weight: 400;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pages/usercenter/subscribe/subscribe.vue

@@ -1,21 +1,24 @@
 <template>
 	<view class="pages">
 		<mescroll-body class="wrap" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
-			<view class="certificate">
-				<view v-for="(item,index) in certificateList" :key="index" class="certificate-item">
-					<view class="certificate-item-photo">
-						<image class="certificate-item-photo-img" :src="item.headimgurl" mode=""></image>
+			<view class="subscribe">
+				<view v-for="(item,index) in subscribeList" :key="index" class="subscribe-item">
+					<view class="subscribe-item-info">
+						<view class="time">
+							认购申请时间：{{item.createTime || ""}}
+						</view>
+						<view class="carbon">
+							共计
+							<text></text>
+							<text>kg</text>
+							碳汇量
+						</view>
 					</view>
-					<view class="certificate-item-text">
-						<view class="certificate-item-name">{{item.memberNickname}} <text class="type">{{item.type}}</text></view>
-						<view class="certificate-item-addr">{{item.addr}}</view>
-						<view class="certificate-item-care">关心：{{item.productName}}</view>
-						<!-- <view class="certificate-item-care">关心：<text v-for="(careitem,careindex) in item.care" :key="careindex">{{careitem}},</text></view> -->
+					<view class="subscribe-item-status">
+						
 					</view>
-					<view class="certificate-item-call" @click="callnumber(item.phonenumber)">
-						<svg class="icon certificate-item-call-icon" aria-hidden="true">
-							<use xlink:href="#icondianhua"></use>
-						</svg>
+					<view class="subscribe-item-icon">
+						<text class="iconfont icon-jiantou"></text>
 					</view>
 				</view>
 			</view>
@@ -50,11 +53,11 @@
 						tip: '暂无相关数据'
 					}
 				},
+				token:'',
+				tokenhead:'Bearer',
 				params:{
-					tokenhead:'',
-					token:'',
 				},
-				certificateList:[
+				subscribeList:[
 					// {
 					// 	img:"http://placekitten.com/90/90",
 					// 	name:'周飞向',
@@ -76,6 +79,7 @@
 			}
 		},
 		onShow() {
+			this.token = this.$store.state.token;
 			let serf = this;
 			//检查登录,获取token
 			// let loginRes = this.checkLogin('/pages/index/index', '2');
@@ -85,20 +89,12 @@
 		onLoad() {
 			let self = this;
 			uni.getStorage({
-				key:'token',
+				key:'accessToken',
 				success: function (res) {
-					self.params.token = res.data;
+					self.params.token = res.data.accessToken;
 				   // console.log(res.data);
 				}
 			});
-			uni.getStorage({
-				key:'tokenhead',
-				success: function (res) {
-					self.params.tokenhead = res.data;
-				   // console.log(res.data);
-				}
-			});
-
 		},
 		methods: {
 			/*mescroll组件初始化的回调,可获取到mescroll对象 (此处可删,mixins已默认)*/
@@ -116,9 +112,9 @@
 				let pageNum = page.num; // 页码, 默认从1开始
 				let pageSize = page.size; // 页长, 默认每页10条
 				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});				
-				let thetoken = this.params.tokenhead + this.params.token;
+				let thetoken = this.tokenhead + ' ' + this.token;
 				console.log('thetoken',thetoken);
-				this.$api.http.get(this.config.apiBaseurl+'/pre/own',{params:this.params,header: {Authorization:thetoken}}).then(data => {
+				this.$api.http.get(this.config.apiBaseurl+'/carbon-h5/wap/apply/list',{params:this.params,header: {Authorization:thetoken}}).then(data => {
 					console.log('1111111111',data);
 					if(data.data.code=='1001'){
 						// uni.redirectTo({
@@ -127,23 +123,23 @@
 					};
 					console.log(data);
 					// 接口返回的当前页数据列表 (数组)
-					let curPageData = data.data.data.list; 
+					let curPageData = data.data.rows; 
 					// console.log('curPageData',curPageData);
 					// 接口返回的当前页数据长度 (如列表有26个数据,当前页返回8个,则curPageLen=8)
 					let curPageLen = curPageData.length; 
 					// 接口返回的总页数 (如列表有26个数据,每页10条,共3页; 则totalPage=3)
 					// let totalPage = data.xxx; 
 					// 接口返回的总数据量(如列表有26个数据,每页10条,共3页; 则totalSize=26)
-					let totalSize = data.data.data.total; 
+					let totalSize = data.data.total; 
 					// this.mescrollList = curPageData;
 					// 接口返回的是否有下一页 (true/false)
 					// let hasNext = data.xxx; 
 					
 					//设置列表数据
-					if(page.num == 1) this.certificateList = []; //如果是第一页需手动置空列表
-					this.certificateList = this.certificateList.concat(curPageData); //追加新数据
+					if(page.num == 1) this.subscribeList = []; //如果是第一页需手动置空列表
+					this.subscribeList = this.subscribeList.concat(curPageData); //追加新数据
 					// console.log('page.num',page.num);
-					console.log('this.certificateList',JSON.parse(JSON.stringify(this.certificateList)));
+					console.log('this.subscribeList',JSON.parse(JSON.stringify(this.subscribeList)));
 					
 					//方法二(推荐): 后台接口有返回列表的总数据量 totalSize
 					this.mescroll.endBySize(curPageLen, totalSize); 
@@ -166,6 +162,6 @@
 	}
 </script>
 
-<style scoped>
+<style>
 @import url("./subscribe.css");
 </style>

pages/usercenter/usercenter.vue

@@ -3,10 +3,10 @@
 		<view class="top-img usercenter">
 			<image :src="$getimg + 'usercenter-bg.png'" class="img" mode="widthFix"></image>
 			<view class="usercenter-baseinfo">
-				<image src="http://xs.gzui.net/img/bookcover/default-bookcover.jpg" class="photo" mode="scaleToFill"></image>
+				<image :src="userInfo.headImage|| ''" class="photo" mode="scaleToFill"></image>
 				<view class="text">
-					<view class="name">环保有限公司</view>
-					<view class="tyep">
+					<view class="name">{{userInfo.customerName|| '游客'}}</view>
+					<view class="tyep" v-if="userInfo.isCompany">
 						<text class="iconfont icon-qiyeyonghu"></text>
 						企业用户
 					</view>
@@ -20,7 +20,7 @@
 						<text class="iconfont icon-jiantou"></text>
 					</view>
 				</view>
-				<view class="tool-bar-item">
+				<view class="tool-bar-item" @click="this.$api.msg('暂未开放')">
 					<view class="tool-bar-til">任务中心</view>
 					<view class="tool-bar-num">
 						<text class="iconfont icon-jiantou"></text>
@@ -61,14 +61,14 @@
 		</view>
 		<!-- usernav-list end -->
 		<view class="wrap40 question-nav">
-			<view class="question-item" @click="$api.href('/pages/use/use')">
+			<view class="question-item" @click="$api.href('/pages/usercenter/question/question')">
 				<view class="question-item-text">
 					<view class="question-item-til">新手指南</view>
 					<view class="question-item-subtil">一看就懂</view>
 				</view>
 				<image :src="$getimg + 'icon-guide-nav.png'" class="question-item-img" mode="aspectFit"></image>
 			</view>
-			<view class="question-item" @click="$api.href('/pages/use/use')">
+			<view class="question-item" @click="$api.href('/pages/usercenter/question/question')">
 				<view class="question-item-text">
 					<view class="question-item-til">常见问题</view>
 					<view class="question-item-subtil">解答疑惑</view>
@@ -77,11 +77,13 @@
 			</view>
 		</view>
 		<!-- question-nav end -->
-		<view class="logout">退出登录</view>
+		<view class="logout" v-if="hasLogin" @click="logout()">退出登录</view>
+		<view class="logout" v-if="!hasLogin" @click="$api.href('/pages/login/loginType')">去登录</view>
 	</view>
 </template>
 
 <script>
+	import { mapState, mapMutations } from 'vuex';
 	export default {
 		data() {
 			return {
@@ -89,13 +91,21 @@
 				
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onShow() {
-		
+			console.log('hasLogin',this.hasLogin);
+			console.log('userInfo',this.userInfo);
+			if (this.hasLogin) {
+				this.upInfo();
+			}		
 		},
 		onLoad() {
-
+			
 		},
 		methods: {
+			...mapMutations(['login', 'logout', 'upInfo']),
 
 		}
 	}

store/index.js

@@ -10,12 +10,12 @@ const http = new Request();
 import md5 from '@/js_sdk/js-md5/md5.min.js';
 import {config} from '@/config/config.js'
 Vue.use(Vuex);
-const userKey = md5("userInfo");
+// const userKey = md5("userInfo");
+const userKey = "userInfo";
 const hPageKey = md5('historyPage');
-const sysTokenKey = md5('accessToken');
+// const sysTokenKey = md5('accessToken');
+const sysTokenKey ='accessToken';
 const loginUrl = '/pages/login/loginType';
-const token = uni.getStorageSync(sysTokenKey);
-let thetoken = 'Bearer ' + token.accessToken;
 export default new Vuex.Store({
 	state: {
 		hasLogin: false,
@@ -23,13 +23,24 @@ export default new Vuex.Store({
 			customerCompanyInfoForm:{}
 		},
 		token: '',
+		cartListTmp:[],
 		hPage: ''
 	},
 	mutations: {
+		addCart(state,data){
+			if(data){
+				state.cartListTmp = data
+				console.log("vuex add：",state.cartListTmp)
+			}			
+		},
+		clearCart(state){
+			state.cartListTmp = []
+			console.log(state.cartListTmp)
+		},
 		login(state, token = '') {
-			token = token instanceof Object ? token.accessToken : token;
+			token = token instanceof Object ? token.token : token;
 			state.token = token || uni.getStorageSync(sysTokenKey).accessToken || '';
-			state.hasLogin = Boolean(state.token);
+			state.hasLogin = Boolean(state.token);			
 			//保存token
 			uni.setStorage({
 				key: sysTokenKey,
@@ -66,69 +77,101 @@ export default new Vuex.Store({
 		// 		});
 		// 	}
 		// },
+		
 		async upInfo(state, provider = {}) {
+			const token = uni.getStorageSync(sysTokenKey);
+			let thetoken = 'Bearer ' + token.accessToken;
 			//用户信息结构
 			const infoObj = {
+				"page": 0,
+				"pageNo": 0,
+				"pageNum": 1,
+				"pageSize": 10,
+				"pageStart": null,
+				"pageEnd": null,
+				"limit": 0,
+				"accessToken": null,
+				"fkProductGuid": null,
+				"fkOrgGuid": null,
+				"state": null,
+				"createUser": "",
+				"createTime": "",
+				"modifiedUser": "",
+				"modifiedTime": "",
+				"orgBrevity": null,
+				"ico": null,
+				"params": null,
+				"codeUrlPrefix": null,
+				"loginOrgGuid": null,
+				"msgCode": null,
+				"storeName": null,
 				"guid": "",
 				"account": "",
-				"customerType": '',
+				"passwd": "",
+				"customerType": null,
 				"customerName": "",
 				"nickName": "",
-				"phone": "",
-				"sex": '',
+				"pid": null,
+				"phone": null,
+				"sex": null,
+				"score": null,
+				"wxId": "",
+				"unionId": null,
 				"headImage": "",
-				"queryStr": '',
-				"carbonAmount": '',
-				"farmerNum": '',
-				"farmerPersonNum": '',
-				"loginType": '',
-				"customerCompanyInfoForm": {
-					"guid": "",
-					"fkCustomerId": "",
-					"companyName": "",
-					"principals": "",
-					"phone": "",
-					"email": "",
-					"companyAddress": "",
-					"companyImages": "",
-					"condition": "",
-					"customerType": "",
-					"imageList": '',
-					"companyType": ''
-				},
-				"channelType": ''
+				"isCompany": 0,
+				"isValidate": 0,
+				"isEnable": 1,
+				"queryStr": null,
+				"carbonAmount": null,
+				"goodsNum": null,
+				"farmerNum": null,
+				"farmerPersonNum": null,
+				"goodsList": null,
+				"loginType": null,
+				"customerCompanyInfoForm": null,
+				"channelType": null
 			};
 			const then = res => {
-				console.log('222',res)
-				// if (res.code == 0) {
-				// 	let data = res.data instanceof Object ? res.data : infoObj;
-				// 	//处理头像连接
-				// 	// data.headImage = $api.alterUrl($api.href, data.headImage || "");
-				// 	state.userInfo = data;
-				// 	uni.setStorage({ //缓存用户登陆状态
-				// 		key: userKey,
-				// 		data
-				// 	});
-				// }
-			}
+				if (res.data.code == 0) {
+					let data = res.data.retBody instanceof Object ? res.data.retBody : infoObj;
+					//处理头像连接
+					// data.headImage = $api.alterUrl($api.href, data.headImage || "");
+					state.userInfo = data;
+					uni.setStorage({ //缓存用户登陆状态
+						key: userKey,
+						data
+					});
+				}
+			};
 			//读取本地缓存信息进行赋值
 			then({
 				code: 0,
 				data: Object.assign(uni.getStorageSync(userKey),provider)
 			});
 			//在线更新取得用户信息
-			// then(await $api.$http({
-			// 	url: config.apiBaseurl + '/carbon-h5/wap/customer/getCustomerByToken'
-			// }));
-			then(await 
-				http.get(config.apiBaseurl + '/carbon-h5/wap/customer/getCustomerByToken',{header: {Authorization:thetoken}}).then(res => {
-					console.log('getCustomerByToken', res);
-				}).catch(err => {
-					// console.log('err', err)
-				})
-			);
-			
-			
+			then(await(
+					http.get(config.apiBaseurl + '/carbon-h5/wap/customer/getCustomerByToken',{header: {Authorization:thetoken}}).then(res => {
+						console.log('getCustomerByToken', res.data);
+						if(res.data.retHead.errCode == 0){res.data.code = 0;}
+						// 处理非微信头像
+						let headImage = res.data.retBody.headImage;
+						if (headImage) {
+						   //判断是否符合http://符合返回真不符合返回假
+						   var http = /^http:\/\/.*/i.test(headImage);
+						   //判断是否符合https://符合返回真不符合返回假
+						   var https = /^https:\/\/.*/i.test(headImage);
+						   //如果两个都为假，我们就为客户添加http://
+						   if (!http && !https) {
+							   headImage = config.onlineImg + headImage;
+						   }
+					   };
+					    res.data.retBody.headImage = headImage;
+						// 处理非微信头像						
+						return res;
+					}).catch(err => {
+						// console.log('err', err)
+					})
+				));
 		}
 	}
 });

unpackage/dist/dev/mp-weixin/app.json

@@ -1,16 +1,19 @@
 {
   "pages": [
-    "pages/usercenter/orderList/orderList",
-    "pages/index/init",
     "pages/index/guide",
     "pages/login/loginType",
     "pages/login/companyLogin",
     "pages/index/index",
+    "pages/product/product",
+    "pages/confirmOrder/confirmOrder",
     "pages/use/use",
     "pages/usercenter/usercenter",
     "pages/usercenter/certificateList/certificateList",
+    "pages/usercenter/orderList/orderList",
     "pages/usercenter/orderList/orderdetails/orderdetails",
-    "pages/usercenter/subscribe/subscribe"
+    "pages/usercenter/subscribe/subscribe",
+    "pages/usercenter/question/question",
+    "pages/offlineBuy/offlineBuy"
   ],
   "subPackages": [],
   "window": {
@@ -23,7 +26,6 @@
     "color": "#999",
     "selectedColor": "#26D18B",
     "borderStyle": "white",
-    "height": "134rpx",
     "backgroundColor": "#ffffff",
     "list": [
       {
@@ -47,5 +49,8 @@
     ]
   },
   "permission": {},
+  "uniStatistics": {
+    "enable": false
+  },
   "usingComponents": {}
 }

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

@@ -133,11 +133,14 @@
 .top-img{position: relative;height: 390rpx;overflow: hidden;}
 .top-img .img{width: 100%;height: 100%;position: absolute;left: 0;top: 0;z-index: -1;}
 .wrap{margin: 24rpx;}
+.padding24{padding: 24rpx;}
 .wrap40{margin: 32rpx 40rpx;}
 .full-btn{height: 98rpx;line-height: 98rpx;background-color: #26D18B;-webkit-border-radius: 8rpx;border-radius: 8rpx;font-size: 36rpx;color: #fff;text-align: center;}
 /* 浮底按钮 */
 .bottom-btn-wrap{height: 146rpx;margin-top: 44rpx;}
-.bottom-btn{height: 98rpx;line-height: 98rpx;position: fixed;left: 24rpx;right: 24rpx;bottom: 24rpx;text-align: center;z-index: 99;}
+.bottom-btn-wrap-bg{position: fixed;left: 0;right: 0;bottom: 0;background-color: #fff;height: inherit;}
+.bottom-btn{height: 98rpx;line-height: 98rpx;position: fixed;left: 24rpx;right: 24rpx;bottom: 24rpx;text-align: center;z-index: 99;-webkit-border-radius: 8rpx;border-radius: 8rpx;}
+.bottom-btn.btn{background-color: #26D18B;color: #fff;}
 /* 截取隐藏 */
 .f-ellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
 .common-content{margin-bottom: 32rpx;-webkit-border-radius: 16rpx;border-radius: 16rpx;-webkit-box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);background-color: #fff;padding: 24rpx;}
@@ -157,5 +160,10 @@
 .icon-form-item-img{width: 44rpx;height: 100%;}
 .icon-form-item-text{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;font-size: 28rpx;color: #333;}
 .icon-form-item-icon{margin-right: 0;width: 68rpx;}
-.icon-form-item-icon .iconfont{font-size: 30rpx;color: #ccc;}	
+.icon-form-item-icon .iconfont{font-size: 30rpx;color: #ccc;}
+/* 头部轮播 */
+.swiper-wrap{margin: 0 auto 32rpx;height: 320rpx;overflow: hidden;position: relative;}
+.swiper{height: 100%;}
+.adv-item{height: 100%;}
+.swiper-wrap .pic{width: 100%;height: 100%;}	
 

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

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "/components/uni-popup/uni-popup",
+    "quick-buy": "/pages/index/modal/quickBuy"
+  }
 }

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

@@ -25,7 +25,7 @@ page{background-color: #f5f5f5;}
 .type-nav-item-subtil{font-size: 24rpx;color: #999;line-height: 33rpx;font-weight: 400;}
 .type-nav-item.active .active-bg{width: 78rpx;margin-left: -39rpx;height: 54rpx;margin-top: -27rpx;position: absolute;left: 50%;top: 50%;z-index: -1;}
 .product-list{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;-webkit-flex-wrap: wrap;flex-wrap: wrap;}
-.product-list-item{width: 200rpx;height: 200rpx;position: relative;margin-bottom: 18rpx;overflow: hidden;-webkit-border-radius: 16rpx;border-radius: 16rpx;}
+.product-list-item{width: 200rpx;height: 200rpx;position: relative;margin-bottom: 18rpx;overflow: hidden;-webkit-border-radius: 16rpx;border-radius: 16rpx;text-align: center;}
 .product-list-item .product-img{width: 100%;height: 100%;}
 .product-list-item .product-text{position: absolute;left: 0;bottom: 0;right: 0;height: 56rpx;line-height: 56rpx;font-size: 24rpx;color: #fff;padding-left: 16rpx;overflow: hidden;text-overflow: ellipsis;background: rgba(0, 0, 0, 0.4);}
 .rank-wrap{margin-bottom: 44rpx;-webkit-border-radius: 16rpx;border-radius: 16rpx;-webkit-box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);}
@@ -40,8 +40,8 @@ page{background-color: #f5f5f5;}
 .rank-top-photo{width: 144rpx;height: 144rpx;-webkit-border-radius: 50%;border-radius: 50%;}
 .rank-top-name{font-size: 28rpx;color: #333;line-height: 40rpx;font-weight: 500;}
 .rank-top-carbon{font-size: 20rpx;color: #999;}
-.rank-wrap .rank-top-item:nth-child(2){-webkit-transform: scale(0.9);transform: scale(0.9);}
-.rank-wrap .rank-top-item:nth-child(3){-webkit-transform: scale(0.8);transform: scale(0.8);}
+.rank-wrap .rank-top-item:nth-child(2){-webkit-transform: scale(0.9);transform: scale(0.9);-webkit-transform-origin: bottom;transform-origin: bottom;}
+.rank-wrap .rank-top-item:nth-child(3){-webkit-transform: scale(0.8);transform: scale(0.8);-webkit-transform-origin: bottom;transform-origin: bottom;}
 .my-rank-wrap{-webkit-box-flex: unset;-webkit-flex: unset;flex: unset;position: absolute;top: 24rpx;right: 0;-webkit-box-align: center;-webkit-align-items: center;align-items: center;display: -webkit-box;display: -webkit-flex;display: flex;}
 .my-rank-photo{width: 80rpx;height: 80rpx;position: relative;right: -30rpx;-webkit-box-sizing: border-box;box-sizing: border-box;-webkit-border-radius: 50%;border-radius: 50%;overflow: hidden;border: 2rpx solid #fff;}
 .my-rank-photo .photo{width: 100%;height: 100%;}

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

@@ -1,5 +0,0 @@
-{
-  "navigationBarBackgroundColor": "#fff",
-  "navigationBarTitleText": "入口页",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pages/index/init.wxml

@@ -1 +0,0 @@
-<view class="pages data-v-41a19ae6"></view>

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

@@ -88,6 +88,12 @@
 
 
 
+
+
+
+
+
+
 
 
 

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

@@ -32,6 +32,106 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -56,8 +156,11 @@
 	/* @import url("./index.css"); */
 .login-out.data-v-6c8ead34{position: fixed;left: 0;right: 0;bottom: 144rpx;}
 .login-wrap.data-v-6c8ead34{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;text-align: center;}
-.login-item.data-v-6c8ead34{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;}
+.login-item.data-v-6c8ead34{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;position: relative;}
 .login-item-icon.data-v-6c8ead34{display: -webkit-box;display: -webkit-flex;display: flex;margin: 0 auto 14rpx;-webkit-box-align: center;-webkit-align-items: center;align-items: center;-webkit-box-pack: center;-webkit-justify-content: center;justify-content: center;width: 151rpx;height: 151rpx;-webkit-border-radius: 50%;border-radius: 50%;background: -webkit-linear-gradient(311deg, #43D394 0%, #18C197 100%);background: linear-gradient(139deg, #43D394 0%, #18C197 100%);}
 .login-item-icon .iconfont.data-v-6c8ead34{color: #fff;font-size: 64rpx;}
 .login-item-text.data-v-6c8ead34{font-size: 28rpx;color: #666;line-height: 40rpx;}
+.wxlogin-btn.data-v-6c8ead34{position: absolute;left: 0;top: 0;right: 0;bottom: 0;opacity: 0;}
+.getPhoneNumber.data-v-6c8ead34{margin: 0 24rpx;}
+.getphone .tip.data-v-6c8ead34{text-align: center;margin: 24rpx;font-size: 24rpx;color: #666;}