From 35506e1d9fdc096019f20604d7a4700160d6d97a Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Fri, 19 Apr 2019 19:11:35 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5ui][=E4=BF=AE=E6=94=B9]:[?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5ui=E4=BF=AE=E6=94=B9=E7=A0=8D=E4=BB=B7?=
=?UTF-8?q?=E6=8B=BC=E5=9B=A2=E4=B8=BA=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E7=9A=84ui]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ext.json | 2 +-
pages/main/bargain/index.js | 6 ++
pages/main/bargain/index.wxml | 39 +++++++++++--
pages/main/bargain/index.wxss | 95 +++++++++++++++++++++++++-------
pages/main/index.js | 8 +--
pages/main/index.wxml | 2 +-
pages/main/index.wxss | 3 +-
pages/main/spellGroup/index.js | 6 ++
pages/main/spellGroup/index.wxml | 39 ++++++++++---
pages/main/spellGroup/index.wxss | 66 +++++++++++++++++++---
utils/imgurl.js | 17 ++++++
11 files changed, 233 insertions(+), 50 deletions(-)
diff --git a/ext.json b/ext.json
index 5a1deff..da2c431 100644
--- a/ext.json
+++ b/ext.json
@@ -4,7 +4,7 @@
"ext": {
"weappId": "wxea71200db93d756b",
"name": "富茂客官开发",
- "appVersion": "C.4.2.105",
+ "appVersion": "C.4.2.107",
"attr": {
"configUrl": "https://ciformall.youlane.cn/C/api",
"socketUrl": "wss://mp.youlane.cn/W/ws",
diff --git a/pages/main/bargain/index.js b/pages/main/bargain/index.js
index 2d8599a..38a2e2f 100644
--- a/pages/main/bargain/index.js
+++ b/pages/main/bargain/index.js
@@ -16,6 +16,7 @@ Component({
data: {
jianUrl: imgurl.jian.url,
barginicon: imgurl.barginicon.url,
+ wangmeimeibargin: imgurl.wangmeimeibargin.url,
list: [],
total:''
},
@@ -24,6 +25,11 @@ Component({
* 组件的方法列表
*/
methods: {
+ gotoBargainList(){
+ wx.navigateTo({
+ url: "/pages/bargain/bargain"
+ })
+ },
getList() {
let that = this;
Http.get({
diff --git a/pages/main/bargain/index.wxml b/pages/main/bargain/index.wxml
index d745810..8c1959d 100644
--- a/pages/main/bargain/index.wxml
+++ b/pages/main/bargain/index.wxml
@@ -1,5 +1,5 @@
-
-
+
+
砍价专场更多砍价>
@@ -15,16 +15,43 @@
-
-
+
+
+
+
+
+
+
+
+
+ 砍价
+
+
+
+
+
+ {{list[0].title}}
+ {{list[0].salePriceStr}}元
+ {{list[0].priceStr}}元
+ 邀请{{list[0].pressLimitNum}}人可砍至底价
+
+
+
+ 更
+ 多
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/main/bargain/index.wxss b/pages/main/bargain/index.wxss
index 4c868ab..2f6ac76 100644
--- a/pages/main/bargain/index.wxss
+++ b/pages/main/bargain/index.wxss
@@ -1,7 +1,7 @@
@import "../../../app.wxss";
.index-rushToBuy {
- width: 690rpx;
- margin: 40rpx auto;
+ width: 688rpx;
+ margin: 30rpx auto;
padding: 20rpx 0 0;
font-family: PingFangSC-Semibold;
box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
@@ -25,7 +25,7 @@
margin-right: 20rpx;
color: #999999;
font-size: 24rpx;
- line-height: 24rpx;
+ line-height: 34rpx;
font-weight: normal;
}
.listimage{
@@ -60,12 +60,12 @@
border-radius:16rpx;
}
-.commodity-info {
+.index-scroll-view .commodity-info {
padding:10rpx 0;
overflow: hidden;
}
-.commodity-info-name {
+.index-scroll-view .commodity-info-name {
width: 285rpx;
overflow: hidden;
white-space: nowrap;
@@ -76,14 +76,14 @@
color: #333333;
}
-.commodity-info-time {
+.index-scroll-view .commodity-info-time {
font-size: 22rpx;
color: #B4B4B4;
letter-spacing: 0.7rpx;
line-height: 42rpx;
}
-.commodity-info-price-p {
+.index-scroll-view .commodity-info-price-p {
font-size: 28rpx;
color: #f96563;
line-height: 30rpx;
@@ -92,7 +92,7 @@
margin-top: 10rpx;
line-height: 30rpx;
}
-.commodity-info-price-o {
+.index-scroll-view .commodity-info-price-o {
display: inline-block;
padding-left: 20rpx;
font-size: 24rpx;
@@ -113,6 +113,11 @@
.text-red{
color:#F12643;
}
+.commodity-info-price-p {
+ font-size: 28rpx;
+ color: #f96563;
+ line-height: 30rpx;
+}
.price{
font-size: 24rpx;
color: #999;
@@ -122,6 +127,13 @@
.one-commodity{
padding-bottom: 20rpx;
}
+.one-commodity-info {
+ width:322rpx;
+ white-space:nowrap;
+ text-overflow:ellipsis;
+ overflow:hidden;
+}
+
.one-commodity-img{
width: 325rpx;
height: 200rpx;
@@ -129,17 +141,11 @@
border-radius:16rpx;
margin: 20rpx 26rpx 0 13rpx;
}
-
-.one-commodity-info{
- width: 322rpx;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
-}
.one-commodity-info .commodity-info-name{
- font-size: 34rpx;
- line-height: 35rpx;
- margin-top: 16rpx;
+ font-size: 24rpx;
+ line-height: 32rpx;
+ margin-top: 14rpx;
+
}
.one-commodity-info .commodity-info-subTitle{
font-size: 28rpx;
@@ -153,11 +159,12 @@
text-overflow: ellipsis;
}
.one-commodity-info .commodity-info-salePriceStr{
- margin-top: 20rpx;
+ line-height: 30rpx;
+ margin-top: 6rpx;
}
.one-commodity-info .commodity-info-price{
margin-top: 0;
- font-size: 24rpx;
+ font-size: 18rpx;
line-height: 26rpx;
margin-left: 0;
text-decoration: none;
@@ -168,4 +175,52 @@
}
.one-commodity-info .salePriceStr{
font-weight: bold;
+ font-size:66rpx;
+ line-height: 66rpx;
+ color: #fc5b24;
+}
+.titlechannel{
+ text-align: center;
+ width: 171rpx;
+ height: 201rpx;
+ background: #fc5b24;
+ border-radius:16rpx;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+.titlechannel text{
+ color:#fff;
+ font-size:46rpx;
+ margin-top:13rpx;
+ font-weight:bold;
+ display:inline-block;
+}
+.rightcontent{
+ position: relative;
+ width: 463rpx;
+ height: 201rpx;
+ background: #fff;
+ border-radius: 16rpx;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+}
+.more{
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ z-index: 10;
+ background: #fc5b24;
+ width: 55rpx;
+ border-bottom-right-radius:16rpx;
+ border-top-right-radius:16rpx;
+}
+.more text{
+ color:#fff;
+ font-size: 26rpx;
+ display: block;
+ text-align: center;
+}
+.more text:nth-of-type(1){
+ margin-top: 68rpx;
}
\ No newline at end of file
diff --git a/pages/main/index.js b/pages/main/index.js
index bbf96db..7de8e90 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -127,14 +127,11 @@ Page({
url: '/pages/discountCardList/discountCardList',
})
},
- //跳往个人中心
+ //跳往积分商城
gotouser:function(){
wx.navigateTo({
- url: '/pages/integralmall/integraHistory/index',
+ url: '/pages/integralmall/index',
})
- // wx.switchTab({
- // url: '/pages/user/index',
- // })
},
//跳往砍价专场
gobargain: function () {
@@ -316,6 +313,7 @@ Page({
levelName: res.data.levelName,
upgradePercent: res.data.upgradePercent,
upgradeScore: res.data.upgradeScore,
+ credit: res.data.credit,
score: res.data.score
})
if (res.data.nickName) {
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 2b10342..ef8e59a 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -21,7 +21,7 @@
积分
- 5000
+ {{credit}}
diff --git a/pages/main/index.wxss b/pages/main/index.wxss
index ebada62..66772ed 100644
--- a/pages/main/index.wxss
+++ b/pages/main/index.wxss
@@ -53,7 +53,7 @@ page {
.userinfo{
position:relative;
- margin: 40rpx auto 35rpx;
+ margin: 30rpx auto 0;
width: 690rpx;
padding: 20rpx 0;
height: 84rpx;
@@ -264,7 +264,6 @@ height:100%;
.product{
height: 135rpx;
padding: 0 30rpx;
- margin-bottom: 30rpx;
}
.product image{
width:690rpx;
diff --git a/pages/main/spellGroup/index.js b/pages/main/spellGroup/index.js
index da2f130..048f31f 100644
--- a/pages/main/spellGroup/index.js
+++ b/pages/main/spellGroup/index.js
@@ -16,6 +16,7 @@ Component({
data: {
jianUrl: imgurl.jian.url,
pintuan: imgurl.pintuan.url,
+ wangmeimeipintuan: imgurl.wangmeimeipintuan.url,
list: [],
total:''
},
@@ -29,6 +30,11 @@ Component({
url: "/pages/spellGroup/spellGroup"
});
},
+ gotospellGroupList(){
+ wx.navigateTo({
+ url: "/pages/spellGroup/spellGroup"
+ })
+ },
gotodetail: function(e) {
wx.navigateTo({
url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${
diff --git a/pages/main/spellGroup/index.wxml b/pages/main/spellGroup/index.wxml
index f19378a..933835f 100644
--- a/pages/main/spellGroup/index.wxml
+++ b/pages/main/spellGroup/index.wxml
@@ -1,8 +1,7 @@
-
-
+
+
拼团专场更多拼团>
-
@@ -14,16 +13,42 @@
-
-
+
+
+
+
+
+
+
+
+ 拼团
+
+
+
+
+
+ {{list[0].title}}
+ {{list[0].salePriceStr}}元
+ {{list[0].priceStr}}元
+ 邀请{{list[0].pressLimitNum}}人可成团
+
+
+
+ 更
+ 多
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/main/spellGroup/index.wxss b/pages/main/spellGroup/index.wxss
index 8566fc0..2f6ac76 100644
--- a/pages/main/spellGroup/index.wxss
+++ b/pages/main/spellGroup/index.wxss
@@ -1,7 +1,7 @@
@import "../../../app.wxss";
.index-rushToBuy {
- width: 690rpx;
- margin: 40rpx auto;
+ width: 688rpx;
+ margin: 30rpx auto;
padding: 20rpx 0 0;
font-family: PingFangSC-Semibold;
box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
@@ -25,7 +25,7 @@
margin-right: 20rpx;
color: #999999;
font-size: 24rpx;
- line-height: 24rpx;
+ line-height: 34rpx;
font-weight: normal;
}
.listimage{
@@ -142,9 +142,10 @@
margin: 20rpx 26rpx 0 13rpx;
}
.one-commodity-info .commodity-info-name{
- font-size: 34rpx;
- line-height: 35rpx;
- margin-top: 16rpx;
+ font-size: 24rpx;
+ line-height: 32rpx;
+ margin-top: 14rpx;
+
}
.one-commodity-info .commodity-info-subTitle{
font-size: 28rpx;
@@ -158,11 +159,12 @@
text-overflow: ellipsis;
}
.one-commodity-info .commodity-info-salePriceStr{
- margin-top: 20rpx;
+ line-height: 30rpx;
+ margin-top: 6rpx;
}
.one-commodity-info .commodity-info-price{
margin-top: 0;
- font-size: 24rpx;
+ font-size: 18rpx;
line-height: 26rpx;
margin-left: 0;
text-decoration: none;
@@ -173,4 +175,52 @@
}
.one-commodity-info .salePriceStr{
font-weight: bold;
+ font-size:66rpx;
+ line-height: 66rpx;
+ color: #fc5b24;
+}
+.titlechannel{
+ text-align: center;
+ width: 171rpx;
+ height: 201rpx;
+ background: #fc5b24;
+ border-radius:16rpx;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+.titlechannel text{
+ color:#fff;
+ font-size:46rpx;
+ margin-top:13rpx;
+ font-weight:bold;
+ display:inline-block;
+}
+.rightcontent{
+ position: relative;
+ width: 463rpx;
+ height: 201rpx;
+ background: #fff;
+ border-radius: 16rpx;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+}
+.more{
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ z-index: 10;
+ background: #fc5b24;
+ width: 55rpx;
+ border-bottom-right-radius:16rpx;
+ border-top-right-radius:16rpx;
+}
+.more text{
+ color:#fff;
+ font-size: 26rpx;
+ display: block;
+ text-align: center;
+}
+.more text:nth-of-type(1){
+ margin-top: 68rpx;
}
\ No newline at end of file
diff --git a/utils/imgurl.js b/utils/imgurl.js
index 68e0be1..0009a03 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -545,4 +545,21 @@ module.exports = {
'url': baseUrl + 'lqcduihuan.png',
'name': '兑换小图标'
},
+ 'wangmeimeibargin':{
+ 'url': baseUrl + 'wangmeimeibargin.jpg',
+ 'name': '砍价专场的图标'
+ },
+ 'wangmeimeipintuan': {
+ 'url': baseUrl + 'wangmeimeipintuan.png',
+ 'name': '拼团专场的图标'
+ },
+ 'wangmeimeijiantou': {
+ 'url': baseUrl + 'wangmeimeijiantou.png',
+ 'name': '专场的更多图标'
+ },
+ 'wangmeimeiarrow01': {
+ 'url': baseUrl + 'wangmeimeiarrow01.png',
+ 'name': '专场的更多图标'
+ }
+
}
\ No newline at end of file