Browse Source

[新页面样式的修改][修改]:页面样式的修改

tags/2.2.4
meo 6 years ago
parent
commit
754e8dcf74
30 changed files with 142 additions and 104 deletions
  1. +4
    -4
      app.json
  2. BIN
      assets/img/banner.png
  3. BIN
      assets/img/home-n.png
  4. BIN
      assets/img/home-y.png
  5. BIN
      assets/img/jian.png
  6. BIN
      assets/img/pass0.png
  7. BIN
      assets/img/pass1.png
  8. BIN
      assets/img/qidai.png
  9. BIN
      assets/img/user-n.png
  10. BIN
      assets/img/user-y.png
  11. +2
    -1
      components/banner/index.wxml
  12. +33
    -7
      components/banner/index.wxss
  13. +6
    -7
      components/coupons/index.wxml
  14. +36
    -33
      components/coupons/index.wxss
  15. +3
    -3
      dist/tab/index.wxss
  16. +2
    -1
      dist/tabs/index.wxss
  17. +1
    -1
      pages/bannerdetail/index.wxss
  18. +4
    -1
      pages/cartest/cartest.wxml
  19. +27
    -16
      pages/cartest/cartest.wxss
  20. +1
    -2
      pages/coupon/detail/index.js
  21. +1
    -10
      pages/coupon/detail/index.wxss
  22. +1
    -1
      pages/couponorder/index/index.js
  23. +1
    -1
      pages/index/coupons/index.js
  24. +1
    -5
      pages/index/index.json
  25. +1
    -1
      pages/index/rushToBuy/index.wxml
  26. +14
    -6
      pages/index/rushToBuy/index.wxss
  27. +1
    -1
      pages/order/detail/index.js
  28. +1
    -1
      pages/order/index/index.js
  29. +1
    -1
      pages/rushToBuy/index.js
  30. +1
    -1
      project.config.json

+ 4
- 4
app.json View File

