Kaynağa Gözat

merge from Meo

tags/2.2.4
Stormeye.Wu 6 yıl önce
ebeveyn
işleme
1d1fa4fe6c
9 değiştirilmiş dosya ile 74 ekleme ve 49 silme
  1. +15
    -11
      pages/coupon/detail/index.js
  2. +2
    -0
      pages/coupon/detail/index.wxml
  3. +1
    -0
      pages/coupon/detail/index.wxss
  4. +1
    -1
      pages/couponorder/detail/index.js
  5. +3
    -4
      pages/couponorder/index/index.wxml
  6. +21
    -11
      pages/couponorder/index/index.wxss
  7. +10
    -8
      pages/index/index.wxml
  8. +19
    -12
      pages/index/index.wxss
  9. +2
    -2
      pages/user/index.wxss

+ 15
- 11
pages/coupon/detail/index.js Dosyayı Görüntüle

@@ -7,26 +7,30 @@ Page({
couponId: null,
orderId: ''
},
onLoad(e) {
console.log(e)
onLoad(options) {
console.log("00000000000000----------");
console.log(options);
let that = this;
wx.showLoading({
title: '加载中...',
})
if (e.flag == 'pay') {
title: "加载中..."
});

if (options.flag == "pay") {
this.orderFunc();
} else {
Http.get({
url: config.api.couponDetail,
data: {
id: e.id
id: options.id
}
}).then(res => {
console.log(res);
wx.hideLoading();
this.setData({
data: res,
couponId: e.id
})
})
that.setData({
data: res.data,
couponId: options.id
});
});
}
},
/**


+ 2
- 0
pages/coupon/detail/index.wxml Dosyayı Görüntüle

@@ -14,6 +14,8 @@
<text>¥{{data.priceStr}}</text>
</view>
</view>

<!-- 未解决 商场的名称 -->
<view class='posi'>
<view class='posi_logo'>
<view>


+ 1
- 0
pages/coupon/detail/index.wxss Dosyayı Görüntüle

@@ -6,6 +6,7 @@
position: relative;
display: flex;
flex-direction: column;
overflow: hidden;
}
.coupons-body{
flex: 1;


+ 1
- 1
pages/couponorder/detail/index.js Dosyayı Görüntüle

@@ -1,5 +1,5 @@
//index.js
const util = require('../../utils/util');
const util = require('../../../utils/util');

Page({



+ 3
- 4
pages/couponorder/index/index.wxml Dosyayı Görüntüle

@@ -15,11 +15,10 @@
<text>{{item.subTitle}}</text>
</view>
<view>
<text>有效期至:</text>{{item.expiredTime}}</view>
<view>
<text></text>
<text>立即使用</text>
<text class="txt1">有效期至:</text>
<text class="txt2">{{item.expiredTime}}</text>
</view>
<view class="btns">立即使用</view>
</view>
</view>
</view>

+ 21
- 11
pages/couponorder/index/index.wxss Dosyayı Görüntüle

@@ -29,14 +29,14 @@
}

.logo {
width: 248rpx;
width: 348rpx;
height: 184rpx;
border-radius: 30rpx;
}

.logo image {
width: 100%;
height: 100%;
border-radius: 15rpx;
}

.info view:nth-child(1) {
@@ -70,14 +70,24 @@
justify-content: space-between;
}

.info view:nth-child(3) text:nth-child(2) {
width: 170rpx;
height: 50rpx;
color: #fff;
line-height: 50rpx;
.btns{
width: 200rpx;
height: 60rpx;
line-height: 60rpx;
text-align: center;
background: #00c0ff;
border-radius: 10px;
font-size: 28rpx;
margin-top: 40rpx;
background: #00C0FF;
color: #fff;
float: right;
border-radius:15rpx;
font-size: 30rpx;
}

.txt1{
font-size: 22rpx;
color: #999;
}
.txt2{
font-size: 22rpx;
color: red;
}

+ 10
- 8
pages/index/index.wxml Dosyayı Görüntüle

@@ -1,8 +1,10 @@
<view class="index-position">
<navigator url="/pages/market/index" >
<text class="iconfont icon-dingweib"></text> {{market.name}} <text class="iconfont icon-choose"></text>
</navigator>
</view>
<c-banner imgUrls="{{imgUrls}}" />
<c-rushToBuy />
<c-coupons />
<view class="container">
<view class="index-position">
<navigator url="/pages/market/index">
<text class="iconfont icon-dingweib txt"></text> {{market.name}} <text class="iconfont icon-choose"></text>
</navigator>
</view>
<c-banner imgUrls="{{imgUrls}}" />
<c-rushToBuy />
<c-coupons />
</view>

+ 19
- 12
pages/index/index.wxss Dosyayı Görüntüle

@@ -1,14 +1,21 @@
.index-position {
background: rgba(0, 0, 0, 0.5);
height: 88rpx;
position: absolute;
top: 0;
width: 100%;
font-family: PingFangSC-Semibold;
font-size: 30rpx;
color: #FFFFFF;
letter-spacing: 0.75rpx;
z-index: 9;
line-height: 88rpx;
padding: 0 30rpx;
background: rgba(0, 0, 0, 0.5);
height: 88rpx;
position: absolute;
top: 0;
width: 100%;
font-family: PingFangSC-Semibold;
font-size: 30rpx;
color: #ffffff;
letter-spacing: 0.75rpx;
z-index: 9;
line-height: 88rpx;
overflow: hidden;
}
page {
width: 100%;
overflow-x: hidden;
}
.txt{
margin-left: 20rpx;
}

+ 2
- 2
pages/user/index.wxss Dosyayı Görüntüle

@@ -50,7 +50,7 @@

.user-btns .user-btn>view {
flex: 1;
padding: 0 32px;
padding: 0 10px 0 32rpx;
}

.user-btns .user-btn>view:last-child {
@@ -61,7 +61,7 @@

.user-btns .user-btn>view:last-child .iconfont {
color: #A8A8A8;
font-size: 75rpx;
font-size: 44rpx;
}

.user-out-btn {


Yükleniyor…
İptal
Kaydet