auto commit

components/lime-painter/canvas.js

@@ -1,5 +1,8 @@
 import { CHAR_WIDTH_SCALE_MAP } from './utils'
 const _expand = ctx => {
+	// #ifndef APP-PLUS
+	ctx._measureText = ctx.measureText
+	// #endif
 	return {
 		setFont({fontFamily: ff = 'sans-serif', fontSize: fs = 14, fontWeight: fw = 'normal' , textStyle: ts = 'normal'}) {
 			// let ctx = this.ctx
@@ -15,11 +18,8 @@ const _expand = ctx => {
 			// fs = toPx(fs)
 			ctx.font = `${ts} ${fw} ${fs}px ${ff}`;
 		},
+		// #ifndef APP-PLUS
 		measureText(text, fontSize) {
-			// #ifndef APP-PLUS
-			return ctx._measureText(text)
-			// #endif
-			// #ifdef APP-PLUS
 			// app measureText为0需要累加计算0
 			return {
 				width: text.split("").reduce((widthScaleSum, char) => {
@@ -28,16 +28,14 @@ const _expand = ctx => {
 				return widthScaleSum + widthScale;
 			  }, 0) * fontSize
 			};
-			// #endif
 		}
+		// #endif
 	}
 }
 export function expand(ctx) {
-	ctx._measureText = ctx.measureText
 	return Object.assign(ctx, _expand(ctx))
 }
 export function adaptor(ctx) {
-	ctx._measureText = ctx.measureText
 	return Object.assign(ctx, _expand(ctx), {
 		setStrokeStyle(val) {
 			ctx.strokeStyle = val;

config/config.js

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

pages.json

@@ -59,7 +59,8 @@
 		{
 			"path": "pages/use/use",
 			"style": {
-				"navigationBarTitleText": "价值实现"
+				"navigationBarTitleText": "价值实现",
+				"navigationStyle":"custom"
 			}
 		},
 		{

pages/index/guide.vue

@@ -14,7 +14,18 @@
 					<view class="adv-item"><image :src="$getimg +'guide01.png'" class="pic" mode="widthFix"></image></view>
 				</swiper-item>
 				<swiper-item>
-					<view class="adv-item" @click="goIndex"><image :src="$getimg +'guide02.png'" class="pic" mode="widthFix"></image></view>
+					<view class="adv-item"><image :src="$getimg +'guide02.png'" class="pic" mode="widthFix"></image></view>
+				</swiper-item>
+				<swiper-item>
+					<view class="adv-item"><image :src="$getimg +'guide03.png'" class="pic" mode="widthFix"></image></view>
+				</swiper-item>
+				<swiper-item>
+					<view class="adv-item" @click="goIndex">
+						<image :src="$getimg +'guide04.png'" class="pic" mode="widthFix"></image>
+						<view class="tip-btn-wrap">
+							<text class="tip-btn">立即体验</text>
+						</view>
+					</view>
 				</swiper-item>
 			</swiper>
 			<!-- <div id="universal-preloader">
@@ -108,12 +119,14 @@
 <style scoped>
 .guide-img{position: fixed;left: 0;right: 0;top: 0;bottom: 0;display: block;}
 .swiper{height: 100%;}
-.adv-item{height: 100%;}
+.adv-item{height: 100%;position: relative;}
 .guide-img .pic{width: 100%;/* max-height: 100%; */}
+.adv-item .tip-btn-wrap{position: fixed;left: 0;bottom: 60rpx;right: 0;text-align: center;}
+.adv-item .tip-btn{display: inline-block;width: 454rpx;height: 100rpx;line-height: 100rpx;font-size: 35rpx;font-weight: 600;letter-spacing: 6rpx;color: #24C696;background-color: #fff;border-radius: 100rpx;}
 
-#universal-preloader{position:fixed;top:0px;left:0px;width:100%;height:100%;opacity:1;background:rgba(0,0,0,0.1) !important;filter:Alpha(opacity=100);background:#000;z-index:1020;}
+/* #universal-preloader{position:fixed;top:0px;left:0px;width:100%;height:100%;opacity:1;background:rgba(0,0,0,0.1) !important;filter:Alpha(opacity=100);background:#000;z-index:1020;}
 #universal-preloader>.preloader{position: relative;width: 100%;height: 100%;}
 .universal-preloader-preloader{width: 100%;min-height: 100%;}
 .preloader-time{position: absolute;right: 24px;top: 24px;font-size: 24rpx;display: inline-block;background: #fff;padding: 3px 8px;border-radius: 10px;}
-#preloader-time-num{font-style: normal;margin-right: 5rpx;color: #57992c;}
+#preloader-time-num{font-style: normal;margin-right: 5rpx;color: #57992c;} */
 </style>

pages/index/index.css

@@ -8,7 +8,7 @@ page{background-color: #f5f5f5;}
 .home-top-subtil{font-size: 26rpx;line-height: 37rpx;}
 
 .swiper-wrap{margin: -151rpx auto 32rpx;width: 670rpx;height: 320rpx;overflow: hidden;border-radius: 16rpx;position: relative;}
-.swiper{height: 100%;}
+.swiper{height: 100%;background:transparent;}
 .adv-item{height: 100%;}
 .swiper-wrap .pic{width: 100%;height: 100%;}
 

pages/index/index.vue

@@ -128,7 +128,7 @@
 					<view class="rank-list-item" v-for="(item, index) in rankList" :key="index">
 						<view class="rank-list-rank">{{item.rank}}</view>
 						<view class="rank-list-user">
-							<image :src="item.img" class="photo" mode="scaleToFill"></image>
+							<image :src="item.headImage" class="photo" mode="scaleToFill"></image>
 							<view class="name f-ellipsis">{{item.customerName}}</view>
 						</view>
 						<view class="rank-list-carbon">共购买{{item.carbonVal}}kg<br />碳汇</view>

pages/login/loginType.vue

@@ -4,7 +4,7 @@
 			<!-- 占据了状态栏位置 -->
 		</view>
 		<view class="page-bg-wrap">
-			<image :src="$getimg+'loginType-bg.png'" class="page-bg" mode="widthFix"></image>
+			<image :src="$getimg+'loginType-bg.jpg'" class="page-bg" mode="widthFix"></image>
 		</view>
 		<view class="login-out">
 			<view class="login-wrap" v-if="!hasLogin">

pages/use/use.css

@@ -1,6 +1,6 @@
 page{background-color: #f5f5f5;}
-.top-img{height: 344rpx;z-index: -1;}
-.use-wrap{margin: -153rpx 40rpx 40rpx;padding: 60rpx 24rpx 24rpx;background-color: #fff;box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);border-radius: 16rpx;}
+.top-img{height: 702rpx;z-index: -1;}
+.use-wrap{margin: -210rpx 40rpx 40rpx;padding: 60rpx 24rpx 24rpx;background-color: #fff;box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.04);border-radius: 16rpx;}
 .use-wrap-header{display: flex;justify-content: space-between;align-items: center;margin-bottom: 60rpx;}
 .use-wrap-header .til{font-size: 32rpx;color: #333;font-weight: 500;}
 .use-wrap-header .subtil{font-size: 24rpx;color: #999;}

pages/use/use.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
 		<view class="top-img">
-			<image :src="$getimg + 'use-bg.png'" class="img" mode="widthFix"></image>
+			<image :src="$getimg + 'use-bg-s1.png'" class="img" mode="widthFix"></image>
 		</view>
 		<view class="use-wrap">
 			<view class="use-wrap-header">