auto commit

config/config.js

@@ -2,8 +2,9 @@ const config = {
 	//dev
 	// apiBaseurl:'http://172.16.90.8:21998',//东东
 	// apiBaseurl:'http://wx.hw.hongweisoft.com/cqthminapp',//东东
-	apiBaseurl:'http://172.16.90.102:21998',//邱波
+	// apiBaseurl:'http://172.16.90.102:21998',//邱波
 	// apiBaseurl:'http://47.108.214.98:21998',//服务器
+	apiBaseurl:'https://cqthht.hongweisoft.com/qbcert',//正式地址 需要在manifest中修改appid
 	
 	// 图片占位
 	placeImg:'http://placekitten.com',

manifest.json

@@ -57,11 +57,12 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxc950eea640108c5e",
+        "appid" : "wx042c1edaadc86fbb",
+        // "appid" : "wxc950eea640108c5e",//测试
         "setting" : {
             "urlCheck" : false,
             "postcss" : false,
-            "minified" : false,
+            "minified" : true,
             "es6" : true
         },
         "usingComponents" : true,

pages/confirmOrder/confirmOrder.css

@@ -5,7 +5,7 @@ page{background: #F5F5F8;padding-bottom: 160rpx;}
 .order-list-item .image-content{width: 202rpx;height: 202rpx;padding-right: 24rpx;}
 .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 .title{width:350rpx;height: 80rpx;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{display: flex;justify-content: space-between;align-items: center;margin-bottom: 24rpx;}

pages/index/index.vue

@@ -140,12 +140,13 @@
 					</view>
 				</view>
 				<!-- rank-top end -->
-				<view class="rank-list-header" v-if="rankList.length>0">
+				<view class="rank-list-header" v-if="rankTop.length > 0">
 					<view class="rank-list-header-rank">排名</view>
 					<view class="rank-list-header-user">用户</view>
 					<view class="rank-list-header-carbon">购买碳汇</view>
-				</view>
-				<view class="rank-list" v-if="rankList">
+				</view>				
+				<view class="rank-list">
+					<custom-nodata notice='暂无更多数据' v-if="rankTop.length > 0&&rankList.length<=0"></custom-nodata>
 					<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">

pages/product/product.css

@@ -1,5 +1,5 @@
 page{background-color: #F5F5F5;}
-.swiper-wrap{margin-bottom: 24rpx;}
+.swiper-wrap{margin-bottom: 24rpx;height: 400rpx;}
 .goods-name{display: flex;align-items: center;justify-content: space-between;padding: 24rpx;background-color: #fff;border-bottom: 1px solid #ddd;}
 .goods-name .name{flex: 1;font-size: 30rpx;font-weight: 600;line-height: 40rpx;}
 .goods-name .type{font-size: 24rpx;color: #999;width: 200rpx;text-align: right;}

pages/usercenter/certificateList/certificate/certificate.vue

@@ -9,7 +9,7 @@
 		+'&buyDate='+item.buyDate
 		+'&nickName='+item.nickName
 		+'&companyName='+item.companyName
-		+'&isH5='+true
+		+'&isH5=1'
 		">
 		</web-view>
 	</view>