@@ -36,7 +36,7 @@
"text": "首页"
},
{
"pagePath": "pages/cartest/cartest",
"pagePath": "pages/passCar/passCar",
"iconPath": "assets/img/pass1.png",
"selectedIconPath": "assets/img/pass0.png",
"text": "停车"
@@ -50,10 +50,10 @@
]
},
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"backgroundTextStyle": "red",
"navigationBarBackgroundColor": "#02C0FF",
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "white"
},
"networkTimeout": {
"request": 10000,


BIN
assets/img/banner.png View File

Before After
Width: 1500  |  Height: 280  |  Size: 13 KiB

BIN
assets/img/home-n.png View File

Before After
Width: 200  |  Height: 200  |  Size: 3.4 KiB Width: 54  |  Height: 54  |  Size: 1.2 KiB

BIN
assets/img/home-y.png View File

Before After
Width: 200  |  Height: 200  |  Size: 3.2 KiB Width: 54  |  Height: 54  |  Size: 1.2 KiB

BIN
assets/img/jian.png View File

Before After
Width: 66  |  Height: 66  |  Size: 1.1 KiB

BIN
assets/img/pass0.png View File

Before After
Width: 200  |  Height: 176  |  Size: 15 KiB Width: 54  |  Height: 54  |  Size: 955 B

BIN
assets/img/pass1.png View File

Before After
Width: 200  |  Height: 176  |  Size: 20 KiB Width: 54  |  Height: 54  |  Size: 937 B

BIN
assets/img/qidai.png View File

Before After
Width: 671  |  Height: 640  |  Size: 220 KiB Width: 240  |  Height: 240  |  Size: 6.5 KiB

BIN
assets/img/user-n.png View File

Before After
Width: 200  |  Height: 200  |  Size: 4.6 KiB Width: 54  |  Height: 54  |  Size: 902 B

BIN
assets/img/user-y.png View File

Before After
Width: 200  |  Height: 200  |  Size: 4.3 KiB Width: 54  |  Height: 54  |  Size: 946 B

+ 2
- 1
components/banner/index.wxml View File

@@ -1,5 +1,6 @@
<view class='bannerbg'><image src='./../../assets/img/banner.png' mode="widthFix"></image></view>
<view class="index-slide-view">
<swiper class="index-slide" bindchange="swiperChange" circular="true" autoplay="true" interval="3000" duration="500">
<swiper class="index-slide" bindchange="swiperChange" circular="false" duration="500">
<block wx:for="{{list}}" wx:key="unique">
<swiper-item>
<image data-id="{{item.id}}" bindtap='gotobannerdetail' src="{{item.coverImg}}" class="index-slide-image" />


+ 33
- 7
components/banner/index.wxss View File

@@ -1,10 +1,26 @@
.index-slide-view{
position: relative;
width: 710rpx;
height: 260rpx;
overflow: hidden;
margin:-126rpx auto 0;
border-radius:16rpx;
z-index: 10000;
/* box-shadow: 0px 10rpx 10rpx 0px rgba(0, 0, 0, 0.2); */
box-shadow: 0 5px 15px 0 rgba(0,0,0,.6);
}
.index-slide,
swiper-item
.index-slide-image {
width: 100%;
height: 465rpx;
display: block;
width: 710rpx;
height: 260rpx;
margin: 0 auto;
border-radius:16rpx;
overflow: hidden;
position: relative;
z-index: 100;

}
.index-slide-view .dots{
position: absolute;
@@ -13,17 +29,27 @@
bottom: 20rpx;
display: flex;
justify-content: center;
z-index: 10000;
}
.index-slide-view .dots .dot{
margin: 0 8rpx;
width: 30rpx;
height: 8rpx;
width: 12rpx;
height: 12rpx;
background: #fff;
border-radius: 100rpx;
border-radius: 50%;
transition: all .6s;
opacity: 0.5;
}
.index-slide-view .dots .dot.active{
background: #FFFFFF;
background: #02C0FF;
width: 30rpx;
height: 12rpx;
border-radius:10rpx;
opacity: 1;
}
.bannerbg{
width: 100%;
}
.bannerbg image{
display: block;
width: 100%;
}

+ 6
- 7
components/coupons/index.wxml View File

@@ -8,7 +8,8 @@
<view class="coupons-info-name tit">{{data.title}}</view>
<view class="coupons-info-name subtitle">{{data.subTitle}}</view>
<view class="coupons-info-price-p">
<text class="i">¥</text>{{data.salePriceStr}}
<!-- <text class="i">¥</text> -->
{{data.salePriceStr}}
<view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}">
满¥{{data.usePriceStr}}可用
</view>
@@ -20,14 +21,12 @@
</view>
<view class="coupons-btn">
<!-- 优惠券价格 -->
<view class="coupons-info-price">
<view class="coupons-info-name sy">剩余: {{data.remainInventory}}</view>
<!-- <text class="coupons-info-price-o"><text class='i'>¥</text>{{data.priceStr}}</text> -->
</view>
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr==0&&data.remainInventory!=0}}" data-date='{{data}}'>领取</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0}}" data-date='{{data}}'>购买</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr==0&&data.remainInventory!=0}}" data-date='{{data}}'>免费领</i-button>
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0}}" data-date='{{data}}'>马上购</i-button>
<i-button i-class="coupons-btn-gms" wx:if="{{data.remainInventory==0}}" data-date='{{data}}'>已售罄</i-button>
</view>
<view class="coupons-info-name sy">剩余{{data.remainInventory}}</view>
<view class="coupons-border"></view>
</view>
</navigator>

+ 36
- 33
components/coupons/index.wxss View File

@@ -6,6 +6,7 @@
padding: 30rpx;
position: relative;
height: 184rpx;
border-bottom: 1rpx solid #eee;
}

.coupons-border {
@@ -19,16 +20,16 @@
}

.coupons-img {
width: 248rpx;
height: 184rpx;
overflow: hidden;
width: 180rpx;
height: 180rpx;
border: 1px solid #f8f8f8;
border-radius: 10rpx;
}

.coupons-img image {
width: 100%;
height: 100%;
display: block;
width: 180rpx;
height: 180rpx;
border-radius: 10rpx;
}

@@ -54,21 +55,21 @@

.coupons-info-price-p {
display: inline-block;
font-size: 36rpx;
color: #f96563;
line-height: 27rpx;
font-weight: 600;
font-size: 40rpx;
color: #FF4949;
line-height: 56rpx;
}

.tit {
margin-top: 14rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 300rpx;
height: 40rpx;
font-weight: 600;
height: 42rpx;
font-size: 30rpx;
color: #000;
letter-spacing: 0;
font-family: PingFangSC-Medium;
}

