ylj/wanmeiyizhan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-05-06 19:34:42 +08:00
parent 5fb40d839b
commit 38531b0c51
84 changed files with 979 additions and 946 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
manifest.json
View File

@ -1,36 +1,36 @@
{ {
"name": "驿佳", "name" : "驿佳",
"appid": "__UNI__F870657", "appid" : "__UNI__F870657",
"description": "", "description" : "",
"versionName": "1.0.4", "versionName" : "1.0.5",
"versionCode": 104, "versionCode" : 105,
"transformPx": false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules": { "modules" : {
"OAuth": {}, "OAuth" : {},
"Payment": false, "Payment" : false,
"Push": false, "Push" : false,
"Share": {}, "Share" : {},
"Speech": {}, "Speech" : {},
"VideoPlayer": {}, "VideoPlayer" : {},
"Maps": {} "Maps" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute": { "distribute" : {
/* android打包配置 */ /* android打包配置 */
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
@ -66,119 +66,116 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios": { "ios" : {
"dSYMs": false, "dSYMs" : false,
"info": { "info" : {},
"NSLocationWhenInUseUsageDescription" : "驿达APP需要获取您的位置信息，用于后台为您持续提供附近服务区的相关服务。",
"NSLocationAlwaysAndWhenInUseUsageDescription" : "驿达APP需要获取您的位置信息，用于后台为您持续提供附近服务区的相关服务",
"NSLocationAlwaysUsageDescription" : "驿达APP需要持续获取位置信息，以便在后台为您持续提供附近服务区的相关服务。",
"NSPhotoLibraryUsageDescription" : "需要访问您的相册，用于上传商品评价图片、更换头像等用户生成内容。",
"NSCameraUsageDescription" : "需要访问您的相机，用于扫描商品条码、拍摄评价照片和进行身份验证。",
"NSMicrophoneUsageDescription" : "需要访问麦克风，用于拍摄带语音的评价视频和在线客服语音沟通。",
"capabilities" : {
"entitlements" : {}
}, },
"NSLocationWhenInUseUsageDescription": "驿达APP需要获取您的位置信息，用于后台为您持续提供附近服务区的相关服务。", "appstore" : "static/icons/logo.png",
"NSLocationAlwaysAndWhenInUseUsageDescription": "驿达APP需要获取您的位置信息，用于后台为您持续提供附近服务区的相关服务", "swiftSupport" : true,
"NSLocationAlwaysUsageDescription": "驿达APP需要持续获取位置信息，以便在后台为您持续提供附近服务区的相关服务。", "embedSwift" : true,
"NSPhotoLibraryUsageDescription": "需要访问您的相册，用于上传商品评价图片、更换头像等用户生成内容。", "maps" : {
"NSCameraUsageDescription": "需要访问您的相机，用于扫描商品条码、拍摄评价照片和进行身份验证。", "AMap" : {
"NSMicrophoneUsageDescription": "需要访问麦克风，用于拍摄带语音的评价视频和在线客服语音沟通。", "apiKey" : "78e8b8340770d439c5415a6d897b68a7"
"capabilities": {
"entitlements": {}
},
"appstore": "static/icons/logo.png",
"swiftSupport": true,
"embedSwift": true,
"maps": {
"AMap": {
"apiKey": "78e8b8340770d439c5415a6d897b68a7"
} }
} }
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs": { "sdkConfigs" : {
"ad": {}, "ad" : {},
"oauth": {}, "oauth" : {},
"maps": { "maps" : {
"amap": { "amap" : {
"name": "amap_18158132615AICJ55IM2", "name" : "amap_18158132615AICJ55IM2",
"appkey_ios": "78e8b8340770d439c5415a6d897b68a7", "appkey_ios" : "78e8b8340770d439c5415a6d897b68a7",
"appkey_android": "d773aa156f8ca2160cfb06d5f117dacd" "appkey_android" : "d773aa156f8ca2160cfb06d5f117dacd"
} }
} }
}, },
/* nvue */ /* nvue */
"nvue": { "nvue" : {
"user-agent": "user-agent" "user-agent" : "user-agent"
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "E:/新建文件夹/整理桌面/logo 206_216/logo 60_60@1x.png", "hdpi" : "E:/新建文件夹/整理桌面/logo 206_216/logo 60_60@1x.png",
"xhdpi": "E:/新建文件夹/整理桌面/logo 206_216/logo 96_96@1x.png", "xhdpi" : "E:/新建文件夹/整理桌面/logo 206_216/logo 96_96@1x.png",
"xxhdpi": "E:/新建文件夹/整理桌面/logo 206_216/logo 144_144@1x.png", "xxhdpi" : "E:/新建文件夹/整理桌面/logo 206_216/logo 144_144@1x.png",
"xxxhdpi": "E:/新建文件夹/整理桌面/logo 206_216/logo 192_192@1x.png" "xxxhdpi" : "E:/新建文件夹/整理桌面/logo 206_216/logo 192_192@1x.png"
}, },
"ios": { "ios" : {
"appstore": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 1024_1024@1x.png", "appstore" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 1024_1024@1x.png",
"iphone": { "iphone" : {
"app@2x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 120_120@1x.png", "app@2x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 120_120@1x.png",
"app@3x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 180_180@1x.png", "app@3x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 180_180@1x.png",
"spotlight@2x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 80_80@1x.png", "spotlight@2x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 80_80@1x.png",
"spotlight@3x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 120_120@1x.png", "spotlight@3x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 120_120@1x.png",
"settings@2x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 58_58@1x.png", "settings@2x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 58_58@1x.png",
"settings@3x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 87_87@1x.png", "settings@3x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 87_87@1x.png",
"notification@2x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 40_40@1x.png", "notification@2x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 40_40@1x.png",
"notification@3x": "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 60_60@1x.png" "notification@3x" : "C:/Users/YSKJ01/Desktop/新建文件夹/logo 206_216/logo 60_60@1x.png"
} }
} }
} }
}, },
"useragent": { "useragent" : {
"value": "app", "value" : "app",
"concatenate": true "concatenate" : true
}, },
"nativePlugins": { "nativePlugins" : {
"AMapModule": { "AMapModule" : {
"__plugin_info__": { "__plugin_info__" : {
"name": "AMapModule测试插件", "name" : "AMapModule测试插件",
"description": "AMapModule测试插件1.7", "description" : "AMapModule测试插件1.7",
"platforms": "Android", "platforms" : "Android",
"url": "", "url" : "",
"android_package_name": "", "android_package_name" : "",
"ios_bundle_id": "", "ios_bundle_id" : "",
"isCloud": false, "isCloud" : false,
"bought": -1, "bought" : -1,
"pid": "", "pid" : "",
"parameters": {} "parameters" : {}
} }
} }
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp": {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin": { "mp-weixin" : {
"appid": "wx4c497eddcec4a0e7", "appid" : "wx4c497eddcec4a0e7",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
}, },
"usingComponents": true, "usingComponents" : true,
"requiredPrivateInfos": [ "requiredPrivateInfos" : [ "getLocation" ],
"getLocation" "__usePrivacyCheck__" : true,
], "lazyCodeLoading" : "requiredComponents",
"__usePrivacyCheck__": true, "permission" : {
"lazyCodeLoading": "requiredComponents", "scope.userLocation" : {
"permission": { "desc" : "获取位置信息用于展示"
"scope.userLocation": {
"desc": "获取位置信息用于展示"
} }
} }
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"vueVersion": "2", "vueVersion" : "2",
"_spaceID": "mp-5b41af94-82e9-4997-bf46-f2ae745e4038" "_spaceID" : "mp-5b41af94-82e9-4997-bf46-f2ae745e4038"
} }

