Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/components/appoint/appoint-time.vue

@@ -203,8 +203,7 @@
 
 <style lang="scss" scoped>
 	.con-box {
-		margin-top: 30rpx;
-		padding: 30rpx 30rpx 20rpx;
+		padding: 30rpx 30rpx 10rpx 30rpx;
 		border-radius: 12rpx;
 		background-color: #FFFFFF;
 

src/components/order/index.vue

@@ -39,7 +39,7 @@
 			<view>
 				<view v-if="showCountTime" class="bottom-left-view">
 					<view :class="['bottom-tag-view', {'timeout': timeout}]"><text>{{tagText}}</text></view>
-					<u-count-down :timestamp="timestamp" font-size="40" show-days separator="zh" hide-zero-day 
+					<u-count-down :timestamp="timestamp" font-size="40" show-days separator="zh"
 						:color="timeout ? '#FA5A49' : '#FF930D'" @change="handleChange" separator-color="#666666" ref="order-count-down"></u-count-down>
 				</view>
 				<view v-else-if="showTime">

src/pages/order/detail.vue

 <template>
 	<view class="order-wrap">
 		<u-navbar :title="title" title-color="#FFFFFF" title-size="32" back-icon-color="#FFFFFF" :background="background" :border-bottom="false" title-bold></u-navbar>
-		<view class="header" v-if="showCountTime  || (order.currentOverTime && showTimeOut)">
-			<image class="bottom-tag-view" :src="tagImage"></image>
-			<!-- 倒计时 -->
-			<view class="title">
-				<u-count-down :timestamp="timestamp" font-size="28" show-days separator="zh" separator-size="32" height="40" hide-zero-day 
-					:color="countColor" separator-color="#FFFFFF" @change="timeOutChange" ref="order-count-down" bg-color="#FFFFFF"></u-count-down>
-				<view class="header-content">
-					<!-- 抓紧时间提示 -->
-					<view class="tip-text">{{tipText}}</view>
-					<!-- 拒单 -->
-					<view v-show="allowRejection" class="reject-button" @click="$u.throttle(rejectOrder, 500)">拒单</view>
+		<view class="content">
+			<view class="header" v-if="showCountTime  || (order.currentOverTime && showTimeOut)">
+				<image class="bottom-tag-view" :src="tagImage"></image>
+				<!-- 倒计时 -->
+				<view class="title">
+					<u-count-down :timestamp="timestamp" font-size="28" show-days separator="zh" separator-size="32" height="40"
+						:color="countColor" separator-color="#FFFFFF" @change="timeOutChange" ref="order-count-down" bg-color="#FFFFFF"></u-count-down>
+					<view class="header-content">
+						<!-- 抓紧时间提示 -->
+						<view class="tip-text">{{tipText}}</view>
+						<!-- 拒单 -->
+						<view v-show="allowRejection" class="reject-button" @click="$u.throttle(rejectOrder, 500)">拒单</view>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="content">
 			<!-- 订单详情 -->
 			<view class="card base-item">
 				<Detail :order="order" :readMore.sync="readMore" :operate="isAllowDianhuaAndDaohang"></Detail>
@@ -221,6 +221,8 @@
 						return this.timeout ? '您的订单已超时，请及时接单' : '请您注意剩余时间，及时接单'
 					case '预约':
 						return this.timeout ? '您的订单已超时，请及时预约' : '请您注意剩余时间，及时预约'
+					case '签到':
+						return this.timeout ? '您的订单已超时，请及时签到' : '请您注意剩余时间，及时签到'
 					case '去完工':
 						return this.timeout ? '您的订单已超时，请及时完工' : '请您注意剩余时间，及时完工'
 					default:
@@ -261,7 +263,7 @@
 					disabled: this.centerBtnDisabled,
 					id: 0,
 					customStyle: {
-						'background-color': this.title == '待抢单' ? '#FF930D' : '#2272FF'
+						'background-color': this.title == '待抢单' ? '#FF930D' : (this.centerBtnDisabled ? '#D1D4D4' : '#2272FF')
 					}
 				}]
 			},
@@ -776,9 +778,25 @@
 						dataValue.push(res.latitude)
 						self.dataValue = dataValue
 					},
-					fail(err) {
-
-					}
+					complete: function(res) {
+					 	if (res.errMsg.indexOf('auth')  != -1) {
+					 		uni.showModal({
+					 				title: '提示',
+					 				content: '获取权限失败，请到设置页面开启权限',
+					 				confirmText: '好的',
+					 				success(res) {
+					 					if (res.confirm) {
+					 						uni.openSetting({
+					 							success(res) {
+					 							  console.log(res.authSetting)
+					 							}
+					 						});
+					 					}
+					 				 
+					 				}
+					 		   })
+					 	}
+					 },
 				});
 			},
 			getDistance(Latitud, Longitud){
@@ -787,10 +805,10 @@
 			/**
 			 * echo distance(116.3896,39.91917,116.3940,39.91726);
 			 * 计算两点之间直线距离
-			 * @param float $lon1    经度
-			 * @param float $lat1    维度
-			 * @param float $lon2    经度
-			 * @param float $lat2    维度
+			 * @param float $lon1    纬度
+			 * @param float $lat1    经度
+			 * @param float $lon2    纬度
+			 * @param float $lat2    经度
 			 * @return float         浮点数
 			 */
 			distance(lat1, lng1, lat2, lng2) {
@@ -853,7 +871,7 @@
 		flex-direction: column;
 
 		.header {
-			padding: 4rpx 32rpx 20rpx 32rpx;
+			padding: 4rpx 2rpx 24rpx 2rpx;
 			display: flex;
 			align-items: center;
 			.bottom-tag-view {
@@ -894,7 +912,7 @@
 			height: 100%;
 			border-radius: 12rpx;
 			overflow: auto;
-			margin: 6rpx 30rpx 30rpx 30rpx;
+			margin: 0rpx 30rpx 30rpx 30rpx;
 
 			.card {
 				background-color: #FFFFFF;

src/pages/order/document-tag.vue

@@ -20,18 +20,18 @@
 		data() {
 			return {
 				labels: [], // 标签列表
-				selectedId: '',
-				type: '1'
+				selectedId: '', // 已选中标签的id
+				type: '1',  // '1': '合作商', '2': '品牌'
 			};
 		},
 		onLoad(e) {
-			if (e && e.selectedId) {
+			if (e && e.selectedId) { // 有已选中标签的id
 				this.selectedId = e.selectedId
 			}
-			if (e && e.partnerCompanyId) { // 合作商id
+			if (e && e.partnerCompanyId) { // 有合作商id，获取品牌标签
 				this.type = '2'
 				this.loadFileLabel(e.partnerCompanyId)
-			} else { // 获取所有文件资料
+			} else { // 无合作商id，获取合作商标签
 				this.type = '1'
 				this.loadFileLabel()
 			}
@@ -72,7 +72,7 @@
 				}
 				let res = await this.$u.api.fileLabel(param)
 				if (res && res.code == 200) {
-					this.labels = res.data || []
+					this.labels = res.data || []
 				}
 			},
 
@@ -93,10 +93,11 @@
 			align-items: center;
 			overflow: auto;
 			flex-wrap: wrap;
-			padding: 0 10rpx 44rpx 30rpx;
+			padding: 0 10rpx 14rpx 30rpx;
 
 			.label-item {
-				padding-right: 20rpx;
+				padding-right: 20rpx;
+				padding-bottom: 30rpx;
 				flex-shrink: 0;
 
 				.label-normal {