From f4f791776c52f6bb82d202ac9bd3cdbcf4e70acd Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Wed, 4 Mar 2020 19:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                         |  26 ++++++---
 pages.json                      |  44 ++++++++------
 pages/get-code/get-code.vue     |  25 ++++++++
 pages/index/components/home.vue |  13 +++--
 pages/index/components/mine.vue |   2 +-
 pages/index/index.vue           |  11 +++-
 pages/statistics/statistics.vue |  99 ++++++++++++++++++++++++++++++++
 static/location.png             | Bin 0 -> 770 bytes
 8 files changed, 187 insertions(+), 33 deletions(-)
 create mode 100644 pages/get-code/get-code.vue
 create mode 100644 pages/statistics/statistics.vue
 create mode 100644 static/location.png

diff --git a/main.js b/main.js
index 8a8632e..0c7b708 100644
--- a/main.js
+++ b/main.js
@@ -1,15 +1,25 @@
-import Vue from 'vue';
+import Vue from 'vue';
 import { http } from 'plugins/request/index';
-import App from './App';
+import App from './App';
 // import store from './store';
 
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
 Vue.prototype.$http = http;
 
-App.mpType = 'app'
+/**
+ * 打开某个页面
+ * @param {string} path 页面完成路径
+ * @param {string} query 参数字符串a=x&b=y
+ */
+Vue.prototype.openPage = function(path, query = '') {
+  let url = query ? `${path}?${query}` : path;
+  uni.navigateTo({ url });
+};
 
-const app = new Vue({
+App.mpType = 'app';
+
+const app = new Vue({
   // store,
-    ...App
-})
-app.$mount()
+  ...App,
+});
+app.$mount();
diff --git a/pages.json b/pages.json
index 26f426b..5fbf4b2 100644
--- a/pages.json
+++ b/pages.json
@@ -1,19 +1,29 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "uni-app"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-  "easycom": {
-    "autoscan": true
+  "pages": [
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "山大健康码"
+      }
+    },
+    {
+      "path": "pages/statistics/statistics",
+      "style": { "navigationBarTitleText": "统计" }
+    },
+    {
+      "path": "pages/get-code/get-code",
+      "style": {
+        "navigationBarTitleText": "领取健康码"
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "山大健康码",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "easycom": {
+    "autoscan": true
   }
-}
+}
diff --git a/pages/get-code/get-code.vue b/pages/get-code/get-code.vue
new file mode 100644
index 0000000..5d70ecd
--- /dev/null
+++ b/pages/get-code/get-code.vue
@@ -0,0 +1,25 @@
+<template>
+  <view>
+    <button @tap="handleSelectLocation">选择位置</button>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    handleSelectLocation() {
+      uni.chooseLocation({
+        success: function(res) {
+          console.log('位置名称：' + res.name);
+          console.log('详细地址：' + res.address);
+          console.log('纬度：' + res.latitude);
+          console.log('经度：' + res.longitude);
+        },
+      });
+    },
+  },
+};
+</script>
diff --git a/pages/index/components/home.vue b/pages/index/components/home.vue
index 16c7a1c..ef49bdb 100644
--- a/pages/index/components/home.vue
+++ b/pages/index/components/home.vue
@@ -1,8 +1,9 @@
 <template>
 	<view class="content">
 		<image src="../../../static/bg.png" style="width: 100%;"></image>
+
 		<view class="box">
-			<view class="cu-card flex margin bg-white shadow card-radius">
+			<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/get-code/get-code')">
 				<view class="flex align-center padding">
 					<view class="round lg cu-avatar icon1">
 						<view class="iconfont icon-erweima"></view>
@@ -13,7 +14,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-card flex margin bg-white shadow card-radius">
+			<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active">
 				<view class="flex align-center padding">
 					<view class="round lg cu-avatar icon2">
 						<view class="iconfont icon-daka"></view>
@@ -24,7 +25,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-card flex margin bg-white shadow card-radius">
+			<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active">
 				<view class="flex align-center padding">
 					<view class="round lg cu-avatar icon3">
 						<view class="iconfont icon-bushuline"></view>
@@ -35,7 +36,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-card flex margin bg-white shadow card-radius">
+			<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/statistics/statistics')">
 				<view class="flex align-center padding">
 					<view class="round lg cu-avatar icon4">
 						<view class="iconfont icon-tongji"></view>
@@ -46,7 +47,7 @@
 					</view>
 				</view>
 			</view>
-		
+
 		</view>
 	</view>
 </template>
@@ -54,7 +55,7 @@
 <script>
 export default {
   name: 'Home',
-  
+
 };
 </script>
 
diff --git a/pages/index/components/mine.vue b/pages/index/components/mine.vue
index 856c49b..74ec854 100644
--- a/pages/index/components/mine.vue
+++ b/pages/index/components/mine.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>user</div>
+  <div>user1</div>
 </template>
 
 <script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6380605..99e3a37 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -30,8 +30,16 @@ export default {
     },
 
     // 扫一扫
