diff --git a/app.js b/app.js index def4385..8c2e1d2 100644 --- a/app.js +++ b/app.js @@ -144,7 +144,7 @@ App({ }) }, globalData: { - typeLsit: {},//初始哈样式 + typeLsit: [],//初始哈样式 scene: "", // token token: null, diff --git a/assets/images/home-a_red.png b/assets/images/home-a_red.png new file mode 100644 index 0000000..3720657 Binary files /dev/null and b/assets/images/home-a_red.png differ diff --git a/components/banner/index.js b/components/banner/index.js index 6a41cd9..a6a401b 100644 --- a/components/banner/index.js +++ b/components/banner/index.js @@ -47,7 +47,20 @@ Component({ wx.navigateTo({ url: `/pages/freeBannerDetail/index?id=${e.currentTarget.dataset.id}` }); - }else{ + }else if(e.currentTarget.dataset.data.type==4){ + wx.navigateToMiniProgram({ + appId: e.currentTarget.dataset.data.goAppid, + // path: 'page/index/index?id=123', + // extraData: { + // foo: 'bar' + // }, + // envVersion: 'develop', + success(res) { + // 打开成功 + } + }) + } + else{ // 固定格式 wx.navigateTo({ url: `/pages/bannerdetail/index?id=${e.currentTarget.dataset.id}` diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml index 2ea0a8e..500320b 100644 --- a/components/coupons/index.wxml +++ b/components/coupons/index.wxml @@ -1,7 +1,8 @@ +预售 - + @@ -20,11 +21,16 @@ {{data.title}} {{data.subTitle}} - - ¥{{data.salePriceStr}}¥{{data.priceStr}} - 抢购价¥{{data.salePriceStr}} - 可砍至¥{{data.salePriceStr}} - 拼团价¥{{data.salePriceStr}} + + ¥ + {{data.salePriceStr}} + ¥{{data.priceStr}} + 抢购价 + ¥{{data.salePriceStr}} + 可砍至 + ¥{{data.salePriceStr}} + 拼团价 + ¥{{data.salePriceStr}} @@ -35,15 +41,18 @@ {{data.priceStr}}小时 + + 预售定金:¥{{data.salePriceStr}} + - 免费领 - 购买 - 去抢购 - 去砍价 - 去拼团 + 免费领 + 购买 + 去抢购 + 去砍价 + 去拼团 已售罄 已下架 diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss index 8bbd190..53eadc9 100644 --- a/components/coupons/index.wxss +++ b/components/coupons/index.wxss @@ -5,9 +5,13 @@ width: 340rpx; display: inline-block; overflow: hidden; - border-radius:12rpx; + border-radius: 12rpx; +} +.earnest{ + color: red; + font-size: 24rpx; + padding-left: 10rpx; } - .coupons-border { height: 1rpx; left: 30rpx; @@ -17,8 +21,6 @@ bottom: 0; } - - .coupons-img image { display: block; width: 300rpx; @@ -37,7 +39,7 @@ .coupons-info-name { font-size: 30rpx; - color: #3C3C3C; + color: #3c3c3c; letter-spacing: 0; line-height: 38rpx; } @@ -65,21 +67,23 @@ line-height: 44rpx; margin-left: 16rpx; padding-top: 16rpx; - color: #FD832D; + color: #fd832d; width: 60%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - } -.rmb{ - font-size: 24rpx!important; - margin-right: 4rpx!important; + +.rmb { + font-size: 24rpx !important; + margin-right: 4rpx !important; color: #FD782D!; } -.num{ - color: #FD782D; + +.num { + color: #fd782d; } + .tit { overflow: hidden; white-space: nowrap; @@ -124,7 +128,7 @@ } .coupons-btn-gm { - border-radius: 10px!important; + border-radius: 10px !important; margin: 0 !important; padding: 0 !important; font-size: 26rpx; @@ -133,12 +137,12 @@ height: 51rpx !important; width: 100rpx !important; line-height: 51rpx !important; - background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)!important; + background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%) !important; } .coupons-btn-gms { background: #b9b9b9 !important; - border-radius: 10px!important; + border-radius: 10px !important; opacity: 0.6; margin: 0 !important; padding: 0 !important; @@ -198,15 +202,16 @@ opacity: 0.6; } -.view02{ - font-size:20rpx; - line-height:34rpx; +.view02 { + font-size: 20rpx; + line-height: 34rpx; text-decoration: line-through; color: #999 !important; - font-weight:normal; - letter-spacing:0; + font-weight: normal; + letter-spacing: 0; margin-left: 10rpx; } + .view01 { text-decoration: line-through; color: #999 !important; @@ -283,13 +288,30 @@ scroll-view { opacity: 1 !important; background: #fff; } -.hover{ - opacity: .6; + +.hover { + opacity: 0.6; } + .navigator { display: inline-block; background: #fff; border-radius: 12rpx; + position: relative; +} + +.presell { + position: absolute; + width: 300rpx; + height: 40rpx; + background-color: rgba(247, 21, 21, 0.6); + z-index: 100; + top: 158rpx; + line-height: 20px; + text-align: center; + color: #fff; + margin-left: 20rpx; + font-size: 26rpx; } .navigator:nth-of-type(2n+1) { diff --git a/components/navbar/navbar.wxml b/components/navbar/navbar.wxml index 803d32f..ec83c6f 100644 --- a/components/navbar/navbar.wxml +++ b/components/navbar/navbar.wxml @@ -1,4 +1,4 @@ - + diff --git a/components/navbar/navbar.wxss b/components/navbar/navbar.wxss index d1aea47..055b358 100644 --- a/components/navbar/navbar.wxss +++ b/components/navbar/navbar.wxss @@ -1,10 +1,12 @@ .navbar { width: 100vw; background-color: #F4F5F9; - /* position: fixed; */ + position: fixed; left: 0; top: 0; - /* z-index: 400000000; */ + /* height:150rpx; */ + overflow: hidden; + z-index: 400000000; } .title-container { diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 38e7bc2..6f85581 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -2,8 +2,10 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let ifStoreApp = extConfig.attr.ifStoreApp; const Http = require("../utils/HttpBasics"); var config = require("../config/config.js"); +let app = getApp(); Component({ data: { + home_a_img:[], selected: 0, "color": "#abb1be", "selectedColor": "#FD782D", @@ -33,8 +35,16 @@ Component({ } ] }, - attached() { + created(){ this.getType() + }, + // lifetimes: { + // attached: function () { + // // 在组件实例进入页面节点树时执行 + + // }, + // }, + attached() { if (ifStoreApp == 1) { this.setData({ list: [{ @@ -77,6 +87,12 @@ Component({ }, methods: { switchTab(e) { + + // this.setData({ + // list: this.data.home_a_img + // }) + // console.log(this.data.home_a_img) + const data = e.currentTarget.dataset; const url = data.path; if (data.index == 0 || data.index == 3) { @@ -129,9 +145,34 @@ Component({ } ], selectedColor: `${data.t_uc_std.styleClass}`, + home_a_img: [{ + "pagePath": "/index/index", + "iconPath": `${data.t_in.icon}`, + "selectedIconPath": `${data.t_in_std.icon}`, + "text": "首页" + }, + { + "pagePath": "/index/searchbar", + "iconPath": `${data.t_md.icon}`, + "selectedIconPath": `${data.t_md_std.icon}`, + "text": "门店" + }, + { + "pagePath": "/index/passCar", + "iconPath": `${data.t_tc.icon}`, + "selectedIconPath": `${data.t_tc_std.icon}`, + "text": "停车" + }, + { + "pagePath": "/index/user", + "iconPath": `${data.t_uc.icon}`, + "selectedIconPath": `${data.t_uc_std.icon}`, + "text": "我的" + } + ], }) } - + console.log(this.data.list[0].selectedIconPath, '99999999999999999999999999999999999999999') }) }, getTemplateId() { @@ -189,4 +230,5 @@ Component({ }, } + }) \ No newline at end of file diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index 29d1b9e..7e45c49 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/index/index.js b/index/index.js index 862c81f..dc30992 100644 --- a/index/index.js +++ b/index/index.js @@ -1,6 +1,6 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let ifStoreApp = extConfig.attr.ifStoreApp; -const navigationBarHeight = (getApp().statusBarHeight + 60) + 'rpx' +const navigationBarHeight = (getApp().statusBarHeight + 44)+"px" const Http = require("../utils/HttpBasics"); const imgurl = require("../utils/imgurl"); const config = require("../config/config"); @@ -237,11 +237,11 @@ Page({ }).then(res=>{ const{code ,data}=res if(code==200){ + app.globalData.typeLsit=data this.setData({ - typeLsit: data + typeLsit: data, }) } - console.log(this.data.typeLsit,"???") }) }, /** diff --git a/index/index.wxml b/index/index.wxml index 2f2a678..8692294 100644 --- a/index/index.wxml +++ b/index/index.wxml @@ -1,12 +1,14 @@ + - + + + + {{squareName}} ↓ - - diff --git a/index/index.wxss b/index/index.wxss index b5a7ff2..71bb0f3 100644 --- a/index/index.wxss +++ b/index/index.wxss @@ -23,10 +23,6 @@ background-color: #F4F5F9; margin-bottom: 20rpx; margin-left: 5rpx; } -.underling{ - font-size: 30rpx; - overflow: hidden; -} .index-position { background: rgba(0, 0, 0, 0.5); height: 88rpx; @@ -78,7 +74,7 @@ page { width: 100%; } .underling{ - margin: 10rpx 30rpx; + padding: 10rpx 30rpx; } .userinfo{ width:690rpx; diff --git a/index/passCar.js b/index/passCar.js index f677041..206eccf 100644 --- a/index/passCar.js +++ b/index/passCar.js @@ -1,5 +1,5 @@ -const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let app = getApp(); const format = require("../utils/util.js"); diff --git a/index/passCar.wxml b/index/passCar.wxml index 289a105..28ecacf 100644 --- a/index/passCar.wxml +++ b/index/passCar.wxml @@ -1,5 +1,6 @@ - + + {{park.addr}} @@ -112,7 +113,7 @@ - + 智慧停车即将上线 敬请期待 diff --git a/index/passCar.wxss b/index/passCar.wxss index bba5340..8fbc8ee 100644 --- a/index/passCar.wxss +++ b/index/passCar.wxss @@ -7,7 +7,10 @@ page { .container { padding-bottom: 60rpx; } - +.cs{ + height: 30rpx; + background-color: aqua +} .con text { display: block; text-align: center; diff --git a/index/searchbar.js b/index/searchbar.js index c936e83..9b69b26 100644 --- a/index/searchbar.js +++ b/index/searchbar.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) +const navigationBarHeight = (getApp().statusBarHeight + 44)+"px" const Http = require("../utils/HttpBasics"); const imgurl = require("../utils/imgurl"); const config = require("../config/config"); diff --git a/index/searchbar.wxml b/index/searchbar.wxml index 4f67ed6..7b6c869 100644 --- a/index/searchbar.wxml +++ b/index/searchbar.wxml @@ -1,10 +1,12 @@ -搜索门店 - + + + 搜索门店 + - + @@ -19,7 +21,7 @@ - +