From 40fdfea3e2e64768428a112e139907cf469d4027 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 5 Jan 2022 16:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 +-
 App.vue                                       |  9 +--
 .../packingStationItem.vue                    |  2 +-
 components/qn-map/qn-map.nvue                 | 49 +++++++++-----
 manifest.json                                 | 22 +++---
 pages/client-list/index.vue                   |  8 +--
 pages/client/index.nvue                       | 57 +++++++---------
 pages/login/index.vue                         | 53 +++------------
 pages/mine/index.vue                          | 67 +++++++++----------
 utils/http/http.js                            |  4 +-
 utils/locationTransform.js                    | 53 +++++++++++++++
 11 files changed, 172 insertions(+), 154 deletions(-)
 create mode 100644 utils/locationTransform.js

diff --git a/.gitignore b/.gitignore
index 11f6b81..637ef21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@ jsconfig.json
 .vscode/settings.json
 components/qn-map/qn-map.vue
 pages/client/index2.vue
-./unpackage/**
+unpackage/
 
 
diff --git a/App.vue b/App.vue
index 2cf70cb..8a5e0b3 100644
--- a/App.vue
+++ b/App.vue
@@ -7,14 +7,9 @@ export default {
     if (!token) {
       go2('login')
     }
-    console.log('App launched')
   },
-  onShow: function () {
-    console.log('App Show')
-  },
-  onHide: function () {
-    console.log('App Hide')
-  }
+  onShow: function () {},
+  onHide: function () {}
 }
 </script>
 
diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue
index 97929dd..33d5da8 100644
--- a/components/bussiness-components/packingStationItem.vue
+++ b/components/bussiness-components/packingStationItem.vue
@@ -112,7 +112,7 @@ export default {
           return phoneNum.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
         }
       }
-      return ''
+      return '--'
     }
   },
   computed: {
diff --git a/components/qn-map/qn-map.nvue b/components/qn-map/qn-map.nvue
index eab5a35..e7262de 100644
--- a/components/qn-map/qn-map.nvue
+++ b/components/qn-map/qn-map.nvue
@@ -7,6 +7,7 @@
     :longitude="centerPoint.longitude"
     :latitude="centerPoint.latitude"
     :markers="markers"
+		:show-location="true"
     :scale="scale"
     @labeltap="labeltap"
     @regionchange="regionchange"
@@ -62,23 +63,6 @@ export default {
         }
       })
     },
-    location: {
-      handler(val) {
-        let data = {
-          longitude: val.longitude,
-          latitude: val.latitude,
-          scale: this.scale
-        }
-        if (this.mapContext) {
-          this.mapContext.moveToLocation({
-            longitude: val.longitude,
-            latitude: val.latitude
-          })
-        }
-        this.$emit('reset', data)
-      },
-      deep: true
-    }
   },
   methods: {
     // 生成markers
@@ -182,7 +166,36 @@ export default {
             break
         }
       }, 500)
-    }
+    },
+		// 移动到当前坐标
+		moveTo({longitude,latitude,scale}) {
+			scale = Math.ceil(scale)
+			if(!isNaN(scale)) {
+				this.scale = scale
+			}else {
+				scale = null
+			}
+			let data = {
+			  longitude: longitude,
+			  latitude: latitude,
+			  scale: scale || this.scale
+			}
+			if (this.mapContext) {
+			  this.mapContext.moveToLocation({
+			    longitude: longitude,
+			    latitude: latitude,
+					success:res => {
+						console.log('移动success',res)
+					},
+					fail:err => {
+						console.log('移动fail',err)
+					}
+			  })
+			}
+			setTimeout(() => {
+				this.$emit('reset', data)
+			},100)
+		}
   }
 }
 </script>
diff --git a/manifest.json b/manifest.json
index 45ed8c0..f7ce734 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "paper-shop-app",
+    "name" : "纸掌柜",
     "appid" : "__UNI__8C1E198",
     "description" : "",
     "versionName" : "1.0.0",
@@ -24,21 +24,20 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Maps" : {}
+            "Maps" : {},
+            "Geolocation" : {},
+            "FaceID" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
@@ -56,7 +55,7 @@
                 "maps" : {
                     "amap" : {
                         "appkey_ios" : "5e4da36f4c1649ca28a1f8f795bcf5d2",
-                        "appkey_android" : "2ced501c80ee5f6a74ba43ef7c2d36bd"
+                        "appkey_android" : "877848546f7f3717101a17c33e1d4df3"
                     }
                 },
                 "payment" : {
@@ -66,7 +65,14 @@
                         "UniversalLinks" : ""
                     }
                 },
-                "ad" : {}
+                "ad" : {},
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "5e4da36f4c1649ca28a1f8f795bcf5d2",
+                        "appkey_android" : "877848546f7f3717101a17c33e1d4df3"
+                    }
+                }
             }
         },
         "uniStatistics" : {
diff --git a/pages/client-list/index.vue b/pages/client-list/index.vue
index ebc188c..2e9a65f 100644
--- a/pages/client-list/index.vue
+++ b/pages/client-list/index.vue
@@ -98,7 +98,6 @@ export default {
         getCompanyList({ ...this.params, ...this.pagination })
           .then((res) => {
             if (res) {
-              console.log('res:', res)
               if (this.pagination.pageNum == 1) {
                 this.list = res.records
               } else {
@@ -116,7 +115,6 @@ export default {
     },
     downCallback() {
       this.pagination.pageNum = 1
-      console.log('下拉刷新:')
       this.getList()
         .then(({ list, total }) => {
           this.$refs.list.refreshSuccess({ list, total })
@@ -126,12 +124,9 @@ export default {
         })
     },
     upCallback(page) {
-      console.log('上拉加载:', page)
       this.pagination.pageNum++
       this.getList()
         .then(({ list, total }) => {
-          console.log('list.length:', list.length)
-          console.log('total:', total)
           this.$refs.list.loadSuccess({ list, total })
         })
         .catch(() => {
@@ -142,8 +137,7 @@ export default {
   watch: {
     params: {
       handler(val) {
-        console.log('val:', val)
-        // this.getList()
+        this.getList()
       },
       deep: true
     }
diff --git a/pages/client/index.nvue b/pages/client/index.nvue
index da5514e..eb64ea4 100644
--- a/pages/client/index.nvue
+++ b/pages/client/index.nvue
@@ -14,9 +14,9 @@
       </view>
     </uni-nav-bar>
     <div class="map_area">
-      <qn-map :location="location" :items="packingList" @dragMap="mapChange" @scaleMap="mapChange" @reset="mapChange" @labeltap="showInfo"></qn-map>
+      <qn-map ref="qnMap" :location="location" :items="packingList" @dragMap="mapChange" @scaleMap="mapChange" @reset="mapChange" @labeltap="showInfo"></qn-map>
       <!-- 元素放在map下面才能展示 -->
-      <cover-view class="enquiry-area" v-show="enquiryList && enquiryList.length > 0 && !isClosed">
+      <cover-view class="enquiry-area" v-if="enquiryList && enquiryList.length > 0 && !isClosed">
         <view class="enquiry-header">
           <view class="notice">
             <image style="width: 32rpx; height: 32rpx" src="/static/imgs/client/horn-icon.png"></image>
@@ -61,10 +61,11 @@
 
 <script>
 import { go2 } from '@/utils/hook.js'
+import wgs84togcj02 from '@/utils/locationTransform.js'
 import qnMap from '@/components/qn-map/qn-map.nvue'
 import packingStationItem from '@/components/bussiness-components/packingStationItem.vue'
 import enquiryItem from './enquiryItem.vue'
-import { getMapCompanyList, getInquiryList,getCompanyInfo } from '@/apis/clientApi'
+import { getMapCompanyList, getInquiryList, getCompanyInfo } from '@/apis/clientApi'
 export default {
   components: { qnMap, enquiryItem, packingStationItem },
   data() {
@@ -84,15 +85,11 @@ export default {
       enquiryList: [],
       isClosed: false,
       hasSelected: false,
-			selectedCompany:undefined
+      selectedCompany: undefined
     }
   },
   methods: {
-    getSupplier(e) {
-      console.log('e:', e.detail.markerId)
-    },
     mapChange(data) {
-      console.log('data:', data)
       let params = {
         cooperationState: 0,
         km: 5,
@@ -121,36 +118,32 @@ export default {
       go2('add-user')
     },
     hideInfo() {
-			console.log('hide')
       this.hasSelected = false
     },
     showInfo(id) {
-      console.log('id:', id)
-			getCompanyInfo({enterpriseId:id}).then(res => {
-				if(res) {
-					this.selectedCompany = res
-					this.hasSelected = true
-				}
-			})
+      getCompanyInfo({ enterpriseId: id }).then((res) => {
+        if (res) {
+          this.selectedCompany = res
+          this.hasSelected = true
+        }
+      })
     },
     locatePosition() {
-      console.log('locate begin')
       uni.getLocation({
-        type: 'gcj02',
+        // type: 'gcj02',
+        type: 'wgs84',
         success: (res) => {
-          console.log('success', res)
-          this.location.latitude = res.latitude
-          this.location.longitude = res.longitude
+          console.log('location success', res)
+          const { lat, lon } = wgs84togcj02(res.latitude, res.longitude)
+          this.$refs.qnMap.moveTo({ latitude: lat, longitude: lon })
         },
         fail: (err) => {
           uni.showToast({
             icon: 'error',
             title: '定位失败:' + err.code
           })
-          console.log('err', err)
         }
       })
-      console.log('locate end')
     },
     getProductionInfo(item) {
       let res = []
@@ -171,9 +164,8 @@ export default {
         longitude: params.longitude,
         size: params.size
       }).then((res) => {
-        console.log('getPackingList', res)
         if (res) {
-          this.packingList = res.records
+          this.packingList = res
         }
       })
     },
@@ -194,7 +186,7 @@ export default {
     }
   },
   created() {
-    this.locatePosition()
+    // this.locatePosition()
     getMapCompanyList({
       cooperationState: 0,
       km: 5,
@@ -212,19 +204,16 @@ export default {
     this.transitionTimer = null
   },
   onShow() {
-    if (!this.isClosed) {
-      this.transitionTimer = setInterval(() => {
-        this.curIndex == this.enquiryList.length - 1 ? (this.curIndex = 0) : this.curIndex++
-      }, 3000)
-    }
-
     const token = this.$store.state.qnToken
     if (token) {
       getInquiryList({ pageNum: 1, pageSize: 10 }).then((res) => {
-        console.log('enquiryList', res)
         if (res) {
           this.enquiryList = res.records
-          console.log('this:', this.enquiryList)
+					if(this.enquiryList.length > 1 && !this.isClosed) {
+						this.transitionTimer = setInterval(() => {
+						  this.curIndex == this.enquiryList.length - 1 ? (this.curIndex = 0) : this.curIndex++
+						}, 3000)
+					} 
         }
       })
     }
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 77bd238..2642882 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,14 +1,6 @@
 <template>
   <view>
-    <uni-nav-bar
-      :fixed="true"
-      color="#ffffff"
-      background-color="#ffffff"
-      :status-bar="true"
-      :border="false"
-      left-icon="closeempty"
-      @clickLeft="close"
-    />
+    <uni-nav-bar :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true" :border="false" left-icon="closeempty" @clickLeft="close" />
     <view class="logo_area">
       <image class="logo" src="/static/logo.png"></image>
       <text class="title">纸掌柜</text>
@@ -25,44 +17,22 @@
         />
       </view>
       <view class="captcha">
-        <uni-easyinput
-          v-model="captcha"
-          :inputBorder="false"
-          :placeholderStyle="'font-size:32rpx;'"
-          placeholder="请输入验证码"
-          :maxlength="6"
-          type="number"
-        />
+        <uni-easyinput v-model="captcha" :inputBorder="false" :placeholderStyle="'font-size:32rpx;'" placeholder="请输入验证码" :maxlength="6" type="number" />
         <view v-show="timer > 0" class="timer_area">
           <text class="timer">{{ `(${timer}S后) ` }}</text>
           <text class="timer_text">重新获取</text>
         </view>
-        <text v-show="timer <= 0" class="code" @click="getCode">
-          获取验证码
-        </text>
-      </view>
-      <view
-        class="login-button"
-        @click="login"
-        :style="{ opacity: disabled ? '0.5' : '' }"
-      >
-        登录
+        <text v-show="timer <= 0" class="code" @click="getCode">获取验证码</text>
       </view>
+      <view class="login-button" @click="login" :style="{ opacity: disabled ? '0.5' : '' }">登录</view>
     </view>
     <view class="agreement_area">
       <checkbox-group @change="onCheck">
-        <checkbox
-          value="cb"
-          :checked="checked"
-          color="#000000"
-          style="transform: scale(0.7)"
-        />
+        <checkbox value="cb" :checked="checked" color="#000000" style="transform: scale(0.7)" />
       </checkbox-group>
       <view class="agreement">
         已阅读并同意纸掌柜
-        <text class="agreement_text" @click="jumpAgreement">
-          《用户与隐私协议》
-        </text>
+        <text class="agreement_text" @click="jumpAgreement">《用户与隐私协议》</text>
       </view>
     </view>
     <!-- 
@@ -123,7 +93,10 @@ export default {
         verifiableAccount: this.phoneNumber,
         verifiableAccountType: verificationType.PHONE
       }).then((res) => {
-        console.log(res)
+        uni.showToast({
+          title: '验证码已发送',
+          icon: 'none'
+        })
       })
     },
     // 倒计时
@@ -182,11 +155,7 @@ export default {
   },
   computed: {
     disabled() {
-      return (
-        this.phoneNumber.trim() === '' ||
-        this.phoneNumber.trim().length != 11 ||
-        this.captcha.trim() === ''
-      )
+      return this.phoneNumber.trim() === '' || this.phoneNumber.trim().length != 11 || this.captcha.trim() === ''
     }
   }
 }
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index bdcbdf7..17a6e2f 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -1,45 +1,44 @@
 <template>
-	<view class="content">
-		<view @click="logout">mine</view>
-	</view>
+  <view class="content">
+    <view @click="logout">mine</view>
+  </view>
 </template>
 
 <script>
-import {exit} from '@/utils/hook.js'
-	export default {
-		methods:{
-			logout() {
-				console.log('123')
-				exit()
-			}
-		}
-	}
+import { exit } from '@/utils/hook.js'
+export default {
+  methods: {
+    logout() {
+      exit()
+    }
+  }
+}
 </script>
 
 <style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
+.content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
 
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
+.logo {
+  height: 200rpx;
+  width: 200rpx;
+  margin-top: 200rpx;
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: 50rpx;
+}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
+.text-area {
+  display: flex;
+  justify-content: center;
+}
 
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
-	}
+.title {
+  font-size: 36rpx;
+  color: #8f8f94;
+}
 </style>
diff --git a/utils/http/http.js b/utils/http/http.js
index ac73b57..6241d13 100644
--- a/utils/http/http.js
+++ b/utils/http/http.js
@@ -66,7 +66,7 @@ export default class Http {
     }).catch((err) => {
       // 吃掉请求产生的异常
       // 后期可以记录
-      console.log('native response error', err)
+      console.error('native response error', err)
     })
   }
   // config:{}
@@ -101,7 +101,7 @@ export default class Http {
         }
       })
     }).catch((err) => {
-      console.log('upload native err', err)
+      console.error('upload native err', err)
     })
   }
 }
diff --git a/utils/locationTransform.js b/utils/locationTransform.js
new file mode 100644
index 0000000..90f8aef
--- /dev/null
+++ b/utils/locationTransform.js
@@ -0,0 +1,53 @@
+var pi = 3.14159265358979324
+var a = 6378245.0
+var ee = 0.00669342162296594323
+
+/**
+ * WGS84坐标转换GCJ02坐标
+ * @param wgLat：wgs纬度
+ * @param wgLon：wgs经度
+ * @return Array[lat:gcj纬度,lon:gcj经度]
+ */
+function wgs84togcj02(wgLat, wgLon) {
+  var mgLat, mgLon
+  if (outOfChina(wgLat, wgLon)) {
+    mgLat = wgLat
+    mgLon = wgLon
+    return
+  }
+  var dLat = transformLat(wgLon - 105.0, wgLat - 35.0)
+  var dLon = transformLon(wgLon - 105.0, wgLat - 35.0)
+  var radLat = (wgLat / 180.0) * pi
+  var magic = Math.sin(radLat)
+  magic = 1 - ee * magic * magic
+  var sqrtMagic = Math.sqrt(magic)
+  dLat = (dLat * 180.0) / (((a * (1 - ee)) / (magic * sqrtMagic)) * pi)
+  dLon = (dLon * 180.0) / ((a / sqrtMagic) * Math.cos(radLat) * pi)
+  mgLat = wgLat + dLat
+  mgLon = wgLon + dLon
+  var arr = {}
+  arr['lat'] = mgLat
+  arr['lon'] = mgLon
+  return arr
+}
+function outOfChina(lat, lon) {
+  if (lon < 72.004 || lon > 137.8347) return true
+  if (lat < 0.8293 || lat > 55.8271) return true
+  return false
+}
+function transformLat(x, y) {
+  var ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(y * pi) + 40.0 * Math.sin((y / 3.0) * pi)) * 2.0) / 3.0
+  ret += ((160.0 * Math.sin((y / 12.0) * pi) + 320 * Math.sin((y * pi) / 30.0)) * 2.0) / 3.0
+  return ret
+}
+function transformLon(x, y) {
+  var ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(x * pi) + 40.0 * Math.sin((x / 3.0) * pi)) * 2.0) / 3.0
+  ret += ((150.0 * Math.sin((x / 12.0) * pi) + 300.0 * Math.sin((x / 30.0) * pi)) * 2.0) / 3.0
+  return ret
+}
+
+export default wgs84togcj02