+    // 只允许通过相机扫码
+    // TODO: 扫码业务
     onScan() {
-      console.log('扫一扫');
+      uni.scanCode({
+        onlyFromCamera: true,
+        success: res => {
+          console.log('条码类型：' + res.scanType);
+          console.log('条码内容：' + res.result);
+        },
+      });
     },
   },
 };
@@ -47,6 +55,7 @@ export default {
 
   .content {
     flex: 1;
+    overflow-y: auto;
   }
   .nav-bottom {
     width: 100%;
diff --git a/pages/statistics/statistics.vue b/pages/statistics/statistics.vue
new file mode 100644
index 0000000..f2dce19
--- /dev/null
+++ b/pages/statistics/statistics.vue
@@ -0,0 +1,99 @@
+<template>
+  <view class="padding">
+    <!-- 日期组件 -->
+    <view></view>
+    <!-- 健康上报组件 -->
+    <view></view>
+    <!-- 校园轨迹组件 -->
+    <view class="card radius shadow-warp bg-white">
+      <view class="card-head solid-bottom">
+        <view class="card-head-avatar">
+          <view class></view>
+        </view>
+        <view class="card-head-title">校园打卡</view>
+        <view class="card-head-action">icon</view>
+      </view>
+
+      <view class="card-content">
+        <view class="map-wrap">
+          <map
+            :latitude="latitude"
+            :longitude="longitude"
+            :markers="covers"
+            style="width: 100%; height: 1000rpx;"
+          />
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      latitude: 37.87059,
+      longitude: 112.55067,
+      covers: [
+        {
+          latitude: 37.87059,
+          longitude: 112.55067,
+          iconPath: '../../static/location.png',
+        },
+        {
+          latitude: 37.87,
+          longitude: 112.5506,
+          iconPath: '../../static/location.png',
+        },
+      ],
+    };
+  },
+
+  onLoad() {
+    this.getLocation();
+  },
+
+  methods: {
+    getLocation() {
+      uni.getLocation({
+        type: 'wgs84',
+        success: res => {
+          this.longitude = res.longitude;
+          this.latitude = res.latitude;
+          console.log('当前位置的经度：' + res.longitude);
+          console.log('当前位置的纬度：' + res.latitude);
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.card {
+  .card-head {
+    display: flex;
+    align-items: center;
+    height: 120rpx;
+    padding: 0 32rpx;
+
+    .card-head-avatar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 56rpx;
+      height: 56rpx;
+      border-radius: 50%;
+      background-color: $blue;
+      color: $white;
+    }
+
+    .card-head-title {
+      flex: 1;
+      margin: 0 20rpx;
+      font-size: 16px;
+      color: $black;
+    }
+  }
+}
+</style>
diff --git a/static/location.png b/static/location.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ef700431c6d2d6b400e8fccd9783a196ef16c14
GIT binary patch
literal 770
zcmV+d1O5DoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008XNkl<ZSV!%a
zO-vI(6vyA2LZVz~yK*ra(ROJxF>o-!qXK&L18+b?4+gp|8a?PyJnBKCv|ES=#ZYeI
z$I<VjBpxIt8ras4XuRO=mJ6D|&NI8v%_6nC+d{Z7mrdrq_kX|r&+N`1Z1BJh?hl&)
zz8we-DTgpXod_5Mf@W(85vB-enhcyM42W<1EUPboP)3O(fn2TuAxL^$%y@<H3=qmF
z-AFLzMVJtJ^thPylIsZ|nEJSjvD&X*1dBPGFEkdC`@Xr=cmfE^xrYGM=@cWxD_BG0
z<{T|z7ZP1x*$gK%DSE1EfbApi>i!t@vj9+Mza1{_F2wh)a3q-d)X1pji=*NEmcU%Y
z&%Oim<se)g2&ZO_0K;cR5dwIsOXBfTq9Iv%f&j<t7^kCJvgvts0O{#LKz7v@A%0Cu
z#0E==hJEA~>s=iXQq%3k*bBRWAgd<Co>BlpS{WmRZabIr4mBBjS(O8!k$gQGyx<V|
zjhqgv$)-uCu#lQ*C5Ep7V5_}c0T$HzB6C#%n8jgPc?$ro4x#TzctcG@Q|6qI&Ls)y
zG63v!<V<Rkc(CfPzye6;ZUfT!)ncSA&0%;|jPQ<@h+bF|071_663~4&F=reB&!|##
z)UC#K6Iu@3Rd&Dvyf@u;6I_m~Pzx>EIq`>Ez9)dCWl(Mc!bLYhD^74rONf`e<a!1O
z4u5WD+%R2m9h?PP3jKSgTobL6+{Xx|l~F`EU9N-(9_R_N*Q=~A03nlWBck#@7Q}Wn
z9(}bg0H$b2Rvsb1iBb&+;IS@=C%rbeK43q|7Qj$`KL)t@hTHzB{Y3_A(+46S{Al_H
zupmlY&HP@)ijWlnn8kvuWC@^a*~W2I67551-5oF+Gz{lOgLCVY3^3L)+aFQ<G_KkK
z>*plr&zet7irlNDc}1JB(nkNQt9TEr704#QUt;#>Aw>%`+W-In07*qoM6N<$f_=tU
A2LJ#7

literal 0
HcmV?d00001