sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev

master
gongfuxiang 2023-12-15 11:46:24 +08:00
parent f85321e9e6 9c60b488a5
commit 9ba2f785e4
3 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/css/page.css
View File

@ -237,7 +237,7 @@ button:before {
.pr {
position: relative;
}
}
.z-i {
z-index: 1 !important;
@ -309,12 +309,12 @@ button:before {
z-index: 2;
padding: 40rpx 90rpx;
background-color: #fff;
box-shadow: inset 0px 1px 3px 0px rgba(0, 0, 0, 0.08);
}
box-shadow: inset 0px 2px 2px 0px rgba(0, 0, 0, 0.08);
}
/**
* 底部右侧浮动+号
*/
*/
.buttom-right-submit {
position: fixed;
bottom: 50rpx;
@ -329,9 +329,9 @@ button:before {
/**
* 兼容底部横线底部内边距
*/
.bottom-line-exclude {
.bottom-line-exclude {
/* #ifndef APP */
padding-bottom: calc(env(safe-area-inset-bottom) - 40rpx);
padding-bottom: calc(env(safe-area-inset-bottom) - 40rpx);
/* #endif */
}
@ -623,10 +623,10 @@ button:before {
.br-0 {
border: 0 !important;
box-shadow: none;
}
.br-top-shadow {
box-shadow: 0rpx -4rpx 10rpx 0px rgba(0, 0, 0, 0.03);
}
.br-top-shadow {
box-shadow: 0rpx -4rpx 10rpx 0px rgba(0, 0, 0, 0.03);
}
/**
@ -968,7 +968,7 @@ button[disabled].bg-grey {
border-radius: 4rpx;
border: 2rpx solid #FFCAC0;
color: #FFCAC0;
padding: 0 12rpx;
padding: 0 12rpx;
line-height: 40rpx;
}

2
components/nav-back/nav-back.vue
View File

@ -96,8 +96,6 @@
<style scoped>
.nav-back {
height: 30px;
/* #ifdef MP */
padding-bottom: 10px !important;
/* #endif */
}
</style>

98
components/no-data/no-data.vue
View File

@ -1,30 +1,30 @@
<template>
<view :class="theme_view">
<!-- 是否有网络 -->
<view v-if="network_type_value == 'none'" class="network-type-tips wh-auto tc bs-bb padding-horizontal-main">
<view class="cr-base text-size">暂时无网络连接</view>
<view class="cr-grey margin-top-sm">请您检查是否系统设置-＞蜂窝移动网络中是否允许【{{title}}】APP使用蜂窝移动网络或无线局域网</view>
</view>
<view v-else>
<!-- 1 加载中 -->
<view v-if="propStatus == 1" class="no-data-box tc no-data-loading loading-animation">
<text>{{title}}</text>
</view>
<!-- 2 处理错误 -->
<view v-else-if="propStatus == 2" class="no-data-box tc">
<image :src="static_dir + 'error.png'" mode="widthFix"></image>
<view class="no-data-tips">{{propMsg || '处理错误'}}</view>
<view v-if="propBackBtn" class="margin-top-xxxl tc">
<button type="default" size="mini" class="bg-grey-e br-grey cr-base round" @tap="back_event">返回</button>
</view>
</view>
<!-- 0 默认没有数据 -->
<view v-else-if="propStatus == 0" class="no-data-box tc">
<image :src="propUrl ? propUrl : static_dir + 'empty.png'" mode="widthFix"></image>
<view class="no-data-tips">{{propMsg || '没有相关数据'}}</view>
</view>
<view :class="theme_view">
<!-- 是否有网络 -->
<view v-if="network_type_value == 'none'" class="network-type-tips wh-auto tc bs-bb padding-horizontal-main">
<view class="cr-base text-size">暂时无网络连接</view>
<view class="cr-grey margin-top-sm">请您检查是否系统设置-＞蜂窝移动网络中是否允许【{{title}}】APP使用蜂窝移动网络或无线局域网</view>
</view>
<view v-else>
<!-- 1 加载中 -->
<view v-if="propStatus == 1" class="no-data-box tc no-data-loading loading-animation">
<text>{{title}}</text>
</view>
<!-- 2 处理错误 -->
<view v-else-if="propStatus == 2" class="no-data-box tc">
<image :src="static_dir + 'error.png'" mode="widthFix"></image>
<view class="no-data-tips">{{propMsg || '处理错误'}}</view>
<view v-if="propBackBtn" class="margin-top-xxxl tc">
<button type="default" size="mini" class="bg-grey-e br-grey cr-base round" @tap="back_event">返回</button>
</view>
</view>
<!-- 0 默认没有数据 -->
<view v-else-if="propStatus == 0" class="no-data-box tc">
<image :src="propUrl ? propUrl : static_dir + 'empty.png'" mode="widthFix"></image>
<view class="no-data-tips">{{propMsg || '没有相关数据'}}</view>
</view>
</view>
</view>
</template>
@ -35,7 +35,7 @@
return {
theme_view: app.globalData.get_theme_value_view(),
static_dir: '/static/images/common/',
title: app.globalData.get_application_title(),
title: app.globalData.get_application_title(),
network_type_value: 0,
};
},
@ -52,32 +52,32 @@
propUrl: {
type: String,
default: '',
},
propBackBtn: {
type: Boolean,
default: true,
},
},
// 页面被展示
created: function () {
self = this;
uni.getNetworkType({
success: function (res) {
self.network_type_value = res.networkType;
}
});
propBackBtn: {
type: Boolean,
default: true,
},
},
methods: {
// 返回事件
back_event(e) {
app.globalData.page_back_prev_event();
}
// 页面被展示
created: function () {
self = this;
uni.getNetworkType({
success: function (res) {
self.network_type_value = res.networkType;
}
});
},
methods: {
// 返回事件
back_event(e) {
app.globalData.page_back_prev_event();
}
},
};
</script>
<style>
.network-type-tips {
padding-top: 15%;
<style>
.network-type-tips {
padding-top: 15%;
}
.no-data-box {
padding: 15% 0;
@ -100,7 +100,7 @@
-webkit-text-fill-color: transparent;
font-size: 60rpx;
font-weight: bold;
padding-top: 20%;
padding-top: 50%;
}
.loading-animation {
-webkit-animation: loading-animation 2s linear infinite;