空状态补充-字体补充-优惠券样式bug

parent ec4dc1d0
@font-face {
font-family: "优设标题黑";
src: url('./优设标题黑.ttf');
font-weight: normal;
font-style: normal;
}
\ No newline at end of file
...@@ -4,6 +4,8 @@ import store from './store'; ...@@ -4,6 +4,8 @@ import store from './store';
import '@/assets/iconfont/iconfont.css'; // 引入自定义图标样式文件 import '@/assets/iconfont/iconfont.css'; // 引入自定义图标样式文件
import Vconsole from 'vconsole'; import Vconsole from 'vconsole';
import './styles/flex.scss'; import './styles/flex.scss';
// 字体
import '@/assets/iconfont/font.css';
export function createApp() { export function createApp() {
const app = createSSRApp(App); const app = createSSRApp(App);
const vConsole = new Vconsole(); const vConsole = new Vconsole();
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<view class="top"> <view class="top">
<!-- 搜索 --> <!-- 搜索 -->
<Search @toSearch="toSearch"> <Search @toSearch="toSearch">
<image class="food" :src="pics" mode="widthFix" /> <text class="title-icon">{{ categoryNames }}</text>
<!-- <image class="food" :src="pics" mode="widthFix" /> -->
</Search> </Search>
<!-- 类别选择 --> <!-- 类别选择 -->
<scroll-view <scroll-view
...@@ -96,6 +97,7 @@ ...@@ -96,6 +97,7 @@
<Sort v-show="rotate3" @sortParams="sortParams" /> <Sort v-show="rotate3" @sortParams="sortParams" />
</view> </view>
<FoodDetails :cardData="cardData" /> <FoodDetails :cardData="cardData" />
<wd-status-tip v-if="cardData.length === 0" image="content" tip="暂无内容" />
<view <view
style="width: 100%; text-align: center; font-size: 24rpx; margin-top: 10rpx; color: #888989" style="width: 100%; text-align: center; font-size: 24rpx; margin-top: 10rpx; color: #888989"
v-if="params.isEnd" v-if="params.isEnd"
...@@ -345,6 +347,12 @@ page { ...@@ -345,6 +347,12 @@ page {
min-height: 420rpx; min-height: 420rpx;
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
overflow: hidden; overflow: hidden;
.title-icon {
font-family: '优设标题黑';
font-size: 24 * 2rpx;
margin-left: 30rpx;
color: #ffffff;
}
.food { .food {
width: 178rpx; width: 178rpx;
height: 45rpx; height: 45rpx;
......
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
</view> </view>
</view> </view>
<!-- 店铺信息-end --> <!-- 店铺信息-end -->
<view class="shop-info-box"></view>
<!-- 补贴 --> <!-- 补贴 -->
<view class="subsidy-content" @click="jumpPage"> <view class="subsidy-content" @click="jumpPage">
<view class="subsidy"> <view class="subsidy">
...@@ -815,15 +814,10 @@ page { ...@@ -815,15 +814,10 @@ page {
.content { .content {
width: 750rpx; width: 750rpx;
position: relative; position: relative;
// 商家信息
.shop-info-box {
height: 146 * 2rpx;
height: 116 * 2rpx;
}
.shop-info { .shop-info {
width: 750rpx; width: 750rpx;
background-color: #fdfdfd; background-color: #fdfdfd;
position: absolute; position: relative;
top: -80rpx; top: -80rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx; border-radius: 16rpx 16rpx 0rpx 0rpx;
display: flex; display: flex;
...@@ -957,6 +951,9 @@ page { ...@@ -957,6 +951,9 @@ page {
padding: 10rpx 40rpx 14rpx 12rpx; padding: 10rpx 40rpx 14rpx 12rpx;
background: #ffefee; background: #ffefee;
margin-top: 16rpx; margin-top: 16rpx;
flex-shrink: 0;
top: -80rpx;
position: relative;
box-shadow: 0rpx 2 * 2rpx 10 * 2rpx 0 * 2rpx rgba(226, 3, 3, 0.08); box-shadow: 0rpx 2 * 2rpx 10 * 2rpx 0 * 2rpx rgba(226, 3, 3, 0.08);
.subsidy { .subsidy {
width: 144 * 2rpx; width: 144 * 2rpx;
...@@ -997,6 +994,8 @@ page { ...@@ -997,6 +994,8 @@ page {
border-radius: 8 * 2rpx; border-radius: 8 * 2rpx;
background: #ffffff; background: #ffffff;
display: flex; display: flex;
position: relative;
top: -80rpx;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx; padding: 20rpx;
...@@ -1054,6 +1053,9 @@ page { ...@@ -1054,6 +1053,9 @@ page {
padding: 20rpx 40rpx; padding: 20rpx 40rpx;
background: #fdfdfd; background: #fdfdfd;
margin-top: 20rpx; margin-top: 20rpx;
position: relative;
top: -80rpx;
.title { .title {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1181,6 +1183,8 @@ page { ...@@ -1181,6 +1183,8 @@ page {
box-sizing: border-box; box-sizing: border-box;
padding: 11 * 2rpx; padding: 11 * 2rpx;
margin-top: 10rpx; margin-top: 10rpx;
position: relative;
top: -80rpx;
.useer-reviews-title { .useer-reviews-title {
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -1313,6 +1317,8 @@ page { ...@@ -1313,6 +1317,8 @@ page {
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx; padding: 20rpx;
margin-top: 10rpx; margin-top: 10rpx;
position: relative;
top: -80rpx;
.title { .title {
font-size: 13 * 2rpx; font-size: 13 * 2rpx;
font-weight: bold; font-weight: bold;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment