瀏覽代碼

[新版ui][修改]:[新版ui修改]

tags/湖南版5.1.4
meo 6 年之前
父節點
當前提交
3402b957a2
共有 23 個檔案被更改,包括 338 行新增278 行删除
  1. +3
    -3
      components/coupons/index.wxml
  2. +32
    -41
      components/coupons/index.wxss
  3. +1
    -1
      config/config.js
  4. +8
    -5
      dist/tab/index.wxss
  5. +3
    -2
      dist/tabs/index.wxss
  6. +1
    -1
      ext.json
  7. +3
    -8
      pages/discountCardList/discountCardList.js
  8. +5
    -3
      pages/discountCardList/discountCardList.wxml
  9. +3
    -0
      pages/discountCardList/discountCardList.wxss
  10. +2
    -7
      pages/index/searchbar/index.js
  11. +4
    -3
      pages/main/bargain/index.wxml
  12. +48
    -43
      pages/main/bargain/index.wxss
  13. +3
    -8
      pages/main/coupons/index.js
  14. +3
    -1
      pages/main/coupons/index.wxml
  15. +16
    -7
      pages/main/coupons/index.wxss
  16. +18
    -12
      pages/main/index.wxml
  17. +40
    -29
      pages/main/index.wxss
  18. +10
    -2
      pages/main/rushtobyCard/index.js
  19. +33
    -29
      pages/main/rushtobyCard/index.wxml
  20. +37
    -21
      pages/main/rushtobyCard/index.wxss
  21. +5
    -6
      pages/main/spellGroup/index.wxml
  22. +60
    -43
      pages/main/spellGroup/index.wxss
  23. +0
    -3
      pages/user/index.wxml

+ 3
- 3
components/coupons/index.wxml 查看文件

@@ -1,4 +1,4 @@
<navigator style='display:inline' url="/pages/coupon/detail/index?couponChannelId={{data.id}}&couponId={{data.couponId}}&title={{data.title}}">
<navigator url="/pages/coupon/detail/index?couponChannelId={{data.id}}&couponId={{data.couponId}}&title={{data.title}}">
<!-- 首页优惠券列表页面 -->
<view class="coupons">
<view class="coupons-img">
@@ -9,7 +9,7 @@
<view class="coupons-info-name subtitle">{{data.subTitle}}</view>
<view class="coupons-info-price-p">
<view class='price'>
<text>{{data.salePriceStr}}<text style="font-size:24rpx;display:inline-block;margin-right:10rpx;">元</text></text>
<text>{{data.salePriceStr}}<text style="font-size:24rpx;display:inline-block;margin-right:10rpx;font-weight:400;">元</text></text>
<view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}">
<view class='view01' wx:if="{{data.unit==0}}">{{data.priceStr}}元</view>
<view wx:if="{{data.unit==1}}">{{data.priceStr}}小时</view>
@@ -34,4 +34,4 @@
</view>
<!-- <view class="coupons-info-name sy">剩余{{data.remainInventory}}</view> -->
</view>
</navigator>
</navigator>

+ 32
- 41
components/coupons/index.wxss 查看文件

@@ -1,15 +1,12 @@
@import "../../app.wxss";
.coupons {
width: 40%;
height: 492rpx;
width: 335rpx;
display: inline-block;
padding: 10rpx 30rpx;
position: relative;
}
.coupons-border {
height: 1rpx;
/* width: 100%; */
left: 30rpx;
right: 30rpx;
background: #f5f5f5;
@@ -19,31 +16,27 @@


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

.coupons-img image {
display: block;
width: 334rpx;
height: 335rpx;
width: 335rpx;
height: 203rpx;
border-top-left-radius: 10rpx;
border-top-right-radius: 10rpx;
}

.coupons-info {
width: 335rpx;
height: 157rpx;
position: absolute;
bottom: 10rpx;
background: #fff;
height: 152rpx;
border-radius:0rpx 0rpx 10rpx 10rpx;
background: #fff;
}

.coupons-info-name {
font-size: 28rpx;
font-weight: bold;
color: #343434;
color: #333333;
letter-spacing: 0;
line-height: 38rpx;
}
@@ -61,30 +54,26 @@
display: block;
font-size: 50rpx;
color: #FF4949;
position: absolute;
bottom: 10rpx;
}
.price{
/* width:48rpx;
height:26rpx; */
font-size:34rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:rgba(255,50,50,1);
line-height:44rpx;
margin-left: 16rpx;
font-size:34rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:rgba(255,50,50,1);
line-height:44rpx;
margin-left: 16rpx;
padding-top: 16rpx;
}
.tit {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 300rpx;
height: 42rpx;
font-size: 30rpx;
color: #000;
font-size: 28rpx;
line-height: 30rpx;
padding-top: 20rpx;
padding-left: 10rpx;
color: #333;
letter-spacing: 0;
font-family: PingFangSC-Medium;
margin: 20rpx 18rpx 13rpx 16rpx;
}

.coupons-info-price-o {
@@ -114,7 +103,7 @@ margin-left: 16rpx;

.coupons-btn {
position: absolute;
bottom: 10rpx;
bottom: 0;
right: 0;
}

@@ -123,9 +112,7 @@ margin-left: 16rpx;
border-radius: 10px 0px 5px 0px !important;
margin: 0 !important;
padding: 0 !important;
font-family: PingFangSC-Semibold;
font-size: 26rpx;
font-weight: 400;
color: #fff !important;
letter-spacing: 0;
height: 51rpx !important;
@@ -151,16 +138,14 @@ margin-left: 16rpx;

.subtitle {
font-size: 24rpx;
color: #919191;
color: #999999;
overflow: hidden;
height: 24rpx;
padding-left: 10rpx;
line-height: 24rpx;
white-space: nowrap;
text-overflow: ellipsis;
width: 300rpx;
height: 23rpx;
line-height: 23rpx;
font-weight:lighter;
margin-bottom: 18rpx;
margin: 0 37rpx 20rpx 18rpx;
margin-top: 12rpx;
}

.coupons-info-manjian {
@@ -266,3 +251,9 @@ scroll-view {
opacity: 1!important;
background: #fff;
}
navigator{
display: inline-block;
}
navigator:nth-of-type(2n+1){
margin-right: 10rpx;
}

+ 1
- 1
config/config.js 查看文件

@@ -34,7 +34,7 @@ var config = {
/**
* 业态查询
*/
businessList: "/wxBusiness/list",
businessList: "/wxBusiness/listAll",
/**
* 频道查询
*/


+ 8
- 5
dist/tab/index.wxss 查看文件

@@ -21,23 +21,26 @@
position: absolute;
bottom: 0;
left: 25%;
background: #00C0FF;
background: #af6e34;
border-radius: 100px;
}

.i-tabs-tab-title {
font-size: 28rpx;
font-size: 30rpx;
line-height: 30rpx;
text-align: center;
box-sizing: border-box;
color: #222222;
color: #666666;
}

.i-tabs-tab-title-current {
color: #00C0FF;
color: #af6e34;
font-size: 36rpx;
}

.i-tabs-tab-scroll {
display: inline-block;
width: auto;
min-width: 70px;
min-width:75rpx;
margin-right:33rpx;
}

+ 3
- 2
dist/tabs/index.wxss 查看文件

@@ -22,16 +22,17 @@
transform-origin: 0 0;
pointer-events: none;
box-sizing: border-box;
border: 0 solid #e9eaec;
/* border: 0 solid #e9eaec; */
border-bottom-width: 1px
}

.i-tabs-scroll {
display: block;
overflow-x: auto;
margin-bottom: 22rpx;
white-space: nowrap;
/* box-shadow:0 0 2px 0 rgba(211,211,211,0.50); */
border-bottom: 1rpx solid #eeeeee;
/* border-bottom: 1rpx solid #eeeeee; */
}

.i-tabs-fixed {


+ 1
- 1
ext.json 查看文件

@@ -4,7 +4,7 @@
"ext": {
"weappId": "wxea71200db93d756b",
"name": "富茂客官开发",
"appVersion": "C.4.2.100",
"appVersion": "C.4.2.105",
"attr": {
"configUrl": "https://ciformall.youlane.cn/C/api",
"socketUrl": "wss://mp.youlane.cn/W/ws",


+ 3
- 8
pages/discountCardList/discountCardList.js 查看文件

@@ -47,17 +47,12 @@ Page({
onShow: function () {
let that = this;
Http.get({
url: config.api.businessList,
data: {
pageNum: 1,
pageSize: 15,
type: 1
}
url: config.api.businessList
}).then(res => {
console.log(res)
let businessObj = [{ id: 0, title: "全部", type: 1 }];
let businessObj = [{ id: 0, title: "全部", type: 1, createDate: 0}];
that.setData({
tabs: res.data.list.concat(businessObj).sort(compare("id"))
tabs: res.data.list.concat(businessObj).sort(compare("createDate"))
});
console.log(that.data.tabs)
})


+ 5
- 3
pages/discountCardList/discountCardList.wxml 查看文件

@@ -1,9 +1,11 @@
<!-- 折扣卡list页面 -->
<view class='content'>
<view class="market clearfix">
<i-tabs current="{{current_scroll}}" scroll bindchange="handleChangeScroll">
<i-tab wx:for="{{tabData}}" wx:key="unique" key="{{item.id}}" title="{{item.title}}"></i-tab>
</i-tabs>
<view class='tabss'>
<i-tabs current="{{current_scroll}}" scroll bindchange="handleChangeScroll">
<i-tab wx:for="{{tabData}}" wx:key="unique" key="{{item.id}}" title="{{item.title}}"></i-tab>
</i-tabs>
</view>
<view class='cards clearfix'>
<view class="nocoupon" wx:if="{{list.length==0}}">
<image src="{{couponUrl}}" mode="aspectFill" lazy-load="true" />


+ 3
- 0
pages/discountCardList/discountCardList.wxss 查看文件

@@ -242,3 +242,6 @@ button::after{ border: none; }
width: 60rpx;
height: 60rpx;
}
.tabss{
padding: 0 30rpx;
}

+ 2
- 7
pages/index/searchbar/index.js 查看文件

@@ -56,16 +56,11 @@ Page({
let that = this;
Http.get({
url: config.api.businessList,
data: {
pageNum: 1,
pageSize: 15,
type: 1
}
}).then(res => {
console.log(res)
let businessObj = [{ id: 0, title: "全部", type: 1 }];
let businessObj = [{ id: 0, title: "全部", type: 1, createDate:0}];
that.setData({
lists: res.data.list.concat(businessObj).sort(compare("id"))
lists: res.data.list.concat(businessObj).sort(compare("createDate"))
});
console.log(that.data.lists);
})


+ 4
- 3
pages/main/bargain/index.wxml 查看文件

@@ -1,16 +1,17 @@
<view class="index-rushToBuy" wx:if="{{list.length>0}}">
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">
<image src="{{barginicon}}" class='barginiconimg' mode='widthFix'/><text class='text-red'>砍价</text>专场<text bindtap="gotomore" class='morebargin'>更多砍价></text></view>
<image src="{{barginicon}}" class='barginiconimg' mode='widthFix'/><text class='text-red'>砍价</text>专场<text bindtap="gotomore" class='morebargin'>更多砍价></text>
</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}}">
<image mode='aspectFill' lazy-load='true' class="commodity-img" src="{{item.coverImg}}" />
<view class="commodity-info">
<view class="commodity-info-name">{{item.title}}</view>
<view class="commodity-info-price"><text class="commodity-info-price-p">可砍至{{item.salePriceStr}}元</text>
<view class="commodity-info-price"><text class="commodity-info-price-p">{{item.salePriceStr}}元</text><text class='price'>{{item.priceStr}}元</text>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
</view>

+ 48
- 43
pages/main/bargain/index.wxss 查看文件

@@ -1,10 +1,10 @@
.index-rushToBuy {
width: 690rpx;
margin: 30rpx auto;
font-family: PingFangSC-Semibold;
border:1rpx solid rgba(56, 56, 56, 0.11);
box-shadow:6rpx 6rpx 8rpx 1rpx rgba(56,56,56,0.08);
border-radius:16rpx;
width: 690rpx;
margin: 40rpx auto;
padding: 20rpx 0 0;
font-family: PingFangSC-Semibold;
box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
border-radius:16rpx;
}

.index-rushToBuy-title {
@@ -13,18 +13,19 @@ border-radius:16rpx;
font-weight:bold;
color: #333333;
letter-spacing: 1.16rpx;
padding-left: 30rpx;
padding-left: 20rpx;
line-height: 34rpx;
}
.useprice{
font-size: 28rpx;
}
.morebargin{
float: right;
margin-right: 20rpx;
color: #999999;
font-size: 24rpx;
margin-top: 8rpx;
font-weight: normal;
float: right;
margin-right: 20rpx;
color: #999999;
font-size: 24rpx;
line-height: 24rpx;
font-weight: normal;
}
.listimage{
position: absolute;
@@ -35,32 +36,27 @@ border-radius:16rpx;
.index-scroll-view {
width: 100%;
white-space: nowrap;
padding-bottom: 10rpx;
/* background:linear-gradient(94deg,rgba(255,143,0,1) 0%,rgba(255,87,0,1) 100%); */
}

.index-scroll-view .commodity {
display: inline-block;
margin: 16rpx 30rpx 16rpx;
margin-right: 0;
position: relative;
background: #fff;
padding: 12rpx 12rpx 0;
/* border: 1rpx solid #dddee1; */
width: 205rpx;
box-shadow: 0 0 10px 0 rgba(211,211,211,0.30);
border-radius: 10rpx;
overflow: hidden;
display: inline-block;
width: 285rpx;
margin: 20rpx 0 0 13rpx;
position: relative;
border-radius: 10rpx;
overflow: hidden;
}
.index-scroll-view .commodity:last-child{
margin-right: 30rpx;
margin-right: 15rpx;
}
.index-scroll-view .commodity:nth-of-type(1){
margin-left: 14rpx;
}
.commodity-img{
display: block;
width: 205rpx;
height: 160rpx;
width: 285rpx;
height: 166rpx;
background:rgba(255,255,255,1);
border-radius:10rpx;
border-radius:16rpx;
}

.index-scroll-view .commodity-info {
@@ -69,12 +65,14 @@ border-radius:16rpx;
}

.index-scroll-view .commodity-info-name {
width: 285rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 24rpx;
color: #000000;
letter-spacing: 0.7rpx;
overflow: hidden;
font-size: 28rpx;
line-height: 30rpx;
margin-top: 16rpx;
color: #333333;
}

.index-scroll-view .commodity-info-time {
@@ -85,9 +83,13 @@ border-radius:16rpx;
}

.index-scroll-view .commodity-info-price-p {
font-size: 24rpx;
font-size: 28rpx;
color: #f96563;
line-height: 36rpx;
line-height: 30rpx;
}
.commodity-info-price{
margin-top: 10rpx;
line-height: 30rpx;
}
.index-scroll-view .commodity-info-price-o {
display: inline-block;
@@ -98,18 +100,21 @@ border-radius:16rpx;
text-decoration:line-through;
line-height: 36rpx;
}
.commodity-info-price{
line-height: 36rpx;
}
.barginicon{
width: 24rpx;
height: 22rpx;
}
.barginiconimg{
width: 24rpx;
height: 22rpx;
margin-right: 2rpx;
width: 26rpx;
height: 23rpx;
margin-right: 6rpx;
}
.text-red{
color:#F12643;
}
.price{
font-size: 24rpx;
color: #999;
text-decoration: line-through;
margin-left: 10rpx;
}

+ 3
- 8
pages/main/coupons/index.js 查看文件

@@ -183,17 +183,12 @@ Component({
Http.setToken(token);
// business获取
Http.get({
url: config.api.businessList,
data: {
pageNum: 1,
pageSize: 15,
type: 1
}
url: config.api.businessList
}).then(res => {
console.log(res)
let businessObj = [{id:0,title: "全部",type: 1}];
let businessObj = [{ id: 0, title: "全部", type: 1, createDate:0}];
that.setData({
tabs: res.data.list.concat(businessObj).sort(compare("id"))
tabs: res.data.concat(businessObj).sort(compare("createDate"))
});
console.log(that.data.tabs)
})


+ 3
- 1
pages/main/coupons/index.wxml 查看文件

@@ -2,7 +2,9 @@
<i-tabs current="{{current_scroll}}" scroll bindchange="handleChangeScroll">
<i-tab wx:for="{{tabs}}" wx:key="unique" key="{{item.id}}" title="{{item.title}}"></i-tab>
</i-tabs>
<c-coupons wx:if="{{list.length!=0}}" wx:for="{{list}}" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{list}}" />
<view class='coupons clearfix'>
<c-coupons wx:if="{{list.length!=0}}" wx:for="{{list}}" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{list}}" />
</view>
<view class='dingdan' wx:if="{{list.length==0}}">
<image src="{{actUrl}}" mode="widthFix"></image>
<text>请您敬请期待</text>


+ 16
- 7
pages/main/coupons/index.wxss 查看文件

@@ -1,9 +1,8 @@
@import "../../../app.wxss";
.index-coupons {
/* height: 820rpx; */
/* margin-top: 30rpx; */
background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,1) 100%);
padding: 0 30rpx;
background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%);
}

.loading {
text-align: center;
height: 80rpx;
@@ -11,7 +10,17 @@
font-size: 26rpx;
color: #999;
}

.coupons c-coupons{
width: 335rpx;
height: 354rpx;
margin-bottom: 22rpx;
}
.coupons c-coupons:nth-of-type(2n+1){
float: left;
}
.coupons c-coupons:nth-of-type(2n){
float: right;
}
.loading image {
width: 60rpx;
height: 60rpx;
@@ -19,9 +28,9 @@
margin-right: 10rpx;
}

.dingdan {
/* .dingdan {
margin-top: 33rpx;
}
} */

.dingdan text:nth-of-type(1) {
display: block;


+ 18
- 12
pages/main/index.wxml 查看文件

@@ -1,21 +1,28 @@
<view class="container">
<c-banner wx:key="unique" list="{{list}}" />
<!-- 会员信息 -->
<view class='userinfo' >
<view class="user-avatar">
<view class='userinfo clearfix' >
<!-- 头像 -->
<view class="user-avatar">
<open-data class="open" type="userAvatarUrl"></open-data>
</view>
<view class="user-data">
<open-data type="userNickName"></open-data>
<!-- 成长值 -->
<view class="user-data fl">
<!-- <open-data type="userNickName"></open-data> -->
<text class='chengzhang'>{{levelName}}</text>
<text class='jifen'>积分</text>
<text class='jifenNumber'>5000</text>
<view class="view">成长值<text class="score">{{score}}</text>
<image src="{{duihuan}}" class='duihuanimg' bindtap='gotouser' mode='widthFix'></image>
<view class="view">成长值<text class="score">{{score}}</text></view>
</view>
<!-- 积分 -->
<view class='fl integral'>
<view class='clearfix'>
<text class='jifen fl'>积分</text>
<text class='jifenNumber fl'>5000</text>
</view>
<image src="{{duihuan}}" class='duihuanimg' bindtap='gotouser' mode='widthFix'></image>
</view>
<view class='barcode' bindtap='qrcode'>
<image src="{{barcode}}" class='barcodeimg' mode='widthFix'></image>
<!-- 二维码 -->
<view class='qrcode fr' bindtap='qrcode'>
<image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image>
</view>
</view>
@@ -36,7 +43,7 @@
</view>
<!-- 限时抢购和消费卡 -->
<c-rushtobyCard id="rushtobyCard"/>
<c-coupons id="lists" bind:myevent="onGetCode" loadingtext="{{loadingtext}}" loading="{{loading}}" />
<c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" loading="{{loading}}" />
<g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" />
</view>
<view class='showQrcode' bindtap='hideQrcode' wx:if="{{showQrcode}}">
@@ -45,7 +52,6 @@
<canvas canvas-id="mycanvas2" id='mycanvas2' />
<button class='button' bindtap='mySpecial'>特享礼遇</button>
</view>
</view>
<!-- 顶部签到成长值 -->
<view class='signin' wx:if="{{fistLogin}}" animation="{{alphaData}}">


+ 40
- 29
pages/main/index.wxss 查看文件

@@ -55,11 +55,11 @@ page {
position:relative;
margin: 30rpx auto 35rpx;
width: 690rpx;
height: 124rpx;
background:rgba(255,255,255,1);
border:1rpx solid rgba(56, 56, 56, 0.11);
box-shadow:0rpx 6rpx 8rpx 1rpx rgba(56,56,56,0.08);
border-radius:16rpx;
padding: 20rpx 0;
height: 84rpx;
box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
border-radius:16rpx;
}
.section {
padding: 0 20rpx;
@@ -109,8 +109,12 @@ border-radius:16rpx;
}

.qrcode image {
width: 70rpx;
margin-right: 20rpx;
position: absolute;
top: 0;
bottom: 0;
right: 20rpx;
margin: auto;
width: 84rpx;
}

.showQrcode {
@@ -138,7 +142,7 @@ border-radius:16rpx;
}

.showQrcode text {
display: block;
display: none;
text-align: center;
font-size: 28rpx;
}
@@ -182,10 +186,10 @@ border-radius:16rpx;
.user-avatar {
position: absolute;
left: 24rpx;
top:7rpx;
top:0;
bottom: 0;
width: 66rpx;
height: 66rpx;
width: 80rpx;
height: 80rpx;
border-radius: 50%;
overflow: hidden;
margin: auto;
@@ -196,34 +200,38 @@ width:100%;
height:100%;
}
.user-data {
font-family: PingFangSC-Regular;
margin-left: 116rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
margin-top: 15rpx;
font-size: 30rpx;
color: #333;
font-weight: bold;
}
.chengzhang {
font-size: 24rpx;
font-size: 29rpx;
font-weight: 400;
color: #AF6E34;
margin-left:9rpx;
}
.jifen{
.integral{
margin-left: 70rpx;
}
.jifen{
display: inline-block;
height: 34rpx;
color: #999999;
font-size: 23rpx;
font-size:24rpx;
line-height: 34rpx;
}
.jifenNumber{
color:#D18B4C;
font-size: 34rpx;
line-height: 34rpx;
margin-left: 10rpx;
font-weight: bold;
}
.view {
font-size: 24rpx;
color: #999999;
line-height: 24rpx;
}
.view>.score{
margin-left:9rpx;
@@ -232,29 +240,29 @@ height:100%;
margin-right:23rpx;
font-family:PingFang-SC-Bold;
}
.barcodeimg{
position: absolute;
right: 21rpx;
top: 23rpx;
.qrcode{
width: 84rpx;
height: 84rpx;
}
.duihuanimg{
width: 86rpx;
height: 63rpx;
right:190rpx;
position:absolute;
top: 60rpx;
.qrcodeimg{
width: 100%;
}
.leftimg{
position: absolute;
position: absolute;
right: 40rpx;
top: 60rpx;
margin-top: -7rpx;
width: 14rpx;
height: 26rpx;
}
.duihuanimg{
display: block;
width: 85rpx;
height: 61rpx;
margin-top: 6rpx;
}
.product{
height: 135rpx;
padding: 0 30rpx;
margin-bottom: 30rpx;
}
@@ -295,4 +303,7 @@ position:absolute;
text-indent: 4em;
border-radius:60rpx;
margin-top: 7rpx;
}
.business{
margin-top: 40rpx;
}

+ 10
- 2
pages/main/rushtobyCard/index.js 查看文件

@@ -23,7 +23,6 @@ Component({
* 组件的方法列表
*/
methods: {
rushtobuy: function (e) {
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${
@@ -31,7 +30,16 @@ Component({
}&couponId=${e.currentTarget.dataset.couponid}`
})
},
gotoRushList:function(){
wx.navigateTo({
url: '/pages/rushToBuy/index',
})
},
gotoCardList:function(){
wx.navigateTo({
url: '/pages/discountCardList/discountCardList',
})
},
gotodiscountCardList: function (e) {
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${e.currentTarget.dataset.quancode}&couponId=${e.currentTarget.dataset.couponid}&cardType=${e.currentTarget.dataset.type}`


+ 33
- 29
pages/main/rushtobyCard/index.wxml 查看文件

@@ -1,40 +1,44 @@
<view class="index-rushToBuy" wx:if="{{list.length>0}}">
<view class='clearfix rushtobuyimgs'>
<!-- 限时抢购 -->
<view wx:if="{{list.length!=0}}">
<text class='xianshi'>限时</text><text class='qianggou'>秒杀</text>
<scroll-view scroll-x class="index-scroll-view">
<view class="commodity" wx:for="{{list}}" wx:key="unique">
<view bindtap="rushtobuy" data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" >
<image mode='aspectFill' lazy-load='true' class="commodity-img" src="{{item.coverImg}}" />
<view class="commodity-info">
<view class="commodity-info-name">{{item.title}}</view>
<view class="commodity-info-price">
<text class="commodity-info-price-p">{{item.salePriceStr}}元</text>
<text class="commodity-info-price-o">{{item.priceStr}}元</text>
<view class='clearfix rushtobuyimgs'>
<!-- 限时抢购 -->
<view wx:if="{{list.length!=0}}" class='fl' style='padding:0 10rpx 10rpx;'>
<view class='clearfix title'>
<text class='qianggou fl'>限时</text>
<text class='xianshi fl'>秒杀</text>
<text class='more' bindtap='gotoRushList'>更多></text>
</view>
<view class="commodity">
<view bindtap="rushtobuy" data-couponId="{{list[0].couponId}}" data-couponChannelId="{{list[0].id}}" data-targetAd="{{list[0].targetAd}}">
<image mode='aspectFill' lazy-load='true' class="commodity-img" src="{{list[0].coverImg}}" />
<view class="commodity-info">
<view class="commodity-info-name">{{list[0].title}}</view>
<view class="commodity-info-price">
<text class="commodity-info-price-p">{{list[0].salePriceStr}}元</text>
<text class="commodity-info-price-o">{{list[0].priceStr}}元</text>
</view>
</view>
</view>
</view>
</view>
</scroll-view>
<!-- 消费卡列表 -->
<view wx:if="{{cardlist.length!=0}}" class='fr' style='padding:0 13rpx 10rpx;'>
<view class='clearfix title'>
<text class='qianggou fl'>消费</text>
<text class='xianshi fl'>卡</text>
<text class='more' bindtap='gotoCardList'>更多></text>
</view>
<!-- 消费卡列表 -->
<view wx:if="{{cardlist.length!=0}}">
<text class='xiaofei'>消费</text> <text class='ka'>卡</text><text class='subtitle'>好物提前购</text>
<scroll-view scroll-x class="index-scroll-view">
<view class="commodity" wx:for="{{cardlist}}" wx:key="unique">
<view bindtap="gotodiscountCardList" data-couponId='{{item.couponId}}' data-type="{{item.type}}" data-quancode="{{item.id}}">
<image mode='aspectFill' lazy-load='true' class="commodity-img" src="{{item.coverImg}}" />
<view class="commodity-info">
<view class="commodity-info-name">{{item.title}}</view>
<view class="commodity-info-price">
<text class="commodity-info-price-p">{{item.salePriceStr}}元</text>
<text class="commodity-info-price-o">{{item.priceStr}}元</text>
<view class="commodity">
<view bindtap="gotodiscountCardList" data-couponId='{{cardlist[0].couponId}}' data-type="{{cardlist[0].type}}" data-quancode="{{cardlist[0].id}}">
<image mode='aspectFill' lazy-load='true' class="commodity-img" src="{{cardlist[0].coverImg}}" />
<view class="commodity-info">
<view class="commodity-info-name">{{cardlist[0].title}}</view>
<view class="commodity-info-price">
<text class="commodity-info-price-p">{{cardlist[0].salePriceStr}}元</text>
<text class="commodity-info-price-o">{{cardlist[0].priceStr}}元</text>
</view>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
</view>

+ 37
- 21
pages/main/rushtobyCard/index.wxss 查看文件

@@ -1,25 +1,33 @@
@import "../../../app.wxss";
.rushtobuyimgs>view{
width: 48%;
display: inline-block;
box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
border-radius:16rpx;

}
.rushtobuyimgs{
padding: 0 30rpx;
margin-bottom: 40rpx;
}
.rushtobuyimgs>view>text{
font-size:34rpx;
font-weight: bold;
}
.xianshi{
color: #F12643;
padding-left:30rpx;
font-weight: bold;
font-size:34rpx;
line-height: 34rpx;
}
.qianggou{
color: #3D3737;
font-weight: bold;
font-size: 34rpx;
line-height: 34rpx;
}
.xiaofei{
color: #3D3737;
padding-left:30rpx;
}
.ka{
color: #ED734A
font-size: 34rpx;
}
.subtitle{
font-size:28rpx !important;
@@ -64,13 +72,11 @@

.index-scroll-view .commodity {
display: inline-block;
margin: 16rpx 30rpx 16rpx;
margin: 20rpx 0 16rpx;
margin-right: 0;
position: relative;
background: #fff;
/* border: 1rpx solid #dddee1; */
width: 334rpx;
/* box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); */
border-radius: 10rpx;
overflow: hidden;
}
@@ -79,10 +85,10 @@
}
.commodity-img{
display: block;
width: 335rpx;
height: 200rpx;
border-radius: 10rpx;
border: 1px solid #ebeced;
width: 314rpx;
height: 174rpx;
border-radius: 16rpx;
border:1rpx solid #f5f5f5;
}

.index-scroll-view .commodity-info {
@@ -90,18 +96,18 @@
overflow: hidden;
}

.index-scroll-view .commodity-info-name {
.commodity-info-name {
font-size: 28rpx;
line-height: 28rpx;
color: #333;
letter-spacing: 0.7rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width:248px;
font-weight: bold;
width:318rpx;
padding:16rpx 0;
}

.index-scroll-view .commodity-info-time {
.commodity-info-time {
font-size: 28rpx;
color: #B4B4B4;
letter-spacing: 0.7rpx;
@@ -109,13 +115,13 @@
font-weight: 500;
}

.index-scroll-view .commodity-info-price-p {
.commodity-info-price-p {
font-size: 28rpx;
color: #FF3232;
line-height: 36rpx;
font-weight:500;
}
.index-scroll-view .commodity-info-price-o {
.commodity-info-price-o {
display: inline-block;
padding-left: 20rpx;
font-size: 24rpx;
@@ -135,4 +141,14 @@
.realRemainingTime {
color: #ff4949;
font-size: 28rpx;
}
.more{
float: right;
line-height: 34rpx;
color: #999999;
font-size: 24rpx;
font-weight: normal;
}
.title{
padding: 20rpx 0;
}

+ 5
- 6
pages/main/spellGroup/index.wxml 查看文件

@@ -1,15 +1,14 @@
<view class="index-rushToBuy" wx:if="{{list.length>0}}">
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title"><image src="{{pintuan}}" class='barginiconimg' mode='widthFix'/><text class='text-red'>拼团</text>专场<text bindtap="gotomore" class='moregroup'>更多拼团></text></view>
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">
<image src="{{pintuan}}" class='barginiconimg' mode='widthFix'/><text class='text-red'>拼团</text>专场<text bindtap="gotomore" class='morebargin'>更多拼团></text>
</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}}">
<image mode='aspectFill' lazy-load='true' class="commodity-img" src="{{item.coverImg}}" />
<image mode='aspectFill' lazy-load='true' class="commodity-img" src="{{item.coverImg}}" />
<view class="commodity-info">
<view class="commodity-info-name">{{item.title}}</view>
<view class="commodity-info-price">
<text class="commodity-info-price-p">{{item.salePriceStr}}元</text>
<text class="commodity-info-price-o">{{item.priceStr}}元</text>
</view>
<view class="commodity-info-price"><text class="commodity-info-price-p">{{item.salePriceStr}}元</text><text class='price'>{{item.priceStr}}元</text></view>
</view>
</view>
</view>


+ 60
- 43
pages/main/spellGroup/index.wxss 查看文件

@@ -1,57 +1,62 @@
.index-rushToBuy {
width: 100%;
font-family: PingFangSC-Semibold;
width: 690rpx;
margin: 40rpx auto;
padding: 20rpx 0 0;
font-family: PingFangSC-Semibold;
box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
border-radius:16rpx;
}

.index-rushToBuy-title {
position: relative;
font-size: 34rpx;
color: #000000;
font-weight:bold;
color: #333333;
letter-spacing: 1.16rpx;
padding-top: 0;
padding-left: 30rpx;
font-weight: bold;
}
.moregroup{
float: right;
margin-right: 20rpx;
color: #999999;
font-size: 24rpx;
margin-top: 8rpx;
font-weight: normal;
padding-left: 20rpx;
line-height: 34rpx;
}
.useprice{
font-size: 28rpx;
}
.morebargin{
float: right;
margin-right: 20rpx;
color: #999999;
font-size: 24rpx;
line-height: 24rpx;
font-weight: normal;
}
.listimage{
position: absolute;
right: 18rpx;
width: 20px;
top: 40rpx;
top: 28rpx;
}
.index-scroll-view {
width: 100%;
white-space: nowrap;
}

.index-scroll-view .commodity {
display: inline-block;
margin: 16rpx 30rpx 16rpx;
margin-right: 0;
position: relative;
background: #fff;
/* border: 1rpx solid #dddee1; */
width: 334rpx;
/* box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); */
border-radius: 10rpx;
overflow: hidden;
display: inline-block;
width: 285rpx;
margin: 20rpx 0 0 13rpx;
position: relative;
border-radius: 10rpx;
overflow: hidden;
}
.index-scroll-view .commodity:last-child{
margin-right: 30rpx;
margin-right: 15rpx;
}
.index-scroll-view .commodity:nth-of-type(1){
margin-left: 14rpx;
}
.commodity-img{
display: block;
width: 329rpx;
height: 200rpx;
border-radius: 10rpx;
border: 1px solid #ebeced;
width: 285rpx;
height: 166rpx;
background:rgba(255,255,255,1);
border-radius:16rpx;
}

.index-scroll-view .commodity-info {
@@ -60,13 +65,14 @@
}

.index-scroll-view .commodity-info-name {
font-size: 24rpx;
color: #000000;
letter-spacing: 0.7rpx;
width: 285rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width:167px;
font-size: 28rpx;
line-height: 30rpx;
margin-top: 16rpx;
color: #333333;
}

.index-scroll-view .commodity-info-time {
@@ -77,9 +83,13 @@
}

.index-scroll-view .commodity-info-price-p {
font-size: 24rpx;
font-size: 28rpx;
color: #f96563;
line-height: 36rpx;
line-height: 30rpx;
}
.commodity-info-price{
margin-top: 10rpx;
line-height: 30rpx;
}
.index-scroll-view .commodity-info-price-o {
display: inline-block;
@@ -90,14 +100,21 @@
text-decoration:line-through;
line-height: 36rpx;
}
.commodity-info-price{
line-height: 36rpx;
}
.barginiconimg{
.barginicon{
width: 24rpx;
height: 22rpx;
margin-right: 2rpx;
}
.barginiconimg{
width: 26rpx;
height: 23rpx;
margin-right: 6rpx;
}
.text-red{
color:#F12643;
}
.price{
font-size: 24rpx;
color: #999;
text-decoration: line-through;
margin-left: 10rpx;
}

+ 0
- 3
pages/user/index.wxml 查看文件

@@ -1,7 +1,4 @@
<view class="user">
<!-- <view class='bannerbg'>
<image src='{{bannerUrl}}' mode="widthFix"></image>
</view> -->
<view class="user-title">
<view class="user-avatar" bindtap='gotograde'>
<open-data class="open" type="userAvatarUrl"></open-data>


Loading…
取消
儲存