Branch_ccc #10

Merged
root merged 22 commits from Branch_ccc into master 2024-11-13 11:11:55 +08:00
5 changed files with 7 additions and 7 deletions
Showing only changes of commit f88c6e9d14 - Show all commits

View File

@ -4,7 +4,7 @@
<s-layout title="首页" navbar="normal" tools="search" tabbar="/pages/index/index" :bgStyle="template.page"
:navbarStyle="template.navigationBar" onShareAppMessage @search="(e) => { console.log(e,'eeeeeeeeeeee') }"
headerBtns='headerBtns' backgroundColor="rgba(248,83,42)" opacityBgUi='ll' :navBg="true">
headerBtns='headerBtns' backgroundColor="#e93422" opacityBgUi='ll' :navBg="true">
<view class="new-bg"></view>
<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
@ -90,7 +90,7 @@
<style lang="scss">
.new-bg {
background: rgba(248, 83, 42);
background: #e93422;
width: 100%;
height: 50px;
position: absolute;

View File

@ -46,7 +46,7 @@
<!-- 营销组件优惠券 -->
<s-coupon-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
<!-- 营销组件魔方 -->
<s-mof-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
<s-mof-block v-if="type === 'MenuGridTow'" :data="data" :styles="styles" />
<!-- 营销组件文章 -->
<!-- <s-richtext-block v-if="type === 'PromotionArticle'" :data="data" :styles="styles" /> -->
<view class="floxt" v-if="type === 'PromotionArticle'">

View File

@ -290,11 +290,11 @@
width: 24%;
&.on{
.t {
color: rgba(255, 102, 7);
color: #e93422;
}
.b {
background: rgba(255, 102, 7);
background: #e93422;
color:white;
}
}

View File

@ -172,7 +172,7 @@
border-radius: 5px;
margin: 0 auto;
padding: 5px 0;
margin-top: 10px;
// margin-top: 10px;
padding-bottom: 10px;
padding-top: 10px;
&>.t {

View File

@ -25,6 +25,6 @@
height: var(--status-bar-height);
}
.ss {
background: rgba(248, 83, 42);
background: #e93422;
}
</style>