Sfoglia il codice sorgente

Merge branch 'dev' of https://git.youlane.cn/weapp/C into dev

tags/河北版C.8.1.01
caserKing 5 anni fa
parent
commit
5c7e074d0b
5 ha cambiato i file con 63 aggiunte e 67 eliminazioni
  1. +1
    -1
      pages/bargain/bargain.wxss
  2. +1
    -0
      pages/joinFrDpell/index.js
  3. +19
    -19
      pages/joinFrDpell/index.wxml
  4. +40
    -46
      pages/joinFrDpell/index.wxss
  5. +2
    -1
      pages/spellGroup/mySpellGroup/index.js

+ 1
- 1
pages/bargain/bargain.wxss Vedi File

@@ -456,7 +456,7 @@ progress{
.no-data{ .no-data{
width: 690rpx; width: 690rpx;
padding-top: 174rpx; padding-top: 174rpx;
height: calc(100vh - 160rpx);
height: calc(100vh - 300rpx);
background: #fff; background: #fff;
margin: 0 auto; margin: 0 auto;
border-radius:15rpx; border-radius:15rpx;


+ 1
- 0
pages/joinFrDpell/index.js Vedi File

@@ -14,6 +14,7 @@ Page({
teljpgUrl: imgurl.teljpg.url, teljpgUrl: imgurl.teljpg.url,
wmhome: imgurl.wmhome.url, wmhome: imgurl.wmhome.url,
orderGroupFail: imgurl.orderGroupFail.url, orderGroupFail: imgurl.orderGroupFail.url,
homeSelectedO: imgurl.homeSelectedO.url,
couponChannelId: '', couponChannelId: '',
couponId: '', couponId: '',
data: [], data: [],


+ 19
- 19
pages/joinFrDpell/index.wxml Vedi File

@@ -45,31 +45,31 @@
<view class='p-title'>购买须知:</view> <view class='p-title'>购买须知:</view>
<view class='p-list'>{{data.remark}}</view> <view class='p-list'>{{data.remark}}</view>
</view> </view>
<form bindsubmit="submit" report-submit='true' >
<view class='edit'>
<button class='goback' bindtap='gotoIndex'>
<image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text>
<view class='edit'>
<button class='goback' bindtap='gotoIndex'>
<image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text>
</button>
<form bindsubmit='{{canBuyIf?"gotoBuy":""}}' report-submit='true' wx:if='{{data.id}}'>
<button form-type="submit" class='edit-left'>
<view class='edit-left-top'>
<view class='price'>{{data.price}}</view>
<view class='price-unit'>元</view>
</view>
<view class='edit-left-bottom'>立即购买</view>
</button> </button>
<button form-type="submit" class='edit-left' wx:if='{{data.id}}' bindtap='{{canBuyIf?"gotoBuy":""}}'>
</form>
<!-- <button class='edit-right' id="shareBtn" open-type="share"></button> -->
<form bindsubmit='{{canSpell?"gotoSpell":""}}' report-submit='true' wx:if='{{data.id}}'>
<button class='edit-right' form-type="submit" >
<view class='edit-left-top'> <view class='edit-left-top'>
<view class='price'>{{data.price}}</view>
<view class='price'>{{data.salePrice}}</view>
<view class='price-unit'>元</view> <view class='price-unit'>元</view>
</view> </view>
<view class='edit-left-bottom'>立即购买</view>
<view class='edit-left-bottom'>参加拼团</view>
</button> </button>
<!-- <button class='edit-right' id="shareBtn" open-type="share"></button> -->
<view class='edit-right' wx:if='{{data.id}}' bindtap='{{canSpell?"gotoSpell":""}}'>
<view class='edit-right-top'>
<view class='real-price'>{{data.salePrice}}</view>
<view class='real-price-unit'>元</view>
</view>
<view class='edit-right-bottom'>参加拼团</view>
</view>
</form>
</view> </view>
</form>

</view> </view>
</view> </view>
<view class='al-bg' wx:if='{{showErr}}'></view> <view class='al-bg' wx:if='{{showErr}}'></view>


+ 40
- 46
pages/joinFrDpell/index.wxss Vedi File

@@ -13,6 +13,14 @@
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.edit-right{
float: right;
width: 268rpx;
height: 96rpx;
line-height: 46rpx;
background:linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%);
border-radius:32rpx;
}
.content{ .content{
position: relative; position: relative;
width: 100%; width: 100%;
@@ -138,33 +146,10 @@
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
line-height:50rpx; line-height:50rpx;
} }
.edit{
position: fixed;
width: 690rpx;
bottom: 20rpx;
left: 30rpx;
}
.edit-left{
float: left;
width: 269rpx;
height: 95rpx;
background:rgba(255,169,2,1);
box-shadow:0px 8rpx 8rpx 1rpx rgba(255,169,2,0.32);
border-radius:48rpx;
}
.edit-right{
float: right;
width: 269rpx;
height: 95rpx;
line-height: 46rpx;
background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
box-shadow:0px 8rpx 8rpx 1rpx rgba(246,93,51,0.32);
border-radius:48rpx;
}
.edit-left-top{ .edit-left-top{
height: 46rpx; height: 46rpx;
line-height: 46rpx;
text-align: center; text-align: center;
line-height:65rpx;
} }
.price{ .price{
display: inline; display: inline;
@@ -173,27 +158,31 @@
font-family:PingFang-SC-Medium; font-family:PingFang-SC-Medium;
font-weight:500; font-weight:500;
color:rgba(254,254,254,1); color:rgba(254,254,254,1);
margin-top: 6rpx;
} }
.price-unit{ .price-unit{
display: inline; display: inline;
font-size:27rpx; font-size:27rpx;
line-height: 27rpx; line-height: 27rpx;
margin-top: 11rpx;
font-family:PingFang-SC-Medium; font-family:PingFang-SC-Medium;
font-weight:500; font-weight:500;
color:rgba(254,254,254,1); color:rgba(254,254,254,1);
} }

.edit-left-bottom{ .edit-left-bottom{
text-align: center; text-align: center;
font-size:30rpx; font-size:30rpx;
line-height: 40rpx; line-height: 40rpx;
height: 40rpx;
font-family:PingFang-SC-Medium; font-family:PingFang-SC-Medium;
font-weight:500; font-weight:500;
color:rgba(254,254,254,1); color:rgba(254,254,254,1);
} }

.edit-left{
float: left;
width: 268rpx;
height: 96rpx;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:32rpx;
}
.edit-right-top{ .edit-right-top{
line-height: 32rpx; line-height: 32rpx;
text-align: center; text-align: center;
@@ -210,8 +199,6 @@
display: inline; display: inline;
font-size:27rpx; font-size:27rpx;
line-height: 27rpx; line-height: 27rpx;
margin-top: 11rpx;
font-family:PingFang-SC-Medium;
font-weight:500; font-weight:500;
color:rgba(254,254,254,1); color:rgba(254,254,254,1);
} }
@@ -219,7 +206,6 @@
text-align: center; text-align: center;
font-size:30rpx; font-size:30rpx;
line-height: 40rpx; line-height: 40rpx;
font-family:PingFang-SC-Medium;
font-weight:500; font-weight:500;
color:rgba(254,254,254,1); color:rgba(254,254,254,1);
} }
@@ -318,6 +304,7 @@
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
line-height: 44rpx; line-height: 44rpx;
} }
button::after{ border: none; }
.j-time{ .j-time{
display: inline; display: inline;
font-size:26rpx; font-size:26rpx;
@@ -328,24 +315,24 @@
} }
.goback { .goback {
float:left; float:left;
width:122rpx!important;
height:95rpx;
background:rgba(255,255,255,1);
line-height:95rpx;
border:1rpx solid rgba(227,227,227,1);
/* box-shadow:0px 8px 8px 1px rgba(189,189,189,0.32); */
border-radius:48rpx;
width:132rpx!important;
height:96rpx;
background:#fff!important;
line-height:96rpx;
border-radius:32rpx;
margin-right:25rpx; margin-right:25rpx;
border: 0!important;
box-sizing: border-box;
} }
.goback image{ .goback image{
position:absolute;
width:60rpx;
left:0;
right:0;
top:0;
position: absolute;
width:52rpx;
height: 50rpx;
left: 0;
right: 0;
top: 0;
bottom:0; bottom:0;
margin:auto;
height: 80rpx;
margin:10rpx auto;
} }
.rest { .rest {
font-size: 24rpx; font-size: 24rpx;
@@ -377,7 +364,14 @@
color: #919191; color: #919191;
letter-spacing: 0; letter-spacing: 0;
} }

.edit{
position:fixed;
bottom:0;
left:0;
right:0;
padding:20rpx 22rpx;
/* background:#fff; */
}
.times { .times {
display: inline-block; display: inline-block;
color: #ff4949; color: #ff4949;


+ 2
- 1
pages/spellGroup/mySpellGroup/index.js Vedi File

@@ -497,7 +497,8 @@ Page({
/** /**
* 发起支付 * 发起支付
*/ */
orderFunc(orderGroupId) {
orderFunc() {
let orderGroupId = this.data.orderGroupId;
let data = { let data = {
couponChannelId: this.data.data.id, couponChannelId: this.data.data.id,
couponId: this.data.data.couponId, couponId: this.data.data.couponId,


Caricamento…
Annulla
Salva