Merge branch 'master' of http://47.114.134.244:3000/chenkainan/tongli_WeChat

pages/index/index.vue

@@ -765,12 +765,12 @@
 		width: 200rpx;
 		line-height: 53rpx;
 		border-radius: 33rpx;
-		border: 1rpx solid #248BAA;
+		border: 1rpx solid #525251;
 		margin: 44rpx auto 0;
 		text-align: center;
 		font-weight: 500;
 		font-size: 27rpx;
-		color: #248BAA;
+		color: #525251;
 	}
 	
 	.couponImg {

pages/login/login.vue

@@ -155,7 +155,7 @@
 		}
 		
 		span {
-			color: rgba(113, 181, 128, 1);
+			color: #C3282E;
 		}
 	}
 </style>

static/css/base.css

@@ -151,10 +151,10 @@ view {
 	height: 60rpx;
 	background: rgba(0, 0, 0, .4);
 	border-radius: 50%;
-	position: absolute;
+	position: fixed;
 	left: 26rpx;
 	top: 98rpx;
-	z-index: 2;
+	z-index: 200;
 }
 .topLeft .iconfont {
 	font-size: 40rpx;

subPackages/hotelHomestay/hotelHomestay.vue

@@ -191,7 +191,7 @@
 		width: 100%;
 		height: 440rpx;
 		.icon-back{
-			position: absolute;
+			position: fixed;
 			display: flex;
 			align-items: center;
 			z-index: 50;

subPackages/order/trades.vue

@@ -113,10 +113,11 @@
 		onLoad(options) {
 			console.log(options);
 			if (options.type) this.typeIndex = this.typeList.findIndex(vm => vm.name === options.type);
-			this.getList();
-
 			uni.$on("updateDataByConnect", this.getDataByConnect)
 		},
+		onShow() {
+			this.getList();
+		},
 		onUnload() {
 			uni.$off("updateDataByConnect", this.getDataByConnect)
 		},

subPackages/ticketBooking/ticketBooking.vue

@@ -115,7 +115,7 @@
 		width: 100%;
 		height: 440rpx;
 		.icon-back{
-			position: absolute;
+			position: fixed;
 			display: flex;
 			align-items: center;
 			z-index: 50;

subPackages/travelGuide/travelGuide.vue

@@ -146,7 +146,7 @@
 		width: 100%;
 		height: 440rpx;
 		.icon-back{
-			position: absolute;
+			position: fixed;
 			display: flex;
 			align-items: center;
 			z-index: 50;

subPackages/user/coupon.vue

@@ -259,7 +259,7 @@
 .coupon-item .item-top .price {
 	font-size: 25rpx;
 	font-weight: bold;
-	color: #FC5209;
+	color: #C3282E;
 	display: flex;
 	align-items: baseline;
 	justify-content: center;
@@ -273,7 +273,7 @@
 .top-left .subtitle {
 	width: 100%;
 	font-size: 24rpx;
-	color: #FC5209;
+	color: #C3282E;
 	padding-left: 6rpx;
 	overflow: hidden;
 	white-space: nowrap;

subPackages/user/profile.vue

@@ -16,10 +16,10 @@
 				<span>性别</span>
 				<view  @click="$refs.popup.open()">{{gender == 1 ? '男' : (gender == 2 ? '女' : '保密')}}</view>
 			</view>
-			<navigator url="/subPackages/user/bindTel" class="userinfo-item">
+			<view class="userinfo-item">
 				<span>手机号</span>
 				<view>{{info.mobile}}</view>
-			</navigator>
+			</view>
 			<view class="userinfo-item">
 				<span>生日</span>
 				<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">

subPackages/user/travelerList.vue

@@ -90,7 +90,7 @@
 		
 		<view class="btn-box">
 			<navigator :url="showType ? '/subPackages/user/myAddressAdd' : '/subPackages/user/myContactsAdd'" class="btn">
-				{{showType ? '添加联系人' : '添加收货地址'}}
+				{{showType ? '添加收货地址' : '添加联系人'}}
 			</navigator>
 		</view>
 	</view>