对接原系统

.env.development

@@ -1,9 +1,9 @@
 VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
-VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
+#VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
 VITE_API_URL=https://modules.gxwebsoft.com/api
 
 #VITE_SERVER_URL=http://127.0.0.1:9090/api
-#VITE_API_URL=http://127.0.0.1:9001/api
+#VITE_API_URL=http://127.0.0.1:9099/api
-#VITE_THINK_URL=http://127.0.0.1:9099/api
+VITE_THINK_URL=http://127.0.0.1:9099/api

package-lock.json

@@ -39,7 +39,8 @@
         "qrcode": "^1.5.3",
         "socket.io-client": "^4.7.2",
         "vue": "3.4.21",
-        "vue-i18n": "9.13.1"
+        "vue-i18n": "9.13.1",
+        "x2js": "^3.4.4"
       },
       "devDependencies": {
         "@dcloudio/types": "3.4.12",
@@ -4966,6 +4967,14 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -12677,6 +12686,14 @@
         }
       }
     },
+    "node_modules/x2js": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmmirror.com/x2js/-/x2js-3.4.4.tgz",
+      "integrity": "sha512-yG/ThaBCgnsa3aoMPAe7QwDpcyU4D70hjXC4Y1lZSfD/Tgd0MpE19FnZZRAjekryw0c8cffpOt9zsPEiqktO6Q==",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.3"
+      }
+    },
     "node_modules/xhr": {
       "version": "2.6.0",
       "resolved": "https://registry.npmmirror.com/xhr/-/xhr-2.6.0.tgz",

package.json

@@ -72,7 +72,8 @@
     "qrcode": "^1.5.3",
     "socket.io-client": "^4.7.2",
     "vue": "3.4.21",
-    "vue-i18n": "9.13.1"
+    "vue-i18n": "9.13.1",
+    "x2js": "^3.4.4"
   },
   "devDependencies": {
     "@dcloudio/types": "3.4.12",

src/api/think/thinkField/index.ts

@@ -35,6 +35,17 @@ export async function listThinkField(params?: ThinkFieldParam) {
   return Promise.reject(new Error(res.data.message));
 }
 
+export async function listThinkFieldWithTimeList(params?: ThinkFieldParam) {
+  const res = await request.post<ApiResult<ThinkField[]>>(
+    THINK_API_URL + '/think/think-field/withTimeList',
+      params
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 /**
  * 添加
  */

src/api/think/thinkSite/index.ts

@@ -104,3 +104,13 @@ export async function getThinkSite(id: number) {
     }
     return Promise.reject(new Error(res.data.message));
 }
+
+export async function getThinkSiteWithDistance(id: number, params?: ThinkSiteParam) {
+    const res = await request.post<ApiResult<ThinkSite>>(
+        THINK_API_URL + '/think/think-site/' + id, params
+    );
+    if (res.data.code === 0 && res.data.data) {
+        return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+}

src/manifest.json

@@ -72,7 +72,13 @@
       "minified": true
     },
     "usingComponents": true,
-        "lazyCodeLoading" : "requiredComponents"
+    "lazyCodeLoading": "requiredComponents",
+    "permission": {
+      "scope.userLocation": {
+        "desc": "场馆定位"
+      }
+    },
+    "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ]
   },
   "mp-alipay": {
     "usingComponents": true

src/package/booking/checkout.vue

@@ -1,17 +1,10 @@
 <template>
   <view class="container">
-		<!-- deBug信息 -->
+    <uv-sticky bg-color="white">
-		<view v-if="merchant" class="web-debug web-text-success" style="display: none;">
+      <view class="merchant-name">{{ merchant.name }}</view>
-			场馆ID：{{ merchant.merchantId }} 场馆编号：{{ merchant.merchantCode }} 场馆名称：{{ merchant.merchantName }}
-			日期：{{ dateTime }}
-			星期：{{ week }}
-			订单总金额：{{ totalPrice }}
-			类型：{{ type }}
-			场地信息：{{ orderInfo }}
-		</view>
-		<!-- <view class="merchant-name">{{ merchant.merchantName }}</view> -->
       <uv-tabs :list="next7day" :itemStyle="{height: '58px'}" :activeStyle="{ color: '#2ba91c'}" lineColor="#2ba91c"
                :inactiveStyle="{ color: '#808080' }" @change="onDateTime"></uv-tabs>
+    </uv-sticky>
     <view class="uni-padding-wrap uni-common-mt">
       <uni-segmented-control :current="current" :values="items" activeColor="#2ba91c" inActiveColor="#ff0000"
                              @clickItem="onType"/>
@@ -36,22 +29,20 @@
       </view>
     </view>
     <!-- 场地列表 -->
-<!-- 		<uv-empty mode="data" v-if="periodList.length == 0"
-			icon="https://cdn.uviewui.com/uview/empty/data.png"></uv-empty> -->
     <view class="checkout-body web-text-primary" v-if="periodList.length > 0">
       <template v-for="(item,index) in periodList" :key="index">
         <view class="period-item">
           <view class="period">{{ item.timePeriod }}</view>
-					<view class="field-list">
+          <!--          <view class="field-list">-->
-						<template v-for="(field,index2) in item.fieldList" :key="index2">
+          <!--            <template v-for="(field,index2) in item.fieldList" :key="index2">-->
-							<view class="field"
+          <!--              <view class="field"-->
-								:class="isActive(field)"
+          <!--                    :class="isActive(field)"-->
-								@click="onField(field,item)">
+          <!--                    @click="onField(field,item)">-->
-								<text class="field-name">{{ field.fieldName }}</text>
+          <!--                <text class="field-name">{{ field.fieldName }}</text>-->
-								<text class="price">{{ item.price }}元</text>
+          <!--                <text class="price">{{ item.price }}元</text>-->
-							</view>
+          <!--              </view>-->
-						</template>
+          <!--            </template>-->
-					</view>
+          <!--          </view>-->
         </view>
       </template>
       <!-- 排版样式备份 -->
@@ -128,6 +119,10 @@
   getWeek,
   getKey
 } from '@/utils/common';
+import {getThinkSite} from "@/api/think/thinkSite";
+import {listThinkSiteTime} from "@/api/think/thinkSiteTime";
+import dayjs from "dayjs";
+import {listThinkField, listThinkFieldWithTimeList} from "@/api/think/thinkField";
 
 const carStore = useCarStore();
 const {
@@ -180,7 +175,8 @@
       // 是否同意协议
       disabled: false,
       // 购物车信息
-				showCarInfo: false
+      showCarInfo: false,
+      timeList: []
     }
   },
   onLoad(option) {
@@ -210,66 +206,87 @@
   },
   methods: {
     async reload() {
-				const app = this
-
       // 请求数据
       uni.showLoading({
         title: '数据读取中.'
       })
-				Promise.all([app.getServerTime(), app.getNext7day(), app.getMerchant()]).then(res => {
+      this.setDateList()
-					const serverTime = res[0];
+      await this.getMerchant()
-					const next7day = res[1];
+      await this.getTimeList()
-					const merchant = res[2];
+      await this.getFieldList()
-					app.serverTime = serverTime;
-					app.next7day = next7day;
-					app.merchant = merchant;
-
-					// 修改标题
-					uni.setNavigationBarTitle({
-						title: merchant.merchantName
-					})
-					// 保存场馆信息
-					carStore.setMerchant(merchant)
-
-					// 加载预定日期
-					app.next7day = next7day.map((d, i) => {
-						if (!app.dateTime && i === 0) {
-							app.dateTime = d.dateTime
-							app.week = d.week
-							carStore.dateTime = d.dateTime
-						}
-						d.name = getWeek(d.week);
-						d.value = d.date;
-						return d
-					})
-					// 加载时段列表
-					app.getBookingPeriod();
-					// 加载场地列表
-					// app.getBookingField();
-					// 关闭加载状态
-				}).catch(() => {
-					uni.showToast({
-						title: '请检查您的网络.',
-						icon: 'none'
-					})
       uni.hideLoading()
+      // Promise.all([app.getServerTime(), app.getNext7day(), app.getMerchant()]).then(res => {
+      //   const serverTime = res[0];
+      //   const next7day = res[1];
+      //   const merchant = res[2];
+      //   app.serverTime = serverTime;
+      //   app.next7day = next7day;
+      //   app.merchant = merchant;
+      //
+      //   // 修改标题
+      //   uni.setNavigationBarTitle({
+      //     title: merchant.merchantName
+      //   })
+      //   // 保存场馆信息
+      //   carStore.setMerchant(merchant)
+      //
+      //   // 加载预定日期
+      //   app.next7day = next7day.map((d, i) => {
+      //     if (!app.dateTime && i === 0) {
+      //       app.dateTime = d.dateTime
+      //       app.week = d.week
+      //       carStore.dateTime = d.dateTime
+      //     }
+      //     d.name = getWeek(d.week);
+      //     d.value = d.date;
+      //     return d
+      //   })
+      //   // 加载时段列表
+      //   app.getBookingPeriod();
+      //   // 加载场地列表
+      //   // app.getBookingField();
+      //   // 关闭加载状态
+      // }).catch(() => {
+      //   uni.showToast({
+      //     title: '请检查您的网络.',
+      //     icon: 'none'
+      //   })
+      //   uni.hideLoading()
+      // })
+    },
+    setDateList() {
+      this.next7day = []
+      for (let i = 0; i < 7; i++) {
+        const day = dayjs().add(i, 'day')
+        this.next7day.push({
+          week: day.format('d') === '0' ? '7' : day.format('d'),
+          dateTime: day.format('YYYY-MM-DD'),
+          name: getWeek(day.format('d')),
+          value: day.format('MM月DD日')
+        })
+      }
+      this.dateTime = dayjs().format('YYYY-MM-DD')
+      this.week = dayjs().format('d') === '0' ? '7' : dayjs().format('d')
+    },
+    async getTimeList() {
+      this.timeList = await listThinkSiteTime({sid: this.merchantId})
+      this.makeTimeList()
+    },
+    makeTimeList() {
+      this.periodList = []
+      this.timeList.forEach(item => {
+        const weekList = JSON.parse(item.week)
+        if (weekList.includes(this.week) && dayjs().isBefore(dayjs(this.dateTime + ' ' + item.timePeriod.split(' - ')[0]))) this.periodList.push(item)
       })
-
     },
     onDisabled() {
       this.disabled = !this.disabled;
     },
     onDateTime(e) {
-				console.log('e: ', e);
-				const {
-					serverTime
-				} = this
       this.week = e.week
       this.dateTime = e.dateTime
-				carStore.dateTime = e.dateTime
+      this.makeTimeList()
-				carStore.orderInfo = []
+      this.getFieldList()
-				this.selection = []
-				this.reload()
     },
     onType(e) {
       const index = e.currentIndex
@@ -283,41 +300,30 @@
       }
       this.reload()
     },
-			getMerchant() {
+    async getMerchant() {
-				return new Promise((resolve, reject) => {
+      this.merchant = await getThinkSite(this.merchantId)
-					MerchantApi.getMerchant(this.merchantId).then(result => {
-						resolve(result)
-					}).catch(reject)
-				})
     },
-			getServerTime() {
+    async getFieldList(){
-				return new Promise((resolve, reject) => {
+      if (!this.periodList.length) {
-					Api.getServerTime()
+        uni.showToast({
-						.then(result => {
+          title: '暂无可预订场地',
-							resolve(result)
+          icon: 'none'
         })
-						.catch(reject)
+      }
+      const periodVoList = []
+      this.periodList.forEach(item => {
+        const timestamp = dayjs(this.dateTime + ' ' + item.timePeriod.split(' - ')[0]).unix()
+        periodVoList.push({
+          timestamp,
+          period: item.timePeriod
         })
+      })
+      const res = await listThinkFieldWithTimeList({
+        sid: this.merchantId,
+        periodVoList
+      })
+      console.log(res)
     },
-			getNext7day() {
-				return new Promise((resolve, reject) => {
-					Api.getNext7day()
-						.then(result => {
-							resolve(result)
-						})
-						.catch(reject)
-				})
-			},
-			// getBookingField() {
-			// 	FieldApi.listField({
-			// 		merchantId: this.merchantId,
-			// 		isStatus: 1,
-			// 		isHalf: this.isHalf,
-			// 		dateTime: `${this.dateTime}`
-			// 	}).then(list => {
-			// 		this.fieldList = list;
-			// 	})
-			// },
     getBookingPeriod() {
       const {
         serverTime,
@@ -373,23 +379,6 @@
     closeCarInfo() {
       this.$refs.popup.close()
     },
-			onMap() {
-				uni.getLocation({
-					type: 'gcj02', //返回可以用于uni.openLocation的经纬度
-					success: function(res) {
-						console.log('返回可以用于uni.openLocation的经纬度: ', res);
-						const latitude = this.merchant.latitude;
-						const longitude = this.merchant.longitude;
-						uni.openLocation({
-							latitude: latitude,
-							longitude: longitude,
-							success: function() {
-								console.log('success');
-							}
-						});
-					}
-				});
-			},
     onField(item, period) {
       // 已被预定
       if (item.sold) {
@@ -537,7 +526,8 @@
 }
 </style>
 <style lang="scss" scoped>
-	.container {}
+.container {
+}
 
 
 .merchant-name {
@@ -571,7 +561,8 @@
     color: #ebcf00;
     align-items: center;
 
-			.save-btn {}
+    .save-btn {
+    }
   }
 }
 

src/package/booking/index.vue

@@ -16,12 +16,15 @@
         </uv-cell>
         <uv-cell title="场馆地址" :label="merchant.address" :cellStyle="{padding: '10px 5px'}">
         </uv-cell>
-				<uv-cell title="场馆位置" :label="`距离【${merchant.merchantName}】3.8公里·约7分钟`" isLink :cellStyle="{padding: '10px 5px'}" @click="mapTo(merchant)">
+        <uv-cell title="场馆位置" v-if="merchant"
+                 :label="`距离【${merchant.name}】${merchant.distance}公里·约${merchant.duration}分钟`" isLink
+                 :cellStyle="{padding: '10px 5px'}" @click="mapTo(merchant)">
           <template v-slot:right-icon>
             <uv-icon size="50rpx" name="map-fill" color="#5ac725" style="color: #ff0000;"></uv-icon>
           </template>
         </uv-cell>
-				<uv-cell title="服务前台电话" :label="merchant.phone" :border="false" :cellStyle="{padding: '10px 5px'}" @click="callPhone(merchant.phone)">
+        <uv-cell title="服务前台电话" :label="merchant.tel" :border="false" :cellStyle="{padding: '10px 5px'}"
+                 @click="callPhone(merchant.phone)">
 
         </uv-cell>
       </uv-cell-group>
@@ -40,7 +43,8 @@
         <view class="text" @click="onDisabled">
           <text>我已阅读并同意</text>
           <text class="link"
-						@click.stop="navTo('/package/article/detail?articleId=503')">《订票协议》</text>
+                @click.stop="navTo('/package/article/detail?articleId=503')">《订票协议》
+          </text>
         </view>
       </view>
     </view>
@@ -81,13 +85,14 @@
 </template>
 
 <script>
-	import {
-		storeToRefs
-	} from 'pinia';
-	import * as MerchantApi from '@/api/shop/merchant';
 import {
   useCarStore
 } from '@/store/modules/car';
+import {getThinkSite, getThinkSiteWithDistance} from "@/api/think/thinkSite";
+import {getLocationAction} from "@/utils";
+import request from "@/utils/request";
+import X2js from 'x2js';
+
 const carStore = useCarStore();
 
 export default {
@@ -99,13 +104,18 @@
       // 场馆相册
       photo: [],
       isLogin: false,
-				disabled: true
+      disabled: true,
+      lat: null,
+      lng: null,
     }
   },
-		onLoad(option) {
+  async onLoad(option) {
     this.id = option.id
     carStore.merchantId = option.id
-			this.reload();
+    const {longitude, latitude} = await getLocationAction()
+    this.lat = latitude
+    this.lng = longitude
+    await this.reload();
   },
   onShow() {
     // 登录状态
@@ -121,25 +131,37 @@
       Promise.all([app.getMerchant()]).then(res => {
         const merchant = res[0];
         app.merchant = merchant;
+        this.merchant.distance = 0
+        this.merchant.minute = 0
 
         // 修改标题
-					uni.setNavigationBarTitle({
+        // uni.setNavigationBarTitle({
-						title: merchant.merchantName
+        // 	title: merchant.merchantName
-					})
+        // })
         // 加载场馆相册
-					if (merchant.files) {
+        // if (merchant.files) {
-						app.photo = JSON.parse(merchant.files)
+        // 	app.photo = JSON.parse(merchant.files)
-					}
+        // }
+        app.photo = [merchant.thumb]
         // 更新购物车状态
         carStore.setMerchant(merchant)
         carStore.merchantId = merchant.merchantId
         carStore.merchantName = merchant.merchantName
         carStore.merchantCode = merchant.merchantCode
+        this.getDuration()
       })
     },
+    async getDuration() {
+      let url = `http://api.tianditu.gov.cn/drive?postStr={"orig":"${this.lng},${this.lat}","dest":"${this.merchant.lng},${this.merchant.lat}","style":"0"}&type=search&tk=71f234f251d4cb1feeb3c293a0f21709`
+      const res = await request.get(url)
+      const x2js = new X2js();
+      const {result} = x2js.xml2js(res.data)
+      this.merchant.distance = result.distance
+      this.merchant.duration = (parseInt(result.duration) / 60).toFixed(1)
+    },
     getMerchant() {
       return new Promise((resolve, reject) => {
-					MerchantApi.getMerchant(this.id).then(result => {
+        getThinkSite(this.id).then(result => {
           resolve(result)
         }).catch(reject)
       })
@@ -153,12 +175,9 @@
       })
     },
     mapTo(item) {
-				console.log('item: ',item.lngAndLat);
-				const arr = item.lngAndLat.split(',');
-				console.log('arr: ',arr);
       uni.openLocation({
-				   latitude: parseFloat(arr[1]),
+        latitude: parseFloat(item.lat),
-				   longitude: parseFloat(arr[0]),
+        longitude: parseFloat(item.lng),
         success: function () {
           console.log('success');
         }
@@ -181,8 +200,8 @@
         type: 'gcj02', //返回可以用于uni.openLocation的经纬度
         success: function (res) {
           console.log('返回可以用于uni.openLocation的经纬度: ', res);
-						const latitude = this.merchant.latitude;
+          const latitude = this.merchant.lat;
-						const longitude = this.merchant.longitude;
+          const longitude = this.merchant.lng;
           uni.openLocation({
             latitude: latitude,
             longitude: longitude,
@@ -218,7 +237,8 @@
 }
 </style>
 <style lang="scss" scoped>
-	.container {}
+.container {
+}
 
 .merchant-name {
   padding: 30rpx;
@@ -279,11 +299,13 @@
   margin-top: 24rpx;
   justify-content: center;
 }
+
 .booking-content {
   padding: 10px;
   font-size: 30rpx;
   line-height: 1.5rem;
 }
+
 .xieyi {
   margin-bottom: 80rpx;
   padding: 0 30rpx;

src/pages/index.vue

@@ -3,7 +3,8 @@
     <!-- #ifndef APP-NVUE || MP-TOUTIAO -->
     <block v-if="ads.length > 0" v-for="(ad,index) in ads" :key="index">
       <view class="uv-demo-block" style="width: 698rpx; margin: auto">
-        <uv-swiper :list="JSON.parse(ad.images)" :height="180" bgColor="transparent" indicatorMode="dot" indicator circular
+        <uv-swiper :list="JSON.parse(ad.images)" :height="180" bgColor="transparent" indicatorMode="dot" indicator
+                   circular
                    :autoplay="false"
                    radius="5" @click="onSlide"></uv-swiper>
       </view>
@@ -67,12 +68,12 @@
     <!-- 商户列表 -->
     <view class="card-title web-text-heading">场地预定</view>
     <view class="card-body">
-      <block v-if="merchant.length > 0">
+      <block v-if="siteList.length > 0">
         <uni-grid :column="3" borderColor="transparent" :highlight="true" @change="change">
-          <uni-grid-item v-for="(item, index) in merchant" :index="index" :key="index">
+          <uni-grid-item v-for="(item, index) in siteList" :index="index" :key="index">
             <view class="merchant-card" style="display: flex; flex-direction: column">
-              <image :src="item.image" mode="widthFix" class="merchant-image"/>
+              <image :src="item.thumb" mode="widthFix" class="merchant-image"/>
-              <text class="merchant-name">{{ item.merchantName }}</text>
+              <text class="merchant-name">{{ item.name }}</text>
             </view>
           </uni-grid-item>
         </uni-grid>
@@ -109,6 +110,7 @@ import {useMpStore} from "@/store/modules/mp";
 import Layout from "@/components/layout.vue";
 import * as MenuIcons from '@/api/menu-icons.ts';
 import {openUrl} from '@/utils/common';
+import {listThinkSite} from "@/api/think/thinkSite";
 
 const mpStore = useMpStore();
 
@@ -140,25 +142,8 @@ export default {
       // 骨架屏
       hideTools: true,
       mp_menu_display_method: 0,
-      baseList: [
+      openid: null,
-        {
+      siteList: []
-          name: 'photo',
-          title: '李白'
-        },
-        {
-          name: 'lock',
-          title: '韩信'
-        },
-        {
-          name: 'star',
-          title: '刘备'
-        },
-        {
-          name: 'star',
-          title: '元芳'
-        }
-      ],
-      openid: null
     };
   },
   onLoad() {
@@ -180,16 +165,6 @@ export default {
       if (uni.getStorageSync('user_id') && uni.getStorageSync('access_token')) {
         app.isLogin = true;
         if (!uni.getStorageSync('openid')) {
-          // 获取用户副表信息
-          // UserApi.getByPhone({
-          //   phone: info.userInfo.phone
-          // }).then((data) => {
-          //   if (data) {
-          //     app.userInfo.ouid = data.uid;
-          //     uni.setStorageSync('ouid', data.uid);
-          //     app.userInfo = Object.assign({}, app.userInfo, data);
-          //   }
-          // });
           // 更新openid
           // #ifdef MP-WEIXIN
           uni.login({
@@ -271,9 +246,9 @@ export default {
       }
 
       // 请求数据
-      Promise.all([app.getMerchantList(), app.getItemList()]).then((res) => {
+      Promise.all([app.getMerchantList(), this.getSiteList()]).then((res) => {
         app.merchant = res[0];
-        app.itemList = res[1];
+        // app.itemList = res[1];
       });
     },
     getSiteInfo() {
@@ -286,7 +261,8 @@ export default {
           .catch(reject);
       });
     },
-    listAdList() {
+    async getSiteList() {
+      this.siteList = await listThinkSite()
     },
     pageGoods() {
       const app = this;
@@ -323,7 +299,7 @@ export default {
     },
     change(e) {
       const {index} = e.detail;
-      const id = this.merchant[index].merchantId;
+      const id = this.siteList[index].id;
       this.openUrl(`/package/booking/index?id=${id}`);
     },
     onNavigation(e) {

src/uni_modules/ws-user-card/components/ws-user-card/ws-user-card.vue

@@ -14,6 +14,9 @@
         <view class="userid">
           <view class="text">{{ data.mobile }}</view>
         </view>
+        <view class="flex flex-col justify-center items-center" @click="scan">
+          <uv-icon name="scan" size="58rpx" label="提货扫码" label-pos="bottom" label-size="24rpx" space="0"/>
+        </view>
       </view>
       <view class="nickname-box" v-else>
         <view class="nickname">点击登录</view>
@@ -179,6 +182,14 @@ export default {
       // console.log(1, e)
       this.form.username = value;
       uni.setStorageSync('username', value)
+    },
+    scan() {
+      uni.scanCode({
+        success: function (res) {
+          console.log(res.result)
+          uni.navigateTo({url: `/package/goods/orderDetailForSelfTake?id=${res.result}`})
+        }
+      })
     }
   }
 };

src/utils/index.js

@@ -0,0 +1,42 @@
+export const getLocationAction = (save = true) => {
+    return new Promise(resolve => {
+        const res = getLocation()
+        if (res.latitude) resolve(res)
+        else {
+            uni.authorize({
+                scope: 'scope.userLocation',
+                success: () => {
+                    uni.getLocation({
+                        isHighAccuracy: true,
+                        success: ({longitude, latitude}) => {
+                            if (save) setLocation({longitude, latitude})
+                            resolve({longitude, latitude})
+                        }
+                    })
+                },
+                fail: err => {
+                    console.log(err)
+                    uni.showModal({
+                        title: '提示',
+                        content: '为了更好的提供服务,请开启定位服务',
+                        success: ({confirm}) => {
+                            if (confirm) uni.openSetting()
+                        }
+                    })
+                }
+            })
+        }
+    })
+}
+
+export const getLocation = () => {
+    return {
+        latitude: uni.getStorageSync("latitude"),
+        longitude: uni.getStorageSync("longitude")
+    }
+}
+
+export const setLocation = ({latitude, longitude}) => {
+    uni.setStorageSync("latitude", latitude)
+    uni.setStorageSync("longitude", longitude)
+}