diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss
index 2ddd3a0..23b74a1 100644
--- a/components/coupons/index.wxss
+++ b/components/coupons/index.wxss
@@ -66,9 +66,9 @@
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #FD782D;
- /* line-height: 44rpx; */
+ line-height: 44rpx;
margin-left: 16rpx;
- /* padding-top: 16rpx; */
+ padding-top: 16rpx;
}
.rmb{
font-size: 24rpx!important;
@@ -132,7 +132,7 @@
.coupons-btn-gms {
background: #b9b9b9 !important;
- border-radius: 10px 0px 5px 0px !important;
+ border-radius: 10px!important;
opacity: 0.6;
margin: 0 !important;
padding: 0 !important;
diff --git a/components/hot/index.js b/components/hot/index.js
index 73dd2af..97ce405 100644
--- a/components/hot/index.js
+++ b/components/hot/index.js
@@ -23,7 +23,9 @@ Component({
wangmeimeibargin: imgurl.wangmeimeibargin.url,
list: [],
pintuanList:[],
- total: ''
+ total: '',
+ flag:false,
+ page:1,
},
/**
* 组件的方法列表
@@ -35,8 +37,8 @@ Component({
Http.get({
url: config.api.couponChannelList,
data: {
- pageNum: 1,
- pageSize: 5,
+ pageNum: this.data.page++,
+ pageSize: 1,
targetAd: 6
}
}).then(res => {
@@ -60,14 +62,15 @@ Component({
Http.get({
url: config.api.couponChannelList,
data: {
- pageNum: 1,
- pageSize: 4,
+ pageNum: this.data.page++,
+ pageSize: 1,
targetAd: 7
- }
+ },
}).then(res => {
this.setData({
pintuanList: res.data.list,
- total: res.data.total
+ total: res.data.total,
+ flag: true
});
console.log(this.data.pintuanList)
})
@@ -79,6 +82,11 @@ Component({
mask: false
});
})
+ },
+ // //换一换
+ getChange(){
+
+
},
//跳转砍价详情
gotokjdetail: function (e) {
diff --git a/components/hot/index.wxml b/components/hot/index.wxml
index 7b62a07..a330e8c 100644
--- a/components/hot/index.wxml
+++ b/components/hot/index.wxml
@@ -5,7 +5,7 @@
爆款专区
-
+
换一换
diff --git a/ext.json b/ext.json
index 6b64b8c..cb6c532 100644
--- a/ext.json
+++ b/ext.json
@@ -3,29 +3,28 @@
"attr": {
"imgProxy": [
{
- "newUrl": "https://ciformall.youlane.cn/img",
+ "newUrl": "https://ctest.malls.iformall.com/img",
"orgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn"
},
{
- "newUrl": "https://ciformall.youlane.cn/img1",
+ "newUrl": "https://ctest.malls.iformall.com/img1",
"orgUrl": "https://s3.cn-northwest-1.amazonaws.com.cn"
},
{
- "newUrl": "https://ciformall.youlane.cn/img2",
+ "newUrl": "https://ctest.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn"
}
],
- "configUrl": "https://ciformall.youlane.cn/C/api",
+ "configUrl": "https://ctest.malls.iformall.com/C/api",
"etcpAppId": "wx192b7d2e8dcbefd0",
- "socketUrl": "wss://mp.youlane.cn/W/ws",
"etcpVersion": "release",
- "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback",
+ "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback",
"ifHaveWebSocket": "0",
"ifHaveCarModular": "1"
},
- "name": "富茂客官开发",
- "weappId": "wxea71200db93d756b",
- "appVersion": "C.4.5.106"
+ "name": "富茂链客",
+ "weappId": "wx649b3be73c1afe47",
+ "appVersion": "C.test.5.2.0"
},
"debug": false,
"tabBar": {
@@ -61,10 +60,10 @@
"window": {
"backgroundTextStyle": "dark",
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "WeChat",
- "navigationBarBackgroundColor": "#fff"
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#FFFFFF"
},
- "extAppid": "wxea71200db93d756b",
+ "extAppid": "wx649b3be73c1afe47",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/pages/addPark/addPark.json b/pages/addPark/addPark.json
index 9e30d0a..0db3cdf 100644
--- a/pages/addPark/addPark.json
+++ b/pages/addPark/addPark.json
@@ -1,3 +1,4 @@
{
- "navigationBarTitleText": "添加车辆"
+ "navigationBarTitleText": "添加车辆",
+ "navigationBarBackgroundColor": "#F4F5F9"
}
\ No newline at end of file
diff --git a/pages/addPark/addPark.wxss b/pages/addPark/addPark.wxss
index 2b2339c..c484ac8 100644
--- a/pages/addPark/addPark.wxss
+++ b/pages/addPark/addPark.wxss
@@ -1,5 +1,7 @@
/* pages/park/addPark/addPark.wxss */
-
+page{
+ background: #F4F5F9;
+}
.addpark-title {
margin-top: 48rpx;
text-align: center;
@@ -18,9 +20,8 @@
.addpark-num-head {
display: flex;
width: 164rpx;
- background: #58abfa;
border-radius: 10rpx;
- color: #fff;
+ color: #3C3C3C;
text-align: center;
align-items: center;
}
@@ -29,13 +30,17 @@
width: 88rpx;
height: 82rpx;
line-height: 82rpx;
+ margin: 0 auto;
+ border: 2rpx solid #E1E1E1;
+ border-radius: 10rpx;
+ background: #FFFFFF;
}
.addpark-num-center {
display: flex;
margin-left: 20rpx;
width: 392rpx;
- border: 2rpx solid #58abfa;
+ /* border: 2rpx solid #E1E1E1; */
border-radius: 10rpx;
text-align: center;
align-items: center;
@@ -46,7 +51,7 @@
}
.addpark-num-center-border {
- border-left: 2rpx solid #58abfa;
+ border-left: 2rpx solid #E1E1E1;
}
.addpark-num-new {
@@ -55,10 +60,12 @@
text-align: center;
align-items: center;
margin-left: 20rpx;
- border: 2rpx solid #12c67a;
+ border: 2rpx dashed #2C8DFF;
border-radius: 10rpx;
}
-
+.addpark-num-new view {
+ border:none!important;
+}
.newsource {
font-size: 16rpx;
position: absolute;
@@ -66,9 +73,9 @@
left: 670rpx;
height: 30rpx;
width: 60rpx;
- background: #11c67b;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
color: #fff;
- border: 1px solid #11c67b;
+ /* border: 1px solid #11c67b; */
border-radius: 14rpx;
text-align: center;
line-height: 30rpx;
@@ -78,7 +85,7 @@
width: 672rpx;
margin: 34rpx auto;
height: 440rpx;
- border: 2rpx solid #58abfa;
+ border: 2rpx solid #FD832D;
border-radius: 16rpx;
padding: 30rpx 15rpx;
}
@@ -91,7 +98,7 @@
.addpark-choose-font {
width: 80rpx;
height: 77rpx;
- background: #f8f8f8;
+ background: #FEFFFE;
text-align: center;
line-height: 77rpx;
border: 1 px solid #f8f8f8;
@@ -114,24 +121,24 @@
width: 672rpx;
margin: 34rpx auto;
height: 510rpx;
- border: 2rpx solid #58abfa;
+ border: 2rpx solid #FD832D;
border-radius: 16rpx;
padding: 30rpx 15rpx;
}
.choose {
- color: #58abfa;
+ color: #FD832D;
}
.choose-title {
- border: 6rpx solid #ffd255;
+ border: 2rpx solid #FD832D;
}
.addpark-button-submit {
width: 670rpx;
height: 94rpx;
margin: 0 auto;
- background: #60b4fc;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
color: #fff;
border-radius: 60rpx;
line-height: 94rpx;
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
index bc23fcd..15e1b94 100644
--- a/pages/bargain/bargain.wxss
+++ b/pages/bargain/bargain.wxss
@@ -82,7 +82,7 @@ page{
font-size: 18rpx;
position: absolute;
right: 0;
- top: 18rpx;
+ top: 22rpx;
}
.money{
display: inline-block!important;
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index 9e9df95..9425923 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -5,6 +5,7 @@ let app = getApp();
const imgurl = require("../../../utils/imgurl");
Page({
data: {
+ noCoupon: imgurl.noCoupon.url,
couponUrl: imgurl.coupon.url,
linessUrl: imgurl.liness.url,
wmhome: imgurl.wmhome.url,
diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml
index 596ab74..5f44de9 100644
--- a/pages/cardorder/index/index.wxml
+++ b/pages/cardorder/index/index.wxml
@@ -6,7 +6,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 0492190..53cb0c5 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -45,11 +45,12 @@
{{data.title}}电子卡
{{data.subTitle}}
- 售价:
+ ¥
+
{{data.salePriceStr}}
{{data.creditPrice}}积分
- 元
- {{data.priceStr}}元
+
+
{{data.priceStr}}小时
过期不退款
@@ -130,7 +131,7 @@
{{data.salePriceStr}}元马上购买
-
+
@@ -146,7 +147,7 @@
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 661ceff..fbe7ada 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -112,7 +112,7 @@ button::after {
display: block;
font-weight: bold;
font-size: 32rpx;
- color: #000;
+ color: #3C3C3C;
letter-spacing: 1.09rpx;
line-height: 45rpx;
width: 542rpx;
@@ -139,8 +139,8 @@ button::after {
font-size: 24rpx;
color: #919191;
letter-spacing: 0;
- height: 70rpx;
- line-height: 70rpx;
+ height: 50rpx;
+ line-height: 50rpx;
/* border-bottom: 1px solid #eee; */
border-bottom: 1px solid #f9f9f9;
}
@@ -177,7 +177,11 @@ button::after {
color: #999;
letter-spacing: 0;
}
-
+.salePriceStr .rmb{
+ color: #FD782D;
+ font-size: 24rpx;
+ float: left;
+}
.salePriceStr .pri01 {
font-size: 40rpx;
color: #FD782D;
@@ -334,7 +338,7 @@ button::after {
}
.buy-view {
- background: #fff;
+ /* background: #fff; */
height: 92rpx;
bottom: 0;
left: 0;
@@ -345,7 +349,7 @@ button::after {
.buy {
position: relative;
- background: #af6e34;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
height: 94rpx;
width: 560rpx;
margin: 0 auto 30rpx;
@@ -354,7 +358,9 @@ button::after {
line-height: 94rpx;
border-radius: 61rpx;
}
-
+.buyHr{
+ background: #CECECE!important;
+}
.goback {
position: relative;
float: left;
@@ -373,8 +379,8 @@ button::after {
left: 0;
right: 0;
top: 0;
- bottom: 50rpx;
- margin: auto;
+ bottom:0;
+ margin:10rpx auto;
}
.tel {
@@ -570,15 +576,20 @@ button::after {
left: 0;
right: 0;
bottom: 0;
- padding-bottom: 37rpx;
- padding-top: 37rpx;
+ padding-bottom: 22rpx;
+ padding-top: 22rpx;
z-index: 12;
/* background: #fff; */
}
.btnTxt{
- /* margin-top: 30rpx; */
+ width: 50rpx;
+ height: 30rpx;
+ line-height: 50rpx;
color: #FD782D;
font-size: 20rpx;
+ position: absolute;
+ right:42rpx ;
+ bottom: 15rpx;
}
.btns .fr,.btns .fl {
@@ -591,8 +602,8 @@ button::after {
.btns .fl {
margin-left: 20rpx;
color: #fff;
- background: rgba(255, 169, 2, 1);
- box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32);
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ /* box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); */
}
.btns .fl text {
@@ -610,8 +621,8 @@ button::after {
color: #fff;
margin-right: 20rpx;
line-height: 95rpx;
- background: rgba(236, 59, 45, 1);
- box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32);
+ background: linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%);
+ /* box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); */
}
.support-tansfer {
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 32f5a90..cb4abf8 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -8,6 +8,8 @@ const QR = require("../../../utils/memberqrcode.js");
Page({
data: {
code: "",
+ topLine: imgurl.topLine.url,
+ btomLine: imgurl.btomLine.url,
lineUrl: imgurl.line.url,
wm01Url: imgurl.wm01.url,
wm02Url: imgurl.wm02.url,
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 897a331..1cf77af 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -1,113 +1,116 @@
-
-
-
-
-
-
- {{data.title}}
- {{data.subTitle}}
-
- ¥{{data.couponPrice/100}}
- ¥{{data.salePrice/100}}
- ¥{{data.salePrice/100}}
- ¥{{data.price/100}}
-
- 过期不退款
-
+
+
+
+
+
+
-
-
-
- 有效期至:
- {{expiredTime}}
-
-
- 有效期:
- {{validStartDate}}
- 至
- {{validEndDate}}
-
- 满{{data.usePrice/100}}元可用
- 仅限本店使用
-
-
-
-
-
-
-
-
-
-
+
+ {{data.title}}
+ {{data.subTitle}}
+
+ ¥{{data.couponPrice/100}}
+ ¥{{data.salePrice/100}}
+ ¥{{data.salePrice/100}}
+ ¥{{data.price/100}}
+
+ 过期不退款
+
+
-
-
- 优惠券码:{{code}}
-
-
-
-
- 适用门店
+
+ 有效期至:
+ {{expiredTime}}
-
-
-
-
-
-
- {{item.merchantName}}
- {{item.addr}}{{item.buildingName}}{{item.floorName}}
-
-
-
+
+ 有效期:
+ {{validStartDate}}
+ 至
+ {{validEndDate}}
+
+ 满{{data.usePrice/100}}元可用
+ 仅限本店使用
+
+
+
+
+
+
+
+
+
+
+
+
+ 优惠券码:{{code}}
-
-
-
-
- 实付金额:
- {{data.couponPrice/100}}
- 元
-
-
- 下单时间:
- {{createDate}}
-
-
- 核销时间:
- {{updateDate}}
-
-
- 过期时间:
- {{updateDate}}
+
+
+ 适用门店
+
+
+
+
+
+
+
+ {{item.merchantName}}
+ {{item.addr}}{{item.buildingName}}{{item.floorName}}
+
+
+
+
+
+
-
- 退款时间:
- {{updateDate}}
+
+
+
+
+ 实付金额:
+ {{data.couponPrice/100}}
+ 元
+
+
+ 下单时间:
+ {{createDate}}
+
+
+ 核销时间:
+ {{updateDate}}
+
+
+ 过期时间:
+ {{updateDate}}
+
+
+ 退款时间:
+ {{updateDate}}
+
+
+ 订单编号:
+ {{data.orderId}}
+
+
-
- 订单编号:
- {{data.orderId}}
+
+
+ 购买须知
+
+
+ {{data.remark}}
+
-
-
-
- 购买须知
-
-
- {{data.remark}}
+
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index 89c7f71..86c159a 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -1,14 +1,19 @@
+
+.box{
+ height: 100%;
+ background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
+}
.container {
background: #fff;
width: 92%;
margin: 8% auto 6%;
border-radius: 16rpx;
}
-
page {
- background: #02c0ff;
+ /* background: #02c0ff; */
+ background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
height: auto !important;
- padding-bottom: 20rpx;
+ /* padding-bottom: 20rpx; */
}
.panel, .zhuangtai image {
diff --git a/pages/discountCardList/discountCardList.json b/pages/discountCardList/discountCardList.json
index c36e07f..def9e01 100644
--- a/pages/discountCardList/discountCardList.json
+++ b/pages/discountCardList/discountCardList.json
@@ -3,5 +3,6 @@
"i-tab": "../../../dist/tab/index",
"i-tabs": "../../../dist/tabs/index"
},
- "navigationBarTitleText": "消费卡"
+ "navigationBarTitleText": "消费卡",
+ "navigationBarBackgroundColor": "#F4F5F9"
}
\ No newline at end of file
diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml
index ca2c248..d8cdd22 100644
--- a/pages/discountCardList/discountCardList.wxml
+++ b/pages/discountCardList/discountCardList.wxml
@@ -3,8 +3,8 @@
-
-
+
+
@@ -24,7 +24,11 @@
{{item.title}}
-
+
+ ¥
+ {{item.salePriceStr}}
+
+ 购买
diff --git a/pages/discountCardList/discountCardList.wxss b/pages/discountCardList/discountCardList.wxss
index 5de5c81..e2250a5 100644
--- a/pages/discountCardList/discountCardList.wxss
+++ b/pages/discountCardList/discountCardList.wxss
@@ -1,5 +1,6 @@
page{
height: auto!important;
+ background: #F4F5F9;
}
.header image{
width: 100%;
@@ -22,6 +23,8 @@ page{
display: inline-block;
}
+
+
.section {
position: relative;
width: 48%;
@@ -41,7 +44,7 @@ page{
}
.mms {
background: #fff;
- padding: 0;
+ padding: 20rpx;
border-radius: 16rpx;
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}
@@ -69,21 +72,20 @@ page{
.detail_msg image {
display: block;
width: 100%;
- height: 200rpx!important;
+ height: 176rpx!important;
border-radius: 16rpx;
}
.detail_msg text{
display: block;
- font-size:28rpx;
- height: 65rpx;
- line-height: 65rpx;
- color: #333;
- text-align: center;
+ font-size:30rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ color: #3C3C3C;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width: 320rpx;
- margin: 0 auto;
+ margin-top: 24rpx;
}
.info view:nth-child(1) {
display: flex;
@@ -140,16 +142,29 @@ page{
}
.buycardbtn{
display: flex;
- flex: 2;
+ justify-content: space-between;
+ margin: 10rpx 0 0 0;
+}
+.buycardbtn .rmb{
+ font-size: 24rpx;
+}
+.buycardbtn .price{
+ font-size: 40rpx;
}
-.buycardbtn button{
- flex: 1;
+.buycardbtn view:nth-child(1){
+ color: #FD782D;
+}
+.buycardbtn view:nth-child(2){
+ width: 88rpx;
+ height: 52rpx;
+ line-height: 52rpx;
font-size: 28rpx;
- color:#FF3535!important;
- background: none;
- border-top:1px solid #eee;
- border-radius: 0!important;
+ color:#FFF!important;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ border-radius: 20rpx!important;
+ text-align: center;
}
+
button::after{ border: none; }
.buycardbtn button text{
margin-left: 10rpx;
@@ -233,7 +248,7 @@ button::after{ border: none; }
}
.cards{
margin-top: 30rpx;
- padding: 0 40rpx;
+ padding: 0 20rpx;
}
.cantransferred{
position: absolute;
diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js
index faa9c8e..729b631 100644
--- a/pages/index/searchbar/detail/index.js
+++ b/pages/index/searchbar/detail/index.js
@@ -9,6 +9,8 @@ Page({
* 页面的初始数据
*/
data: {
+ noMerchant: imgurl.noMerchant.url,
+ noCoupon: imgurl.noCoupon.url,
poterbg: imgurl.poterbg.url,
teljpgUrl: imgurl.teljpg.url,
fenxiang: imgurl.fenxiang.url,
diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml
index bb9a7d1..89d871d 100644
--- a/pages/index/searchbar/detail/index.wxml
+++ b/pages/index/searchbar/detail/index.wxml
@@ -22,7 +22,6 @@
{{data.merchantName}}
{{data.title}}
-
分享有礼
@@ -71,11 +70,13 @@
-
+
优惠信息
+
-
+
商家简介
+
@@ -85,7 +86,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
@@ -97,8 +98,9 @@
+
{{data.introduction}}
- 信息完善中,敬请期待。
+ 信息完善中,敬请期待~
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index 993d18a..3e31381 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -175,11 +175,11 @@
.merchants text {
display: block;
- text-align: left;
+ /* text-align: left; */
font-size: 26rpx;
margin-bottom: 6rpx;
- height: 26rpx;
- line-height: 26rpx;
+ /* height: 26rpx; */
+ line-height: 24rpx;
color: #A6A6A6;
}
@@ -230,25 +230,35 @@
.swiper-tab {
text-align: left;
- width: 100%;
+ width: 70%;
display: flex;
flex-flow: row;
+ justify-content: space-around;
height: 88rpx;
line-height: 88rpx;
margin-bottom: 30rpx;
+ padding: 0 15%;
}
.swiper-tab-item {
color: #434343;
font-size: 30rpx;
margin-right: 50rpx;
+ position: relative;
}
.active-tab {
- color: #af6e34;
- border-bottom: 6rpx solid #af6e34;
+ color: #FD782D;
+ display: block;
+ width: 72%;
+ height: 8rpx;
+ background: 0 0;
+ position: absolute;
+ bottom: 0;
+ left: 15%;
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ border-radius: 100px;
}
-
.fenxiang {
position: absolute;
right: 0;
@@ -318,7 +328,17 @@
min-height: 400rpx;
padding-bottom: 44rpx;
}
-
+.swiperactive image{
+ display: block;
+ width: 300rpx;
+ margin: 30rpx auto 0;
+}
+.swiperactive text{
+ /* margin: 30rpx auto 0; */
+ display:block;
+ text-align:center;
+ color: #A6A6A6;
+}
.modal {
width: 100%;
height: 100%;
@@ -399,6 +419,7 @@
width: 300rpx;
margin: 30rpx auto 0;
}
+
button::after{ border: none; }
.goback{
position: fixed;
diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index 52cd5a2..2cd4baf 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -69,9 +69,12 @@ Page({
showEdit: true
})
}
+ console.log(res.data,22222222222)
that.setData({
score: res.data.score,
levelName: res.data.levelName,
+ upgradePercent: res.data.upgradePercent,
+ upgradeScore: res.data.upgradeScore
})
if (res.data.nickName) {
that.setData({
@@ -124,39 +127,6 @@ Page({
url: '/pages/integralmall/integraHistory/index',
})
},
- getmemberId: function (token) {
- let that = this;
- Http.get({
- url: config.api.getScore,
- data: {
- token: token
- }
- }).then(res => {
- that.setData({
- levelName: res.data.levelName,
- upgradePercent: res.data.upgradePercent,
- upgradeScore: res.data.upgradeScore,
- credit: res.data.credit ? res.data.credit : 0,
- score: res.data.score
- })
- if (res.data.nickName) {
- that.setData({
- ismember: true,
- memberId: res.data.id
- })
- var initUrl = JSON.stringify({
- flagid: res.data.id
- });
- }
- })
- .catch(err => {
- wx.showModal({
- title: '提示',
- content: err.message,
- showCancel: false
- })
- })
- },
getList(pageNum) {
var that = this;
console.log(pageNum)
diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index 79ef8c2..1c47d7c 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -13,17 +13,17 @@
{{levelName}}
-
还需{{upgradeScore}}成长值升级
-
+
{{creditAmount}}
- 可用积分>
+ 积分详情>
+
diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss
index 01337fe..bd4834f 100644
--- a/pages/integralmall/index.wxss
+++ b/pages/integralmall/index.wxss
@@ -41,7 +41,7 @@
margin:0 20rpx;
}
.usre_level{
- /* width:70rpx; */
+ width:70rpx;
height:32rpx;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:9px 9px 9px 0px;
@@ -102,6 +102,10 @@ progress{
top: 176rpx;
left:70rpx;
}
+.jifen image{
+ width: 10rpx;
+ height: 22rpx;
+}
.topbg .score{
font-size: 40rpx;
font-weight: 500;
@@ -205,7 +209,7 @@ image{
width: 40%;
height: 100%;
float: left;
- margin-left: 20rpx;
+ /* margin-left: 20rpx; */
color: #A6A6A6;
overflow: hidden;
text-overflow:ellipsis;
@@ -311,9 +315,9 @@ image{
font-weight:500;
text-align: center;
color:rgba(255,255,255,1);
- line-height:44rpx;
+ line-height:52rpx;
margin: 88rpx 24rpx 0 0;
- margin-top: 110rpx;
+ margin-top: 90rpx;
}
.right-text{
font-size:22rpx;
diff --git a/pages/main/index.js b/pages/main/index.js
index 7a80248..41c742c 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -141,6 +141,12 @@ Page({
url: '/pages/spellGroup/spellGroup',
})
},
+ //跳往显示抢购
+ gotoRushList: function () {
+ wx.navigateTo({
+ url: '/pages/rushToBuy/index',
+ })
+ },
//搜索门店
// searchbar:function(){
// wx.switchTab({
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 2b92e94..d1df2df 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -57,8 +57,8 @@
积分商城
-
-
+
+
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 6296d2d..58f8f83 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -2,18 +2,18 @@
- 领取成功
- 请尽快到门店使用,有效期至{{}}
+ 交易成功
+
付款成功
- 请尽快到门店使用,有效期至{{}}
+
{{order.title}}
-
+
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index 10587b9..b5c202c 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -19,7 +19,7 @@ page {
.tips {
width: 92%;
- height: 100rpx;
+ height: 70rpx;
background: #2C8DFF;
color: #fff;
padding: 20rpx 4% 0;
@@ -92,9 +92,11 @@ page {
color: #3C3C3C;
}
.info view:nth-child(1) {
- display: flex;
- justify-content: space-between;
padding: 0 4%;
+ width: 80%;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
.info {
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 238e622..27f18d6 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -56,6 +56,14 @@ Page({
url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&flag='pay'`
})
},
+ //再次购买
+ gotopayAgain: function (e) {
+ wx.navigateTo({
+ url: `/pages/coupon/detail/index?couponChannelId=${
+ e.currentTarget.dataset.couponchannelid
+ }&couponId=${e.currentTarget.dataset.couponid}`
+ });
+ },
// gotoSpellPay(e) {
// console.log(e, 333)
// let data = e.currentTarget.dataset.data
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index cc2c8d7..69e124e 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -68,7 +68,7 @@
退款失败
-
+
再次购买
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index 7892c10..8300063 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -235,14 +235,14 @@
bottom: 0;
margin: auto;
right: 20rpx;
- width: 140rpx;
+ width: 118rpx;
height: 52rpx;
line-height: 52rpx;
text-align: center;
color: #fff;
float: right;
font-size: 28rpx;
- border: 2rpx solid #02c0ff;
+ border: 2rpx solid #2C8DFF;
border-radius: 30rpx;
}
@@ -251,7 +251,7 @@
color: #FFFFFF;
}
.txGm{
- font-size: 24rpx;
+ font-size: 26rpx!important;
color: #2C8DFF!important;
}
.dingdan {
diff --git a/pages/orderquanma/index.wxml b/pages/orderquanma/index.wxml
index cf63df8..014ffa0 100644
--- a/pages/orderquanma/index.wxml
+++ b/pages/orderquanma/index.wxml
@@ -1,4 +1,5 @@
-
+
+
{{title}}
@@ -37,11 +38,12 @@
{{remark}}
-
-
-
-
- 用户专享神秘礼物
- 独家福利,抢完即止
-
\ No newline at end of file
+
+
+
+ 用户专享神秘礼物
+ 独家福利,抢完即止
+
+
+
diff --git a/pages/orderquanma/index.wxss b/pages/orderquanma/index.wxss
index 988a0bf..7d52b76 100644
--- a/pages/orderquanma/index.wxss
+++ b/pages/orderquanma/index.wxss
@@ -1,14 +1,17 @@
@import "../../app.wxss";
page {
+
+}
+.couponBox{
+ height: 100%;
background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
}
-
.couponbg {
position: relative;
background: #fff;
overflow: hidden;
width: 92%;
- margin: 8% auto 6%;
+ margin: 0 auto 6%;
border-radius: 16rpx;
}
diff --git a/pages/passCar/couponList/couponList.json b/pages/passCar/couponList/couponList.json
index 074746d..9bc1f02 100644
--- a/pages/passCar/couponList/couponList.json
+++ b/pages/passCar/couponList/couponList.json
@@ -3,5 +3,6 @@
"i-tab": "../../../dist/tab/index",
"i-tabs": "../../../dist/tabs/index"
},
- "navigationBarTitleText": "停车券"
+ "navigationBarTitleText": "停车券",
+ "navigationBarBackgroundColor": "#F4F5F9"
}
\ No newline at end of file
diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml
index 83a908a..349c358 100644
--- a/pages/passCar/couponList/couponList.wxml
+++ b/pages/passCar/couponList/couponList.wxml
@@ -30,7 +30,7 @@
查看
-
+
有效期至:
{{item.expiredTime}}
diff --git a/pages/passCar/couponList/couponList.wxss b/pages/passCar/couponList/couponList.wxss
index 1535780..00bbe33 100644
--- a/pages/passCar/couponList/couponList.wxss
+++ b/pages/passCar/couponList/couponList.wxss
@@ -1,7 +1,7 @@
.market {
width: 100%;
height: 100%;
- /* background: #f5f5f5; */
+ background: #F4F5F9;
}
.tabs {
@@ -13,6 +13,7 @@
left: 0;
right: 0;
z-index: 100000;
+ background: #FFF;
}
.i-tab {
@@ -26,29 +27,31 @@
.mms {
width: 690rpx;
- height: 170rpx !important;
+ height: 180rpx !important;
background: #fff;
- padding: 30rpx 0 0;
+ /* padding: 30rpx 0 0; */
margin: 0 auto 40rpx;
- border-radius: 16rpx;
- border-top: 8rpx solid #02b7ff;
+ /* border-radius: 16rpx; */
+ /* border-top: 8rpx solid #02b7ff; */
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}
.detail_msg {
display: flex;
- padding-bottom: 26rpx;
+ padding-top: 16rpx;
+ padding-bottom: 16rpx;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
}
.expiretime {
display: block;
width: 100%;
text-align: left;
- text-indent: 1em;
- height: 40rpx;
- line-height: 36rpx;
+ text-indent: 0.5em;
+ height: 54rpx;
+ line-height: 45rpx;
font-size: 22rpx;
- color: #333;
+ color: #A6A6A6;
letter-spacing: 0;
}
@@ -60,10 +63,10 @@
.logo {
width: 60rpx;
height: 60rpx;
- border: 1px solid #f8f8f8;
+ /* border: 1px solid #f8f8f8; */
border-radius: 50rpx;
display: block;
- margin-left: 20rpx;
+ margin: 15rpx 20rpx 0 20rpx;
}
.logo image {
@@ -75,18 +78,20 @@
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
- padding: 0 2%;
+ padding: 0 4%;
+ margin-top: 15rpx;
}
.info {
width: 100%;
+ border-left: 1rpx #FFF dashed;
}
.info view:nth-child(1) text {
font-size: 32rpx;
line-height: 32rpx;
height: 32rpx;
- color: #333;
+ color: #FFFFFF;
letter-spacing: 0;
width: 400rpx;
display: inline-block;
@@ -96,9 +101,9 @@
}
.info view:nth-child(2) {
- padding-left: 2%;
+ padding-left: 4%;
font-size: 22rpx;
- color: #333;
+ color: #FFFFFF;
letter-spacing: 0;
margin-top: 6rpx;
display: inline-block;
@@ -120,20 +125,20 @@
height: 48rpx;
line-height: 48rpx;
text-align: center;
- border: 2rpx solid #02c0ff;
+ border: 2rpx solid #fff;
border-radius: 60rpx;
- color: #02c0ff;
+ color: #fff;
font-size: 28rpx;
}
.active {
color: #fff;
- background: #02c0ff;
+ /* background: #02c0ff; */
}
.txt1 {
font-size: 22rpx;
- color: #333;
+ color: #A6A6A6;
letter-spacing: 0;
}
diff --git a/pages/passCar/passCar.json b/pages/passCar/passCar.json
index a02ad69..f51c175 100644
--- a/pages/passCar/passCar.json
+++ b/pages/passCar/passCar.json
@@ -1,6 +1,6 @@
{
"component": true,
"usingComponents": {},
- "navigationBarTitleText": "停车",
+ "navigationBarTitleText": "智能停车",
"enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/ques/ques.wxml b/pages/ques/ques.wxml
index 0ffc760..6872782 100644
--- a/pages/ques/ques.wxml
+++ b/pages/ques/ques.wxml
@@ -1,46 +1,46 @@
- Q1.我怎么添加车牌呢?
+ Q我怎么添加车牌呢?
首次使用“停车缴费”的用户需绑定车牌号,即可为车辆进行缴费 。您可以最多添加三张车牌。
- Q2.有哪些方式可以支持停车费?
+ Q有哪些方式可以支持停车费?
我们仅支持微信支付。您还可以使用停车券进行减免。注意哦您必须在抵达岗亭前完成支付。
- Q3.如何获得停车券?
+ Q如何获得停车券?
我们会不定期进行赠送停车券,您可以在支付停车费时使用,记得多多关注商场微信公众号以及商场信息哦。
- Q4.每次可以使用几张停车券?
+ Q每次可以使用几张停车券?
单次入场车辆仅限使用一张停车券,未离场再次支付时不再享有优惠哦。
- Q5.支付完毕后我需要做什么吗?
+ Q支付完毕后我需要做什么吗?
您在支付完毕的规定时间内可以驾着您的爱车直接离场。
- Q6.支付完毕后未在规定时间内离场怎么办?
+ Q支付完毕后未在规定时间内离场怎么办?
不用担心,重新扫描停车小程序二维码进行缴费就可以了。
- Q7.哪些用户不能在线支付停车费呢?
+ Q哪些用户不能在线支付停车费呢?
目前车牌号输入仅支持各省简称、无车牌用户、教练车、特殊车牌(军用、武警、警车等)暂不支持在线支付停车费,请进行线下支付。
- Q8.我为什么绑定(解绑)不了车牌?
+ Q我为什么绑定(解绑)不了车牌?
每位用户最多可同时绑定三张车牌。当您绑定的车牌在停车场内是无法解绑车牌的,支付离场后才可以进行变更哦!
- Q9.每个用户可以绑定几个车牌?
+ Q每个用户可以绑定几个车牌?
每个用户30天内最多绑定4次车牌。
- Q10.停车券使用时间?
+ Q停车券使用时间?
车辆离场前使用。
- Q11.为什么我的车牌解绑不成功?
+ Q为什么我的车牌解绑不成功?
请先确认车辆已离场。
\ No newline at end of file
diff --git a/pages/ques/ques.wxss b/pages/ques/ques.wxss
index 3c83dca..ccc3730 100644
--- a/pages/ques/ques.wxss
+++ b/pages/ques/ques.wxss
@@ -1,18 +1,36 @@
.content {
- padding: 0 30rpx 30rpx 30rpx;
- margin: 30rpx auto;
+ padding: 0 30rpx 20rpx 30rpx;
+ margin: 20rpx auto;
}
.tit {
- font-size: 26rpx;
- color: #02c0ff;
+ font-size: 30rpx;
+ color: #FD832D;
letter-spacing: 1.16rpx;
+ height: 68rpx;
+ line-height: 68rpx;
+}
+.right{
+ width: 85%;
+ height:42rpx;
+ /* margin-top: 5rpx; */
+ float: left;
+ margin-left: 15rpx;
}
-
.description {
- margin-top: 15rpx;
+ margin-top: 12rpx;
font-size: 26rpx;
color: #333;
letter-spacing: 1.16rpx;
- padding-left: 47rpx;
+ padding-left: 83rpx;
}
+.Q{
+ width:68rpx;
+ height:68rpx;
+ border:2rpx solid #FD832D;
+ border-radius: 34rpx;
+ line-height: 68rpx;
+ text-align: center;
+ font-size: 32rpx;
+ float: left
+}
\ No newline at end of file
diff --git a/pages/specialcourtesy/specialcourtesy.wxss b/pages/specialcourtesy/specialcourtesy.wxss
index 682758e..1f29a31 100644
--- a/pages/specialcourtesy/specialcourtesy.wxss
+++ b/pages/specialcourtesy/specialcourtesy.wxss
@@ -156,10 +156,10 @@ Page {
}
.code {
- width: 714rpx;
- height: 794rpx;
+ width: 690rpx;
+ height: 740rpx;
background: #fff;
- margin: 0 auto;
+ margin: 20rpx auto;
border-radius: 10rpx;
padding: 20rpx 0 40rpx;
}
diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js
index fcaab61..b8c2e13 100644
--- a/pages/spellDetail/index.js
+++ b/pages/spellDetail/index.js
@@ -9,6 +9,10 @@ Page({
* 页面的初始数据
*/
data: {
+ orangeImg: imgurl.orange.url,
+ blueImg: imgurl.blue.url,
+ grayImg: imgurl.gray.url,
+ tuanzhang: imgurl.tuanzhang.url,
tuanzhang: imgurl.tuanzhang.url,
spellBg: imgurl.spellBg.url,
position: imgurl.position.url,
diff --git a/pages/spellDetail/index.json b/pages/spellDetail/index.json
index 5188e07..797f2ef 100644
--- a/pages/spellDetail/index.json
+++ b/pages/spellDetail/index.json
@@ -1,7 +1,7 @@
{
"navigationBarTitleText": "拼团详情",
"usingComponents": {},
- "navigationBarBackgroundColor": "#F13C42",
- "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#F4F5F9",
+ "navigationBarTextStyle": "black",
"enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/spellDetail/index.wxml b/pages/spellDetail/index.wxml
index c0edefd..e5caf31 100644
--- a/pages/spellDetail/index.wxml
+++ b/pages/spellDetail/index.wxml
@@ -14,20 +14,23 @@
{{data.subTitle}}
- {{data.salePrice}}元
- 拼团价
+ {{data.salePrice}}
+ 「拼团价」¥
- 元
{{data.salePrice}}
+ ¥
实付款
+ {{data.statustext}}
+ {{data.statustext}}
+
-
+
@@ -63,6 +66,18 @@
-->
+
+ 结束
+ {{sec}}
+ :
+ {{min}}
+ :
+ {{hour}}
+ 天
+ {{day}}
+ 剩余
+
+
diff --git a/pages/spellDetail/index.wxss b/pages/spellDetail/index.wxss
index 9329784..d2e5ec9 100644
--- a/pages/spellDetail/index.wxss
+++ b/pages/spellDetail/index.wxss
@@ -2,8 +2,8 @@
page {
height: auto;
overflow: auto;
- background: #f89132;
- background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png');
+ background: #F4F5F9;
+ /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png'); */
background-size: cover;
background-repeat: no-repeat;
}
@@ -31,7 +31,7 @@ page {
font-size:32rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
- color:rgba(243,69,58,1);
+ color:#FD782D;
line-height: 75rpx;
}
.p-time{
@@ -39,11 +39,11 @@ page {
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(243,69,58,1);
+ color:#FFF;
width: 38rpx;
height: 30rpx;
margin-top: 22rpx;
- background:rgba(252,220,221,1);
+ background:#FD782D;
border-radius:10rpx;
line-height: 30rpx;
text-align: center;
@@ -54,7 +54,7 @@ page {
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(243,69,58,1);
+ color:#3C3C3C;
line-height: 75rpx;
}
.p-text{
@@ -72,6 +72,9 @@ page {
text-align: center;
border-bottom: 1rpx solid #F9F9F9;
}
+.status-lists{
+ margin-top: 60rpx;
+}
.tuanzhang{
float: left;
width: 120rpx;
@@ -94,8 +97,8 @@ page {
width: 80rpx;
height: 80rpx;
overflow: hidden;
- background:rgba(252,220,221,1);
- border:1rpx solid rgba(243,69,58,1);
+ background:#ECEEF3;
+ /* border:1rpx solid rgba(243,69,58,1); */
border-radius:50%;
box-sizing: border-box;
line-height: 78rpx;
@@ -103,7 +106,7 @@ page {
font-size:32rpx;
font-family:PingFang-SC-Regular;
font-weight:400;
- color:rgba(243,69,58,1);
+ color:#CACACA;
margin: 0;
padding: 0;
}
@@ -141,7 +144,7 @@ page {
font-size:28rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(51,51,51,1);
+ color:#B8B8B8;
line-height: 72rpx;
}
.detail{
@@ -168,7 +171,8 @@ page {
.return-index{
position: fixed;
right: 50rpx;
- top: 60rpx;
+ /* top: 60rpx; */
+ bottom: 60rpx;
width:100rpx!important;
height:100rpx;
z-index: 100;
@@ -194,11 +198,11 @@ page {
}
.detail-top01{
float: left;
- width: 180rpx;
+ width: 120rpx;
}
.detail-top01 image{
- width: 180rpx;
- height: 180rpx;
+ width: 120rpx;
+ height: 120rpx;
margin-top: 33rpx;
}
.detail-top02{
@@ -228,8 +232,8 @@ page {
white-space:nowrap;
}
.detail-top03{
- float: left;
- padding-top: 180rpx;
+ float: right;
+ padding-top: 100rpx;
width: 230rpx;
}
.detail-p-name{
@@ -237,7 +241,7 @@ page {
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(134,134,134,1);
+ color:#3C3C3C;
line-height:44rpx;
}
.detail-p-price{
@@ -251,32 +255,31 @@ page {
border-top: 1rpx solid #F9F9F9;
width: 100%;
overflow: hidden;
- height: 86rpx;
+ height: 60rpx;
}
.b-unit{
float: right;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(237,63,46,1);
- margin-top: 36rpx;
+ color:#FD782D;
+ margin-top: 18rpx;
}
.b-price{
float: right;
font-size:40rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(237,63,46,1);
- margin-top: 18rpx;
+ color:#FD782D;
}
.b-name{
float: right;
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(51,51,51,1);
+ color:#FD782D;
margin-right: 6rpx;
- margin-top: 34rpx;
+ margin-top: 18rpx;
}
.order{
width: 690rpx;
@@ -287,31 +290,31 @@ page {
border-radius:15rpx;
}
.order-list{
- height: 55rpx;
+ height: 98rpx;
+ line-height: 98rpx;
}
.order-title{
- line-height: 55rpx;
+ line-height: 98rpx;
float: left;
- font-size:26rpx;
+ font-size:28rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(51,51,51,1);
+ color:#A6A6A6;
}
.order-text{
float: right;
text-align: right;
- line-height: 55rpx;
- font-size:26rpx;
+ line-height: 98rpx;
+ font-size:32rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(134,134,134,1);
+ color:#3C3C3C;
}
.user-motto {
border: 0;
width:650rpx;
height:85rpx;
- background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%);
- box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32);
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:43rpx;
font-size:36rpx;
font-family:PingFang-SC-Medium;
@@ -385,7 +388,32 @@ page {
.alert-button .share{
width:500rpx;
height:95rpx;
- background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%);
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:47rpx;
margin-top: 79rpx;
+}
+.need{
+ font-size:24rpx;
+ font-family:PingFangSC-Regular;
+ font-weight:400;
+ color:rgba(60,60,60,1);
+}
+.needNum{
+ color: #FD782D;
+}
+
+.frImg{
+ height: 78rpx;
+ width: 78rpx;
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+.frImg text{
+ transform: rotate(45deg);
+ color: #FFFFFF;
+ font-size: 16rpx;
+ position: absolute;
+ left: 14rpx;
+ top: 12rpx;
}
\ No newline at end of file
diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js
index 8eeed74..8e4d228 100644
--- a/pages/spellGroup/mySpellGroup/index.js
+++ b/pages/spellGroup/mySpellGroup/index.js
@@ -9,6 +9,8 @@ Page({
* 页面的初始数据
*/
data: {
+ fenxiang: imgurl.fenxiang.url,
+ homeSelectedO:imgurl.homeSelectedO.url,
isshowposter:false,//是否显示分享弹框
teljpgUrl: imgurl.teljpg.url,
wmhome: imgurl.wmhome.url,
diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml
index e2042f2..f48d229 100644
--- a/pages/spellGroup/mySpellGroup/index.wxml
+++ b/pages/spellGroup/mySpellGroup/index.wxml
@@ -13,17 +13,20 @@
-
+
+ 分享有礼
- 【拼团购】{{data.pressLimitNum}}人拼团成功,单价仅需
- {{data.salePriceStr}}元
+ 「拼团价」{{data.pressLimitNum}}人拼团成功,单价仅需¥
+ {{data.salePriceStr}}
有效期:
{{data.validStartDate}}至{{data.validEndDate}}(请在有效期内使用)
- 限购条件:每人限购{{data.useLimitQuantity}}张
+
+
+ 每人限购{{data.useLimitQuantity}}张
仅限新用户活动
({{minLimit}}-{{maxLimit}}成长值)
(大于{{minLimit}}成长值)
@@ -68,7 +71,10 @@
-
+
+ 去支付
diff --git a/pages/spellGroup/paySpellGroup/index.wxss b/pages/spellGroup/paySpellGroup/index.wxss
index 3a875f7..cf3b0ad 100644
--- a/pages/spellGroup/paySpellGroup/index.wxss
+++ b/pages/spellGroup/paySpellGroup/index.wxss
@@ -2,8 +2,8 @@
page {
height: auto;
overflow: auto;
- background: #f89132;
- background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png');
+ background: #F4F5F9;
+ /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png'); */
background-size: cover;
background-repeat: no-repeat;
}
@@ -175,7 +175,7 @@ page {
.return-index{
position: fixed;
right: 50rpx;
- top: 60rpx;
+ bottom: 60rpx;
width:100rpx!important;
height:100rpx;
z-index: 100;
@@ -294,31 +294,31 @@ page {
border-radius:15rpx;
}
.order-list{
- height: 55rpx;
+ height: 98rpx;
+ line-height: 98rpx;
}
.order-title{
- line-height: 55rpx;
+ line-height: 98rpx;
float: left;
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(51,51,51,1);
+ color:#A6A6A6;
}
.order-text{
float: right;
text-align: right;
- line-height: 55rpx;
+ line-height: 98rpx;
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(134,134,134,1);
+ color:#A6A6A6;
}
.user-motto {
border: 0;
width:650rpx;
height:85rpx;
- background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%);
- box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32);
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:43rpx;
font-size:36rpx;
font-family:PingFang-SC-Medium;
@@ -443,4 +443,19 @@ page {
text-align: center;
line-height: 95rpx;
margin: 0 auto 43rpx;
+}
+.frImg{
+ height: 78rpx;
+ width: 78rpx;
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+.frImg text{
+ transform: rotate(45deg);
+ color: #FFFFFF;
+ font-size: 16rpx;
+ position: absolute;
+ left: 14rpx;
+ top: 12rpx;
}
\ No newline at end of file
diff --git a/pages/spellGroup/spellGroup.json b/pages/spellGroup/spellGroup.json
index 5c13d9c..113445a 100644
--- a/pages/spellGroup/spellGroup.json
+++ b/pages/spellGroup/spellGroup.json
@@ -1,8 +1,8 @@
{
"navigationBarTitleText": "拼团专场",
"enablePullDownRefresh": true,
- "navigationBarBackgroundColor":"#F13C42",
- "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor":"#F4F5F9",
+ "navigationBarTextStyle": "black",
"usingComponents": {
"c-banner": "../../components/spellbanner/index",
"i-tab": "../../../dist/tab/index",
diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml
index b2029ee..9e61407 100644
--- a/pages/spellGroup/spellGroup.wxml
+++ b/pages/spellGroup/spellGroup.wxml
@@ -21,19 +21,19 @@
{{item.title}}
- {{item.pressLimitNum+'人团'}}
+
+ {{item.pressLimitNum+'人团'}}
+ 剩余{{item.remainInventory}}
+
+ ¥
{{item.salePriceStr}}
- 元
- {{item.priceStr}}
+ ¥{{item.priceStr}}
+ 去拼团
-
- 去拼团
- 剩余{{item.remainInventory}}
-
@@ -54,15 +54,15 @@
{{item.title}}
-
+
拼团价
{{item.salePrice/100}}
- 元
+
-
+
@@ -87,8 +87,8 @@
- 拼团商品
- 我的拼团
+ 拼团商品
+ 我的拼团
{{content}}
diff --git a/pages/spellGroup/spellGroup.wxss b/pages/spellGroup/spellGroup.wxss
index e08eceb..79ff158 100644
--- a/pages/spellGroup/spellGroup.wxss
+++ b/pages/spellGroup/spellGroup.wxss
@@ -2,14 +2,15 @@
page {
height: auto;
overflow: auto;
- background: #f89132;
- background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spell-bg.png');
+ background: #F4F5F9;
+ /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spell-bg.png'); */
background-size: cover;
background-repeat: no-repeat;
}
.content-box{
height: auto;
- padding-bottom: 200rpx;
+ /* padding-bottom: 200rpx; */
+ padding: 0 16rpx 200rpx;
}
.loading {
text-align: center;
@@ -63,28 +64,36 @@ image{
border-radius: 16rpx;
overflow: hidden;
}
+
.content .sepll-list{
- width: 690rpx;
- height: 230rpx;
+ width: 346rpx;
+ height: 432rpx;
background: #fff;
border-radius: 30rpx;
- margin: 30rpx auto 0;
+ margin-bottom: 20rpx;
}
-.content .spell-left{
- width: 230rpx;
- height: 230rpx;
+.content >view:nth-of-type(2n){
+ float: right;
+}
+.content>view:nth-of-type(2n+1){
float: left;
}
+.content .spell-left{
+ width: 100%;
+ height: 196rpx;
+}
.content .spell-left image{
- width: 180rpx;
- height: 180rpx;
- margin: 25rpx;
+ width: 300rpx;
+ height: 176rpx;
+ margin: 20rpx;
}
.content .spell-center{
- float: left;
+ padding: 0 20rpx;
width: 304rpx;
height: 100%;
}
+
+
.content .tilte{
font-size:30rpx;
font-family:PingFang-SC-Bold;
@@ -107,28 +116,34 @@ image{
text-overflow:ellipsis;
white-space: nowrap;
}
+.content .numBox{
+ display: flex;
+ justify-content: space-between;
+}
.content .spell-num{
- width: 95rpx;
- border:1px solid rgba(255,50,50,1);
+ width: 80rpx;
+ height: 32rpx;
+ border:1px solid #FD782D;
border-radius:10rpx;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(255,50,50,1);
- line-height:30rpx;
+ color:#FD782D;
+ line-height:32rpx;
margin: 10rpx 0;
text-align: center;
}
.content .price{
overflow: hidden;
- margin-top: 10rpx;
+ /* margin-top: 10rpx; */
+ margin-bottom: 20rpx;
}
.content .price01{
display: inline;
font-size:50rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(255,50,50,1);
+ color:#FD782D;
line-height:44rpx;
}
.content .price02{
@@ -141,29 +156,25 @@ image{
}
.content .price-num{
display: inline;
+ font-size: 40rpx;
}
.content .price-unit{
display: inline;
font-size:24rpx;
- margin-right: 10rpx;
-}
-.content .spell-right{
- float: left;
- width: 156rpx;
+ /* margin-right:4rpx; */
}
.right-button{
- width:120rpx;
- height:48rpx;
- font-size:26rpx;
- background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
- border-radius:24rpx;
+ width:100rpx;
+ height:50rpx;
+ font-size:24rpx;
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ border-radius:20rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
text-align: center;
color:rgba(255,255,255,1);
- line-height:44rpx;
- margin: 110rpx auto 0;
- margin-top: 110rpx;
+ line-height:50rpx;
+ float: right;
}
.right-text{
font-size:22rpx;
@@ -174,39 +185,41 @@ image{
text-align: center;
}
.bottom{
- width: 690rpx;
- height: 85rpx;
- position: fixed;
- bottom: 26rpx;
- left: 30rpx;
- /* background:rgba(243,69,58,1); */
- border:1px solid rgba(255, 222, 67, 1);
- border-radius:40px;
- color: #fff;
- overflow: hidden;
+ width:100%;
+ height:100rpx;
+ position:fixed;
+ bottom:0;
+ left: 0;
+ color:#fff;
+ overflow:hidden;
}
.bottom-left{
width: 50%;
+ height: 100%;
float: left;
margin-left: -1rpx;
text-align: center;
- line-height: 85rpx;
+ line-height: 100rpx;
font-size:30rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,253,245,1);
- border-right:1px solid rgba(255, 222, 67, 1);
+ /* border-right:1px solid rgba(255, 222, 67, 1); */
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
opacity: 1;
}
-.bottom-right{
+.bottom-leftN{
width: 50%;
+ height: 100%;
float: left;
+ margin-left: -1rpx;
text-align: center;
- line-height: 85rpx;
+ line-height: 100rpx;
font-size:30rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(255,253,245,1);
+ color:#3C3C3C;
+ background:#FFF;
opacity: 1;
}
.spell-bottom{
@@ -214,7 +227,7 @@ image{
}
.spell-top{
height: auto;
- margin: 0 30rpx;
+ margin: 0 20rpx;
overflow: hidden;
box-sizing: border-box;
border-bottom: 1rpx solid #EEEEEE;
@@ -222,10 +235,16 @@ image{
.spell-top-left{
float: left;
width: 60%;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
.spell-top-right{
- float: left;
+ float: right;
width: 40%;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
.top-title{
display: inline;
diff --git a/project.config.json b/project.config.json
index cb99eff..b6bb9ba 100644
--- a/project.config.json
+++ b/project.config.json
@@ -14,7 +14,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.5.0",
- "appid": "wxb11603577a84a86d",
+ "appid": "wxfa336cad86ed598d",
"projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F",
"isGameTourist": false,
"simulatorType": "wechat",
diff --git a/utils/imgurl.js b/utils/imgurl.js
index 1db6979..17de774 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -653,5 +653,13 @@ module.exports = {
'url': baseUrl + "homeSelectedO.png",
'name': ''
},
+ 'noMerchant': {
+ 'url': baseUrl + "noMerchant.png",
+ 'name': ''
+ },
+ 'rightHr': {
+ 'url': baseUrl + "rightHr.png",
+ 'name': ''
+ },
}
\ No newline at end of file