Skip to content

7
7-Eleven
Commit b8062cc9 by 高淑倩
Options

warning

parent fee42de6
Showing with 61 additions and 203 deletions
src/app.wxss
/**app.wxss**/ /**app.wxss**/
page {
width: 100%;
box-sizing: border-box;
/* background-color: #f2f4f7; */
font-size: 30rpx;
font-family:"iconfont-711" !important;
}
.container { .container {
height: 100%; height: 100%;
display: flex; display: flex;
...@@ -20,16 +11,16 @@ page { ...@@ -20,16 +11,16 @@ page {
/* 主题色 */ /* 主题色 */
.theme-color{ .theme-color {
background-color: #CB3C3C; background-color: #cb3c3c;
} }
.theme-text-color{ .theme-text-color {
color: #CB3C3C; color: #cb3c3c;
} }
/* 按钮样式 */ /* 按钮样式 */
.btn{ .btn {
width: 100%; width: 100%;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
...@@ -37,48 +28,66 @@ page { ...@@ -37,48 +28,66 @@ page {
padding-right: 0; padding-right: 0;
border-radius: 0; border-radius: 0;
} }
.btn:active{ .btn:active {
opacity: 0.5; opacity: 0.5;
} }
.btn-default{ .btn-default {
background: none; background: none;
color: #808080; color: #808080;
border: 1px solid #808080; border: 1px solid #808080;
} }
.btn-primary{ .btn-primary {
background-color: #CB3C3C; background-color: #cb3c3c;
color: #ffffff; color: #ffffff;
border: 1px solid #CB3C3C; border: 1px solid #cb3c3c;
font-size: 25rpx; font-size: 25rpx;
} }
.btn-gray{ .btn-gray {
background-color: #959595; background-color: #959595;
color: #ffffff; color: #ffffff;
border: 1px solid #959595; border: 1px solid #959595;
font-size: 25rpx; font-size: 25rpx;
} }
.btn-outline{ .btn-outline {
background: none; background: none;
color: #CB3C3C; color: #cb3c3c;
} }
/* 按钮大小 */ /* 按钮大小 */
.btn-xs{ .btn-xs {
height: 39rpx; height: 39rpx;
line-height: 39rpx; line-height: 39rpx;
} }
.btn-sm{ .btn-sm {
height: 46rpx; height: 46rpx;
line-height: 46rpx; line-height: 46rpx;
} }
.btn-lg{ .btn-lg {
height: 88rpx; height: 88rpx;
line-height: 88rpx; line-height: 88rpx;
} }
.fixed-bottom0 {
position: fixed;
bottom: 0;
width: 100%;
z-index: 9999;
}
.pr {
float: right;
}
.df {
display: flex;
align-items: center;
justify-content: center;
}
/*文字居中*/
.tc {
text-align: center;
}
.df-1 {
flex: 1;
}
src/component/announcement/announcement.wxml
<!--component/announcement/announcement.wxml--> <!--component/announcement/announcement.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" /> <wxs src="../../wxs/utils.wxs" module="utils" />
<view class="announcement" style="background-color:{{notice.backgroundColor}}" data-redirectId="{{notice.redirectId}}" bindtap="handelToAnn">
<view class="announcement df" style="background-color:{{notice.backgroundColor}}" data-redirectId="{{notice.redirectId}}" bindtap="handelToAnn">
<view class="horn"> <view class="horn">
<image class="img" src="{{notice.iconImageUrl? utils.formateUrl(notice.iconImageUrl,baseImgUrl) : '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" /> <image class="img" src="{{notice.iconImageUrl? utils.formateUrl(notice.iconImageUrl,baseImgUrl) : '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" />
<!--<image class="img" src="{{notice.iconImageUrl? 'notice.iconImageUrl': '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" />--> <!--<image class="img" src="{{notice.iconImageUrl? 'notice.iconImageUrl': '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" />-->
......
src/component/announcement/announcement.wxss
/* component/announcement/announcement.wxss */ /* component/announcement/announcement.wxss */
@import './../../base/base.wxss';
.announcement { .announcement {
height: 58rpx; height: 58rpx;
margin: 20rpx; margin: 20rpx;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
display: flex;
align-items: center;
justify-content: center;
} }
.text { .text {
overflow: hidden; overflow: hidden;
...@@ -15,7 +18,6 @@ ...@@ -15,7 +18,6 @@
color: rgba(102, 102, 102, 1); color: rgba(102, 102, 102, 1);
font-size: 22rpx; font-size: 22rpx;
text-align: left; text-align: left;
font-family: PingFangSC-Regular;
} }
.horn { .horn {
width: 50rpx; width: 50rpx;
......
src/component/bottomTabs/bottomTabs.wxss
/* component/bottomTabs/bottomTabs.wxss */ /* component/bottomTabs/bottomTabs.wxss */
@import './../../base/base.wxss'; /* @import './../../base/base.wxss'; */
@import "/app.wxss";
.bottom-tab { .bottom-tab {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.tab-img { .tab-img {
/* width: 50rpx;
height: 50rpx; */
width: 70rpx; width: 70rpx;
height: 70rpx; height: 70rpx;
} }
.tab { .tab {
flex: 1; flex: 1;
} }
.btn-tab,.tab { .btn-tab .tab {
height: 100%; height: 100%;
} }
.bgc { .bgc {
...@@ -30,7 +29,3 @@ ...@@ -30,7 +29,3 @@
.pdt { .pdt {
padding-top: 50rpx; padding-top: 50rpx;
} }
/* .btn-tab {
display: flex;
justify-content: center;
} */
\ No newline at end of file
src/component/hotItem/hotItem.js deleted 100644 → 0
// component/hotItem/hotItem.js
var app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
Component({
/**
* 组件的属性列表
*/
properties: {
},
attached () {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
src/component/hotItem/hotItem.json deleted 100644 → 0
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/hotItem/hotItem.wxml deleted 100644 → 0
<!--component/hotItem/hotItem.wxml-->
<view class="hot-item border_box">
<view class="hot-img-box">
<image class="hot-img" src="./../../assets/imgs/7_1_0/scancode.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<view class="hot-item-desc border_box">
<view class="item-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
<view class="item-vip-price weui-flex">
<view class="">
<image
class="item-vip"
src="./../../assets/imgs/7_1_0/vip.png"
mode="widthFix"
lazy-load="false"
binderror=""
bindload=""
/>
</view>
<text class="vip-sale-price border_box">￥189</text>
<text class="vip-original-price">￥189</text>
</view>
<view class="item-plus-price weui-flex">
<view class="">
<image
class="item-plus"
src="./../../assets/imgs/7_1_0/plus.png"
mode="widthFix"
lazy-load="false"
binderror=""
bindload=""
/>
</view>
<text class="vip-plus-price vip-sale-price border_box">￥158</text>
</view>
<view class="buy-btn">
<button class="buy">立即购买</button>
</view>
<view/>
</view>
</view>
src/component/hotItem/hotItem.wxss deleted 100644 → 0
/* component/hotItem/hotItem.wxss */
@import './../../base/base.wxss';
.hot-item {
display: flex;
padding: 28rpx;
width: 710rpx;
height: 236rpx;
border-radius: 10px;
margin: 0 auto;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.05);
}
.hot-img {
width: 180rpx;
height: 180rpx;
}
.hot-item-desc {
margin-left: 28rpx;
}
.item-name {
overflow: hidden;
white-space: nowrap;
width: 440rpx;
height: 30rpx;
color: rgba(0, 0, 0, 1);
font-size: 22rpx;
text-align: left;
font-family: PingFangSC-Light;
padding: 10rpx 0 20rpx 0;
}
.item-vip,
.item-plus {
width: 88rpx;
height: 30rpx;
border-radius: 3rpx;
background-color: #fff;
}
.item-plus-price,
.item-vip-price{
display: flex;
height: 45rpx;
color: rgba(51, 51, 51, 1);
font-size: 32rpx;
font-family: PingFangSC-Medium;
flex-direction: row;
align-items: baseline;
}
.vip-sale-price {
padding: 0 10rpx;
}
.vip-original-price {
width: 62rpx;
color: rgba(170, 170, 170, 1);
font-size: 22rpx;
font-family: PingFangSC-Regular;
text-decoration: line-through;
}
.vip-plus-price {
color: rgba(203, 60, 60, 1);
}
.buy-btn {
text-align: right;
}
.buy {
display: inline-block;
width: 125rpx;
height: 39rpx;
line-height: 35rpx;
border-radius: 19rpx;
text-align: center;
background-color: rgba(203, 60, 60, 1);
border: 2rpx solid rgba(151, 151, 151, 1);
color: rgba(255, 255, 255, 1);
font-size: 18rpx;
font-family: PingFangSC-Regular;
}
src/component/iconSwiper/iconSwiper.wxml
<!--component/iconSwiper/iconSwiper.wxml--> <!--component/iconSwiper/iconSwiper.wxml-->
<view class="df"> <view class="icon-swiper">
<block wx:for="{{icons}}" wx:key="{{item}}"> <block wx:for="{{icons}}" wx:key="{{item}}">
<view class="icon-box border_box"> <view class="icon-box border_box">
<view class=""> <view class="">
......
src/component/iconSwiper/iconSwiper.wxss
/* component/iconSwiper/iconSwiper.wxss */ /* component/iconSwiper/iconSwiper.wxss */
@import './../../base/base.wxss'; /* @import './../../base/base.wxss'; */
.icon-swiper {
display: flex;
align-items: center;
justify-content: center;
}
.icon-box { .icon-box {
width: 25%; width: 25%;
text-align: center; text-align: center;
......
src/component/personCenter/personCenter.wxss
/* component/personCenter/personCenter.wxss */ /* component/personCenter/personCenter.wxss */
@import './../../base/base.wxss'; /* @import './../../base/base.wxss'; */
@import "/app.wxss";
.user-content{ .user-content{
height: 92rpx; height: 92rpx;
padding: 28rpx 35rpx 0 50rpx; padding: 28rpx 35rpx 0 50rpx;
......
src/component/plus/plus.wxml
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
bindgetuserinfo="_getUserInfo" bindgetuserinfo="_getUserInfo"
data-jflag="false" data-jflag="false"
open-type='getUserInfo' open-type='getUserInfo'
class='btn btn-primary' class='btn btn-primary pay-btn'
hover-class="btn-hover" hover-class="btn-hover"
> >
<text>立即支付</text> <text>立即支付</text>
......
src/component/plus/plus.wxss
/* component/plus/plus.wxss */ /* component/plus/plus.wxss */
@import '../../base/base.wxss'; /* @import '../../base/base.wxss'; */
@import "/app.wxss"; @import "/app.wxss";
.plus-wrap { .plus-wrap {
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -28,14 +29,14 @@ ...@@ -28,14 +29,14 @@
background-repeat: no-repeat; background-repeat: no-repeat;
position: relative; position: relative;
} }
.poster-tips{ /* .poster-tips{
position: fixed; position: fixed;
bottom: 220rpx; bottom: 220rpx;
left: 33rpx; left: 33rpx;
} }
.poster-tips image{ .poster-tips image{
width: 362rpx; width: 362rpx;
} } */
.pay{ .pay{
height: 88rpx; height: 88rpx;
line-height: 88rpx; line-height: 88rpx;
...@@ -44,7 +45,7 @@ ...@@ -44,7 +45,7 @@
flex-direction: row-reverse; flex-direction: row-reverse;
margin-right: 30rpx; margin-right: 30rpx;
} }
.pay button{ .pay .pay-btn{
width: 280rpx; width: 280rpx;
height: 52rpx; height: 52rpx;
line-height: 52rpx; line-height: 52rpx;
......
src/pages/my/my.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"tab-sort": "/component/tabSort/tabSort", "tab-sort": "/component/tabSort/tabSort",
"announcement": "/component/announcement/announcement", "announcement": "/component/announcement/announcement",
"icon-swiper": "/component/iconSwiper/iconSwiper", "icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd", "bannerAd": "/component/bannerAd/bannerAd",
"attention": "/component/attention/attention", "attention": "/component/attention/attention",
"guide-page-modal": "/component/guidePageModal/guidePageModal", "guide-page-modal": "/component/guidePageModal/guidePageModal",
......
src/pages/userCenter/userCenter.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"tab-sort": "/component/tabSort/tabSort", "tab-sort": "/component/tabSort/tabSort",
"announcement": "/component/announcement/announcement", "announcement": "/component/announcement/announcement",
"icon-swiper": "/component/iconSwiper/iconSwiper", "icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd", "bannerAd": "/component/bannerAd/bannerAd",
"attention": "/component/attention/attention", "attention": "/component/attention/attention",
"guide-page-modal": "/component/guidePageModal/guidePageModal", "guide-page-modal": "/component/guidePageModal/guidePageModal",
......
src/subPackage/page/pages/subPage/subPage.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"tab-sort": "/component/tabSort/tabSort", "tab-sort": "/component/tabSort/tabSort",
"announcement": "/component/announcement/announcement", "announcement": "/component/announcement/announcement",
"icon-swiper": "/component/iconSwiper/iconSwiper", "icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd", "bannerAd": "/component/bannerAd/bannerAd",
"attention": "/component/attention/attention", "attention": "/component/attention/attention",
"guide-page-modal": "/component/guidePageModal/guidePageModal", "guide-page-modal": "/component/guidePageModal/guidePageModal",
......
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