faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
yangtao 2024-03-25 10:42:01 +08:00
parent f991263979
commit aa54cae220
4 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -60,7 +60,7 @@
onLaunch: function(option) { onLaunch: function(option) {
uni.hideTabBar(); uni.hideTabBar();
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid this.globalData.uid = this.$store.state.app.uid;
let that = this; let that = this;
// #ifdef MP // #ifdef MP
if (HTTP_REQUEST_URL == '') { if (HTTP_REQUEST_URL == '') {

26
manifest.json
View File

@ -58,7 +58,6 @@
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>" "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
], ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
@ -79,14 +78,15 @@
"NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
"NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
}, },
"idfa" : false "idfa" : false,
"dSYMs" : false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs" : {
"maps" : { "maps" : {
"amap" : { "amap" : {
"appkey_ios" : "", "appkey_ios" : "f868a24eddab123b4e3a2cadb78b6fba",
"appkey_android" : "" "appkey_android" : "a4fc891e60ccdf388ce0996cc833aca1"
} }
}, },
"payment" : { "payment" : {
@ -94,27 +94,17 @@
"__platform__" : [ "ios", "android" ] "__platform__" : [ "ios", "android" ]
} }
}, },
"share" : { "share" : {},
"weixin" : {
"appid" : "",
"UniversalLinks" : "https://mer. .net/"
}
},
"geolocation" : { "geolocation" : {
"amap" : { "amap" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ],
"appkey_ios" : "", "appkey_ios" : "f868a24eddab123b4e3a2cadb78b6fba",
"appkey_android" : "" "appkey_android" : "a4fc891e60ccdf388ce0996cc833aca1"
} }
}, },
"push" : {}, "push" : {},
"oauth" : { "oauth" : {
"apple" : {}, "apple" : {}
"weixin" : {
"appid" : "",
"appsecret" : "",
"UniversalLinks" : "https://mer. .net/"
}
}, },
"ad" : {} "ad" : {}
}, },

18
pages/shop/css/shop.css
View File

@ -26,6 +26,7 @@
font-size: 40rpx; font-size: 40rpx;
position: absolute; position: absolute;
right:28rpx; right:28rpx;
color:#3587F7;
} }
.content .top-tab .tab-location .icon-dingwei{ .content .top-tab .tab-location .icon-dingwei{
color: blue; color: blue;
@ -33,11 +34,11 @@
} }
.content .content-map{ .content .content-map{
width: 100%; width: 100%;
height: 400rpx; height: 520rpx;
} }
.content .content-map .map{ .content .content-map .map{
width:100%; width:100%;
height: 400rpx; height: 520rpx;
} }
.content .content-type{ .content .content-type{
width: 100%; width: 100%;
@ -89,6 +90,19 @@
margin: 24rpx 28rpx; margin: 24rpx 28rpx;
padding: 24rpx 0; padding: 24rpx 0;
} }
.content .content-list .list-container .list-fail {
text-align: center;
margin: 78rpx auto 56rpx auto;
padding-bottom: 60rpx;
}
.content .content-list .list-container .list-fail image {
width: 414rpx;
height: 305rpx;
}
.content .content-list .list-container .list-fail view{
color: #999;
}
.content .content-list .list-container .list-item .list-item-left{ .content .content-list .list-container .list-item .list-item-left{
display: flex; display: flex;
justify-content: center; justify-content: center;

15
pages/shop/index.vue
View File

@ -62,7 +62,7 @@
<view :class="current==0?'action':''" @click="selectCurrent(0)">全部商家</view> <view :class="current==0?'action':''" @click="selectCurrent(0)">全部商家</view>
<view :class="current==1?'action':''" @click="selectCurrent(1)">附近商家</view> <view :class="current==1?'action':''" @click="selectCurrent(1)">附近商家</view>
</view> </view>
<view class="list-container"> <view class="list-container" v-if="false">
<view class="list-item" v-for="(item,index) in 20" :key='index'> <view class="list-item" v-for="(item,index) in 20" :key='index'>
<view class="list-item-left" v-if="index==1"> <view class="list-item-left" v-if="index==1">
<image src="@/static/images/shop/1.jpg" mode=""></image> <image src="@/static/images/shop/1.jpg" mode=""></image>
@ -100,13 +100,19 @@
</view> </view>
</view> </view>
</view> </view>
<view class="list-container" v-else>
<view class="list-fail">
<image :src="`${domain}/static/images/noCart.png`"></image>
<view>暂无商家，去看看其他的吧</view>
</view>
</view>
</view> </view>
<!--自定义底部tab栏--> <!--自定义底部tab栏-->
<customTab :newData="newData" :activeRouter="activeRouter"></customTab> <customTab :newData="newData" :activeRouter="activeRouter"></customTab>
</view> </view>
</template> </template>
<script> <script>
import { HTTP_REQUEST_URL } from '@/config/app';
import { getNavigation } from '@/api/public.js'; import { getNavigation } from '@/api/public.js';
import customTab from '@/components/customTab'; import customTab from '@/components/customTab';
export default { export default {
@ -115,8 +121,9 @@
}, },
data(){ data(){
return{ return{
newData: {}, domain: HTTP_REQUEST_URL,
activeRouter: '', newData: {},
activeRouter: '',
tabList:[], tabList:[],
current:0, current:0,
navtop:0, navtop:0,