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

1

This commit is contained in:
faiz 2024-03-25 16:01:55 +08:00
parent 59543847aa aa54cae220
commit c9f08e2243
10 changed files with 110 additions and 47 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" : {}
}, },

35
pages.json
View File

@ -16,7 +16,7 @@
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
"navigationStyle": "custom", "navigationStyle": "custom",
// #ifdef APP-PLUS // #ifdef APP-PLUS
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
// #endif // #endif
"app-plus": { "app-plus": {
"scrollIndicator": false //禁用原生导航栏 "scrollIndicator": false //禁用原生导航栏
@ -26,7 +26,7 @@
{ {
"path": "pages/order_addcart/order_addcart", "path": "pages/order_addcart/order_addcart",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "购物车" "navigationBarTitleText": "购物车"
} }
}, },
@ -40,7 +40,7 @@
{ {
"path": "pages/user/index", "path": "pages/user/index",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
@ -53,18 +53,11 @@
} }
}, },
{
"path": "pages/shop/index",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "门店"
}
},
{ {
"path": "pages/shop_details/index", "path": "pages/shop_details/index",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationStyle": "custom" "navigationBarTitleText": "门店详情"
// #ifdef MP || APP-PLUS // #ifdef MP || APP-PLUS
, ,
"navigationBarBackgroundColor": "#F2F2F2" "navigationBarBackgroundColor": "#F2F2F2"
@ -84,15 +77,19 @@
{ {
"path": "pages/goods_cate/goods_cate", "path": "pages/goods_cate/goods_cate",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "商品分类" "navigationBarTitleText": "商品分类"
} }
}, },
{ {
"path": "pages/shop/index", "path": "pages/shop/index",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "商家联盟" "navigationStyle": "custom",
// "navigationBarTitleText": "商家联盟",
"app-plus": {
"scrollIndicator": false //禁用原生导航栏
}
} }
}, },
{ {
@ -972,7 +969,7 @@
"pages": [{ "pages": [{
"path": "goods_seckill/index", "path": "goods_seckill/index",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "限时秒杀", "navigationBarTitleText": "限时秒杀",
"navigationBarBackgroundColor": "#F2F2F2" "navigationBarBackgroundColor": "#F2F2F2"
} }
@ -994,7 +991,7 @@
{ {
"path": "presell/index", "path": "presell/index",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "预售列表" "navigationBarTitleText": "预售列表"
// #ifdef MP || APP-PLUS // #ifdef MP || APP-PLUS
, ,
@ -1012,7 +1009,7 @@
{ {
"path": "combination/index", "path": "combination/index",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "拼团" "navigationBarTitleText": "拼团"
// #ifdef MP || APP-PLUS // #ifdef MP || APP-PLUS
, ,
@ -1038,7 +1035,7 @@
{ {
"path": "assist/index", "path": "assist/index",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": false,
"navigationBarTitleText": "助力列表", "navigationBarTitleText": "助力列表",
"navigationBarBackgroundColor": "#F2F2F2" "navigationBarBackgroundColor": "#F2F2F2"
} }
@ -1328,7 +1325,7 @@
"pagePath": "pages/shop/index", "pagePath": "pages/shop/index",
"iconPath": "static/images/shop/index-tab.png", "iconPath": "static/images/shop/index-tab.png",
"selectedIconPath": "static/images/shop/index-tab.png", "selectedIconPath": "static/images/shop/index-tab.png",
"text": "门店" "text": "商家"
}, },
{ {
"pagePath": "pages/order_addcart/order_addcart", "pagePath": "pages/order_addcart/order_addcart",

14
pages/admin/business/index.vue
View File

@ -64,6 +64,20 @@
icon: 'iconfont icon-shangjiaguanli' icon: 'iconfont icon-shangjiaguanli'
}); });
} }
if(this.service.is_goods){
list.push({
title: '我要收款',
url: '/pages/product/list/index?mer_id=' + merId,
icon: 'iconfont icon-shangjiaguanli'
});
}
if(this.service.is_goods){
list.push({
title: '基本信息',
url: '/pages/product/list/index?mer_id=' + merId,
icon: 'iconfont icon-shangjiaguanli'
});
}
return list; return list;
} }
}, },

