Compare commits

..

No commits in common. "fc1a36ef3b54399c9cea5f4c1c62a1c0bbf4420f" and "04fbcd6449c93fcc642e7c650a220a56cdfb133d" have entirely different histories.

12 changed files with 271 additions and 357 deletions

View File

@ -3,23 +3,7 @@ import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
onLaunch(() => { onLaunch(() => {
//tabBar //tabBar
// #ifdef MP-ALIPAY // uni.hideTabBar();
my.hideTabBar({
animation: false, // alipay 1.95.0
success: (res) => {
//
console.log("TabBar has been hidden", res);
},
fail: (err) => {
//
console.error("Failed to hide TabBar", err);
},
});
// #endif
// #ifndef MP-ALIPAY
uni.hideTabBar();
// #endif
}); });
onShow(() => { onShow(() => {
console.log("App Show"); console.log("App Show");

View File

@ -37,7 +37,6 @@ const navbarRect = reactive({
layoutHeight: 0, layoutHeight: 0,
}); });
// #ifndef H5
const menuButtonInfo = uni.getMenuButtonBoundingClientRect(); const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
navbarRect.height = menuButtonInfo.height; navbarRect.height = menuButtonInfo.height;
navbarRect.top = menuButtonInfo.top; navbarRect.top = menuButtonInfo.top;
@ -54,7 +53,6 @@ uni.getSystemInfo({
50; 50;
}, },
}); });
// #endif
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -67,7 +65,7 @@ uni.getSystemInfo({
background-color: bisque; background-color: bisque;
} }
.layout { .layout {
background-color: #fff; background-color: #FFF;
} }
.bottom { .bottom {
position: fixed; position: fixed;

View File

@ -1,22 +1,17 @@
<template> <template>
<!-- 工作台底部菜单 --> <!-- 工作台底部菜单 -->
<view class="custom-tabbar"> <view class="custom-tabbar">
<view <view v-for="item in state.list" :key="item.text" @click="handleClick(item)">
v-for="item in state.list"
:key="item.text"
@click="handleClick(item)"
>
<view> <view>
<image <image
:src="`${url}/static/img/tabbar/${ :src="`${url}/static/img/tabbar/${select === item.text ? item.activeIcon : item.icon}`"
select === item.text ? item.activeIcon : item.icon
}`"
class="custom-img" class="custom-img"
></image> ></image>
</view> </view>
<view :class="{ active: select === item.text }"> <view :class="{'active': select === item.text}">
{{ item.text }} {{ item.text }}
</view> </view>
</view> </view>
<!-- <view v-for="item in state.list" :key="item.text"> <!-- <view v-for="item in state.list" :key="item.text">
<image <image
@ -74,7 +69,8 @@ const handleClick = (item: tabBar) => {
}; };
onLaunch(() => { onLaunch(() => {
//tabBar
uni.hideTabBar();
}); });
</script> </script>

View File

@ -86,8 +86,7 @@
"lazyCodeLoading" : "requiredComponents" "lazyCodeLoading" : "requiredComponents"
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true, "usingComponents" : true
"styleIsolation":"apply-shared"
}, },
"mp-baidu" : { "mp-baidu" : {
"usingComponents" : true "usingComponents" : true

View File

@ -15,14 +15,14 @@
{ {
"path": "pagesHome/index", "path": "pagesHome/index",
"style": { "style": {
// "navigationStyle": "custom", // "navigationStyle": "custom", //
"navigationBarTitleText": "首页" "navigationBarTitleText": "首页"
} }
}, },
{ {
"path": "pagesHome/profile", "path": "pagesHome/profile",
"style": { "style": {
// "navigationStyle": "custom", // "navigationStyle": "custom", //
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的"
} }
} }
@ -113,11 +113,11 @@
"list": [ "list": [
{ {
"pagePath": "pagesHome/index", "pagePath": "pagesHome/index",
"text": "" "text": "工作台"
}, },
{ {
"pagePath": "pagesHome/profile", "pagePath": "pagesHome/profile",
"text": "" "text": "我的"
} }
] ]
}, },

View File

@ -2,8 +2,8 @@
<!-- 轮播图 --> <!-- 轮播图 -->
<CustomSwiper :list="bannerList"> </CustomSwiper> <CustomSwiper :list="bannerList"> </CustomSwiper>
<!-- 入口 --> <!-- 入口 -->
<view class="entry-card">
<uni-card <uni-card
class="entry-card"
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'20px 10px'" :padding="'20px 10px'"
:border="false" :border="false"
@ -23,11 +23,9 @@
</view> </view>
</view> </view>
</uni-card> </uni-card>
</view>
<!-- 介绍 --> <!-- 介绍 -->
<view class="avatar-card">
<uni-card <uni-card
class="avatar-card"
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'20px 10px'" :padding="'20px 10px'"
:border="false" :border="false"
@ -45,8 +43,11 @@
<up-gap height="10" bgColor="#F8F8F8"></up-gap> <up-gap height="10" bgColor="#F8F8F8"></up-gap>
<view class="title mt-20">回收物品</view> <view class="title mt-20">回收物品</view>
<uni-grid :column="2" :showBorder="false" :square="false"> <uni-grid :column="2" :showBorder="false" :square="false">
<uni-grid-item v-for="(item, index) in serviceItemList" :key="index"> <uni-grid-item
<view class="item"> class="item"
v-for="(item, index) in serviceItemList"
:key="index"
>
<uni-card <uni-card
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'0px'" :padding="'0px'"
@ -63,7 +64,6 @@
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
</view> </view>
</uni-card> </uni-card>
</view>
</uni-grid-item> </uni-grid-item>
</uni-grid> </uni-grid>
@ -80,14 +80,9 @@
<view class="other"> <view class="other">
<view>其他问题请咨询客服电话</view> <view>其他问题请咨询客服电话</view>
<view <view><text @click="callNumber('15150231777')" class="active">15150231777&nbsp;&nbsp;欢迎咨询</text></view>
><text @click="callNumber('15150231777')" class="active"
>15150231777&nbsp;&nbsp;欢迎咨询</text
></view
>
</view> </view>
</uni-card> </uni-card>
</view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -186,7 +181,7 @@ const handleClick = (item: any) => {
}); });
}; };
const callNumber = (number:any) => { const callNumber = (number) => {
// //
if ( if (
uni.getSystemInfoSync().platform === "android" || uni.getSystemInfoSync().platform === "android" ||

View File

@ -3,15 +3,18 @@
<!-- 轮播图 --> <!-- 轮播图 -->
<CustomSwiper> </CustomSwiper> <CustomSwiper> </CustomSwiper>
<!-- 入口 --> <!-- 入口 -->
<view class="entry-card">
<uni-card <uni-card
class="entry-card"
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'20px 10px'" :padding="'20px 10px'"
:border="false" :border="false"
> >
<uni-grid :column="3" :showBorder="false" :square="false"> <uni-grid :column="3" :showBorder="false" :square="false">
<uni-grid-item v-for="(item, index) in entryItemList" :key="index"> <uni-grid-item
<view class="item"> class="item"
v-for="(item, index) in entryItemList"
:key="index"
>
<view @click="handleClick(item)"> <view @click="handleClick(item)">
<view> <view>
<image :src="`${url}/static/img/${item.path}`"></image> <image :src="`${url}/static/img/${item.path}`"></image>
@ -20,15 +23,12 @@
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
</view> </view>
</view> </view>
</view>
</uni-grid-item> </uni-grid-item>
</uni-grid> </uni-grid>
</uni-card> </uni-card>
</view>
<!-- 介绍 --> <!-- 介绍 -->
<view class="avatar-card">
<uni-card <uni-card
class="avatar-card"
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'10px 10px'" :padding="'10px 10px'"
:border="false" :border="false"
@ -60,7 +60,6 @@
style="width: 100%" style="width: 100%"
/> />
</uni-card> </uni-card>
</view>
</Layout> </Layout>
</template> </template>
@ -137,7 +136,7 @@ const handleClick = (item: any) => {
padding: 0px !important; padding: 0px !important;
} }
image + image { image + image {
margin-top: -14rpx; margin-top: -12rpx;
} }
} }
</style> </style>

View File

@ -6,7 +6,7 @@
<image :src="`${url}/static/img/profile/user.png`" class="user"></image> <image :src="`${url}/static/img/profile/user.png`" class="user"></image>
<view> <view>
<view> <view>
<text class="name">{{ '用户' || "-" }}</text> <text class="name">{{ '抖音用户' || "-" }}</text>
</view> </view>
<view> <view>
<text class="company">{{ '-' || "-" }}</text> <text class="company">{{ '-' || "-" }}</text>
@ -65,10 +65,8 @@ const hanldeClick = (item: any) => {
const openDoc = (item: string) => { const openDoc = (item: string) => {
// //
const isWX = uni.getSystemInfoSync().uniPlatform === 'mp-weixin'
console.log(`${url}/static/${isWX && (item === '在生万有隐私政策') ? 'weixin/' : ''}${item}.docx`)
uni.downloadFile({ uni.downloadFile({
url: `${url}/static/${isWX && (item === '在生万有隐私政策') ? 'weixin/' : ''}${item}.docx`, url: `${url}/static/${item}.docx`,
success: function (res) { success: function (res) {
setTimeout( setTimeout(
() => () =>
@ -94,25 +92,6 @@ const openDoc = (item: string) => {
}, },
}); });
}; };
//tabBar
// #ifdef MP-ALIPAY
my.hideTabBar({
animation: false, // alipay 1.95.0
success: (res) => {
//
console.log("TabBar has been hidden", res);
},
fail: (err) => {
//
console.error("Failed to hide TabBar", err);
},
});
// #endif
// #ifndef MP-ALIPAY
uni.hideTabBar();
// #endif
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -2,8 +2,8 @@
<!-- 轮播图 --> <!-- 轮播图 -->
<CustomSwiper :list="bannerList"> </CustomSwiper> <CustomSwiper :list="bannerList"> </CustomSwiper>
<!-- 介绍 --> <!-- 介绍 -->
<view class="avatar-card">
<uni-card <uni-card
class="avatar-card"
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'20px 10px'" :padding="'20px 10px'"
:border="false" :border="false"
@ -22,11 +22,7 @@
<view>货场名称{{ item.name }}</view> <view>货场名称{{ item.name }}</view>
<view>货场地址{{ item.address }}</view> <view>货场地址{{ item.address }}</view>
<view <view
>联系电话{{ item.owner }} &nbsp;&nbsp;<text >联系电话{{item.owner}} &nbsp;&nbsp;<text @click="callNumber(item.phone)" class="active">{{ item.phone }} &nbsp;&nbsp;欢迎询价</text></view
@click="callNumber(item.phone)"
class="active"
>{{ item.phone }} &nbsp;&nbsp;欢迎询价</text
></view
> >
</view> </view>
</view> </view>
@ -58,12 +54,12 @@
>加入爱梵达</u-button >加入爱梵达</u-button
></view ></view
> >
</view> </view>
<view class="mt-30 mb-30">爱梵达智能过磅系统提升您的经营效率</view> <view class="mt-30 mb-30">爱梵达智能过磅系统提升您的经营效率</view>
</uni-grid> </uni-grid>
</view> </view>
</uni-card> </uni-card>
</view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -83,7 +79,7 @@ const list = ref([
"长期回收废钢(轻一、轻二、轻三、重废、钢板料等)、废纸、泡沫、塑料等,量大价优,欢迎来电咨询。", "长期回收废钢(轻一、轻二、轻三、重废、钢板料等)、废纸、泡沫、塑料等,量大价优,欢迎来电咨询。",
name: "在生万有-中悦犇站", name: "在生万有-中悦犇站",
address: "上海市奉贤区川南奉公路8598号", address: "上海市奉贤区川南奉公路8598号",
owner: "刘先生", owner: '刘先生',
phone: "13651779998", phone: "13651779998",
}, },
{ {
@ -92,7 +88,7 @@ const list = ref([
"长期回收重废、中废、轻废、小废、岩棉板、花盒等,量大价优,欢迎来电咨询。", "长期回收重废、中废、轻废、小废、岩棉板、花盒等,量大价优,欢迎来电咨询。",
name: "上海宽钢公司", name: "上海宽钢公司",
address: "上海市宝山区兰岗路2号门", address: "上海市宝山区兰岗路2号门",
owner: "李女士", owner: '李女士',
phone: "13601647155", phone: "13601647155",
}, },
]); ]);
@ -126,14 +122,13 @@ const handleJoin = () => {
}); });
}; };
const callNumber = (number:any) => { const callNumber = (number) => {
// //
if ( if (
uni.getSystemInfoSync().platform === "android" || uni.getSystemInfoSync().platform === "android" ||
uni.getSystemInfoSync().platform === "ios" uni.getSystemInfoSync().platform === "ios"
) { ) {
// 使 // 使
// my.makePhoneCall({ number: '1111111' });
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: number, // phoneNumber: number, //
success: function () { success: function () {

View File

@ -2,15 +2,18 @@
<!-- 轮播图 --> <!-- 轮播图 -->
<CustomSwiper :list="bannerList"> </CustomSwiper> <CustomSwiper :list="bannerList"> </CustomSwiper>
<!-- 入口 --> <!-- 入口 -->
<view class="entry-card">
<uni-card <uni-card
class="entry-card"
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'20px 10px'" :padding="'20px 10px'"
:border="false" :border="false"
> >
<uni-grid :column="4" :showBorder="false" :square="false"> <uni-grid :column="4" :showBorder="false" :square="false">
<uni-grid-item v-for="(item, index) in entryItemList" :key="index"> <uni-grid-item
<view class="item"> class="item"
v-for="(item, index) in entryItemList"
:key="index"
>
<view @click="handleClick(item)"> <view @click="handleClick(item)">
<view> <view>
<image :src="`${url}/static/img/vehicle/${item.path}`"></image> <image :src="`${url}/static/img/vehicle/${item.path}`"></image>
@ -19,14 +22,12 @@
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
</view> </view>
</view> </view>
</view>
</uni-grid-item> </uni-grid-item>
</uni-grid> </uni-grid>
</uni-card> </uni-card>
</view>
<!-- 介绍 --> <!-- 介绍 -->
<view class="avatar-card">
<uni-card <uni-card
class="avatar-card"
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'20px 10px'" :padding="'20px 10px'"
:border="false" :border="false"
@ -38,7 +39,6 @@
v-for="(item, index) in serviceItemList" v-for="(item, index) in serviceItemList"
:key="index" :key="index"
> >
<view class="item">
<uni-card <uni-card
:shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'" :shadow="'0rpx 0rpx 10rpx 0rpx rgba(5,68,37,0.12)'"
:padding="'0px'" :padding="'0px'"
@ -55,7 +55,6 @@
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
</view> </view>
</uni-card> </uni-card>
</view>
</uni-grid-item> </uni-grid-item>
</uni-grid> </uni-grid>
@ -70,14 +69,9 @@
<view class="other"> <view class="other">
<view>其他问题请咨询客服电话</view> <view>其他问题请咨询客服电话</view>
<view <view><text @click="callNumber('15150231777')" class="active">15150231777 &nbsp;&nbsp;欢迎咨询</text></view>
><text @click="callNumber('15150231777')" class="active"
>15150231777 &nbsp;&nbsp;欢迎咨询</text
></view
>
</view> </view>
</uni-card> </uni-card>
</view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -183,7 +177,7 @@ const handleClick = (item: any) => {
}); });
}; };
const callNumber = (number: any) => { const callNumber = (number) => {
// //
if ( if (
uni.getSystemInfoSync().platform === "android" || uni.getSystemInfoSync().platform === "android" ||

View File

@ -4,8 +4,10 @@
:padding="'0px'" :padding="'0px'"
:margin="'20px'" :margin="'20px'"
:border="false" :border="false"
:cover="'cover'"
> >
<image <image
slot="cover"
style="height: 680rpx" style="height: 680rpx"
:src="`${url}/static/img/vehicle/flow.png`" :src="`${url}/static/img/vehicle/flow.png`"
mode="'aspectFit'" mode="'aspectFit'"

View File

@ -72,30 +72,3 @@ body {
.u-empty { .u-empty {
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
.uni-tabbar {
bottom: -10px !important;
}
.custom-tabbar {
background: #ffffff;
// box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 56, 93, 0.12);
border-radius: 13rpx 13rpx 0rpx 0rpx;
border-top: 1px solid rgba(0, 0, 0, 0.05);
display: flex;
align-items: center;
justify-content: space-around;
font-weight: 500;
font-size: 30rpx;
color: #999;
text-align: center;
padding-top: 20rpx;
.custom-img {
width: 48rpx;
height: 48rpx;
}
.active {
color: $u-primary;
}
}