7
pages/discovery/index.vue
View File

@ -737,8 +737,15 @@ export default {
this.handleGetMemberData(); this.handleGetMemberData();
this.handleGetOnlineShoppingMall(); this.handleGetOnlineShoppingMall();
}, },
onHide(){
this.isLoading = false
},
onUnload() { onUnload() {
this.isShow = false; this.isShow = false;
this.isLoading = false
},
destroyed(){
this.isLoading = false
}, },
onShow() { onShow() {
uni.hideTabBar({ uni.hideTabBar({

58
pages/home/newIndex.vue
View File

@ -54,7 +54,7 @@
<view class="tabItem" v-for="(item, index) in tabList" :key="index" <view class="tabItem" v-for="(item, index) in tabList" :key="index"
@click="handleChangeTab(item)"> @click="handleChangeTab(item)">
<view :class="selectTab === item.value ? 'title selectTitle' : 'title'">{{ item.label || "" <view :class="selectTab === item.value ? 'title selectTitle' : 'title'">{{ item.label || ""
}} }}
</view> </view>
<view :class="selectTab === item.value ? 'desc selectDesc' : 'desc'">{{ item.desc || "" }} <view :class="selectTab === item.value ? 'desc selectDesc' : 'desc'">{{ item.desc || "" }}
</view> </view>
@ -62,7 +62,8 @@
</view> </view>
</scroll-view> </scroll-view>
<view v-show="selectTab === 1" style="background-color: #fff;margin-top: 24rpx;"> <view v-if="chaegeBoxList && chaegeBoxList.length > 0"
style="background-color: #fff;margin-top: 24rpx;">
<ChargeBox :showType="'horizontal'" :serviceAreaList="chaegeBoxList" pageType="scanCode" <ChargeBox :showType="'horizontal'" :serviceAreaList="chaegeBoxList" pageType="scanCode"
:showStore="true" :comeForm="'home'" :showPadding="true" /> :showStore="true" :comeForm="'home'" :showPadding="true" />
</view> </view>
@ -94,7 +95,11 @@
<view class="foodList"> <view class="foodList">
<view class="foodItem" v-for="(item, index) in foodList" :key="index" <view class="foodItem" v-for="(item, index) in foodList" :key="index"
@click="handleGoFoodShop(item)"> @click="handleGoFoodShop(item)">
<image class="foodSrc" :src="item.IMAGE_URL" /> <!-- <view class="foodSrc" :style="{ backgroundImage: `url(${item.IMAGE_URL})` }"></view> -->
<view class="foodSrcBox">
<image class="foodSrc" mode="aspectFit" lazy-load="true" :src="item.IMAGE_URL" />
</view>
<view class="foodDetail"> <view class="foodDetail">
<view class="foodName">{{ item.COMMODITY_NAME }}</view> <view class="foodName">{{ item.COMMODITY_NAME }}</view>
<!-- <view class="foodInfo">月售249 仅剩13份</view> --> <!-- <view class="foodInfo">月售249 仅剩13份</view> -->
@ -167,7 +172,7 @@
</view> </view>
<tabbar :page="'/pages/home/newIndex'" /> <tabbar :page="'/pages/home/newIndex'" />
<CustomLoading :visible="isLoading" @update:visible="val => isLoading = val" /> <CustomLoading v-if="isLoading" :visible="isLoading" @update:visible="val => isLoading = val" />
</view> </view>
</template> </template>
@ -182,6 +187,7 @@ import {
} from "../../utils/publicMethods"; } from "../../utils/publicMethods";
export default { export default {
components: { tabbar, CustomLoading, ChargeBox }, components: { tabbar, CustomLoading, ChargeBox },
data() { data() {
return { return {
@ -233,8 +239,6 @@ export default {
}), }),
}, },
async onLoad() { async onLoad() {
console.log('1111');
// await getApp().globalData.initReady; // await getApp().globalData.initReady;
// 获取手机参数对页面进行适配 主要是用于拿到胶囊的位置 // 获取手机参数对页面进行适配 主要是用于拿到胶囊的位置
let systemInfo = uni.getSystemInfoSync(); let systemInfo = uni.getSystemInfoSync();
@ -263,6 +267,7 @@ export default {
this.handleOnShowUpdate(currentService) this.handleOnShowUpdate(currentService)
} }
} }
this.isLoading = false;
}, },
// 下拉刷新 // 下拉刷新
async onPullDownRefresh() { async onPullDownRefresh() {
@ -275,6 +280,10 @@ export default {
await this.handleOnLoad() await this.handleOnLoad()
this.isLoading = false this.isLoading = false
}, },
onHide() {
this.isLoading = false
this.$forceUpdate();
},
methods: { methods: {
...mapMutations({ ...mapMutations({
setArea: "setHomeServer", setArea: "setHomeServer",
@ -286,8 +295,10 @@ export default {
}), }),
// onshow需要更新得内容 // onshow需要更新得内容
async handleOnShowUpdate(currentService) { async handleOnShowUpdate(currentService) {
// this.isLoading = true this.isLoading = true
let allServiceList = uni.getStorageSync("allServiceList"); let allServiceList = uni.getStorageSync("allServiceList");
this.chaegeBoxList = []
this.$forceUpdate()
console.log('allServiceListallServiceListallServiceList', allServiceList); console.log('allServiceListallServiceListallServiceList', allServiceList);
if (allServiceList && allServiceList.length > 0) { if (allServiceList && allServiceList.length > 0) {
allServiceList.forEach((item) => { allServiceList.forEach((item) => {
@ -296,10 +307,16 @@ export default {
} }
}) })
} }
this.chaegeBoxList = [this.serverPart]
// 拿到当前服务区的点餐数据 // 拿到当前服务区的点餐数据
await this.handleGetCurrentService() await this.handleGetCurrentService()
// this.isLoading = false
let _this = this
setTimeout(() => {
_this.chaegeBoxList = [_this.serverPart.SERVERPART_NAME]
}, 500)
this.isLoading = false
this.$forceUpdate() this.$forceUpdate()
}, },
// 跳转精选活动 // 跳转精选活动
@ -330,7 +347,7 @@ export default {
}, },
// 切换tab // 切换tab
handleChangeTab(obj) { handleChangeTab(obj) {
this.selectTab = obj.value // this.selectTab = obj.value
if (obj.value === 2) { if (obj.value === 2) {
// 出行导航 // 出行导航
uni.navigateTo({ uni.navigateTo({
@ -354,7 +371,7 @@ export default {
this.nearPart = serviceInfo.currentService; this.nearPart = serviceInfo.currentService;
this.serverPart = serviceInfo.currentService; this.serverPart = serviceInfo.currentService;
this.chaegeBoxList = [serviceInfo.nearThreeList[0]] // this.chaegeBoxList = [serviceInfo.nearThreeList[0]]
console.log('this.serverPart', this.serverPart); console.log('this.serverPart', this.serverPart);
// 拿到当前服务区的点餐数据 // 拿到当前服务区的点餐数据
await this.handleGetCurrentService() await this.handleGetCurrentService()
@ -908,10 +925,27 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx; padding: 24rpx;
.foodSrcBox {
width: 200rpx;
height: 200rpx;
background-color: #f5f5f5;
border-radius: 8rpx;
overflow: hidden;
.foodSrc {
width: 200rpx;
height: 200rpx;
background-repeat: no-repeat;
// margin-bottom: 16rpx;
}
}
.foodSrc { .foodSrc {
width: 200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
margin-bottom: 16rpx; background-repeat: no-repeat;
// margin-bottom: 16rpx;
} }
.foodDetail { .foodDetail {

49
pages/memberBenefits/index.vue
View File

@ -75,47 +75,31 @@
<view class="contentBox"> <view class="contentBox">
<view class="boxItem"> <view class="boxItem">
<view class="itemLabel">1、会员推荐</view> <view class="itemLabel">1、会员推荐</view>
<view class="itemValue" <view class="itemValue">成功推荐一名新会员加入，奖励推荐人<span class="light">50</span>个积分。</view>
>成功推荐一名新会员加入，奖励推荐人<span class="light">50</span
>个积分。</view
>
</view> </view>
<view class="boxItem" style="margin-top: 24rpx"> <view class="boxItem" style="margin-top: 24rpx">
<view class="itemLabel">2、参与活动</view> <view class="itemLabel">2、参与活动</view>
<view class="itemValue" <view class="itemValue">参加服务区内的各类活动（如节庆活动、主题活动等），每次奖励<span class="light">20-50</span>个积分不等。</view>
>参加服务区内的各类活动（如节庆活动、主题活动等），每次奖励<span
class="light"
>20-50</span
>个积分不等。</view
>
</view> </view>
</view> </view>
</view> </view>
<view class="contentItem" style="margin-top: 48rpx"> <view class="contentItem" style="margin-top: 48rpx">
<view class="itemTitle"> <view class="itemTitle">
<image <image class="pointIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/specialIntegral.svg" />
class="pointIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/specialIntegral.svg"
/>
<span class="titleText">特殊积分</span> <span class="titleText">特殊积分</span>
</view> </view>
<view class="contentBox"> <view class="contentBox">
<view class="boxItem"> <view class="boxItem">
<view class="itemLabel">1、生日礼遇</view> <view class="itemLabel">1、生日礼遇</view>
<view class="itemValue" <view class="itemValue">在会员生日月份，到服务区消费单笔满<span class="light">10</span>元额外赠送</view>
>在会员生日月份，到服务区消费单笔满<span class="light">10</span
>元额外赠送</view
>
</view> </view>
<view class="boxItem" style="margin-top: 24rpx"> <view class="boxItem" style="margin-top: 24rpx">
<view class="itemLabel">2、节假日优惠</view> <view class="itemLabel">2、节假日优惠</view>
<view class="itemValue" <view class="itemValue">在特定节假日期间，消费可额外得双倍积分。</view>
>在特定节假日期间，消费可额外得双倍积分。</view
>
</view> </view>
</view> </view>
</view> </view>
@ -228,24 +212,28 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
.main { .main {
width: 100vw; width: 100vw;
// height: 100vh; min-height: 100vh;
// background: #fff; // background: #fff;
background: #fff; background: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 32rpx 40rpx; padding: 32rpx 40rpx;
padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS 11.2+ */ // padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS 11.2+ */
padding-bottom: constant(safe-area-inset-bottom); /* 兼容 iOS <11.2 */ // padding-bottom: constant(safe-area-inset-bottom); /* 兼容 iOS <11.2 */
.contentItem { .contentItem {
width: 100%;
.itemTitle { .itemTitle {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
.pointIcon { .pointIcon {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
margin-right: 8rpx; margin-right: 8rpx;
} }
.titleText { .titleText {
font-family: "PingFangSC"; font-family: "PingFangSC";
font-weight: 600; font-weight: 600;
@ -260,9 +248,11 @@ export default {
.itemContent { .itemContent {
width: 100%; width: 100%;
margin-top: 16rpx; margin-top: 16rpx;
.smallTitle { .smallTitle {
display: flex; display: flex;
align-items: center; align-items: center;
.label { .label {
font-family: "PingFangSC"; font-family: "PingFangSC";
font-weight: 400; font-weight: 400;
@ -272,12 +262,14 @@ export default {
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
.labelIcon { .labelIcon {
width: 80rpx; width: 80rpx;
height: 32rpx; height: 32rpx;
margin-left: 8rpx; margin-left: 8rpx;
} }
} }
.value { .value {
font-family: "PingFangSC"; font-family: "PingFangSC";
font-weight: 400; font-weight: 400;
@ -293,6 +285,7 @@ export default {
.table { .table {
width: 100%; width: 100%;
margin-top: 16rpx; margin-top: 16rpx;
.header { .header {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
@ -301,6 +294,7 @@ export default {
border-radius: 6rpx; border-radius: 6rpx;
display: flex; display: flex;
align-items: center; align-items: center;
.firstCol { .firstCol {
width: 172rpx; width: 172rpx;
font-family: "PingFangSC"; font-family: "PingFangSC";
@ -311,6 +305,7 @@ export default {
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
.secondCol { .secondCol {
width: calc(100% - 172rpx); width: calc(100% - 172rpx);
font-family: "PingFangSC"; font-family: "PingFangSC";
@ -322,6 +317,7 @@ export default {
font-style: normal; font-style: normal;
} }
} }
.row { .row {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
@ -329,6 +325,7 @@ export default {
border-bottom: 1px solid #f5f6f7; border-bottom: 1px solid #f5f6f7;
display: flex; display: flex;
align-items: center; align-items: center;
.firstCol { .firstCol {
width: 172rpx; width: 172rpx;
font-family: "PingFangSC"; font-family: "PingFangSC";
@ -339,6 +336,7 @@ export default {
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
.secondCol { .secondCol {
width: calc(100% - 172rpx); width: calc(100% - 172rpx);
font-family: "PingFangSC"; font-family: "PingFangSC";
@ -355,6 +353,7 @@ export default {
.contentBox { .contentBox {
width: 100%; width: 100%;
margin-top: 16rpx; margin-top: 16rpx;
.boxItem { .boxItem {
.itemLabel { .itemLabel {
font-family: "PingFangSC"; font-family: "PingFangSC";
@ -365,6 +364,7 @@ export default {
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
.itemValue { .itemValue {
margin-top: 4rpx; margin-top: 4rpx;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
@ -374,6 +374,7 @@ export default {
line-height: 40rpx; line-height: 40rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
.light { .light {
color: #ba922f; color: #ba922f;
margin: 0 8rpx; margin: 0 8rpx;

7
pages/scanCodeCharge/travelNavigation.vue
View File

@ -629,6 +629,13 @@ export default {
}, },
// 直接点击回车 触发搜索 // 直接点击回车 触发搜索
handleConfirmToSearch() { handleConfirmToSearch() {
if (!this.endObj.name) {
uni.showToast({
title: "请选择目的地",
icon: 'none'
})
return
}
if (this.pointList && this.pointList.length > 0 && !this.endObj.location) { if (this.pointList && this.pointList.length > 0 && !this.endObj.location) {
this.handleGoUsMap(this.pointList[0]); this.handleGoUsMap(this.pointList[0]);
this.endPlaceFocus = false; this.endPlaceFocus = false;

9
pages/serviceDetail/index.vue
View File

@ -934,7 +934,7 @@ export default {
}; };
}, },
async onLoad(query) { async onLoad(query) {
this.isLoading = true; // this.isLoading = true;
let systemInfo = uni.getSystemInfoSync(); let systemInfo = uni.getSystemInfoSync();
let type = uni.getStorageSync("loginType"); let type = uni.getStorageSync("loginType");
this.loginType = type; this.loginType = type;
@ -957,7 +957,7 @@ export default {
// this.isLoading = false; // this.isLoading = false;
}, },
async onShow() { async onShow() {
this.isLoading = true; // this.isLoading = true;
if (this.isFirst) { if (this.isFirst) {
this.isFirst = false; this.isFirst = false;
} else { } else {
@ -972,6 +972,7 @@ export default {
await this.handleGetMerchant(); await this.handleGetMerchant();
} }
} }
// this.isLoading = false;
}, },
computed: { computed: {
...mapGetters({ ...mapGetters({
@ -1520,12 +1521,12 @@ export default {
if (this.user.MEMBERSHIP_MOBILEPHONE) { if (this.user.MEMBERSHIP_MOBILEPHONE) {
let id = item.SERVERPARTSHOP_IDS.split(",")[0]; let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`, url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
}); });
} else { } else {
let id = item.SERVERPARTSHOP_IDS.split(",")[0]; let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`, url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
}); });
this.isLogin = true; this.isLogin = true;
} }

4
pages/serviceDetail/shopDetail/index.vue
View File

@ -421,12 +421,12 @@ export default {
if (this.user.MEMBERSHIP_MOBILEPHONE) { if (this.user.MEMBERSHIP_MOBILEPHONE) {
let id = item.SERVERPARTSHOP_IDS.split(",")[0]; let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`, url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
}); });
} else { } else {
let id = item.SERVERPARTSHOP_IDS.split(",")[0]; let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`, url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
}); });
this.isLogin = true; this.isLogin = true;
} }

4
unpackage/dist/build/app-plus/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/manifest.json vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/card.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/currentService.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/keyboard.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/noData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/contact/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/couponDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/discovery/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/bindingCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/complaints/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/complaintsAndQuestionare/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/complaintsDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/consumption/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/help/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/integral/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/myCoupon/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/mycar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/newComplaints/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/payfor/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mapIndex.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/investMoney/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/register.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mallHome/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/address/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/newAdd/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newEvaluate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newMap/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orders/buydetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orders/order/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orders/orderdetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payAgreement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/product/productDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/product/shopCart/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/rate/components/rateItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/rate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservationOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/scanCodeCharge/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/mapDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/shopDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/coupon/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/orderRemark/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/aliPay.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/chargAndSwapp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/newPage.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/testPage.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/userCenter/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map vendored
View File

File diff suppressed because one or more lines are too long

561
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

807
unpackage/dist/dev/app-plus/app-view.js vendored
View File

File diff suppressed because it is too large Load Diff

2
unpackage/dist/dev/app-plus/manifest.json vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/dist/dev/mp-weixin/common/vendor.js vendored
View File

@ -1119,8 +1119,8 @@ function populateParameters(result) {
var parameters = { var parameters = {
appId: "__UNI__F870657", appId: "__UNI__F870657",
appName: "驿佳", appName: "驿佳",
appVersion: "1.0.4", appVersion: "1.0.5",
appVersionCode: "104", appVersionCode: "105",
appLanguage: getAppLanguage(hostLanguage), appLanguage: getAppLanguage(hostLanguage),
uniCompileVersion: "4.45", uniCompileVersion: "4.45",
uniCompilerVersion: "4.45", uniCompilerVersion: "4.45",
@ -1220,8 +1220,8 @@ var getAppBaseInfo = {
result = sortObject(Object.assign(result, { result = sortObject(Object.assign(result, {
appId: "__UNI__F870657", appId: "__UNI__F870657",
appName: "驿佳", appName: "驿佳",
appVersion: "1.0.4", appVersion: "1.0.5",
appVersionCode: "104", appVersionCode: "105",
appLanguage: getAppLanguage(hostLanguage), appLanguage: getAppLanguage(hostLanguage),
hostVersion: version, hostVersion: version,
hostLanguage: hostLanguage, hostLanguage: hostLanguage,

4
unpackage/dist/dev/mp-weixin/components/currentService.json vendored
View File

@ -1,4 +1,4 @@
{ {
"component": true, "usingComponents": {},
"usingComponents": {} "component": true
} }

4
unpackage/dist/dev/mp-weixin/components/keyboard.json vendored
View File

@ -1,4 +1,4 @@
{ {
"component": true, "usingComponents": {},
"usingComponents": {} "component": true
} }

7
unpackage/dist/dev/mp-weixin/pages/discovery/index.js vendored
View File

@ -447,8 +447,15 @@ var _default = {
this.handleGetMemberData(); this.handleGetMemberData();
this.handleGetOnlineShoppingMall(); this.handleGetOnlineShoppingMall();
}, },
onHide: function onHide() {
this.isLoading = false;
},
onUnload: function onUnload() { onUnload: function onUnload() {
this.isShow = false; this.isShow = false;
this.isLoading = false;
},
destroyed: function destroyed() {
this.isLoading = false;
}, },
onShow: function onShow() { onShow: function onShow() {
uni.hideTabBar({ uni.hideTabBar({

31
unpackage/dist/dev/mp-weixin/pages/serviceDetail/index.js vendored
View File

@ -265,7 +265,7 @@ var _default = {
while (1) { while (1) {
switch (_context.prev = _context.next) { switch (_context.prev = _context.next) {
case 0: case 0:
_this.isLoading = true; // this.isLoading = true;
systemInfo = uni.getSystemInfoSync(); systemInfo = uni.getSystemInfoSync();
type = uni.getStorageSync("loginType"); type = uni.getStorageSync("loginType");
_this.loginType = type; _this.loginType = type;
@ -281,12 +281,12 @@ var _default = {
if (query.come) { if (query.come) {
_this.come = query.come; _this.come = query.come;
} }
_context.next = 10; _context.next = 9;
return _this.handleGetServerpartDetail(_this.serverpart); return _this.handleGetServerpartDetail(_this.serverpart);
case 10: case 9:
_context.next = 12; _context.next = 11;
return _this.handleGetMerchant(); return _this.handleGetMerchant();
case 12: case 11:
case "end": case "end":
return _context.stop(); return _context.stop();
} }
@ -302,31 +302,30 @@ var _default = {
while (1) { while (1) {
switch (_context2.prev = _context2.next) { switch (_context2.prev = _context2.next) {
case 0: case 0:
_this2.isLoading = true;
if (!_this2.isFirst) { if (!_this2.isFirst) {
_context2.next = 5; _context2.next = 4;
break; break;
} }
_this2.isFirst = false; _this2.isFirst = false;
_context2.next = 15; _context2.next = 14;
break; break;
case 5: case 4:
currentService = uni.getStorageSync("currentService"); currentService = uni.getStorageSync("currentService");
console.log("onShow", currentService); console.log("onShow", currentService);
console.log("serverpart", _this2.serverpart); console.log("serverpart", _this2.serverpart);
console.log("come", _this2.come); console.log("come", _this2.come);
// && this.come !== "chargeBox" // && this.come !== "chargeBox"
if (!(currentService.SERVERPART_ID !== _this2.serverpart)) { if (!(currentService.SERVERPART_ID !== _this2.serverpart)) {
_context2.next = 15; _context2.next = 14;
break; break;
} }
_this2.serverpart = currentService.SERVERPART_ID; _this2.serverpart = currentService.SERVERPART_ID;
_context2.next = 13; _context2.next = 12;
return _this2.handleGetServerpartDetail(_this2.serverpart); return _this2.handleGetServerpartDetail(_this2.serverpart);
case 13: case 12:
_context2.next = 15; _context2.next = 14;
return _this2.handleGetMerchant(); return _this2.handleGetMerchant();
case 15: case 14:
case "end": case "end":
return _context2.stop(); return _context2.stop();
} }
@ -963,12 +962,12 @@ var _default = {
if (this.user.MEMBERSHIP_MOBILEPHONE) { if (this.user.MEMBERSHIP_MOBILEPHONE) {
var id = item.SERVERPARTSHOP_IDS.split(",")[0]; var id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE) url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER)
}); });
} else { } else {
var _id = item.SERVERPARTSHOP_IDS.split(",")[0]; var _id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE) url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER)
}); });
this.isLogin = true; this.isLogin = true;
} }

4
unpackage/dist/dev/mp-weixin/pages/serviceDetail/shopDetail/index.js vendored
View File

@ -394,12 +394,12 @@ var _default = {
if (this.user.MEMBERSHIP_MOBILEPHONE) { if (this.user.MEMBERSHIP_MOBILEPHONE) {
var id = item.SERVERPARTSHOP_IDS.split(",")[0]; var id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE) url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER)
}); });
} else { } else {
var _id = item.SERVERPARTSHOP_IDS.split(",")[0]; var _id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({ uni.navigateTo({
url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE) url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER)
}); });
this.isLogin = true; this.isLogin = true;
} }

2
utils/publicMethods.js
View File

@ -164,8 +164,6 @@ export async function handleGetIOSPosition() {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const data = permision.judgeIosPermission("location") const data = permision.judgeIosPermission("location")
let locationFirst = uni.getStorageSync("locationFirst"); let locationFirst = uni.getStorageSync("locationFirst");
if (data) { if (data) {