12-25

pages.json

@@ -688,11 +688,6 @@
 		},
 		{
 			"path": "pages/train/index",
-			// "style": {
-			// 	"navigationBarTitleText": "救护培训报名",
-			// 	"navigationBarBackgroundColor":"#E62129",
-			// 	"navigationBarTextStyle":"white"
-			// }
 			"style": {
 				"navigationBarTitleText": "培训报名",
 				"app-plus": {
@@ -704,11 +699,6 @@
 		},
 		{
 			"path": "pages/train/sign",
-			// "style": {
-			// 	"navigationBarTitleText": "救护培训报名",
-			// 	"navigationBarBackgroundColor":"#E62129",
-			// 	"navigationBarTextStyle":"white"
-			// }
 			"style": {
 				"navigationBarTitleText": "报名",
 				"app-plus": {
@@ -753,18 +743,6 @@
 			
 			}
 		},
-		// {
-		// 	"path": "pages/applic/detail",
-		// 	"style": {
-		// 		// #ifndef MP
-		// 		"app-plus": {
-		// 			"titleNView": false
-		// 		},
-		// 		// #endif
-		// 		"navigationBarTitleText": "资讯详情"
-			
-		// 	}
-		// },
 		{
 			"path": "pages/applic/other",
 			"style": {
@@ -1003,7 +981,6 @@
 				"iconPath": "static/tabBar/user.png",
 				"selectedIconPath": "static/tabBar/user-action.png",
 				"text": "我的"
-				// "visible":false
 			}
 		]
 	}

pages/user/jkjl.vue

@@ -60,9 +60,9 @@
 					limit: obj.limit,
 					status: 1
 				}).then(({data}) => {
-					obj.list = obj.list.concat(data)
+					obj.list = obj.list.concat(data.data)
 					obj.page++
-					if(obj.limit == data.length) {
+					if(obj.limit == data.data.length) {
 						obj.loadingType = 'more'
 					}else {
 						obj.loadingType = 'noMore'

pages/user/user.vue

@@ -39,7 +39,7 @@
 					>
 				</view>
 			</view>
-			<view class="nav-item flex" @click="tojkjl">
+			<!-- <view class="nav-item flex" @click="tojkjl">
 				<view class="item-left flex">
 					<image src="../../static/icon/i6.png" mode="" class="img1"></image>
 					<view class="title">捐款记录</view>
@@ -47,7 +47,7 @@
 				<view class="item-right">
 					>
 				</view>
-			</view>
+			</view> -->
 			<view class="nav-item flex" @click="commonaddress">
 				<view class="item-left flex">
 					<image src="../../static/icon/i8.png" mode="" class="img3"></image>
@@ -94,33 +94,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="tt">
-			<view class="tt-box " @click="tohelp" style="background-color:#FEFAF2;">
-				<image src="../../static/icon/icon-04.png" class="tt-icon1" mode="" style="width: 52rpx; height: 62rpx;"></image>
-				<view class="tt-txt">
-					求救记录
-				</view>
-			</view>
-			<view class="tt-box " @click="torreco" style="background-color:#FDF4F4;">
-				<image src="../../static/icon/icon-05.png" class="tt-icon1" mode=""></image>
-				<view class="tt-txt">
-					救援记录
-				</view>
-			</view>
-			<view class="tt-box " @click="commonaddress" style="background-color:#F2F6FE;margin-right: 0">
-				<image src="../../static/icon/icon-06.png" class="tt-icon1" mode=""></image>
-				<view class="tt-txt">
-					常用地址
-				</view>
-			</view>
-			pages/form/certificates
-			<view class="tt-box" @click="tocertificates" style="background-color:#EEFFFC;">
-				<image src="../../static/icon/icon-07.png" class="tt-icon1" mode=""></image>
-				<view class="tt-txt">
-					我的证书
-				</view>
-			</view>
-		 </view> -->
 	</view>
 </template>
 
@@ -278,8 +251,9 @@
 		background: #fff;
 	}
 	.content {
-		line-height: 1;
-		background-color: #fff;
+		line-height: 1.5;
+		background-color: #fff;
+		height: 100%;
 		.top {
 			width: 750rpx;
 			height: 312rpx;