diff --git a/app.json b/app.json index e58e4d0..52259e3 100644 --- a/app.json +++ b/app.json @@ -71,8 +71,8 @@ } }, "tabBar": { - "color": "#B5BAC6", - "selectedColor": "#273238", + "color": "#B5BAC6", + "selectedColor": "#273238", "list": [ { "pagePath": "pages/main/index", @@ -104,5 +104,6 @@ "request": 30000, "downloadFile": 10000 }, - "debug": false + "debug": false, + "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/components/banner/index.wxml b/components/banner/index.wxml index 9c83f32..f82ad3f 100644 --- a/components/banner/index.wxml +++ b/components/banner/index.wxml @@ -1,6 +1,4 @@ - - - + diff --git a/components/banner/index.wxss b/components/banner/index.wxss index 0bf4cbd..31d715b 100644 --- a/components/banner/index.wxss +++ b/components/banner/index.wxss @@ -1,9 +1,9 @@ .index-slide-view{ position: relative; width: 750rpx; - height: 390rpx; + height: 300rpx; overflow: hidden; - margin:-166rpx auto 0; + margin:0 auto; /* border-radius:16rpx; */ /* box-shadow: 0 6px 20px 0 rgba(0,0,0,0.15); */ } @@ -11,9 +11,10 @@ swiper-item .index-slide-image { display: block; - width: 750rpx; - height: 390rpx; + width: 690rpx; + height: 300rpx; margin: 0 auto; + border-radius:16rpx; /* border-radius:16rpx; */ overflow: hidden; position: relative; diff --git a/pages/main/bargain/index.js b/pages/main/bargain/index.js index 7c4627a..2d8599a 100644 --- a/pages/main/bargain/index.js +++ b/pages/main/bargain/index.js @@ -15,6 +15,7 @@ Component({ */ data: { jianUrl: imgurl.jian.url, + barginicon: imgurl.barginicon.url, list: [], total:'' }, diff --git a/pages/main/bargain/index.wxml b/pages/main/bargain/index.wxml index e339cac..7a6830f 100644 --- a/pages/main/bargain/index.wxml +++ b/pages/main/bargain/index.wxml @@ -1,5 +1,6 @@ - 砍价专场更多砍价> + + 砍价专场更多砍价> diff --git a/pages/main/bargain/index.wxss b/pages/main/bargain/index.wxss index c404122..21872cd 100644 --- a/pages/main/bargain/index.wxss +++ b/pages/main/bargain/index.wxss @@ -1,7 +1,10 @@ .index-rushToBuy { - width: 100%; + width: 690rpx; + margin: 30rpx auto; font-family: PingFangSC-Semibold; - /* background:linear-gradient(94deg,rgba(255,143,0,1) 0%,rgba(255,87,0,1) 100%); */ + border:1rpx solid rgba(56, 56, 56, 0.11); +box-shadow:6rpx 6rpx 8rpx 1rpx rgba(56,56,56,0.08); +border-radius:16rpx; } .index-rushToBuy-title { @@ -10,21 +13,20 @@ font-weight:bold; color: #333333; letter-spacing: 1.16rpx; - padding-top: 20rpx; padding-left: 30rpx; } .useprice{ font-size: 28rpx; } -.index-rushToBuy-title text{ - float: right; +.morebargin{ + float: right; margin-right: 20rpx; color: #999999; font-size: 24rpx; margin-top: 8rpx; font-weight: normal; } -.index-rushToBuy-title image{ +.listimage{ position: absolute; right: 18rpx; width: 20px; @@ -99,3 +101,15 @@ .commodity-info-price{ line-height: 36rpx; } +.barginicon{ + width: 24rpx; + height: 22rpx; +} +.barginiconimg{ + width: 24rpx; + height: 22rpx; + margin-right: 2rpx; +} +.text-red{ + color:#F12643; +} \ No newline at end of file diff --git a/pages/main/index.js b/pages/main/index.js index a2c0e0f..b061f48 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -25,6 +25,9 @@ Page({ newbargain: imgurl.newbargain.url, newgroup: imgurl.newgroup.url, product: imgurl.product.url, + barginicon: imgurl.barginicon.url, + pintuan: imgurl.pintuan.url, + duihuan: imgurl.duihuan.url, market: app.globalData.market, list: [], loading: true, @@ -97,7 +100,7 @@ Page({ TYPE: "memberCode", ID: that.data.memberId, }); - that.createQrCode(url, "mycanvas2", size.w, size.h); + that.createQrCode(url, "mycanvas2", size.w, size.h);; that.setData({ maskHidden: true }); diff --git a/pages/main/index.wxml b/pages/main/index.wxml index f439d49..8af6808 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -1,26 +1,5 @@ - - - - - 门店 - - - - 会员权益 - - - - - 我的卡包 - - - - - 我的券包 - - @@ -29,35 +8,23 @@ {{levelName}} + 积分 + 5000 成长值{{score}} - 优惠劵{{score}} + - - - - - - - - - - - - - - - - + + + + - - @@ -75,7 +42,7 @@ {{levelName}} - + diff --git a/pages/main/index.wxss b/pages/main/index.wxss index 920fc94..3232f17 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -50,13 +50,13 @@ page { .userinfo{ position:relative; - margin: 0 auto 38rpx; + margin: 30rpx auto 35rpx; width: 690rpx; - height: 120rpx; + height: 124rpx; background:rgba(255,255,255,1); border:1rpx solid rgba(56, 56, 56, 0.11); box-shadow:0rpx 6rpx 8rpx 1rpx rgba(56,56,56,0.08); -border-radius:50rpx; +border-radius:16rpx; } .section { padding: 0 20rpx; @@ -199,7 +199,7 @@ height:100%; margin-left: 116rpx; letter-spacing: 0.64rpx; line-height: 44rpx; - margin-top: 25rpx; + margin-top: 15rpx; font-size: 30rpx; color: #333; font-weight: bold; @@ -210,6 +210,16 @@ height:100%; color: #AF6E34; margin-left:9rpx; } +.jifen{ + margin-left: 70rpx; + color: #999999; + font-size: 23rpx; +} +.jifenNumber{ + color:#D18B4C; + font-size: 34rpx; + margin-left: 10rpx; +} .view { font-size: 24rpx; color: #999999; @@ -223,11 +233,17 @@ height:100%; } .barcodeimg{ position: absolute; - right: 80rpx; - top: 60rpx; - margin-top: -31rpx; - width: 80rpx; - height: 62rpx; + right: 21rpx; + top: 23rpx; + width: 84rpx; + height: 84rpx; +} +.duihuanimg{ + width: 86rpx; + height: 63rpx; + right:190rpx; +position:absolute; + top: 60rpx; } .leftimg{ position: absolute; diff --git a/pages/main/spellGroup/index.js b/pages/main/spellGroup/index.js index b7a7866..da2f130 100644 --- a/pages/main/spellGroup/index.js +++ b/pages/main/spellGroup/index.js @@ -15,6 +15,7 @@ Component({ */ data: { jianUrl: imgurl.jian.url, + pintuan: imgurl.pintuan.url, list: [], total:'' }, diff --git a/pages/main/spellGroup/index.wxml b/pages/main/spellGroup/index.wxml index 7d4df46..499d18f 100644 --- a/pages/main/spellGroup/index.wxml +++ b/pages/main/spellGroup/index.wxml @@ -1,5 +1,5 @@ - 拼团专场更多拼团> + 拼团专场更多拼团> diff --git a/pages/main/spellGroup/index.wxss b/pages/main/spellGroup/index.wxss index 20e6f0b..ec73aa2 100644 --- a/pages/main/spellGroup/index.wxss +++ b/pages/main/spellGroup/index.wxss @@ -1,7 +1,6 @@ .index-rushToBuy { width: 100%; font-family: PingFangSC-Semibold; - margin-top: 26rpx; } .index-rushToBuy-title { @@ -13,8 +12,7 @@ padding-left: 30rpx; font-weight: bold; } - -.index-rushToBuy-title text{ +.moregroup{ float: right; margin-right: 20rpx; color: #999999; @@ -22,7 +20,7 @@ margin-top: 8rpx; font-weight: normal; } -.index-rushToBuy-title image{ +.listimage{ position: absolute; right: 18rpx; width: 20px; @@ -95,4 +93,11 @@ .commodity-info-price{ line-height: 36rpx; } - +.barginiconimg{ + width: 24rpx; + height: 22rpx; + margin-right: 2rpx; +} +.text-red{ + color:#F12643; +} diff --git a/project.config.json b/project.config.json index e32a248..913c7d5 100644 --- a/project.config.json +++ b/project.config.json @@ -16,6 +16,8 @@ "appid": "wxb11603577a84a86d", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, "condition": { "search": { "current": -1, diff --git a/utils/imgurl.js b/utils/imgurl.js index ee62781..68e0be1 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -510,8 +510,8 @@ module.exports = { 'name': '左箭头' }, 'barcode': { - 'url': baseUrl + 'barcode.png', - 'name': '条形码' + 'url': baseUrl + 'lqcbarcode.png', + 'name': '二维码' }, 'newgroup': { 'url': baseUrl + 'newgroup.png', @@ -533,4 +533,16 @@ module.exports = { 'url': baseUrl + 'product.png', 'name': '新UI产品栏' }, + 'barginicon': { + 'url': baseUrl + 'lqcbarginicon.png', + 'name': '砍价小图标' + }, + 'pintuan': { + 'url': baseUrl + 'lqcpintuan.png', + 'name': '拼团小图标' + }, + 'duihuan': { + 'url': baseUrl + 'lqcduihuan.png', + 'name': '兑换小图标' + }, } \ No newline at end of file