From 29658de29b2eb5292bf0c2fad7427b374b769ebc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 10 五月 2023 20:29:31 +0800
Subject: [PATCH] 样式修改,引入字体，修改逻辑
---
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue | 1
pages/public-page/forward/forward.vue | 146 ++++++++----
package-lock.json | 138 +++++++++++-
pages/driver-page/drvier-my/drvier-my.vue | 4
pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue | 2
pages/customer-page/customer-index/customer-index.vue | 14 -
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 13 -
pages/tabbar-page/index-tabbar/index-tabbar.vue | 25 ++
pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue | 3
App.vue | 27 ++
pages/customer-page/customer-my/customer-my.vue | 1
pages/driver-page/driver-index/driver-index.vue | 56 ++--
pages/customer-page/customer-my/userMange/userMange.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 97 ++++++--
utils/amap-wx.130.js | 31 ++
package.json | 1
main.js | 1
pages/public-page/message/message.vue | 1
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 34 --
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 10
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 2
21 files changed, 410 insertions(+), 199 deletions(-)
diff --git a/App.vue b/App.vue
index 2ff8874..681a4b3 100644
--- a/App.vue
+++ b/App.vue
@@ -2,10 +2,37 @@
export default {
onShow() {},
methods: {}
+ // created() {
+ // uni.loadFontFace({
+ // family: 'siYuanLight', // 瀛椾綋鍚嶇О锛屽彲浠ヨ嚜瀹氫箟
+ // source: 'url("/utils/fonts/siyuan.OTF")', // 瀛椾綋鏂囦欢璺緞
+ // success() {
+ // console.log('瀛椾綋鍔犺浇鎴愬姛');
+ // },
+ // fail() {
+ // console.log('瀛椾綋鍔犺浇澶辫触');
+ // }
+ // });
+ // }
};
</script>
<style lang="scss" scoped>
/*姣忎釜椤甸潰鍏叡css */
@import '@/uni_modules/uview-ui/index.scss';
+@font-face {
+ font-family: siYuanLight;
+ src: url('https://mx.jzeg.cn:9095/appimg/fonts/siyuan.OTF');
+}
+@font-face {
+ font-family: weighting;
+ src: url('https://mx.jzeg.cn:9095/appimg/fonts/weighting.TTF');
+}
+body {
+ font-family: siYuanLight, sans-serif;
+}
+// @font-face {
+// font-family: 'weighting';
+// src: url('./utils/fonts/weighing.TTF');
+// }
</style>
diff --git a/main.js b/main.js
index b214c90..51df9cf 100644
--- a/main.js
+++ b/main.js
@@ -1,5 +1,6 @@
import App from './App'
import Vue from 'vue'
+import '../unattended-app/static/fonts/commontfont.css'
import tabbar from '@/components/tab-bar/tab-bar.vue'
Vue.config.productionTip = false
diff --git a/package-lock.json b/package-lock.json
index eb8c2c1..2e569ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,127 @@
{
"name": "pigx-app",
"version": "4.6.0",
- "lockfileVersion": 1,
+ "lockfileVersion": 2,
"requires": true,
+ "packages": {
+ "": {
+ "name": "pigx-app",
+ "version": "4.6.0",
+ "dependencies": {
+ "@amap/amap-jsapi-loader": "^1.0.1",
+ "bignumber.js": "^9.1.1",
+ "crypto-js": "^3.1.9-1",
+ "qs": "^6.9.7",
+ "vue-i18n": "^8.20.0"
+ }
+ },
+ "node_modules/@amap/amap-jsapi-loader": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
+ "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
+ },
+ "node_modules/bignumber.js": {
+ "version": "9.1.1",
+ "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
+ "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/call-bind": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ }
+ },
+ "node_modules/crypto-js": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-3.3.0.tgz",
+ "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+ },
+ "node_modules/function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ },
+ "node_modules/get-intrinsic": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+ "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-symbols": "^1.0.3"
+ }
+ },
+ "node_modules/has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dependencies": {
+ "function-bind": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/has-symbols": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/object-inspect": {
+ "version": "1.12.3",
+ "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz",
+ "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+ },
+ "node_modules/qs": {
+ "version": "6.11.1",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.1.tgz",
+ "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">=0.6"
+ }
+ },
+ "node_modules/side-channel": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
+ "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+ "dependencies": {
+ "call-bind": "^1.0.0",
+ "get-intrinsic": "^1.0.2",
+ "object-inspect": "^1.9.0"
+ }
+ },
+ "node_modules/vue-i18n": {
+ "version": "8.28.2",
+ "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-8.28.2.tgz",
+ "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
+ }
+ },
"dependencies": {
+ "@amap/amap-jsapi-loader": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
+ "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
+ },
"bignumber.js": {
"version": "9.1.1",
- "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+ "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
"integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
},
"call-bind": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+ "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
"requires": {
"function-bind": "^1.1.1",
@@ -20,17 +130,17 @@
},
"crypto-js": {
"version": "3.3.0",
- "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
+ "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-3.3.0.tgz",
"integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
},
"function-bind": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"get-intrinsic": {
"version": "1.2.0",
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+ "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
"integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
"requires": {
"function-bind": "^1.1.1",
@@ -40,7 +150,7 @@
},
"has": {
"version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
"requires": {
"function-bind": "^1.1.1"
@@ -48,25 +158,25 @@
},
"has-symbols": {
"version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+ "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
},
"object-inspect": {
"version": "1.12.3",
- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+ "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz",
"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
},
"qs": {
- "version": "6.11.0",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
- "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+ "version": "6.11.1",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.1.tgz",
+ "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
"requires": {
"side-channel": "^1.0.4"
}
},
"side-channel": {
"version": "1.0.4",
- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+ "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
"requires": {
"call-bind": "^1.0.0",
@@ -76,7 +186,7 @@
},
"vue-i18n": {
"version": "8.28.2",
- "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz",
+ "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-8.28.2.tgz",
"integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
}
}
diff --git a/package.json b/package.json
index 33c9298..056bfd4 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"url": "https://pig4cloud.com"
},
"dependencies": {
+ "@amap/amap-jsapi-loader": "^1.0.1",
"bignumber.js": "^9.1.1",
"crypto-js": "^3.1.9-1",
"qs": "^6.9.7",
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 558f7c3..ed37706 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -314,7 +314,6 @@
width: 96%;
height: 34rpx;
font-size: 32rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
@include flex;
@@ -324,7 +323,6 @@
width: 100%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@@ -347,7 +345,6 @@
width: 96%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@@ -366,7 +363,6 @@
width: 100%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@@ -420,13 +416,11 @@
width: 15%;
text {
font-size: 24rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #c78a64;
}
.residue {
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
}
@@ -443,7 +437,6 @@
flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
position: relative;
@@ -461,7 +454,6 @@
height: 30rpx;
line-height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -480,7 +472,6 @@
height: 24rpx;
line-height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -508,12 +499,14 @@
background: url('../../../static/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
text-align: center;
line-height: vww(45);
}
+ }
+ .receive {
+ left: vww(20);
}
.forward {
width: vww(106);
@@ -524,7 +517,6 @@
background: url('../../../static/image/banner/transpartent.png') no-repeat;
background-size: cover;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #3b56eb;
text-align: center;
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 0e81689..f3896fb 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -11,7 +11,6 @@
<view class="dept-num">
<text
style="font-size: 46rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #FFFFFF;
text-shadow: 0rpx 4rpx 0rpx #1A66FE;"
@@ -20,7 +19,6 @@
</text>
<text
style="font-size: 24rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #F81414;
text-shadow: 0rpx 4rpx 0rpx #1A66FE;"
@@ -111,7 +109,7 @@
orderPlanId: null,
orderCode: null,
orderPlanDetail: {},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'],
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'],
yyDailyList: [],
// 棰嗗彇鏁伴噺
cars2: '',
@@ -203,7 +201,6 @@
width: 226rpx;
height: 36rpx;
font-size: 38rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #fff;
line-height: 69rpx;
@@ -218,7 +215,6 @@
top: vww(54);
.dept-name {
font-size: 32rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #ffffff;
line-height: 69rpx;
@@ -248,7 +244,6 @@
.forward-name,
.fleet-name {
font-size: 28rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #757575;
line-height: 69rpx;
@@ -256,7 +251,6 @@
.forward-num,
.fleet-num {
font-size: 40rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #303030;
line-height: 69rpx;
@@ -276,7 +270,6 @@
height: 30rpx;
line-height: vww(15);
font-size: 28rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #757575;
text {
@@ -284,7 +277,6 @@
height: 30rpx;
line-height: vww(15);
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
}
@@ -335,7 +327,6 @@
.car-num {
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
}
@@ -360,7 +351,6 @@
height: 29rpx;
line-height: 29rpx;
font-size: 28rpx;
- font-family: PingFang SC;
font-weight: 400;
color: #919090;
}
@@ -368,7 +358,6 @@
height: 29rpx;
line-height: 29rpx;
font-size: 38rpx;
- font-family: PingFang SC;
font-weight: 400;
color: #035cfb;
}
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index 6600f2f..b4388cb 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -80,7 +80,7 @@
orderPlanId: '',
yyDailyList: {},
orderPlanDetail: {},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'],
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'],
index: ''
};
},
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 0b8994f..9c4b348 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -364,7 +364,6 @@
width: 80rpx;
height: 37rpx;
font-size: 40rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #ffffff;
line-height: 69rpx;
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 6af93fb..786fab1 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -26,6 +26,7 @@
</view>
<view class="filter-condition"></view>
<view class="date-information">
+ <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="filterList.length == 0"></u-empty>
<view class="statistics-card" v-for="(item, index) in filterList" :key="index">
<view class="card-top">
<view class="left"><combined-title :title="item.condition"></combined-title></view>
@@ -218,6 +219,8 @@
},
first: '',
last: '',
+ firstFilter: '',
+ lastFilter: '',
taskList: [],
filterList: [],
totalLength: 0,
@@ -242,7 +245,7 @@
// 鐐瑰嚮鍙崇澶磋鎯呭脊绐�
faYunDetailobj: {},
modalShow: false,
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�']
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌']
};
},
onShow() {
@@ -258,6 +261,7 @@
let d = '01';
m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
this.first = [y, m, d].join('-');
+ this.firstFilter = [y, m, d].join('-');
},
lastDate() {
let y = new Date().getFullYear(); //鑾峰彇骞翠唤
@@ -266,6 +270,7 @@
m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
d = d < 10 ? '0' + d : d; //鏃ユ暟琛� 0
this.last = [y, m, d].join('-');
+ this.lastFilter = [y, m, d].join('-');
},
// 绛涢�夋潯浠�
getShipping() {
@@ -431,19 +436,8 @@
// 閲嶇疆绛涢��
resetCondition() {
this.conditinonShow = false;
- this.filterList = this.taskList;
- if (this.filterList.length != 0) {
- this.totalLength = this.filterList.map(v => v.taskCoalList.length).reduce((x, y) => x + y);
- this.totalTon = this.filterList.map(v =>
- v.taskCoalList.reduce((prev, cur) => {
- return cur.clean + prev;
- }, 0)
- );
- this.totalTon = this.totalTon.reduce((x, y) => x + y);
- } else {
- this.totalLength = 0;
- this.totalTon = 0;
- }
+ this.first = this.dateRange.slice(0, 10);
+ this.last = this.dateRange.slice(11);
this.coalList.forEach(v => {
v.active = false;
});
@@ -560,7 +554,7 @@
return uni.getStorageSync('roleType');
},
dateRange() {
- return `鏃ユ湡:${this.first}-${this.last}`;
+ return `${this.firstFilter}-${this.lastFilter}`;
},
dateselect() {
return `${this.first}-${this.last}`;
@@ -674,7 +668,6 @@
width: 100%;
height: vww(16);
font-size: 40rpx;
- font-family: Source Han Sans CN;
font-weight: bold;
color: #3b56eb;
text-align: center;
@@ -683,7 +676,6 @@
width: 96rpx;
height: 24rpx;
font-size: 24rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
}
@@ -693,7 +685,6 @@
width: 160rpx;
height: 38rpx;
font-size: 40rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #ffffff;
line-height: 69rpx;
@@ -724,7 +715,6 @@
width: 330rpx;
height: 40rpx;
font-size: 28rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #494949;
}
@@ -751,13 +741,11 @@
@include flex;
.left {
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #494949;
}
.card-top_num {
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #6074ee;
}
@@ -809,7 +797,6 @@
.point-number {
width: 20%;
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
}
@@ -824,7 +811,6 @@
flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
position: relative;
@@ -842,7 +828,6 @@
height: 30rpx;
line-height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -865,7 +850,6 @@
}
.carnum-text {
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
diff --git a/pages/customer-page/customer-my/userMange/userMange.vue b/pages/customer-page/customer-my/userMange/userMange.vue
index 62649ca..694e387 100644
--- a/pages/customer-page/customer-my/userMange/userMange.vue
+++ b/pages/customer-page/customer-my/userMange/userMange.vue
@@ -153,14 +153,12 @@
&_label {
line-height: 28rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
}
&_value {
line-height: 28rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
}
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue b/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
index fa878bb..e0b8b83 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
@@ -71,14 +71,12 @@
margin-top: 19%;
text-align: center;
font-size: vww(40);
- font-family: Source Han Sans CN, Source Han Sans CN-Bold;
font-weight: 700;
color: #896227;
}
&-coalTwo {
margin-top: 20%;
font-size: vww(20);
- font-family: Source Han Sans CN, Source Han Sans CN-Bold;
font-weight: 700;
text-align: center;
color: #2e363f;
@@ -98,7 +96,6 @@
&-coalThree {
margin-top: vww(46);
font-size: vww(18);
- font-family: Source Han Sans CN, Source Han Sans CN-Bold;
font-weight: 700;
text-align: center;
color: #2e363f;
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index e6bbd9d..0515852 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -34,18 +34,22 @@
</view> -->
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
- <view class="middle-block">
+ <view class="middle-block" v-if="firstHairCustomernameShow || sideline">
<view class="block-main" v-if="firstHairCustomernameShow">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="second-line">
- <view class="label-text">鐨噸</view>
- <view class="input-container"><u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="weighData.coalContactSkin"></u--input></view>
- <view class="unit">鍚�</view>
+ <view class="label-text" :class="{ focusClass: isfocus1 }">鐨噸</view>
+ <view class="input-container" :class="{ inputClass: isfocus1 }">
+ <u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="weighData.coalContactSkin" @focus="inputFocus(1)" @blur="inputBlur"></u--input>
+ </view>
+ <view class="unit" :class="{ focusClass: isfocus1 }">鍚�</view>
</view>
<view class="second-line">
- <view class="label-text">姣涢噸</view>
- <view class="input-container"><u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="weighData.coalContactHair"></u--input></view>
- <view class="unit">鍚�</view>
+ <view class="label-text" :class="{ focusClass: isfocus2 }">姣涢噸</view>
+ <view class="input-container" :class="{ inputClass: isfocus2 }">
+ <u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="weighData.coalContactHair" @focus="inputFocus(2)" @blur="inputBlur"></u--input>
+ </view>
+ <view class="unit" :class="{ focusClass: isfocus2 }">鍚�</view>
</view>
<view class="second-line">
<view class="label-text">鍑�閲�</view>
@@ -53,7 +57,7 @@
<view class="unit">鍚�</view>
</view>
</view>
- <view class="block-sideline" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞嚭'">
+ <view class="block-sideline" v-if="sideline">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="weigh-item">
<view class="item">
@@ -71,6 +75,7 @@
</view>
</view>
</view>
+ <view v-else style="width: 100%;height: vww(20);"></view>
<view class="bottom-block">
<view class="block-main">
<view class="main-information">
@@ -199,8 +204,10 @@
// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
coalContactHair: '',
- coalContactSkin: ''
- // 浜屾纭
+ coalContactSkin: '',
+ // 鑱氱劍鏃舵敼鍙樻牱寮�
+ isfocus1: false,
+ isfocus2: false
};
},
watch: {
@@ -257,13 +264,14 @@
},
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
- if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
- if (this.weighList.hair == 0) {
- return true;
- } else if (this.weighList.hair != 0) {
- return false;
- }
- }
+ return this.realTimeWeigh == 0;
+ // if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
+ // if (this.weighList.hair == 0) {
+ // return true;
+ // } else if (this.weighList.hair != 0) {
+ // return false;
+ // }
+ // }
},
// 鏄惁鏀剧┖鎸夐挳绂佺敤
isEvacuation() {
@@ -273,6 +281,9 @@
if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆') {
return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
}
+ },
+ sideline() {
+ return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞嚭';
}
},
methods: {
@@ -375,6 +386,19 @@
// 鏀剧┖寮圭獥鍙栨秷
evacuationCancel() {
this.evacuationModalShow = false;
+ },
+ // input鑱氱劍
+ inputFocus(v) {
+ if (v == 1) {
+ this.isfocus1 = true;
+ } else {
+ this.isfocus2 = true;
+ }
+ },
+ // input澶辩劍
+ inputBlur() {
+ this.isfocus1 = false;
+ this.isfocus2 = false;
}
}
};
@@ -406,11 +430,13 @@
align-items: center;
justify-content: center;
font-size: 74rpx;
- font-family: Determination Sans;
font-weight: 400;
color: #ffffff;
line-height: 69rpx;
text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33);
+ text {
+ font-family: weighting;
+ }
}
.top_right {
display: flex;
@@ -418,7 +444,6 @@
justify-content: center;
flex: 2;
font-size: 31rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
view {
@@ -435,11 +460,8 @@
align-items: center;
flex-direction: column;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #d9e1fe;
- // position: relative;
- // top: vww(-10);
}
}
.middle-block {
@@ -449,17 +471,28 @@
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
- @include flex justify-content: center;
+ @include flex;
+ justify-content: center;
overflow: hidden;
.block-main {
width: 650rpx;
height: 350rpx;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
margin-bottom: vww(20);
+ position: relative;
.first-line,
.second-line {
width: 90%;
height: vww(44);
+ .focusClass {
+ color: #5b95fd;
+ }
+ .inputClass {
+ border: 1px solid rgba(73, 95, 252, 0.6) !important;
+ box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
+ border-radius: 12rpx !important;
+ }
.input-container {
border: 2px solid #c5c5c5;
box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
@@ -468,6 +501,8 @@
}
.first-line {
@include flex;
+ position: relative;
+ top: vww(8);
}
.second-line {
@include flex;
@@ -489,7 +524,6 @@
min-width: vww(50);
height: vww(45);
font-size: 21rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
text-align: center;
@@ -501,7 +535,6 @@
}
.num {
font-size: 40rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
}
@@ -527,13 +560,21 @@
align-items: flex-start;
flex-direction: column;
.main-information {
- width: 50%;
+ width: 100%;
height: 28rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
@include flex;
+ justify-content: flex-start;
+ .prefix {
+ min-width: vww(60);
+ }
+ .suffix {
+ flex: 1;
+ margin-left: vww(12);
+ text-align: left;
+ }
}
}
}
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 5e5d716..498ea06 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -18,14 +18,14 @@
<view class="first-line">
<view class="dispatch-receive">
<view v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'" class="container">
- <view class="dispatch">{{ item.deptName }}</view>
+ <view class="dispatch">{{ item.deptName || '' }}</view>
<view class="receive-icon"></view>
- <view class="receive">{{ item.customerNameCopy }}</view>
+ <view class="receive">{{ item.customerNameCopy || '' }}}</view>
</view>
<view v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'" class="container">
- <view class="dispatch">{{ item.customerNameCopy }}</view>
+ <view class="dispatch">{{ item.customerNameCopy || '' }}</view>
<view class="receive-icon"></view>
- <view class="receive">{{ item.deptName }}</view>
+ <view class="receive">{{ item.deptName || '' }}}</view>
</view>
</view>
<view class="point-number">
@@ -162,6 +162,7 @@
<script>
import { customerId } from '@/utils/status';
import combinedTitle from '@/components/combined-title/combined-title.vue';
+
export default {
components: {
combinedTitle
@@ -191,7 +192,11 @@
qiangDanOrderPlanId: null,
fleetId: '',
xsUserId: '',
- customerId: ''
+ customerId: '',
+ // 闆嗘垚楂樺痉鍦板浘
+ amapPlugin: null,
+ key: 'e3106700a6225e6a25727d3a41fa54c5',
+ addressName: ''
};
},
onShow() {
@@ -302,12 +307,12 @@
height: 24rpx;
line-height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
.havedclock {
width: 58% !important;
+ margin-right: 0 !important;
.send-date {
width: 100%;
margin-left: vww(12);
@@ -330,10 +335,9 @@
.button-img {
width: 100%;
height: 100%;
- background: url('../../../static/image/banner/button.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
text-align: center;
@@ -345,7 +349,7 @@
margin: 0 auto;
// 涓讳綋
.driver-index-body {
- margin-bottom: vww(56);
+ // margin-bottom: vww(56);
// 寰呴鍙栨彁鐓ゅ崟
.wait-collection {
width: 100%;
@@ -404,13 +408,12 @@
width: 15%;
text {
font-size: 24rpx;
- font-family: Microsoft YaHei;
+
font-weight: 400;
color: #c78a64;
}
.residue {
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
}
@@ -427,7 +430,7 @@
min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
+
font-weight: 300;
color: #515151;
position: relative;
@@ -438,7 +441,7 @@
min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
+
font-weight: 300;
color: #515151;
position: relative;
@@ -456,7 +459,6 @@
min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
text-align: center;
@@ -475,7 +477,6 @@
margin-left: vww(14);
line-height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -492,10 +493,9 @@
.button-img {
width: 100%;
height: 100%;
- background: url('../../../static/image/banner/button.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
text-align: center;
@@ -518,11 +518,12 @@
justify-content: space-between;
.first-line {
position: relative;
- @include firstLine .main-information {
- width: 40%;
+ @include firstLine;
+ .main-information {
+ width: 100%;
height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.sign {
@@ -530,12 +531,12 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('../../../static/image/banner/blueblock.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
+ margin-right: vww(20);
}
}
.main-divider {
@@ -551,22 +552,22 @@
@include firstLine margin: 0;
margin-left: vww(16);
.main-information {
- width: 40%;
+ width: 100%;
height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.sign {
width: vww(28);
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('../../../static/image/banner/redblock.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
+ margin-right: vww(20);
}
}
}
@@ -577,7 +578,7 @@
.clock {
width: 33%;
height: vww(21);
- // margin-right: vww(70);
+ margin-right: vww(70);
line-height: vww(21);
@include flex;
justify-content: flex-start;
@@ -599,7 +600,6 @@
border: 2px solid #035cfb;
border-radius: 4rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #035cfb;
text-align: center;
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 8638d70..464ddd6 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -373,7 +373,6 @@
width: 80rpx;
height: 37rpx;
font-size: 40rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #ffffff;
line-height: 69rpx;
@@ -397,7 +396,6 @@
width: 136rpx;
height: 32rpx;
font-size: 34rpx;
- font-family: Source Han Sans CN;
font-weight: bold;
color: #ffffff;
margin-left: vww(17);
@@ -442,7 +440,6 @@
.label-text {
width: 120rpx;
font-size: 30rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
line-height: 85rpx;
@@ -452,7 +449,6 @@
min-width: vww(125);
@include flex;
font-size: 30rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
line-height: 85rpx;
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 522c0dc..f4d80ff 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -262,7 +262,6 @@
width: 96%;
height: 34rpx;
font-size: 32rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
@include flex;
@@ -272,7 +271,6 @@
width: 100%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@@ -295,7 +293,6 @@
width: 96%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@@ -314,7 +311,6 @@
width: 50%;
height: 31rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@@ -395,13 +391,11 @@
width: 15%;
text {
font-size: 24rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #c78a64;
}
.residue {
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
}
@@ -418,7 +412,6 @@
flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
position: relative;
@@ -436,7 +429,6 @@
height: 30rpx;
line-height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -455,7 +447,6 @@
margin-left: vww(14);
line-height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -477,7 +468,6 @@
background: url('../../../static/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #fff;
text-align: center;
diff --git a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
index ab50e65..cf1a7ef 100644
--- a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
+++ b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -231,7 +231,6 @@
width: 80rpx;
height: 37rpx;
font-size: 40rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #ffffff;
line-height: 69rpx;
diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
index ee0fa01..a1e3497 100644
--- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
+++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
@@ -114,7 +114,7 @@
return {
id: '',
faYunDetailobj: {},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�']
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌']
};
},
methods: {},
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index ed2d14a..40d8611 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -10,7 +10,14 @@
</u-form-item>
<u-form-item label="杈撳叆鏁伴噺" labelWidth="20%" ref="item1">
<view class="forward-card-amount">
- <view class="forward-card-amount-input"><u--input v-model="val.carNum" placeholder="璇疯緭鍏ヨ浆鍙戞暟閲�"></u--input></view>
+ <view class="forward-card-amount-input">
+ <u--input
+ v-model="val.carNum"
+ placeholder="璇疯緭鍏ヨ浆鍙戞暟閲�"
+ @input="debouncecarNumInput(index, val.carNum)"
+ @blur="blurInput(index, val.carNum)"
+ ></u--input>
+ </view>
<u-checkbox-group v-model="val.checkboxValue1" placement="column" @change="v => checkboxChange(v, index, val)">
<u-checkbox :customStyle="{ marginBottom: '8px' }" size="30" labelSize="30" label="鍏ㄩ儴杞彂" name="鍏ㄩ儴杞彂" :disabled="val.ischecked"></u-checkbox>
</u-checkbox-group>
@@ -20,9 +27,11 @@
</u--form>
</view>
<!-- 澧炲姞鎸夐挳 -->
- <view class="AdddBtn"><u-button text="娣诲姞" :hairline="false" type="primary" :customStyle="{ marginBottom: '8px' }" @click="addForm"></u-button></view>
+ <view class="AdddBtn">
+ <u-button text="娣诲姞" :hairline="false" type="primary" :customStyle="{ marginBottom: '8px' }" @click="addForm" :disabled="whetherClick"></u-button>
+ </view>
<!-- 鎸夐挳 -->
- <view class="forwardBtn"><u-button text="鎻愪氦" :hairline="false" type="warning" @click="submitForm"></u-button></view>
+ <view class="forwardBtn"><u-button text="鎻愪氦" :hairline="false" type="warning" @click="submitForm" :disabled="whetherClick1"></u-button></view>
<!-- 閫夋嫨璐т唬鎴栬溅闃熷脊鍑烘 -->
<view class="selectHuoDaiOrFleet-container">
@@ -55,13 +64,14 @@
<script>
import { customerId } from '@/utils/status';
+import toast from '../../../uni_modules/uview-ui/libs/config/props/toast';
export default {
onLoad(params) {
console.log(params, '杞彂椤甸潰鐨勫弬鏁�');
// 瀹㈡埛
this.cars2 = Number(params.cars2);
- this.carNumSurplus1 = Number(params.carNumSurplus1);
+ this.tempcarNumSurplus1 = this.carNumSurplus1 = Number(params.carNumSurplus1);
// 璐т唬
this.carNum = Number(params.carNum);
this.carNumSurplusHuodai = this.forwardSurplus = Number(params.carNumSurplusHuodai);
@@ -128,12 +138,15 @@
list1: [{ name: '杞﹂槦' }, { name: '璐т唬' }],
tabHuoDai: false,
carNumSurplus1: '',
+ tempcarNumSurplus1: '',
cars2: '',
carNum: '',
carNumSurplusHuodai: '',
formNum: 1,
// 涓汉杞彂鏁版嵁
- personalForward: {}
+ personalForward: {},
+ whetherClick: false,
+ whetherClick1: false
};
},
onShow() {
@@ -187,8 +200,7 @@
}
},
checkboxChange(value, index, v) {
- uni.setStorageSync('allrelay', this.jhOrderPlanForwardList[index].carNum);
- this.jhOrderPlanForwardList = this.jhOrderPlanForwardList.map((v, i) => {
+ this.jhOrderPlanForwardList = this.jhOrderPlanForwardList.map(v => {
return {
...v,
ischecked: false
@@ -197,35 +209,34 @@
if (value.length != 0) {
let tempforwardSurplus = this.forwardSurplus;
let tempcarNumSurplus1 = this.carNumSurplus1;
- if (v.id) {
- this.$reqGet('jhorderplanforward', { forwardId: v.id }).then(res => {
- this.personalForward = res.data;
- // 璁＄畻鍏ㄩ儴杞彂鏁�
- // 瀹㈡埛
- if (this.roleType == 1) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempcarNumSurplus1);
- if (this.jhOrderPlanForwardList[index].carNum == 0) {
- this.jhOrderPlanForwardList[index].carNum == tempcarNumSurplus1;
- }
- }
- tempcarNumSurplus1 = 0;
- // 璐т唬
- if (this.roleType == 2) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempforwardSurplus);
- }
- tempforwardSurplus = 0;
- });
- } else {
- if (this.roleType == 1) {
- this.jhOrderPlanForwardList[index].carNum = this.carNumSurplus1;
- // this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.carNumSurplus1);
- }
- tempcarNumSurplus1 = 0;
- if (this.roleType == 2) {
- this.jhOrderPlanForwardList[index].carNum = this.forwardSurplus;
- // this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.forwardSurplus);
- }
- tempforwardSurplus = 0;
+ // if (v.id) {
+ // this.$reqGet('jhorderplanforward', { forwardId: v.id }).then(res => {
+ // this.personalForward = res.data;
+ // // 璁＄畻鍏ㄩ儴杞彂鏁�
+ // // 瀹㈡埛
+ // if (this.roleType == 1) {
+ // this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempcarNumSurplus1);
+ // this.calculate(this.jhOrderPlanForwardList);
+ // if (tempcarNumSurplus1 == 0) {
+ // this.jhOrderPlanForwardList[index].carNum = this.allrelay(0, this.carNumSurplus1);
+ // }
+ // }
+ // tempcarNumSurplus1 = 0;
+ // // 璐т唬
+ // if (this.roleType == 2) {
+ // this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempforwardSurplus);
+ // }
+ // tempforwardSurplus = 0;
+ // });
+ // } else { }
+
+ if (this.roleType == 1) {
+ this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.carNumSurplus1, this.jhOrderPlanForwardList[index].carNum);
+ this.calculate(this.jhOrderPlanForwardList);
+ }
+ if (this.roleType == 2) {
+ this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.forwardSurplus, this.jhOrderPlanForwardList[index].carNum);
+ this.calculate(this.jhOrderPlanForwardList);
}
// 閫夋嫨涓�涓悗鍏朵綑绂佹澶嶉��
this.jhOrderPlanForwardList.forEach((v, i) => {
@@ -233,23 +244,10 @@
v.ischecked = true;
}
});
+ this.whetherClick = true;
} else {
- let tempforwardSurplus = this.forwardSurplus;
- let tempcarNumSurplus1 = this.carNumSurplus1;
- // 璐т唬
- if (this.roleType == 2) {
- this.jhOrderPlanForwardList[index].carNum = 0;
- if (this.jhOrderPlanForwardList[index].carNum <= 0) {
- this.jhOrderPlanForwardList[index].carNum = 0;
- }
- }
- // 瀹㈡埛
- if (this.roleType == 1) {
- this.jhOrderPlanForwardList[index].carNum = 0;
- if (this.jhOrderPlanForwardList[index].carNum <= 0) {
- this.jhOrderPlanForwardList[index].carNum = 0;
- }
- }
+ this.jhOrderPlanForwardList[index].carNum = 0;
+ this.calculate(this.jhOrderPlanForwardList);
}
},
// 鑾峰彇璐т唬鍒楄〃
@@ -303,6 +301,43 @@
}
});
},
+ // 璁＄畻鎻愮叅鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
+ calculate(arr) {
+ let total = arr.reduce((prev, cur) => {
+ return cur.carNum + prev;
+ }, 0);
+ console.log(total, '鎻愮叅鍗曚竴鍏辩殑鏁版嵁');
+ if (this.roleType == 1) {
+ if (this.cars2 >= total) {
+ this.carNumSurplus1 = this.cars2 - total;
+ this.whetherClick = false;
+ this.whetherClick1 = false;
+ } else {
+ this.carNumSurplus1 = 0;
+ this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+ this.whetherClick = true;
+ this.whetherClick1 = true;
+ }
+ }
+ return total;
+ },
+ debouncecarNumInput(index, value) {
+ let time;
+ let that = this;
+ return (function() {
+ if (!time) {
+ time = setTimeout(() => {
+ that.$set(that.jhOrderPlanForwardList[index], 'carNum', Number(value));
+ that.calculate(that.jhOrderPlanForwardList);
+ time = null;
+ }, 800);
+ }
+ })();
+ },
+ blurInput(index, value) {
+ this.$set(this.jhOrderPlanForwardList[index], 'carNum', Number(value));
+ this.calculate(this.jhOrderPlanForwardList);
+ },
// 娣诲姞涓�缁勮〃鍗�
addForm() {
// 鍒ゆ柇鏄惁鏈変竴涓閫夛紝濡傛灉鏈夊垯绂佹鏂板姞鐨勫閫夛紝娌℃湁鍒欎笉绂佹
@@ -311,7 +346,7 @@
this.jhOrderPlanForwardList.push({
orderPlanId: this.orderPlanId,
name: '',
- carNum: 0,
+ carNum: null,
xsUserId: 0,
fleetId: 0,
checkboxValue1: '',
@@ -321,13 +356,14 @@
this.jhOrderPlanForwardList.push({
orderPlanId: this.orderPlanId,
name: '',
- carNum: 0,
+ carNum: null,
xsUserId: 0,
fleetId: 0,
checkboxValue1: '',
ischecked: true
});
}
+ this.calculate(this.jhOrderPlanForwardList);
},
// 鍒犻櫎涓�缁勮〃鍗�
deleteGroup(index, v) {
@@ -336,6 +372,7 @@
this.$reqPost('deleteForward', { id: v.id }, 'params').then(res => {
if (res.code === 0) {
this.jhOrderPlanForwardList.splice(index, 1);
+ this.calculate(this.jhOrderPlanForwardList);
this.$u.toast('鍒犻櫎鎴愬姛');
} else if (res.code === 1) {
this.$u.toast(res.msg);
@@ -343,6 +380,7 @@
});
} else {
this.jhOrderPlanForwardList.splice(index, 1);
+ this.calculate(this.jhOrderPlanForwardList);
this.$u.toast('鍒犻櫎鎴愬姛');
}
},
diff --git a/pages/public-page/message/message.vue b/pages/public-page/message/message.vue
index d9c6938..21bebd4 100644
--- a/pages/public-page/message/message.vue
+++ b/pages/public-page/message/message.vue
@@ -139,7 +139,6 @@
::v-deep .u-cell__title-text {
height: 32rpx;
font-size: 34rpx !important;
- font-family: PingFang SC;
font-weight: bold;
color: #2f2f2f !important;
margin-bottom: vww(18);
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 6111883..da810e4 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -1,5 +1,5 @@
<template>
- <view>
+ <view class="max-block">
<view class="search-bar">
<view class="icon-body">
<view class="icon-box" @click="messagePage">
@@ -31,6 +31,7 @@
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
import { mapState, mapMutations } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
+
let socket = null;
export default {
components: {
@@ -110,6 +111,18 @@
console.log('寮�鍚弻浜洪�氳瘽鎴愬姛Complete');
}
});
+ let amap = require('../../../utils/amap-wx.130.js');
+ let amapPlugin = new amap.AMapWX({
+ key: 'e3106700a6225e6a25727d3a41fa54c5'
+ });
+ amapPlugin.getRegeo({
+ success: data => {
+ console.log(data, '鑾峰彇浣嶇疆');
+ },
+ fail: info => {
+ console.log(info, '閿欒淇℃伅');
+ }
+ });
},
data() {
return {
@@ -121,7 +134,10 @@
messagePushShow: false,
messageList: {},
isconnect: false,
- dotShow: false
+ dotShow: false,
+ amapPlugin: null,
+ key: 'e3106700a6225e6a25727d3a41fa54c5',
+ addressName: ''
};
},
onShow() {
@@ -293,9 +309,12 @@
</script>
<style lang="scss" scoped>
+.max-block {
+ font-family: siYuanLight !important;
+}
.white-block {
width: 100%;
- height: vww(50);
+ height: vww(20);
margin-top: vww(10);
}
.search-bar {
diff --git a/utils/amap-wx.130.js b/utils/amap-wx.130.js
new file mode 100644
index 0000000..718d6ef
--- /dev/null
+++ b/utils/amap-wx.130.js
@@ -0,0 +1,31 @@
+function AMapWX(a){this.key=a.key;this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};this.MeRequestConfig={key:a.key,serviceName:"https://restapi.amap.com/rest/me"}}
+AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(c){c=c.longitude+","+c.latitude;wx.setStorage({key:"userLocation",data:c});b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(d){d.data&&b(d.data)}});a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getMEKeywordsSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.city&&(d.city=b.city);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);b.sig&&(d.sig=
+b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/local",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getMEIdSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.id&&(d.id=b.id);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/id",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&
+0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getMEPolygonSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.polygon&&(d.polygon=b.polygon);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);
+b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/polygon",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getMEaroundSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.center&&(d.center=b.center);b.radius&&(d.radius=b.radius);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&
+(d.pageSize=b.pageSize);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/around",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
+AMapWX.prototype.getGeo=function(a){var b=this.requestConfig,c=a.options;b={key:this.key,extensions:"all",s:b.s,platform:b.platform,appname:this.key,sdkversion:b.sdkversion,logversion:b.logversion};c.address&&(b.address=c.address);c.city&&(b.city=c.city);c.batch&&(b.batch=c.batch);c.sig&&(b.sig=c.sig);wx.request({url:"https://restapi.amap.com/v3/geocode/geo",data:b,method:"GET",header:{"content-type":"application/json"},success:function(d){(d=d.data)&&d.status&&"1"===d.status?a.success(d):a.fail({errCode:"0",
+errMsg:d})},fail:function(d){a.fail({errCode:"0",errMsg:d.errMsg||""})}})};
+AMapWX.prototype.getRegeo=function(a){function b(d){var e=c.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:c.key,location:d,extensions:"all",s:e.s,platform:e.platform,appname:c.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){g=g.data.regeocode;var h=g.addressComponent,f=[],k=g.roads[0].name+"\u9644\u8fd1",m=d.split(",")[0],n=d.split(",")[1];if(g.pois&&
+g.pois[0]){k=g.pois[0].name+"\u9644\u8fd1";var l=g.pois[0].location;l&&(m=parseFloat(l.split(",")[0]),n=parseFloat(l.split(",")[1]))}h.provice&&f.push(h.provice);h.city&&f.push(h.city);h.district&&f.push(h.district);h.streetNumber&&h.streetNumber.street&&h.streetNumber.number?(f.push(h.streetNumber.street),f.push(h.streetNumber.number)):f.push(g.roads[0].name);f=f.join("");a.success([{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:k,longitude:m,latitude:n,id:0,regeocodeData:g}])}else a.fail({errCode:g.data.infocode,
+errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this;a.location?b(a.location):c.getWxLocation(a,function(d){b(d)})};
+AMapWX.prototype.getWeather=function(a){function b(g){var h="base";a.type&&"forecast"==a.type&&(h="all");wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:d.key,city:g,extensions:h,s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(f){if(f.data.status&&"1"==f.data.status)if(f.data.lives){if((f=f.data.lives)&&0<f.length){f=f[0];var k={city:{text:"\u57ce\u5e02",data:f.city},
+weather:{text:"\u5929\u6c14",data:f.weather},temperature:{text:"\u6e29\u5ea6",data:f.temperature},winddirection:{text:"\u98ce\u5411",data:f.winddirection+"\u98ce"},windpower:{text:"\u98ce\u529b",data:f.windpower+"\u7ea7"},humidity:{text:"\u6e7f\u5ea6",data:f.humidity+"%"}};k.liveData=f;a.success(k)}}else f.data.forecasts&&f.data.forecasts[0]&&a.success({forecast:f.data.forecasts[0]});else a.fail({errCode:f.data.infocode,errMsg:f.data.info})},fail:function(f){a.fail({errCode:"0",errMsg:f.errMsg||""})}})}
+function c(g){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:d.key,location:g,extensions:"all",s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(h){if(h.data.status&&"1"==h.data.status){h=h.data.regeocode;if(h.addressComponent)var f=h.addressComponent.adcode;else h.aois&&0<h.aois.length&&(f=h.aois[0].adcode);b(f)}else a.fail({errCode:h.data.infocode,errMsg:h.data.info})},
+fail:function(h){a.fail({errCode:"0",errMsg:h.errMsg||""})}})}var d=this,e=d.requestConfig;a.city?b(a.city):d.getWxLocation(a,function(g){c(g)})};
+AMapWX.prototype.getPoiAround=function(a){function b(e){e={key:c.key,location:e,s:d.s,platform:d.platform,appname:c.key,sdkversion:d.sdkversion,logversion:d.logversion};a.querytypes&&(e.types=a.querytypes);a.querykeywords&&(e.keywords=a.querykeywords);wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){if((g=g.data)&&g.pois){for(var h=[],f=0;f<g.pois.length;f++){var k=0==
+f?a.iconPathSelected:a.iconPath;h.push({latitude:parseFloat(g.pois[f].location.split(",")[1]),longitude:parseFloat(g.pois[f].location.split(",")[0]),iconPath:k,width:22,height:32,id:f,name:g.pois[f].name,address:g.pois[f].address})}a.success({markers:h,poisData:g.pois})}}else a.fail({errCode:g.data.infocode,errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this,d=c.requestConfig;a.location?b(a.location):c.getWxLocation(a,function(e){b(e)})};
+AMapWX.prototype.getStaticmap=function(a){function b(e){c.push("location="+e);a.zoom&&c.push("zoom="+a.zoom);a.size&&c.push("size="+a.size);a.scale&&c.push("scale="+a.scale);a.markers&&c.push("markers="+a.markers);a.labels&&c.push("labels="+a.labels);a.paths&&c.push("paths="+a.paths);a.traffic&&c.push("traffic="+a.traffic);e="https://restapi.amap.com/v3/staticmap?"+c.join("&");a.success({url:e})}var c=[];c.push("key="+this.key);var d=this.requestConfig;c.push("s="+d.s);c.push("platform="+d.platform);
+c.push("appname="+d.appname);c.push("sdkversion="+d.sdkversion);c.push("logversion="+d.logversion);a.location?b(a.location):this.getWxLocation(a,function(e){b(e)})};
+AMapWX.prototype.getInputtips=function(a){var b=Object.assign({},this.requestConfig);a.location&&(b.location=a.location);a.keywords&&(b.keywords=a.keywords);a.type&&(b.type=a.type);a.city&&(b.city=a.city);a.citylimit&&(b.citylimit=a.citylimit);wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.tips&&a.success({tips:c.data.tips})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||
+""})}})};
+AMapWX.prototype.getDrivingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.waypoints&&(b.waypoints=a.waypoints);a.avoidpolygons&&(b.avoidpolygons=a.avoidpolygons);a.avoidroad&&(b.avoidroad=a.avoidroad);wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths,
+taxi_cost:c.data.route.taxi_cost||""})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getWalkingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getTransitRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.city&&(b.city=a.city);a.cityd&&(b.cityd=a.cityd);wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&(c=c.data.route,a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||
+"",transits:c.transits}))},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
+AMapWX.prototype.getRidingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/riding",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};module.exports.AMapWX=AMapWX;
\ No newline at end of file
--
Gitblit v1.9.1