.coupons-info-price-o {
@@ -98,22 +99,22 @@

.coupons-btn {
position: absolute;
top: 40rpx;
top: 83rpx;
right: 30rpx;
}

.coupons-btn-gm {
background: #00c0ff !important;
border-radius: 10rpx !important;
border-radius: 50rpx !important;
margin: 0 !important;
padding: 0 !important;
font-family: PingFangSC-Semibold;
font-size: 28rpx;
font-size: 26rpx;
color: #fff !important;
letter-spacing: 0;
height: 50rpx !important;
width: 138rpx !important;
line-height: 50rpx !important;
height: 48rpx !important;
width: 120rpx !important;
line-height: 48rpx !important;
}

.coupons-btn-gms {
@@ -123,39 +124,41 @@
margin: 0 !important;
padding: 0 !important;
font-family: PingFangSC-Semibold;
font-size: 28rpx;
font-size: 26rpx;
color: #fff !important;
letter-spacing: 0;
height: 50rpx !important;
width: 138rpx !important;
line-height: 50rpx !important;
height: 48rpx !important;
width: 120rpx !important;
line-height: 48rpx !important;
}

.subtitle {
font-size: 24rpx;
color: #6f6f6f;
color: #919191;
text-align: left;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 300rpx;
height: 40rpx;
margin-top: 8rpx;
height: 33rpx;
line-height: 33rpx;
}

.coupons-info-manjian {
color: #6f6f6f !important;
font-weight: normal;
font-size: 20rpx;
font-size: 24rpx;
line-height: 34rpx;
display: inline-block;
color: #FF4949;
letter-spacing: 0;
}

.coupons-info-manjian1 {
color: #ccc !important;
font-weight: normal;
line-height: 28rpx;
font-size: 20rpx;
line-height: 20rpx;
color: #919191;
letter-spacing: 0;
display: inline-block;
overflow: hidden;
white-space: nowrap;
@@ -184,12 +187,12 @@

.sy {
display: block;
text-align: left;
width: 136rpx;
text-align: center;
width: 181rpx;
font-size: 24rpx;
color: #6f6f6f;
color: #999;
height: 40rpx;
margin-top: 8rpx;
margin-top: 106rpx;
}

.usermotto {


+ 3
- 3
dist/tab/index.wxss View File

@@ -16,7 +16,7 @@
.i-tabs-tab-bar {
display: block;
width: 50%;
height: 2px;
height: 6rpx;
background: 0 0;
position: absolute;
bottom: 0;
@@ -29,7 +29,7 @@
font-size: 28rpx;
text-align: center;
box-sizing: border-box;
color: #B8B8B8;
color: #222222;
}

.i-tabs-tab-title-current {
@@ -39,5 +39,5 @@
.i-tabs-tab-scroll {
display: inline-block;
width: auto;
min-width: 60px;
min-width: 70px;
}

+ 2
- 1
dist/tabs/index.wxss View File

@@ -30,7 +30,8 @@
display: block;
overflow-x: auto;
white-space: nowrap;
box-shadow:0 0 2px 0 rgba(211,211,211,0.50);
/* box-shadow:0 0 2px 0 rgba(211,211,211,0.50); */
border-bottom: 1rpx solid #eeeeee;
}

.i-tabs-fixed {


+ 1
- 1
pages/bannerdetail/index.wxss View File

@@ -170,7 +170,7 @@
.notes view:nth-child(2)>text {
font-size: 28rpx;
color: #a9a9a9;
line-height: 56rpx;
line-height: 45rpx;
}

.spot {


+ 4
- 1
pages/cartest/cartest.wxml View File

@@ -1,3 +1,6 @@
<view class="con">
<image src="./../../assets/img/qidai.png" mode="widthFix"></image>
<image class="img" src="./../../assets/img/qidai.png" mode="widthFix"></image>
<text class="txt1">正在疯狂开发中</text>
<text class="txt2">更好用的体验即将到来
请敬请期待</text>
</view>

+ 27
- 16
pages/cartest/cartest.wxss View File

@@ -1,17 +1,28 @@
.con{
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
page {
height: 100%;
overflow:hidden;
}
.img {
display: block;
width: 300rpx;
height: 300rpx;
margin: 168rpx auto 0;
}

.txt1 {
display: block;
font-size: 34rpx;
color: #333;
letter-spacing: 0;
text-align: center;
}

.txt2 {
display: block;
font-size: 28rpx;
color: #999;
letter-spacing: 0;
text-align: center;
line-height: 40rpx;
margin-top: 10rpx;
}
.con image{
position: absolute;
width: 400rpx;
height: 400rpx;
left: 0;
right: 0;
top: 0rpx;
bottom: 0;
margin: auto;
}

+ 1
- 2
pages/coupon/detail/index.js View File

@@ -309,7 +309,6 @@ Page({
that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功
console.log(res);
if (res.errMsg == "requestPayment:ok") {

wx.showToast({
title: "购买成功",
image: "./../../../assets/img/success.png",
@@ -323,7 +322,7 @@ Page({
wx.hideLoading();
}, 1600);
setTimeout(() => {
wx.redirectTo({
wx.navigateTo({
url: `/pages/order/detail/index?orderId=${
that.data.orderId
}`


+ 1
- 10
pages/coupon/detail/index.wxss View File

@@ -175,16 +175,7 @@
line-height: 45rpx;
}

.spot {
width: 12rpx;
height: 12rpx;
display: inline-block;
background: #a9a9a9;
margin-right: 16rpx;
position: relative;
bottom: 4rpx;
border-radius: 50%;
}


.buy-view {
background: #fff;


+ 1
- 1
pages/couponorder/index/index.js View File

@@ -105,7 +105,7 @@ Page({
console.log("加载完成allow_load设置成false");
that.setData({
loading: true,
content: "^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ"
content: "——— 在拉裤子就掉了啦 ———"
});
setTimeout(function() {
that.setData({


+ 1
- 1
pages/index/coupons/index.js View File

@@ -117,7 +117,7 @@ Component({
console.info("allow_load==false 已禁止加载");
that.setData({
loading:true,
content:"^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ"
content: "——— 在拉裤子就掉了啦 ———"
})
setTimeout(function(){
that.setData({


+ 1
- 5
pages/index/index.json View File

@@ -5,9 +5,5 @@
"c-coupons": "./coupons/index"
},
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "首页",
"backgroundColor": "#eeeeee",
"backgroundTextStyle": "light"
"navigationBarTitleText": "首页"
}

+ 1
- 1
pages/index/rushToBuy/index.wxml View File

@@ -1,5 +1,5 @@
<view class="index-rushToBuy">
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">限时抢购<text bindtap="gotomore">查看更多</text></view>
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">限时抢购<text bindtap="gotomore" wx:if="{{list.length>=5}}">查看更多</text><image wx:if="{{list.length>=5}}" src='./../../../assets/img/jian.png' mode="widthFix"></image></view>
<scroll-view scroll-x class="index-scroll-view">
<view class="commodity" wx:for="{{list}}" wx:key="unique">
<view bindtap="gotodetail" data-couponChannelId="{{item.id}}" data-couponId="{{item.couponId}}" data-targetAd="{{item.targetAd}}">


+ 14
- 6
pages/index/rushToBuy/index.wxss View File

@@ -4,18 +4,26 @@
}

.index-rushToBuy-title {
font-size: 32rpx;
position: relative;
font-size: 34rpx;
color: #000000;
letter-spacing: 0.75rpx;
padding-top: 20rpx;
letter-spacing: 1.16rpx;
padding-top: 34rpx;
padding-left: 30rpx;
}

.index-rushToBuy-title text{
float: right;
margin-right: 20rpx;
margin-right: 53rpx;
color: #a8adb4;
font-size: 26rpx;
font-size: 28rpx;
margin-top: 8rpx;
}
.index-rushToBuy-title image{
position: absolute;
right: 18rpx;
width: 20px;
top: 44rpx;
}
.index-scroll-view {
width: 100%;
@@ -24,7 +32,7 @@

.index-scroll-view .commodity {
display: inline-block;
margin: 30rpx;
margin: 16rpx 30rpx 30rpx;
margin-right: 0;
overflow: hidden;
position: relative;


+ 1
- 1
pages/order/detail/index.js View File

@@ -134,7 +134,7 @@ Page({
wx.hideLoading();
}, 1600);
setTimeout(() => {
wx.redirectTo({
wx.navigateTo({
url: `/pages/order/detail/index?orderId=${
that.data.orderId
}`


+ 1
- 1
pages/order/index/index.js View File

@@ -106,7 +106,7 @@ Page({
console.log("加载完成allow_load设置成false");
that.setData({
loading: true,
content: "^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ"
ccontent: "——— 在拉裤子就掉了啦 ———"
})
setTimeout(function () {
that.setData({


+ 1
- 1
pages/rushToBuy/index.js View File

@@ -94,7 +94,7 @@ Page({
console.info("allow_load==false 已禁止加载");
that.setData({
loading:true,
content:"^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ"
content: "——— 在拉裤子就掉了啦 ———"
})
setTimeout(function(){
that.setData({


+ 1
- 1
project.config.json View File

@@ -4,7 +4,7 @@
"ignore": []
},
"setting": {
"urlCheck": true,
"urlCheck": false,
"es6": true,
"postcss": true,
"minified": true,


Loading…
Cancel
Save