auto commit

pages/login/companyLogin.vue

@@ -20,7 +20,7 @@
 			<view class="full-btn" @click="handleLogin">登录</view>
 		</view>
 		<view class="bottom-btn-wrap">
-			<view class="bottom-btn forgetpass">忘记密码</view>
+			<!-- <view class="bottom-btn forgetpass">忘记密码</view> -->
 		</view>
 	</view>
 </template>

pages/offlineBuy/offlineBuy.vue

@@ -112,8 +112,8 @@
 			getDetails(){
 				this.$api.http.get(this.config.apiBaseurl+'/carbon-h5/wap/apply/'+this.guid,{header: {Authorization:this.thetoken}}).then( res =>{
 					console.log('this.applyStatus',res);
-					this.applyStatus = res.data.data.applyStatus;
-					this.orderGuid = res.data.data.orderGuid;
+					this.applyStatus = res.data.retBody.applyStatus;
+					this.orderGuid = res.data.retBody.orderGuid;
 					console.log('this.applyStatus1',this.applyStatus)
 				})
 			},

pages/usercenter/subscribe/subscribe.vue

@@ -116,7 +116,7 @@
 				let thetoken = this.tokenhead + ' ' + this.token;
 				console.log('thetoken',thetoken);
 				this.$api.http.get(this.config.apiBaseurl+'/carbon-h5/wap/apply/list',{params:this.params,header: {Authorization:thetoken}}).then(data => {
-					console.log('1111111111',data);
+					// console.log('1111111111',data);
 					if(data.data.code=='1001'){
 						// uni.redirectTo({
 						// 	url:'/pages/login/login?backpage=/pages/index/index'+'&backtype='+2,
@@ -124,14 +124,14 @@
 					};
 					console.log(data);
 					// 接口返回的当前页数据列表 (数组)
-					let curPageData = data.data.rows; 
+					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.total; 
+					let totalSize = data.data.retHead.total; 
 					// this.mescrollList = curPageData;
 					// 接口返回的是否有下一页 (true/false)
 					// let hasNext = data.xxx;