diff --git a/app.json b/app.json index e10756e..ba7eb1d 100644 --- a/app.json +++ b/app.json @@ -36,7 +36,7 @@ "text": "首页" }, { - "pagePath": "pages/cartest/cartest", + "pagePath": "pages/passCar/passCar", "iconPath": "assets/img/pass1.png", "selectedIconPath": "assets/img/pass0.png", "text": "停车" @@ -50,10 +50,10 @@ ] }, "window": { - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#fff", + "backgroundTextStyle": "red", + "navigationBarBackgroundColor": "#02C0FF", "navigationBarTitleText": "WeChat", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "white" }, "networkTimeout": { "request": 10000, diff --git a/assets/img/banner.png b/assets/img/banner.png new file mode 100644 index 0000000..1d1c837 Binary files /dev/null and b/assets/img/banner.png differ diff --git a/assets/img/home-n.png b/assets/img/home-n.png index d6b8e32..8eabafe 100644 Binary files a/assets/img/home-n.png and b/assets/img/home-n.png differ diff --git a/assets/img/home-y.png b/assets/img/home-y.png index 38dfacd..dbe9b25 100644 Binary files a/assets/img/home-y.png and b/assets/img/home-y.png differ diff --git a/assets/img/jian.png b/assets/img/jian.png new file mode 100644 index 0000000..5d06dab Binary files /dev/null and b/assets/img/jian.png differ diff --git a/assets/img/pass0.png b/assets/img/pass0.png index 4b16412..9eaad91 100644 Binary files a/assets/img/pass0.png and b/assets/img/pass0.png differ diff --git a/assets/img/pass1.png b/assets/img/pass1.png index f91a4f0..d2cfd99 100644 Binary files a/assets/img/pass1.png and b/assets/img/pass1.png differ diff --git a/assets/img/qidai.png b/assets/img/qidai.png index d9cf5d6..91da047 100644 Binary files a/assets/img/qidai.png and b/assets/img/qidai.png differ diff --git a/assets/img/user-n.png b/assets/img/user-n.png index 9501475..1918d8f 100644 Binary files a/assets/img/user-n.png and b/assets/img/user-n.png differ diff --git a/assets/img/user-y.png b/assets/img/user-y.png index 3fc04d7..08612e9 100644 Binary files a/assets/img/user-y.png and b/assets/img/user-y.png differ diff --git a/components/banner/index.wxml b/components/banner/index.wxml index e29c4d3..7e18828 100644 --- a/components/banner/index.wxml +++ b/components/banner/index.wxml @@ -1,5 +1,6 @@ + - + diff --git a/components/banner/index.wxss b/components/banner/index.wxss index 31ac99a..022334a 100644 --- a/components/banner/index.wxss +++ b/components/banner/index.wxss @@ -1,10 +1,26 @@ .index-slide-view{ position: relative; + width: 710rpx; + height: 260rpx; + overflow: hidden; + margin:-126rpx auto 0; + border-radius:16rpx; + z-index: 10000; + /* box-shadow: 0px 10rpx 10rpx 0px rgba(0, 0, 0, 0.2); */ + box-shadow: 0 5px 15px 0 rgba(0,0,0,.6); } .index-slide, + swiper-item .index-slide-image { - width: 100%; - height: 465rpx; + display: block; + width: 710rpx; + height: 260rpx; + margin: 0 auto; + border-radius:16rpx; + overflow: hidden; + position: relative; + z-index: 100; + } .index-slide-view .dots{ position: absolute; @@ -13,17 +29,27 @@ bottom: 20rpx; display: flex; justify-content: center; + z-index: 10000; } .index-slide-view .dots .dot{ margin: 0 8rpx; - width: 30rpx; - height: 8rpx; + width: 12rpx; + height: 12rpx; background: #fff; - border-radius: 100rpx; + border-radius: 50%; transition: all .6s; - opacity: 0.5; } .index-slide-view .dots .dot.active{ - background: #FFFFFF; + background: #02C0FF; + width: 30rpx; + height: 12rpx; + border-radius:10rpx; opacity: 1; + } + .bannerbg{ + width: 100%; + } + .bannerbg image{ + display: block; + width: 100%; } \ No newline at end of file diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml index 5cdca5d..41a557e 100644 --- a/components/coupons/index.wxml +++ b/components/coupons/index.wxml @@ -8,7 +8,8 @@ {{data.title}} {{data.subTitle}} - {{data.salePriceStr}} + + {{data.salePriceStr}} 满¥{{data.usePriceStr}}可用 @@ -20,14 +21,12 @@ - - 剩余: {{data.remainInventory}} - - - 领取 - 购买 + 免费领 + 马上购 已售罄 + 剩余{{data.remainInventory}} + \ No newline at end of file diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss index e251da6..bb2549b 100644 --- a/components/coupons/index.wxss +++ b/components/coupons/index.wxss @@ -6,6 +6,7 @@ padding: 30rpx; position: relative; height: 184rpx; + border-bottom: 1rpx solid #eee; } .coupons-border { @@ -19,16 +20,16 @@ } .coupons-img { - width: 248rpx; - height: 184rpx; - overflow: hidden; + width: 180rpx; + height: 180rpx; border: 1px solid #f8f8f8; border-radius: 10rpx; } .coupons-img image { - width: 100%; - height: 100%; + display: block; + width: 180rpx; + height: 180rpx; border-radius: 10rpx; } @@ -54,21 +55,21 @@ .coupons-info-price-p { display: inline-block; - font-size: 36rpx; - color: #f96563; - line-height: 27rpx; - font-weight: 600; + font-size: 40rpx; + color: #FF4949; + line-height: 56rpx; } .tit { - margin-top: 14rpx; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 300rpx; - height: 40rpx; - font-weight: 600; + height: 42rpx; font-size: 30rpx; + color: #000; + letter-spacing: 0; + font-family: PingFangSC-Medium; } .coupons-info-price-o { @@ -98,22 +99,22 @@ .coupons-btn { position: absolute; - top: 40rpx; + top: 83rpx; right: 30rpx; } .coupons-btn-gm { background: #00c0ff !important; - border-radius: 10rpx !important; + border-radius: 50rpx !important; margin: 0 !important; padding: 0 !important; font-family: PingFangSC-Semibold; - font-size: 28rpx; + font-size: 26rpx; color: #fff !important; letter-spacing: 0; - height: 50rpx !important; - width: 138rpx !important; - line-height: 50rpx !important; + height: 48rpx !important; + width: 120rpx !important; + line-height: 48rpx !important; } .coupons-btn-gms { @@ -123,39 +124,41 @@ margin: 0 !important; padding: 0 !important; font-family: PingFangSC-Semibold; - font-size: 28rpx; + font-size: 26rpx; color: #fff !important; letter-spacing: 0; - height: 50rpx !important; - width: 138rpx !important; - line-height: 50rpx !important; + height: 48rpx !important; + width: 120rpx !important; + line-height: 48rpx !important; } .subtitle { font-size: 24rpx; - color: #6f6f6f; + color: #919191; text-align: left; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 300rpx; - height: 40rpx; - margin-top: 8rpx; + height: 33rpx; + line-height: 33rpx; } .coupons-info-manjian { - color: #6f6f6f !important; font-weight: normal; - font-size: 20rpx; + font-size: 24rpx; line-height: 34rpx; display: inline-block; + color: #FF4949; + letter-spacing: 0; } .coupons-info-manjian1 { - color: #ccc !important; font-weight: normal; + line-height: 28rpx; font-size: 20rpx; - line-height: 20rpx; + color: #919191; + letter-spacing: 0; display: inline-block; overflow: hidden; white-space: nowrap; @@ -184,12 +187,12 @@ .sy { display: block; - text-align: left; - width: 136rpx; + text-align: center; + width: 181rpx; font-size: 24rpx; - color: #6f6f6f; + color: #999; height: 40rpx; - margin-top: 8rpx; + margin-top: 106rpx; } .usermotto { diff --git a/dist/tab/index.wxss b/dist/tab/index.wxss index 9fc8784..1a692d3 100644 --- a/dist/tab/index.wxss +++ b/dist/tab/index.wxss @@ -16,7 +16,7 @@ .i-tabs-tab-bar { display: block; width: 50%; - height: 2px; + height: 6rpx; background: 0 0; position: absolute; bottom: 0; @@ -29,7 +29,7 @@ font-size: 28rpx; text-align: center; box-sizing: border-box; - color: #B8B8B8; + color: #222222; } .i-tabs-tab-title-current { @@ -39,5 +39,5 @@ .i-tabs-tab-scroll { display: inline-block; width: auto; - min-width: 60px; + min-width: 70px; } \ No newline at end of file diff --git a/dist/tabs/index.wxss b/dist/tabs/index.wxss index e6b1a3b..1d36704 100644 --- a/dist/tabs/index.wxss +++ b/dist/tabs/index.wxss @@ -30,7 +30,8 @@ display: block; overflow-x: auto; white-space: nowrap; - box-shadow:0 0 2px 0 rgba(211,211,211,0.50); + /* box-shadow:0 0 2px 0 rgba(211,211,211,0.50); */ + border-bottom: 1rpx solid #eeeeee; } .i-tabs-fixed { diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss index 59b1183..8f0d1b4 100644 --- a/pages/bannerdetail/index.wxss +++ b/pages/bannerdetail/index.wxss @@ -170,7 +170,7 @@ .notes view:nth-child(2)>text { font-size: 28rpx; color: #a9a9a9; - line-height: 56rpx; + line-height: 45rpx; } .spot { diff --git a/pages/cartest/cartest.wxml b/pages/cartest/cartest.wxml index 1e01fb6..1e2a0a4 100644 --- a/pages/cartest/cartest.wxml +++ b/pages/cartest/cartest.wxml @@ -1,3 +1,6 @@ - + + 正在疯狂开发中 + 更好用的体验即将到来 +请敬请期待 \ No newline at end of file diff --git a/pages/cartest/cartest.wxss b/pages/cartest/cartest.wxss index d3da5db..be003e3 100644 --- a/pages/cartest/cartest.wxss +++ b/pages/cartest/cartest.wxss @@ -1,17 +1,28 @@ -.con{ - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; +page { + height: 100%; + overflow:hidden; +} +.img { + display: block; + width: 300rpx; + height: 300rpx; + margin: 168rpx auto 0; +} + +.txt1 { + display: block; + font-size: 34rpx; + color: #333; + letter-spacing: 0; + text-align: center; +} + +.txt2 { + display: block; + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: center; + line-height: 40rpx; + margin-top: 10rpx; } -.con image{ - position: absolute; - width: 400rpx; - height: 400rpx; - left: 0; - right: 0; - top: 0rpx; - bottom: 0; - margin: auto; -} \ No newline at end of file diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index a83b2a5..f42b2cd 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -309,7 +309,6 @@ Page({ that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 console.log(res); if (res.errMsg == "requestPayment:ok") { - wx.showToast({ title: "购买成功", image: "./../../../assets/img/success.png", @@ -323,7 +322,7 @@ Page({ wx.hideLoading(); }, 1600); setTimeout(() => { - wx.redirectTo({ + wx.navigateTo({ url: `/pages/order/detail/index?orderId=${ that.data.orderId }` diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index dc66612..b0c62b8 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -175,16 +175,7 @@ line-height: 45rpx; } -.spot { - width: 12rpx; - height: 12rpx; - display: inline-block; - background: #a9a9a9; - margin-right: 16rpx; - position: relative; - bottom: 4rpx; - border-radius: 50%; -} + .buy-view { background: #fff; diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index a79ef6d..1e9c8a8 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -105,7 +105,7 @@ Page({ console.log("加载完成allow_load设置成false"); that.setData({ loading: true, - content: "^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ" + content: "——— 在拉裤子就掉了啦 ———" }); setTimeout(function() { that.setData({ diff --git a/pages/index/coupons/index.js b/pages/index/coupons/index.js index 3013965..a73b583 100644 --- a/pages/index/coupons/index.js +++ b/pages/index/coupons/index.js @@ -117,7 +117,7 @@ Component({ console.info("allow_load==false 已禁止加载"); that.setData({ loading:true, - content:"^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ" + content: "——— 在拉裤子就掉了啦 ———" }) setTimeout(function(){ that.setData({ diff --git a/pages/index/index.json b/pages/index/index.json index ee618b4..f5dbc51 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -5,9 +5,5 @@ "c-coupons": "./coupons/index" }, "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "首页", - "backgroundColor": "#eeeeee", - "backgroundTextStyle": "light" + "navigationBarTitleText": "首页" } diff --git a/pages/index/rushToBuy/index.wxml b/pages/index/rushToBuy/index.wxml index d2ae3b0..82bdc06 100644 --- a/pages/index/rushToBuy/index.wxml +++ b/pages/index/rushToBuy/index.wxml @@ -1,5 +1,5 @@ - 限时抢购查看更多 + 限时抢购查看更多 diff --git a/pages/index/rushToBuy/index.wxss b/pages/index/rushToBuy/index.wxss index f66dc85..4b4de22 100644 --- a/pages/index/rushToBuy/index.wxss +++ b/pages/index/rushToBuy/index.wxss @@ -4,18 +4,26 @@ } .index-rushToBuy-title { - font-size: 32rpx; + position: relative; + font-size: 34rpx; color: #000000; - letter-spacing: 0.75rpx; - padding-top: 20rpx; + letter-spacing: 1.16rpx; + padding-top: 34rpx; padding-left: 30rpx; } .index-rushToBuy-title text{ float: right; - margin-right: 20rpx; + margin-right: 53rpx; color: #a8adb4; - font-size: 26rpx; + font-size: 28rpx; + margin-top: 8rpx; +} +.index-rushToBuy-title image{ + position: absolute; + right: 18rpx; + width: 20px; + top: 44rpx; } .index-scroll-view { width: 100%; @@ -24,7 +32,7 @@ .index-scroll-view .commodity { display: inline-block; - margin: 30rpx; + margin: 16rpx 30rpx 30rpx; margin-right: 0; overflow: hidden; position: relative; diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 619f784..8427395 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -134,7 +134,7 @@ Page({ wx.hideLoading(); }, 1600); setTimeout(() => { - wx.redirectTo({ + wx.navigateTo({ url: `/pages/order/detail/index?orderId=${ that.data.orderId }` diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 576521e..0242e7e 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -106,7 +106,7 @@ Page({ console.log("加载完成allow_load设置成false"); that.setData({ loading: true, - content: "^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ" + ccontent: "——— 在拉裤子就掉了啦 ———" }) setTimeout(function () { that.setData({ diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js index a9486fb..dc6211b 100644 --- a/pages/rushToBuy/index.js +++ b/pages/rushToBuy/index.js @@ -94,7 +94,7 @@ Page({ console.info("allow_load==false 已禁止加载"); that.setData({ loading:true, - content:"^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ" + content: "——— 在拉裤子就掉了啦 ———" }) setTimeout(function(){ that.setData({ diff --git a/project.config.json b/project.config.json index 41012c0..de8711f 100644 --- a/project.config.json +++ b/project.config.json @@ -4,7 +4,7 @@ "ignore": [] }, "setting": { - "urlCheck": true, + "urlCheck": false, "es6": true, "postcss": true, "minified": true,