17
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,10 +34,11 @@
} }
.content .content-map{ .content .content-map{
width: 100%; width: 100%;
height: 300rpx; height: 520rpx;
} }
.content .content-map .map{ .content .content-map .map{
width:100%; width:100%;
height: 520rpx;
} }
.content .content-type{ .content .content-type{
width: 100%; width: 100%;
@ -88,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;

63
pages/shop/index.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<view class="content"> <view class="content">
<view class="top-tab"> <view class="top-tab" :style="`padding-top:`+navtop">
<view class="tab-location"> <view class="tab-location">
北京 深圳
<view class="iconfont icon-dingwei"></view> <view class="iconfont icon-dingwei"></view>
</view> </view>
商家联盟 商家联盟
@ -11,8 +11,11 @@
</view> </view>
<view class="content-map" > <view class="content-map" >
<map class="map" :latitude="22.547" :longitude="114.085947"></map> <map class="map" :latitude="22.547" :longitude="114.085947"></map>
</view> </view>
<view class="content-type"> <view class="content-type">
<!-- <cover-image src="../annex/static/vipBg.png" style="position: absolute;
top: -20px;"></cover-image> -->
<view class="type-item"> <view class="type-item">
<image class="type-item-img" src="@/static/images/shop/tab1.png" mode=""></image> <image class="type-item-img" src="@/static/images/shop/tab1.png" mode=""></image>
<text class="type-item-text">餐饮美食</text> <text class="type-item-text">餐饮美食</text>
@ -23,7 +26,7 @@
</view> </view>
<view class="type-item"> <view class="type-item">
<image class="type-item-img" src="@/static/images/shop/tab3.png" mode=""></image> <image class="type-item-img" src="@/static/images/shop/tab3.png" mode=""></image>
<text class="type-item-text">休息娱乐</text> <text class="type-item-text">休闲娱乐</text>
</view> </view>
<view class="type-item"> <view class="type-item">
<image class="type-item-img" src="@/static/images/shop/tab4.png" mode=""></image> <image class="type-item-img" src="@/static/images/shop/tab4.png" mode=""></image>
@ -46,7 +49,7 @@
<text class="type-item-text">汽车服务</text> <text class="type-item-text">汽车服务</text>
</view> </view>
<view class="type-item"> <view class="type-item">
<image class="type-item-img" src="@/static/images/shop/tab8.png" mode=""></image> <image class="type-item-img" src="@/static/images/shop/tab9.png" mode=""></image>
<text class="type-item-text">家装</text> <text class="type-item-text">家装</text>
</view> </view>
<view class="type-item"> <view class="type-item">
@ -59,10 +62,19 @@
<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="true">
<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"> <view class="list-item-left" v-if="index==1">
<image src="../users/static/images/level_avatar.png" mode=""></image> <image src="@/static/images/shop/1.jpg" mode=""></image>
</view>
<view class="list-item-left" v-else-if="index==2">
<image src="@/static/images/shop/2.jpg" mode=""></image>
</view>
<view class="list-item-left" v-else-if="index==3">
<image src="@/static/images/shop/3.png" mode=""></image>
</view>
<view class="list-item-left" v-else>
<image src="@/static/images/shop/4.jpg" mode=""></image>
</view> </view>
<view class="list-item-right" @click="navtoDetail()"> <view class="list-item-right" @click="navtoDetail()">
<view class="item-title"> <view class="item-title">
@ -88,23 +100,58 @@
</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>
</view>
<!--自定义底部tab栏-->
<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
</view>
</template> </template>
<script> <script>
import { HTTP_REQUEST_URL } from '@/config/app';
import { getNavigation } from '@/api/public.js';
import customTab from '@/components/customTab';
export default { export default {
components:{ components:{
customTab,
}, },
data(){ data(){
return{ return{
domain: HTTP_REQUEST_URL,
newData: {},
activeRouter: '',
tabList:[], tabList:[],
current:0, current:0,
navtop:0,
} }
}, },
onLoad(){ onLoad(){
}, },
onShow(){
this.getNav();
},
created(options) {
let statusBarHeight= uni.getSystemInfoSync().statusBarHeight+"px";
this.navtop=statusBarHeight;
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
let curRoute = routes[routes.length - 1].route //获取当前页面路由
this.activeRouter = '/' + curRoute
},
methods:{ methods:{
getNav(){
getNavigation().then(res => {
this.newData = res.data
if (this.newData.status && this.newData.status.status) {
uni.hideTabBar()
} else {
uni.showTabBar()
}
})
},
handleBorcode() { handleBorcode() {
// 从相机和相册扫码 // 从相机和相册扫码
// #ifdef APP-PLUS // #ifdef APP-PLUS

BIN
static/images/shop/1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 62 KiB

BIN
static/images/shop/2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
static/images/shop/3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 175 KiB

BIN
static/images/shop/4.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB