diff --git a/assets/images/gift.png b/assets/images/gift.png
new file mode 100644
index 0000000..cb67017
Binary files /dev/null and b/assets/images/gift.png differ
diff --git a/components/commodityMould/commodityMould.wxml b/components/commodityMould/commodityMould.wxml
index 45b4bcf..cbc90fa 100644
--- a/components/commodityMould/commodityMould.wxml
+++ b/components/commodityMould/commodityMould.wxml
@@ -22,24 +22,24 @@
-
+
-
+
{{item.title}}
-
+
¥
{{item.salePriceStrQ?item.salePriceStrQ:item.salePriceStr}}
{{item.salePriceStrH?'.'+item.salePriceStrH:''}}
-
+
{{item.creditPrice}}
积分
diff --git a/components/commodityMould/commodityMould.wxss b/components/commodityMould/commodityMould.wxss
index 0f9742f..78a379b 100644
--- a/components/commodityMould/commodityMould.wxss
+++ b/components/commodityMould/commodityMould.wxss
@@ -242,6 +242,7 @@
font-family: OPPOSans;
font-weight: 500;
color: #999;
+ margin-top: 50rpx;
}
.product {
@@ -256,4 +257,4 @@
height: 100%;
display: block;
width: 100%;
-}
+}
\ No newline at end of file
diff --git a/index/user.js b/index/user.js
index ea44edb..2e07150 100644
--- a/index/user.js
+++ b/index/user.js
@@ -13,7 +13,6 @@ Page({
* 页面的初始数据
*/
data: {
-
mch_id: mch_id,
businessSwitch: businessSwitch,
goUrl: "",
@@ -430,6 +429,5 @@ Page({
console.log("获取设备信息失败" + e);
}
return size;
- },
-
+ }
});
\ No newline at end of file
diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js
index 6135f18..a6fc7e4 100644
--- a/pages/ConsumeDetail/ConsumeDetail.js
+++ b/pages/ConsumeDetail/ConsumeDetail.js
@@ -166,8 +166,9 @@ Page({
console.log(res);
if (res.code == 200 && res.data.list && res.data.list.length > 0) {
wx.hideLoading();
- res.data.list.map(file => {
- file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss")
+ res.data.list.map(item => {
+ item.updateDate = util.formatTime(item.updateDate, "yyyy-MM-dd hh:mm:ss")
+ item.createDate = util.formatTime(item.createDate, "yyyy-MM-dd hh:mm:ss")
})
that.setData({
showPage: true,
diff --git a/pages/addPark/addPark.js b/pages/addPark/addPark.js
index 2b0cbcd..9960b08 100644
--- a/pages/addPark/addPark.js
+++ b/pages/addPark/addPark.js
@@ -36,29 +36,29 @@ Page({
],
chooseNumFir: [
['A', 'B', 'C', 'D', 'E', 'F', 'G'],
- ['H', 'J', 'K', 'L', 'M', 'N', 'P',],
- ['Q', 'R', 'S', 'T', 'U', 'V', 'W'],
- ['X', 'Y', 'Z', '', '', '','DEL'],
+ ['H', 'J', 'K', 'L', 'M', 'N', 'O'],
+ ['P', 'Q', 'R', 'S', 'T', 'U', 'V'],
+ ['X', 'Y', 'Z', 'W', '', '', 'DEL'],
],
chooseNumSco: [
['A', 'B', 'C', 'D', 'E', 'F', 'G'],
['H', 'J', 'K', 'L', 'M', 'N', 'P'],
['Q', 'R', 'S', 'T', 'U', 'V', 'W'],
- ['X', 'Y', 'Z', '1', '2','3', '4'],
+ ['X', 'Y', 'Z', '1', '2', '3', '4'],
['5', '6', '7', '8', '9', '0', 'DEL'],
],
chooseSpec: [
['A', 'B', 'C', 'D', 'E', 'F', 'G'],
['H', 'J', 'K', 'L', 'M', 'N', 'P'],
['Q', 'R', 'S', 'T', 'U', 'V', 'W'],
- ['X', 'Y', 'Z', '港', '澳','1', '2'],
+ ['X', 'Y', 'Z', '港', '澳', '1', '2'],
['3', '4', '5', '6', '7', '8', '9'],
- ['0', '', '', '', "", "",'DEL']
+ ['0', '', '', '', "", "", 'DEL']
],
},
- onLoad: function(options) {
+ onLoad: function (options) {
let that = this;
if (Object.keys(options).length != 0) {
@@ -67,13 +67,13 @@ Page({
})
}
},
- jumpTo: function() {
+ jumpTo: function () {
// 返回
wx.navigateBack({
url: '/index/passCar'
})
},
- handleTap: function(e) {
+ handleTap: function (e) {
this.buttonStatus();
this.setData({
choose: e.target.dataset.cardata,
@@ -114,7 +114,7 @@ Page({
}
},
- chooseNum: function(e) {
+ chooseNum: function (e) {
if (e.target.dataset.msg == 'I') {
return
}
@@ -338,7 +338,7 @@ Page({
this.buttonStatus();
},
- submit: function() {
+ submit: function () {
if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") {
var carNumber = ''
carNumber += this.data.title + this.data.numFir + this.data.numSco + this.data.numThr + this.data.numFor + this.data.numFive + this.data.numSix
@@ -361,7 +361,7 @@ Page({
}
},
- buttonStatus: function() {
+ buttonStatus: function () {
if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") {
this.setData({
buttonStatus: true
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 8658cc4..7b960bb 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -765,6 +765,8 @@ Page({
if (res.data.type == 10) {
that.setData({
salePriceStr: res.data.salePriceStr,
+ soldStartTime: util.formatTime(res.data.soldStartTime, "yyyy-MM-dd"),
+ soldEndTime: util.formatTime(res.data.soldEndTime, "yyyy-MM-dd"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
priceStr: res.data.priceStr,
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 92e3490..ff8cb26 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -88,14 +88,17 @@
-
-
自领取之日起
{{validDays}}天内有效
(请在有效期内使用)
+
+
+ 售卖期:{{soldStartTime}} 至 {{soldEndTime}}
+
+
- {{validStartDate}}至{{validEndDate}}
+ 使用期:{{validStartDate}} 至 {{validEndDate}}
当次有效
@@ -163,21 +166,26 @@
首页
-
@@ -187,17 +195,21 @@
首页
-
-
+
+
+
+
+
+
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 8de95ee..ddbbc3e 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -391,7 +391,7 @@ button::after {
#noBuy {
position: relative;
- background-color: rgba(0, 0, 0, 0.2);
+ background-color: #00000033;
height: 94rpx;
width: 560rpx;
margin: 0 auto 30rpx;
diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js
index 4c4ba6a..5b6e257 100644
--- a/pages/spellGroup/mySpellGroup/index.js
+++ b/pages/spellGroup/mySpellGroup/index.js
@@ -52,7 +52,8 @@ Page({
merchantVoList: [],
goHomeUrl: "",
mallList: '',
- contentType: ''
+ contentType: '',
+ activityStatus: ''
},
/**
@@ -503,8 +504,11 @@ Page({
data.salePrice = (data.salePrice / 100).toFixed(2);
data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd')
data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd')
+ data.soldStartTime = utils.formatTime(data.soldStartTime, 'yyyy-MM-dd')
+ data.soldEndTime = utils.formatTime(data.soldEndTime, 'yyyy-MM-dd')
that.setData({
data,
+ activityStatus: data.activityStatus
// merchantVoList: data.merchantVoList
});
Http.get({
diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml
index aa86114..8a4628d 100644
--- a/pages/spellGroup/mySpellGroup/index.wxml
+++ b/pages/spellGroup/mySpellGroup/index.wxml
@@ -28,9 +28,18 @@
过期不退款
-
- {{data.validStartDate}}至{{data.validEndDate}}(请在有效期内使用)
+
+
+ 售卖期:{{data.soldStartTime}} 至 {{data.soldEndTime}}
+ (请在售卖期内购买)
+
+
+
+ 使用期:{{data.validStartDate}} 至 {{data.validEndDate}}
+ (请在使用期内使用)
+
+
@@ -84,25 +93,32 @@
首页
-
-
-
+
+
+
+
+
+
+
+
+ 活动未开始
+
diff --git a/pages/spellGroup/mySpellGroup/index.wxss b/pages/spellGroup/mySpellGroup/index.wxss
index 6ca5bf9..7318dda 100644
--- a/pages/spellGroup/mySpellGroup/index.wxss
+++ b/pages/spellGroup/mySpellGroup/index.wxss
@@ -7,52 +7,64 @@
width: 130rpx;
text-align: center;
margin-left: 26rpx;
- color: red!important;
+ color: red !important;
}
-page{
+
+page {
background: #F4F5F9;
}
-.top-img{
+
+.top-img {
width: 100%;
height: 533rpx;
z-index: 1;
}
-.top-img image{
+
+.top-img image {
width: 100%;
height: 533rpx;
}
+
.goback {
- float:left;
- width:132rpx!important;
- height:96rpx;
- background:rgba(255,255,255,1);
- line-height:96rpx;
- border-radius:32rpx;
- margin-right:25rpx;
-}
-.timess{
+ float: left;
+ width: 132rpx !important;
+ height: 96rpx;
+ background: rgba(255, 255, 255, 1);
+ line-height: 96rpx;
+ border-radius: 32rpx;
+ margin-right: 25rpx;
+}
+
+.timess {
color: #af6e34;
}
-.wx-swiper-dots{
+
+.wx-swiper-dots {
margin-bottom: 30rpx;
}
-button::after{ border: none; }
-.goback image{
+
+button::after {
+ border: none;
+}
+
+.goback image {
position: absolute;
- width:52rpx;
+ width: 52rpx;
height: 50rpx;
left: 0;
right: 0;
top: 0;
- bottom:0;
- margin:10rpx auto;
+ bottom: 0;
+ margin: 10rpx auto;
}
-.content-box{
+
+.content-box {
box-sizing: content-box;
height: auto;
overflow: hidden;
}
-.content{
+
+.content {
position: relative;
width: 100%;
height: auto;
@@ -60,11 +72,13 @@ button::after{ border: none; }
overflow: hidden;
padding-bottom: 130rpx;
}
-.text{
+
+.text {
position: relative;
/* padding: 0 30rpx; */
}
-.title{
+
+.title {
position: relative;
background-color: #fff;
z-index: 10;
@@ -73,24 +87,26 @@ button::after{ border: none; }
padding-left: 30rpx;
line-height: 50rpx;
opacity: 1;
- font-size:32rpx;
- font-weight:bold;
- color:rgba(51,51,51,1);
+ font-size: 32rpx;
+ font-weight: bold;
+ color: rgba(51, 51, 51, 1);
box-sizing: border-box;
}
-.remark{
+
+.remark {
background: #FFF;
- font-size:24rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(134,134,134,1);
+ font-size: 24rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(134, 134, 134, 1);
line-height: 48rpx;
padding: 0 80rpx 0 30rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
-.des{
+
+.des {
width: 100%;
height: auto;
padding-top: 6rpx;
@@ -99,207 +115,237 @@ button::after{ border: none; }
color: #FD782D;
display: flex;
}
-.des-peoplenum{
+
+.des-peoplenum {
display: inline;
- font-size:24rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- line-height:70rpx;
+ font-size: 24rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ line-height: 70rpx;
}
-.des-saleprice{
+
+.des-saleprice {
display: inline;
- font-size:40rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
+ font-size: 40rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
}
-.status{
+
+.status {
width: 100%;
border-radius: 15rpx;
- background:rgba(255,235,229,1);
+ background: rgba(255, 235, 229, 1);
margin: 30rpx 0;
overflow: hidden;
}
-.status01{
+
+.status01 {
float: left;
width: 130rpx;
height: 130rpx;
}
-.status01 image{
+
+.status01 image {
width: 90rpx;
height: 90rpx;
border-radius: 45rpx;
margin: 20rpx 0 0 20rpx;
}
-.status02{
+
+.status02 {
margin-top: 20rpx;
float: left;
width: 140rpx;
- font-size:28rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(51,51,51,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(51, 51, 51, 1);
}
-.r-p-num{
+
+.r-p-num {
display: inline;
color: #FF3535;
}
-.status03{
+
+.status03 {
width: 264rpx;
float: left;
padding-left: 10rpx;
color: #F74812;
box-sizing: border-box;
}
-.hh,.mm,.ss{
+
+.hh,
+.mm,
+.ss {
display: inline-block;
- font-size:26rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(255,255,255,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(255, 255, 255, 1);
height: 38rpx;
width: 38rpx;
background: #F74812;
- border-radius:10rpx;
+ border-radius: 10rpx;
margin: 46rpx 0 0 0;
text-align: center;
line-height: 38rpx;
}
-.day-box{
+
+.day-box {
width: 40rpx;
text-align: center;
}
-.mao{
+
+.mao {
display: inline-block;
width: 20rpx;
text-align: center;
}
-.status04{
+
+.status04 {
float: left;
width: 146rpx;
}
-.s-button{
- background:#ED3D2E;
+
+.s-button {
+ background: #ED3D2E;
width: 120rpx;
height: 48rpx;
- font-size:28rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(255,255,255,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(255, 255, 255, 1);
text-align: center;
line-height: 48rpx;
border-radius: 24rpx;
margin: 40rpx auto 0;
}
-.p-title{
- font-size:30rpx;
- color:rgba(51,51,51,1);
+
+.p-title {
+ font-size: 30rpx;
+ color: rgba(51, 51, 51, 1);
margin: 10rpx 0 20rpx 0;
}
-.p-list{
- font-size:24rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(51,51,51,1);
- line-height:50rpx;
-}
-.edit{
- position:fixed;
- bottom:0;
- left:0;
- right:0;
- padding:20rpx 22rpx;
- background:transparent!important;
-}
-.edit-left{
+
+.p-list {
+ font-size: 24rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(51, 51, 51, 1);
+ line-height: 50rpx;
+}
+
+.edit {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ padding: 20rpx 22rpx;
+ background: transparent !important;
+}
+
+.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;
+ background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
+ border-radius: 32rpx;
}
-.edit-right{
+
+.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;
+ background: linear-gradient(90deg, rgba(40, 179, 255, 1) 0%, rgba(48, 103, 255, 1) 100%);
+ border-radius: 32rpx;
}
-.btnTxt{
+
+.btnTxt {
width: 50rpx;
height: 30rpx;
line-height: 50rpx;
color: #FD782D;
font-size: 20rpx;
position: absolute;
- right:42rpx ;
+ right: 42rpx;
bottom: 15rpx;
}
-.edit-left-top{
+
+.edit-left-top {
height: 46rpx;
text-align: center;
- line-height:65rpx;
+ line-height: 65rpx;
}
-.price{
+
+.price {
display: inline;
- font-size:32rpx;
+ font-size: 32rpx;
line-height: 32rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(254,254,254,1);
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(254, 254, 254, 1);
}
-.price-unit{
+
+.price-unit {
display: inline;
- font-size:27rpx;
+ font-size: 27rpx;
line-height: 27rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(254,254,254,1);
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(254, 254, 254, 1);
}
-.edit-left-bottom{
+
+.edit-left-bottom {
text-align: center;
- font-size:30rpx;
+ font-size: 30rpx;
line-height: 40rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(254,254,254,1);
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(254, 254, 254, 1);
}
-.edit-right-top{
+.edit-right-top {
line-height: 32rpx;
text-align: center;
margin-top: 13rpx;
}
-.real-price{
+
+.real-price {
display: inline;
- font-size:32rpx;
- font-family:PingFang-SC-Medium;
- font-weight:500;
- color:rgba(254,254,254,1);
+ font-size: 32rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ color: rgba(254, 254, 254, 1);
}
-.real-price-unit{
+
+.real-price-unit {
display: inline;
- font-size:27rpx;
+ font-size: 27rpx;
line-height: 27rpx;
- font-weight:500;
- color:rgba(254,254,254,1);
+ font-weight: 500;
+ color: rgba(254, 254, 254, 1);
}
-.edit-right-bottom{
+
+.edit-right-bottom {
text-align: center;
- font-size:30rpx;
+ font-size: 30rpx;
line-height: 40rpx;
- font-weight:500;
- color:rgba(254,254,254,1);
+ font-weight: 500;
+ color: rgba(254, 254, 254, 1);
}
+
.posi {
position: relative;
background: #FFF;
margin-top: 18rpx;
- padding: 15rpx 30rpx
+ padding: 15rpx 30rpx
}
-.applyshop{
- font-size:32rpx;
- color:rgba(51,51,51,1);
+
+.applyshop {
+ font-size: 32rpx;
+ color: rgba(51, 51, 51, 1);
margin: 10rpx 0 20rpx 0;
}
@@ -364,6 +410,7 @@ button::after{ border: none; }
height: 36rpx;
overflow: hidden;
}
+
.tel {
right: 0;
top: 0;
@@ -372,6 +419,7 @@ button::after{ border: none; }
width: 50rpx;
height: 50rpx;
}
+
.rest {
font-size: 24rpx;
color: #919191;
@@ -383,9 +431,11 @@ button::after{ border: none; }
background: #FFF;
padding: 0 30rpx;
}
-.right-text{
+
+.right-text {
float: right;
}
+
.restNum {
font-size: 24rpx;
color: #999;
@@ -393,12 +443,31 @@ button::after{ border: none; }
text-align: right;
}
-.time {
+.timeX {
+ display: block;
font-size: 24rpx;
color: #333;
letter-spacing: 0;
line-height: 33rpx;
+}
+
+#noBuy {
+ height: 94rpx;
+ width: 490rpx;
+ margin: 0 auto 30rpx;
+ color: #fff;
+ font-size: 36rpx;
+ line-height: 94rpx;
+ border-radius: 61rpx;
+ background-color: #25252533;
+}
+
+.time {
display: inline-block;
+ font-size: 24rpx;
+ color: #333;
+ letter-spacing: 0;
+ line-height: 33rpx;
}
.txt01 {
@@ -428,27 +497,30 @@ button::after{ border: none; }
font-weight: bold;
background: #ff4949;
}
+
.fenxiang {
- position:absolute;
- right:0;
- top:-55rpx;
- width:108rpx;
- z-index:10;
+ position: absolute;
+ right: 0;
+ top: -55rpx;
+ width: 108rpx;
+ z-index: 10;
display: flex;
flex-direction: column;
}
.fenxiang image {
- width:48rpx;
+ width: 48rpx;
height: 48rpx;
z-index: 10;
margin: 0 auto;
}
-.gift{
+
+.gift {
color: #3C3C3C;
font-size: 20rpx;
margin: 0 auto;
}
+
.user-motto {
width: 270rpx;
border: 0;
@@ -457,6 +529,7 @@ button::after{ border: none; }
color: #fff;
position: fixed;
}
+
.user-motto::after {
border: none;
}
@@ -545,80 +618,84 @@ button::after{ border: none; }
width: 100%;
margin-bottom: 20rpx;
}
-.poster{
+
+.poster {
width: 100%;
-height: 100%;
-padding: 20rpx;
-position: absolute;
-top: 0;
-left: 0;
+ height: 100%;
+ padding: 20rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
}
+
.bottomsave {
-width: 100%;
-height: 140rpx;
-line-height: 140rpx;
-margin: auto 0;
-bottom:0;
-left: 0;
-right: 0;
-border-top: 1px solid #ccc;
-box-shadow: 0 0rpx 150rpx #ccc;
-background: #fff;
+ width: 100%;
+ height: 140rpx;
+ line-height: 140rpx;
+ margin: auto 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ border-top: 1px solid #ccc;
+ box-shadow: 0 0rpx 150rpx #ccc;
+ background: #fff;
}
+
.saveposter {
-color: #fff;
-width: 380rpx;
-height: 80rpx;
-border-radius: 50rpx;
-background: #f08f04;
-margin-top: 30rpx;
-font-size: 32rpx;
+ color: #fff;
+ width: 380rpx;
+ height: 80rpx;
+ border-radius: 50rpx;
+ background: #f08f04;
+ margin-top: 30rpx;
+ font-size: 32rpx;
}
+
.modal {
-width: 100%;
-height: 100%;
-position: fixed;
-top: 0;
-left: 0;
-background: rgba(0, 0, 0, 0.5);
-overflow: hidden;
-z-index: 10000;
-color: #fff;
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: rgba(0, 0, 0, 0.5);
+ overflow: hidden;
+ z-index: 10000;
+ color: #fff;
}
.modal-content {
-width: 540rpx;
-height: 233rpx;
-line-height: 60rpx;
-overflow: hidden;
-position: fixed;
-top: 50%;
-left: 0;
-z-index: 11;
-background: #f9f9f9;
-margin: -130rpx 105rpx;
-border-radius: 36rpx;
-display: flex;
+ width: 540rpx;
+ height: 233rpx;
+ line-height: 60rpx;
+ overflow: hidden;
+ position: fixed;
+ top: 50%;
+ left: 0;
+ z-index: 11;
+ background: #f9f9f9;
+ margin: -130rpx 105rpx;
+ border-radius: 36rpx;
+ display: flex;
}
.modal-content view {
-display: inline-block;
-flex: 1;
-text-align: center;
+ display: inline-block;
+ flex: 1;
+ text-align: center;
}
.modal-content view>text {
-color: #000;
-display: block;
-font-size: 30rpx;
-height: 80rpx;
-line-height: 80rpx;
+ color: #000;
+ display: block;
+ font-size: 30rpx;
+ height: 80rpx;
+ line-height: 80rpx;
}
.modal-content view>image {
-margin-top: 30rpx;
-width: 90rpx;
-height: 90rpx;
+ margin-top: 30rpx;
+ width: 90rpx;
+ height: 90rpx;
}
.b1 .con {
@@ -674,7 +751,7 @@ height: 90rpx;
border-bottom: 1rpx solid #eee;
}
-.b1 .quessss >view:last-child {
+.b1 .quessss>view:last-child {
border-bottom: 0;
}
@@ -740,7 +817,8 @@ height: 90rpx;
background: #fff;
}
-.b1 .btns .fr,.btns .fl {
+.b1 .btns .fr,
+.btns .fl {
width: 277rpx;
height: 95rpx;
border-radius: 48rpx;
@@ -896,7 +974,8 @@ height: 90rpx;
text-overflow: ellipsis;
}
-.b1 checkbox-group, radio-group {
+.b1 checkbox-group,
+radio-group {
height: 400rpx;
overflow-y: scroll;
}
@@ -911,6 +990,7 @@ height: 90rpx;
width: 100%;
margin-bottom: 20rpx;
}
+
.b1 .content {
margin: 0;
padding: 0;
@@ -919,26 +999,29 @@ height: 90rpx;
background: #f3f3f3;
position: relative;
}
-.b1 .poster{
- width: 100%;
+
+.b1 .poster {
+ width: 100%;
height: 100%;
- padding: 20rpx;
- position: absolute;
- top: 0;
- left: 0;
+ padding: 20rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
}
+
.b1 .bottomsave {
width: 100%;
height: 140rpx;
line-height: 140rpx;
margin: auto 0;
- bottom:0;
+ bottom: 0;
left: 0;
right: 0;
border-top: 1px solid #ccc;
box-shadow: 0 0rpx 150rpx #ccc;
background: #fff;
}
+
.b1 .saveposter {
color: #fff;
width: 380rpx;
@@ -948,6 +1031,7 @@ height: 90rpx;
margin-top: 30rpx;
font-size: 32rpx;
}
+
.b1 .modal {
width: 100%;
height: 100%;
@@ -992,37 +1076,44 @@ height: 90rpx;
width: 90rpx;
height: 90rpx;
}
-.b1 .wx-swiper-dots{
+
+.b1 .wx-swiper-dots {
margin-bottom: 30rpx;
}
-.quan{
+
+.quan {
float: left;
- margin:28rpx 15rpx 0 0;
+ margin: 28rpx 15rpx 0 0;
width: 12rpx;
height: 12rpx;
background: #E1E1E1;
border-radius: 50%;
}
-.swiper-box .wx-swiper-dots.wx-swiper-dots-horizontal{
-margin-bottom: 2rpx;
+
+.swiper-box .wx-swiper-dots.wx-swiper-dots-horizontal {
+ margin-bottom: 2rpx;
}
-.swiper-box .wx-swiper-dot{
-width:40rpx;
-display: inline-flex;
-height: 6rpx;
-margin-left: 10rpx;
-border-radius:6rpx;
-justify-content:space-between;
+
+.swiper-box .wx-swiper-dot {
+ width: 40rpx;
+ display: inline-flex;
+ height: 6rpx;
+ margin-left: 10rpx;
+ border-radius: 6rpx;
+ justify-content: space-between;
}
-.swiper-box .wx-swiper-dot::before{
-content: '';
-flex-grow: 1;
-background: #ccc8c8;
+
+.swiper-box .wx-swiper-dot::before {
+ content: '';
+ flex-grow: 1;
+ background: #ccc8c8;
}
-.swiper-box .wx-swiper-dot-active::before{
-background:#f6792b;
+
+.swiper-box .wx-swiper-dot-active::before {
+ background: #f6792b;
}
-.yj{
+
+.yj {
text-decoration: line-through;
color: #CCC;
font-size: 26rpx;