fix: 还原地图配置，修改页面样式

.env.js

@@ -11,13 +11,16 @@
 		} else if (NODE_ENV === 'prod') {
 			ENV_VAR = require('./.env.prod.js');
 		}
-
+		// 百度地图AK，请勿删除
+		ENV_VAR['bmapAK'] = 'G1wPip2Oj62NnoUctXhiE1faZVHbeo2A'
 	} else if (process.env.NODE_ENV === "production") {
 		if (NODE_ENV === 'test') {
 			ENV_VAR = require('./.env.test.js');
 		} else if (NODE_ENV === 'prod') {
 			ENV_VAR = require('./.env.prod.js');
 		}
+		// 百度地图AK，请勿删除
+		ENV_VAR['bmapAK'] = 'lF1HoyXdiv4uZx6TrGQEZs48F5y8kEHI'
 	}
 	if (ENV_VAR) {
 		process.uniEnv = {};

src/common/iconfont.css

 @font-face {
   font-family: "wxh"; /* Project id 2600874 */
   src: 
-       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAQUAAsAAAAACBgAAAPFAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDDAqEFINfATYCJAMQCwoABCAFhDEHOxsUBxHVm0PJfiTGMSnrzJJXUa4yEzzQe9abzLQL+2Cu08seiGTvi9AfoQbA5mYMV6MiFEtyHvwv35G2zPRCGD9wTn36LrAAwHh1W9LBblaR4hfGKwyvdRnHIAB3SlEDrV6DZtl49+4wuC/hKMxKAUmq6N2jWwdcBTmqIVXgisDedahCfMUG2gTtLDAt+L14QxnhCho2iblSq671O3P8uXgupek0cci7FE+Xg+YaYAMkkLkxpchv1rdBRv5MJO5VekUyra8Q8Fw6nc+FR9/2Xx5INAQIOybfE9RyAQnPhUNPBBp4BAIJ5oUvpQBwBVyAVcA7THHkNF0kIigsINw7IWTUxOyrFmDmXAMm5d0ArNzrkuETHcznWGlM0k7KuVajNbOvdumhu0/cKAqtTR4ekzZQ4FY114+auHHhopC83OzZIcdir7XpxJ60nA1Llqdmz06eGNx1rrVpUlCXOQvmr+8/MX3u0gh9Wc1u89at2ZDLCOw8OzA7b14Ir5m0YQk/w+Fy7WeP8J54/bqwWTdueHhNOjXG9DtQ5tWrsTK0X1FFvXwFR0XjfsWiCrpegSLvGxUdFcrryPsVjfIOR/lu9i8LuhspevKUKcl6inHRRv3IKZP1ZCP1IlBETp6crKcaF2FN0qdMqchO6bP7etC9IK26yxOOxG2Vd4WMe5Txy/OZfrjdxnnzLpyfO+99xr2M9wsXxHu98n34kGUX45Ma7/2D3ocEv0+/l+5/d6NxaPrbG1Flz8woVT5qTLxlLpi7Nr5njwnF1sGSmR8+ZH45aFnvM865vS+2/F5Gl29F+eXm7rT6Sam1Ux6nuGjYKO1YZJ1aX86NnxcdlJ2N/gA4xyrkOOd/p6U0WUyCpvwirR/ejDa3fxwr8qn2zdXjmV13///aFmDdKWMTcEUDnv57tSgaCP8LaU5Q6svgjULVPQ5FUyS8GuBumcFJzf7cn0IYpNJACIMSUMOFUFAiiSEqajxow4Mk0I6kFOhOBmVHexCAgUQoNyCdAYQrIFwEUMObFaDEzjaiou4BbQRziGu3hJcAupPLjSk9SBZZrqrLqAUdmD9MlnZv1xR1P/GF4Vw1Rxhq/ZCPiXZoqyYTGnFH7t7juEIn4sEzbTD0XA3XlSAxzWiliiKpr2tf9aDK0paprC6jFnRg/jBZ2r23qqhs2BNfGM5Vc5EB7Q9V/TF1Toa2aqqJI39vKrjErMcVOhEPnmmDcFhUi6vlJ0jV2TNaqSg+wJv6minnu/KrzQu3d8gFJZh7qFwTUihhw2ZXskuZcC8d2SwDAAAA') format('woff2');
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARkAAsAAAAACPwAAAQWAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDGgqFWIUMATYCJAMUCwwABCAFhDEHRRvdBxHVm4XJfiTGtg+yTC2LnrCTqAkevne2v5OZdE2zi2lbTLxyICWLqCTgFUz9z+W5gP9uA2Bzrgc2KkKN5OyTR19I22F6WQZ/cE39X1ikznYL4alEpmZa0sBmFhFUKT4fiOwBu2vZhyCAZGrSHK1t+64+0scMnDKOYii0RgFhrhgzcvhAElkzqoQqSNS56k5ViC/ooC3XHgAr3e+Lf6ktEkFDl2g79RzWbgi3/hB/KGnHbULyOxb0VwLdNUAHJFB1ZlbRr9ztQ/rhqkiS89wKL7ZXCPhDxeN/CFs8b15QSLQ/D+FCU6cCvmVEwR/CFIcaDYxIkIKKtEaBdP/Vuq1NxoyfQQTRCCVQSz0gjKKZRmFOsfTy+bPDvhdAsf0vKZHga4oTeGWYETaFjtMJvk45I/6XBU7b96LOzzQD0jkSPoRmG/71kaNOy9bJ4SOin3M0JSVymL5WU/vQ7PCRLVvzgwHfOk/hUJc6evt8Jf/h7bu8vnXucN6wDc7RiDF0/eZNhyaEK2/YUdzc2WL4xoP7DycKcoesy/UFN+Yzjsjh7cwK1+oOWDczPfzqldCd169T0iJ3u1jmNMp+8aKMLDK+oIFZr77ZoOB7Q+AYzPpWxg9W/VD9eikBLhOqZzVwfd40wvKaFWMxt+mxHhsCSI5FTbflfZJDcUejiFeAiopAiZkVh/eevGyZx/i+yv9G07zCjRvfVQn0jMIMNbB+QBrgGrB+aGDVCyGbGR7Tzf8J/kkrt+UZe+6V8b2hNbNUwjQm7R1y0vfUzgpmrLrW/8jGjY8fbRi7+bstm8ul/Z3500/sfFIubPEu23iXn/eu8veVnc8esa6u+u91yTr3V9esV3JuOcfevOFAuVEjly9wrtSo+v591c9XHOddlYdJ7xY4WX+VqteTervsc5XaVfS28vzisQRep0o3S7Ru+fnhwo2ljPhqNAQgPk8h58cL447S5AIiasvP0vmb9qPjxj3lCzKafk1MUQB8T93hrrA+bl4GiWjAiP8dJ4oSpLCSLESTAmWmsFzaJg2dLkgIakCy7oc4+rP5oR+98VKiAokRgkYCRUAiKY0qfDnQSaEiuJDUhGSqUGd2CjlYSIRKAiozkQCBi62gkc5ukLg4iSr8edDJ46rSpWufAiQT4PWSKbhFteQ2PqMStKD/UBnqndFSLvMSXujHVrEvhFY/5KGiHvIki8We2CPXHzFMvhBx4Jg6eDTcDduWIDLVaCQJIrFMU5d3p8RQt7pwZVSCFvQfKkO9s3eVC/MSXujHVnFaAs4fSu6hqp0NeZLlo091X1ZxjFWHyRciDhxTB9rHqE5s9TBBzC+u0UiCohbBWKZkPVdXncxe211FJVCDdhNdaEIKJXTh4jil6pBG2ZuWTLON2G8tmdUKAAA=') format('woff2');
 }
 
 .wxh {
@@ -12,6 +12,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.wxh-timeout:before {
+  content: "\e604";
+}
+
 .wxh-clock:before {
   content: "\e603";
 }

src/pages/mine/address/addSite.vue

@@ -199,7 +199,6 @@ export default {
 				h.regeocoding({
 					location: lat + ',' + long,
 					success: data => {
-						console.log('regeocoding[success]:', data);
 						this.location = data.wxMarkerData[0];
 						let regeocod = data.originalData.result.addressComponent;
 						this.adcode = regeocod.adcode;
@@ -208,9 +207,6 @@ export default {
 						if (this.$u.test.contains(this.address, region)) {
 							this.address = this.address.replace(region, '');
 						}
-					},
-					fail: res => {
-						console.log('regeocoding[fail]:', res);
 					}
 				});
 			}
@@ -219,14 +215,10 @@ export default {
 			if (this.address) {
 				let t = {
 					success: res => {
-						console.log('[geocoding][success]:', res);
 						let e = res.wxMarkerData[0];
 						if (e.longitude && e.latitude) {
 							this.regeocoding(e.latitude, e.longitude);
 						}
-					},
-					fail: res => {
-						console.log('[geocoding][fail]:', res);
 					}
 				};
 				t.address = this.address;
@@ -243,9 +235,6 @@ export default {
 				success: res => {
 					this.address = res.address + res.name;
 					this.regeocoding(res.latitude, res.longitude);
-				},
-				fail: function(res) {
-					console.log('chooseLocation[fail]:', res);
 				}
 			});
 		},

src/pages/mine/address/index.vue

@@ -2,7 +2,7 @@
 	<view class="address-wrap">
 		<w-navbar title="收货地址"></w-navbar>
 		<view class="body" v-if="hasAdderss">
-			<w-address @editSite="toAddSite" :info="addressInfo" :is-default="true" />
+			<w-address @editSite="toAddSite" :info="info" :is-default="true" />
 		</view>
 	</view>
 </template>
@@ -15,28 +15,25 @@ export default {
 			background: {
 				backgroundColor: 'none'
 			},
+			info: {
+				name: '',
+				mobile: '',
 				address: '',
 				region: [],
-			siteList: []
+			},
 		};
 	},
 	computed: {
 		editPen() {
 			return process.uniEnv.qn_base_url + 'icon/edit-pen.png'
 		},
-		settled() {
-			return this.vuex_settled && this.vuex_settled.record || null
-		},
 		hasAdderss() {
-			return this.settled && this.address && this.settled.id_card_name
-		},
-		settledName() {
-			return this.settled.id_card_name || this.settled.nickname || this.settled.name
+			return this.info.address
 		},
 		addressInfo() {
 			return {
-				name: this.settledName,
-				mobile: this.settled.mobile,
+				name: this.name,
+				mobile: this.mobile,
 				address: this.address,
 				region: this.region || [],
 			}
@@ -46,10 +43,8 @@ export default {
 		getApp().trackPage('我的收获地址页')
 	},
 	onShow() {
-		if(!this.vuex_token) {
+		if(this.$u.test.isEmpty(this.vuex_token)) {
 			this.$u.route({url: 'pages/login/index'})
-		} else if(!this.settled) {
-			app.getBaseInfo(this);
 		}
 		this.getData();
 	},
@@ -59,27 +54,31 @@ export default {
 		},
 		getMineSite() {
 			this.$u.api.getSiteAddress().then((res) => {
-				if(res.code == 200 && res.data) {
-					this.address = res.data.address
-					this.region = [
-						res.data.provinceName, 
-						res.data.cityName, 
-						res.data.districtName
-					]
+				const data = res.data
+				if(res.code == 200 && !this.$u.test.isEmpty(data)) {
+					let region = []
+					if(data.provinceName && data.cityName && data.districtName) {
+						region = [data.provinceName, data.cityName, data.districtName]
+					}
+					this.info = {
+						name: data.name,
+						mobile: data.mobile,
+						address: data.address,
+						region: region,
+					}
 				}
 			})
 		},
 		toAddSite(title){
-			const info = this.addressInfo
-			const region = this.region.join('-')
+			const region = this.info.region.join('-')
 			this.$u.route({
 				url: 'pages/mine/address/addSite',
 				params: {
 					type: 'edit',
-					name: info.name,
-					mobile: info.mobile,
 					region: region,
-					address: info.address
+					name: this.info.name,
+					mobile: this.info.mobile,
+					address: this.info.address,
 				}
 			})
 		}

src/pages/mine/warehouse/index.vue

@@ -284,7 +284,7 @@
 			overflow: auto;
 
 			.load-more-view {
-				margin-bottom: 20rpx;
+				margin-bottom: 68rpx;
 			}
 
 			.loading-view {

src/pages/mine/warehouse/partsDetail.vue

@@ -4,7 +4,8 @@
 		</u-navbar>
 		<view class="title-text">
 			<text>{{title}}</text>
-			<view class="express-view" @click="$u.throttle(handleClickExpress, 500)">
+			<view v-show="hasExpress" class="express-view" 
+			@click="$u.throttle(handleClickExpress, 500)">
 				<text>查看物流信息</text>
 				<u-icon name="arrow-right"></u-icon>
 			</view>
@@ -28,7 +29,8 @@
 				</view>
 				<view class="line-view"></view>
 				<view class="detail-info-view">
-					<view v-for="(value, key) in detailKey" :key="key" class="info-item">
+					<view v-for="(value, key) in detailKey" :key="key"
+					class="info-item" v-show="showInfoItem">
 						<view class="detail-left-view">
 							<text>{{ value }}</text>
 							<text @longpress="handleLongpress(key, detail[key] )">{{ detail[key] }}</text>
@@ -80,6 +82,12 @@
 			buttonText() {
 				return this.texts[this.info.status]
 			},
+			hasExpress() {
+				if(this.$u.test.isEmpty(this.info.express.number)) {
+					return false
+				}
+				return true
+			},
 			buttonStyle() {
 				return {
 					'height': '104rpx',
@@ -217,7 +225,13 @@
 					uni.setClipboardData({
 						data: text,
 						success: function() {
-							console.log('success');
+							uni.getClipboardData({
+							  success: function (res) {
+								uni.showToast({
+								  title: '复制成功'
+								})
+							  }
+							})
 						}
 					});
 				}
@@ -226,7 +240,13 @@
 				uni.setClipboardData({
 					data: this.info.orderNumber,
 					success: function() {
-						console.log('success');
+						uni.getClipboardData({
+						  success: function (res) {
+							uni.showToast({
+							  title: '复制成功'
+							})
+						  }
+						})
 					}
 				});
 			}

src/pages/order/detail.vue

@@ -11,7 +11,7 @@
 			<view class="card">
 				<view class="header" v-if="showTimeView">
 					<view class="header-left-view">
-						<u-icon name="clock" margin-left="10" custom-prefix="wxh"
+						<u-icon :name="clockName" margin-left="10" custom-prefix="wxh"
 							:color="countColor" size="40" :label="tipText" label-size="32"
 							:label-color="countColor" :custom-style="{'font-weight': 'bold'}" />
 						</view>
@@ -233,6 +233,9 @@
 					}
 				}]
 			},
+			clockName() {
+				return this.timeout ? 'timeout' : 'clock'
+			},
 			countColor() {
 				return this.timeout ? '#FA5A49' : '#2272FF'
 			},

src/pages/parts/application.vue

@@ -37,7 +37,7 @@
 			</view>
 		</view>
 		<view class="bottom">
-			<u-button shape="circle" :disabled="isEmptyParts"
+			<u-button shape="circle" :disabled="isEmptyParts && $u.test.isEmpty(remark)"
 				:hair-line="false" :custom-style="customStyle" 
 				hover-class="none" @click="submitParts">提交</u-button>
 		</view>
@@ -92,6 +92,8 @@ export default {
 		loadAddress() {
 			this.$u.api.getSiteAddress().then((res) => {
 				if(res.code == 200 && res.data) {
+					this.addressInfo.name = res.data.name
+					this.addressInfo.mobile = res.data.mobile
 					this.addressInfo.address = res.data.address
 					this.addressInfo.region = [
 						res.data.provinceName, 
@@ -105,21 +107,11 @@ export default {
 			this.$u.api.orderDetail({}, this.orderId).then((res) => {
 				if (res.code == 200) {
 					this.order = res.data
-					this.initAddressInfo()
 				} else {
 					console.log(res.message, "获取订单详情失败！");
 				}
 			});
 		},
-		initAddressInfo() {
-			if(this.$u.test.isEmpty(this.order)) {
-				this.addressInfo.name = ''
-				this.addressInfo.mobile = ''
-			} else {
-				this.addressInfo.name = this.order.maintainWorkerName
-				this.addressInfo.mobile = this.order.maintainWorkerPhone
-			}
-		},
 		qnFile(src) {
 			return process.uniEnv.qn_base_url + src
 		},
@@ -139,13 +131,19 @@ export default {
 			this.addressInfo = site
 		},
 		addParts() {
-			this.$u.route({
-				url: "pages/parts/addParts",
-				params: {
+			let data = {}
+			if(this.$u.test.isEmpty(this.order)) {
+				data = {type: 2}
+			} else {
+				data = {
 					type: 1, 
 					brandId: this.order.brandId, 
 					categaryId: this.order.categoryId
 				}
+			}
+			this.$u.route({
+				url: "pages/parts/addParts",
+				params: data,
 			})
 		},
 		updateParts(parts) {