1. 删除压缩包代码

2. 替换当前hdq 分支app 的代码为 压缩包中的文件

app/pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="page-index" :class="{'bgf':navIndex >0}">
-			<!-- #ifdef H5 -->
+		<!-- #ifdef H5||APP --> 
 			<view class="header">
 				<view class="serch-wrapper flex">
 					<view class="logo">
@@ -13,21 +13,6 @@
 				</view>
 			</view>
 			<!-- #endif -->
-			<!-- #ifdef MP -->
-			<view class="mp-header">
-				<view class="sys-head" :style="{ height: statusBarHeight }"></view>
-				<view class="serch-box" style="height: 40px;">
-					<view class="serch-wrapper flex">
-						<view class="logo">
-							<image :src="logoUrl" mode=""></image>
-						</view>
-						<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text
-								class="iconfont icon-xiazai5"></text>
-							搜索商品</navigator>
-					</view>
-				</view>
-			</view>
-			<!-- #endif -->
 			<!-- 首页展示 -->
 			<view class="page_content" :style="'margin-top:'+(marTop)+'px;'" v-if="navIndex == 0">
 				<view class="mp-bg"></view>
@@ -247,6 +232,7 @@
 		},
 		data() {
 			return {
+				pageHeight: 0,
 				loaded: false,
 				loading: false,
 				isAuto: false, //没有授权的不会自动授权
@@ -1006,14 +992,14 @@
 			}
 		}
 
-		/* #ifdef MP */
+		/* #ifdef MP||APP */
 		.mp-header {
 			z-index: 999;
 			position: fixed;
 			left: 0;
 			top: 0;
 			width: 100%;
-			/* #ifdef H5 */
+			/* #ifdef H5||APP */
 			padding-bottom: 20rpx;
 			/* #endif */
 			background-color: $theme-color;
@@ -1032,7 +1018,7 @@
 				.input {
 					display: flex;
 					align-items: center;
-					/* #ifdef MP */
+					/* #ifdef MP||APP */
 					width: 305rpx;
 					/* #endif */
 					height: 50rpx;

app/pages/users/login/index.vue

@@ -408,6 +408,16 @@
 					if (backUrl.indexOf('/pages/users/login/index') !== -1) {
 						backUrl = '/pages/index/index';
 					}
+					
+					// #ifdef APP  
+						uni.reLaunch({
+							url: "/pages/index/index"
+						});
+						return
+					// #endif
+					
+					console.log(69999);
+					console.log(backUrl);
 					uni.reLaunch({
 						url: backUrl
 					});

app/pages/users/order_confirm/index.vue

@@ -949,7 +949,7 @@
 					mark: that.mark,
 					storeId: that.system_store.id || 0,
 					shippingType: that.$util.$h.Add(that.shippingType, 1),
-					payChannel: that.payChannel
+					payChannel: that.payChannel||'weixinh5'
 
 				};
 				if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))

app/pages/users/user_address/index.vue

@@ -1,5 +1,8 @@
 <template>
 	<view>
+		<!-- #ifdef APP-->
+		<view class='status'></view>
+		<!-- #endif -->
 		<form @submit="formSubmit" report-submit='true'>
 			<view class='addAddress pad30'>
 				<view class='list borRadius14'>
@@ -575,4 +578,12 @@
 		position: absolute;
 		right:0;
 	}
+	
+	.status{
+		display: flex;
+		width: 750rpx;
+		// background-color: #E93323;
+		height: var(--status-bar-height);
+	}
+	
 </style>

app/pages/users/user_address_list/index.vue

@@ -1,5 +1,8 @@
 <template>
 	<view>
+		<!-- #ifdef APP-->
+		<view class='status_1'></view>
+		<!-- #endif -->
 		<view class='line'>
 			<image src='../../../static/images/line.jpg' v-if="addressList.length"></image>
 		</view>
@@ -44,9 +47,16 @@
 			<view class='addressBnt wxbnt' @click='getWxAddress'><text class='iconfont icon-weixin2'></text>导入微信地址</view>
 			<!-- #endif -->
 			<!-- #ifdef H5-->
+			
 			<view class='addressBnt bg-color' :class="this.$wechat.isWeixin()?'':'on'" @click='addAddress'><text class='iconfont icon-tianjiadizhi'></text>添加新地址</view>
 			<view v-if="this.$wechat.isWeixin()" class='addressBnt wxbnt' @click='getAddress'><text class='iconfont icon-weixin2'></text>导入微信地址</view>
 			<!-- #endif -->
+			
+			
+			<!-- #ifdef APP-->
+			<view class='addressBnt on bg-color' @click='addAddress'><text class='iconfont icon-tianjiadizhi'></text>添加新地址</view>
+			<!-- #endif -->
+			
 		</view>
 		<!-- #ifdef MP -->
 		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
@@ -458,4 +468,10 @@
 	 .footer .addressBnt.wxbnt {
 		background-color: #fe960f;
 	}
+	.status_1{
+		display: flex;
+		width: 750rpx;
+		// background-color: #E93323;
+		height: var(--status-bar-height);
+	}
 </style>