From 734d3a93771f1b0e9b9f658e0cad5fb9f2610c49 Mon Sep 17 00:00:00 2001 From: zdx <731335498@qq.com> Date: Mon, 28 Dec 2020 14:00:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/company/enterprise/enterprise.js | 15 +++-- components/company/enterprise/enterprise.wxml | 2 +- .../company/fengcaiInfo/fengcaiInfo.wxss | 2 +- .../company/personalInfo/personalInfo.js | 9 ++- .../company/personalInfo/personalInfo.wxml | 2 +- components/company/videoInfo/videoInfo.wxss | 18 +++-- pages/home/beSureOrder/beSureOrder.js | 20 ++++-- pages/home/beSureOrder/beSureOrder.wxml | 13 +++- pages/home/beSureOrder/beSureOrder.wxss | 50 +++++++++++++- pages/home/index.js | 21 +++--- pages/home/index.wxml | 67 ++++++++++--------- pages/home/projectDetail/projectDetail.wxss | 11 +-- pages/home/projectSuccess/projectSuccess.js | 10 +-- pages/shortVideo/index.js | 3 +- 14 files changed, 169 insertions(+), 74 deletions(-) diff --git a/components/company/enterprise/enterprise.js b/components/company/enterprise/enterprise.js index 9011b38..9bdc664 100644 --- a/components/company/enterprise/enterprise.js +++ b/components/company/enterprise/enterprise.js @@ -4,8 +4,8 @@ Component({ * 组件的属性列表 */ properties: { - info:{ - type:Object + info: { + type: Object } }, @@ -73,9 +73,12 @@ Component({ break; } }, - - - - + // 跳转到员工名片详情 + goCard(e) { + console.log(e.currentTarget.dataset.cardid); + wx.navigateTo({ + url: '/pages/card/index?cardid='+e.currentTarget.dataset.cardid, + }) + } } }) \ No newline at end of file diff --git a/components/company/enterprise/enterprise.wxml b/components/company/enterprise/enterprise.wxml index 4f7cde5..0cc6af8 100644 --- a/components/company/enterprise/enterprise.wxml +++ b/components/company/enterprise/enterprise.wxml @@ -35,7 +35,7 @@ - + {{item.name}} {{item.job}} diff --git a/components/company/fengcaiInfo/fengcaiInfo.wxss b/components/company/fengcaiInfo/fengcaiInfo.wxss index 54547c2..38bd9ab 100644 --- a/components/company/fengcaiInfo/fengcaiInfo.wxss +++ b/components/company/fengcaiInfo/fengcaiInfo.wxss @@ -7,7 +7,7 @@ background-color: #fff; box-shadow: 0 0 14rpx rgba(0, 0, 0, 0.3); margin-top: 20rpx; - padding:30rpx 30rpx 20rpx 30rpx; + padding:30rpx 20rpx 20rpx 20rpx; } .enterprise_content .content{ diff --git a/components/company/personalInfo/personalInfo.js b/components/company/personalInfo/personalInfo.js index 14714a5..8cb8f8d 100644 --- a/components/company/personalInfo/personalInfo.js +++ b/components/company/personalInfo/personalInfo.js @@ -17,7 +17,12 @@ Component({ * 组件的方法列表 */ methods: { - // 获取员工列表 - + // 跳转到员工名片详情 + goCard(e) { + console.log(e.currentTarget.dataset.cardid); + wx.navigateTo({ + url: '/pages/card/index?cardid='+e.currentTarget.dataset.cardid, + }) + } } }) diff --git a/components/company/personalInfo/personalInfo.wxml b/components/company/personalInfo/personalInfo.wxml index 381f6d1..bf6e5d5 100644 --- a/components/company/personalInfo/personalInfo.wxml +++ b/components/company/personalInfo/personalInfo.wxml @@ -1,4 +1,4 @@ - + {{info.name}}({{info.job}}) diff --git a/components/company/videoInfo/videoInfo.wxss b/components/company/videoInfo/videoInfo.wxss index 54547c2..c416eb0 100644 --- a/components/company/videoInfo/videoInfo.wxss +++ b/components/company/videoInfo/videoInfo.wxss @@ -1,16 +1,21 @@ /* 企业视频*/ -.enterprise_content{ - font-size:29rpx ; +.enterprise_content { + font-size: 29rpx; color: #333; margin: 0 30rpx; border-radius: 12rpx; background-color: #fff; box-shadow: 0 0 14rpx rgba(0, 0, 0, 0.3); margin-top: 20rpx; - padding:30rpx 30rpx 20rpx 30rpx; + padding: 30rpx 20rpx 20rpx 20rpx; } -.enterprise_content .content{ + +.enterprise_content video { + width: 100%; +} + +.enterprise_content .content { position: relative; text-overflow: -o-ellipsis-lastline; overflow: hidden; @@ -23,7 +28,7 @@ } /* 播放 */ -.content .play{ +.content .play { background-color: rgba(0, 0, 0, 0.3); width: 100%; height: calc(100% - 10rpx); @@ -36,7 +41,8 @@ align-items: center; box-sizing: border-box; } -.content .play image{ + +.content .play image { width: 102rpx; height: 102rpx; } \ No newline at end of file diff --git a/pages/home/beSureOrder/beSureOrder.js b/pages/home/beSureOrder/beSureOrder.js index 71f062c..6fcac25 100644 --- a/pages/home/beSureOrder/beSureOrder.js +++ b/pages/home/beSureOrder/beSureOrder.js @@ -4,16 +4,19 @@ Page({ addressList: [], info: '', remark: '', - crowdfund_id: '' + crowdfund_id: '', + addressDel: {}, }, + onLoad(e) { wx.$api.companyModule.crowdfundsCreat(e.crowdfund_item_id).then(res => { - console.log(res); if (res.address.length > 0) { this.setData({ - address_id: res.address[0].address_id, addressList: res.address, + addressDel: res.address[0] }) + console.log(res); + console.log(this.data.addressDel) } this.setData({ crowdfund_item_id: e.crowdfund_item_id, @@ -25,6 +28,9 @@ Page({ wx.navigateBack({}) }) }, + onShow() { + console.log(this.data.addressDel) + }, input(e) { this.setData({ remark: e.detail.value @@ -35,7 +41,7 @@ Page({ title: '创建中...', mask: 'true' }) - wx.$api.companyModule.crowdfundsCreatOrder(this.data.crowdfund_item_id, this.data.address_id, this.data.remark).then(res => { + wx.$api.companyModule.crowdfundsCreatOrder(this.data.crowdfund_item_id, this.data.addressDel.address_id, this.data.remark).then(res => { var data = {}; if (res.trade_no) { wx.login({ @@ -76,6 +82,12 @@ Page({ }).catch(res => { wx.navigateBack({}) }) + }, + // 跳转到地址列表和新增地址页面 + goAddress(){ + wx.navigateTo({ + url: '/pages/mall/mall_address/mall_address?type=selectAddress', + }) } }) \ No newline at end of file diff --git a/pages/home/beSureOrder/beSureOrder.wxml b/pages/home/beSureOrder/beSureOrder.wxml index 4576274..32fcdf9 100644 --- a/pages/home/beSureOrder/beSureOrder.wxml +++ b/pages/home/beSureOrder/beSureOrder.wxml @@ -1,10 +1,17 @@ - + - 张冬雪 14745798066 学校 默认 - 黑龙江省哈尔滨市南岗区汉水路451号省科学院研究所7楼 + {{addressDel.name}} {{addressDel.mobile}} 学校 + 默认 + {{addressDel.address}} + + + + 添加收货地址 + + diff --git a/pages/home/beSureOrder/beSureOrder.wxss b/pages/home/beSureOrder/beSureOrder.wxss index 69f6422..8ee74ee 100644 --- a/pages/home/beSureOrder/beSureOrder.wxss +++ b/pages/home/beSureOrder/beSureOrder.wxss @@ -17,9 +17,10 @@ height: 120rpx; } -.besure_bottom .left{ +.besure_bottom .left { width: 160rpx; } + .besure_now_act .left span { font-size: 28rpx; color: #333; @@ -58,7 +59,8 @@ border-top: solid 1rpx #f7f7f7; } -.besure_bottom input , .besure_bottom>span { +.besure_bottom input, +.besure_bottom>span { flex: 1; /* margin-left: 30rpx; */ padding-top: 4rpx; @@ -138,6 +140,7 @@ justify-content: space-between; align-items: center; box-sizing: border-box; + position: relative; } .besure_address .userinfo { @@ -179,4 +182,47 @@ .besure_address .des { font-size: 24rpx; padding-top: 10rpx; +} + +.arrows-right { + position: absolute; + bottom: 0; + left: 0; + width: 100%; +} + +.order-add-address { + text-align: center; + padding: 30rpx 0; + position: relative; +} + +.order-add-address navigator { + display: inline-block; + background: #e92344; + color: white; + line-height: 60rpx; + padding: 0 30rpx; + margin-right: 20rpx; +} + +.arrows-add { + text-align: center; + width: 100%; +} + +.arrows-add-img { + width: 30rpx; + vertical-align: middle; + margin: -8rpx 6rpx 0 0; +} + +.arrows-add { + width: 100%; + background-color: red; + height: 90rpx; +} + +.jc_start { + justify-content: start; } \ No newline at end of file diff --git a/pages/home/index.js b/pages/home/index.js index 3b18f41..818cf6b 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -7,17 +7,12 @@ Page({ selectMenuId: 0, //默认是企业信息0 视频1 活动2 项目筹集3 company_id: wx.getStorageSync('company_id'), //企业Id, info: '', //企业信息 + loaded:false }, onLoad(e) { - console.log(e) - if(e.id){ - this.company(e.id) - wx.setStorageSync('company_id', e.id) - }else{ - this.company(this.company_id) - } }, onShow() { + this.company(wx.getStorageSync('company_id')) }, onUnload: function () { wx.removeStorageSync('company_id') @@ -65,7 +60,8 @@ Page({ wx.$api.companyModule.company(this.data.company_id, this.data.page).then(res => { console.log(res) this.setData({ - info: res + info: res, + loaded:true, }) }) }, @@ -77,5 +73,14 @@ Page({ wx.makePhoneCall({ phoneNumber: this.data.info.certification.phone, }) + }, + /** + * 进入商城 + */ + goMall(e){ + console.log('1111') + wx.navigateTo({ + url: '/pages/mall/index', + }) } }) \ No newline at end of file diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 5972307..41180f3 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -1,45 +1,50 @@ - - - {{info.base.name}} - - - - - - - - 注册资本：{{info.base.registered_capital||'未完善' }}元 + + + + {{info.base.name}} + - - - 成立时间：{{info.base.setup_at||'未完善' }} - - - - 企业法人：{{info.certification.name||'未完善' }} - - - - 拨打电话 + + + + + 注册资本：{{info.base.registered_capital||'未完善' }}元 - - 进入商城 + + + 成立时间：{{info.base.setup_at||'未完善' }} - - 关注企业 + + + 企业法人：{{info.certification.name||'未完善' }} + + + + 拨打电话 + + + 进入商城 + + + 关注企业 + - + - 企业信息 + 企业信息 - 企业动态 - 企业活动 - 项目筹集 + 企业动态 + 企业活动 + 项目筹集 diff --git a/pages/home/projectDetail/projectDetail.wxss b/pages/home/projectDetail/projectDetail.wxss index d22cd1a..768ed9d 100644 --- a/pages/home/projectDetail/projectDetail.wxss +++ b/pages/home/projectDetail/projectDetail.wxss @@ -223,7 +223,8 @@ swiper { height: 100%; } -.project_now_act span , .project_now_act button { +.project_now_act span, +.project_now_act button { margin-left: 60rpx; flex: 1; display: inline-block; @@ -231,10 +232,11 @@ swiper { color: #fff; font-size: 30rpx !important; border-radius: 10rpx !important; - padding: 20rpx 100rpx ; + padding: 20rpx 100rpx; text-align: center; font-weight: 600; } + .project_now_act button { padding: 10rpx 0 !important; } @@ -378,6 +380,7 @@ swiper { color: #333; font-weight: 600; margin-left: 30rpx; + width: calc(100% - 180rpx); } /* 项目回报列表 */ @@ -447,7 +450,7 @@ swiper { color: #999; } -.project_list .seeAll span { +.project_list .seeAll span { background-color: #378fff; color: #fff; padding: 8rpx 20rpx; @@ -472,7 +475,7 @@ swiper { border-radius: 50rpx; background-color: #378fff; color: #fff; - margin:30rpx 20rpx; + margin: 30rpx 20rpx; font-size: 26rpx; text-align: center; width: 50%; diff --git a/pages/home/projectSuccess/projectSuccess.js b/pages/home/projectSuccess/projectSuccess.js index ccaa772..e8c2a9d 100644 --- a/pages/home/projectSuccess/projectSuccess.js +++ b/pages/home/projectSuccess/projectSuccess.js @@ -1,11 +1,10 @@ - Page({ /** * 页面的初始数据 */ data: { - info:{},//产品基本信息 + info: {}, //产品基本信息 }, /** @@ -30,6 +29,9 @@ Page({ title: '您的好友邀请你一起', path: '/pages/companyModule/projectDetail/projectDetail?id=6', imageUrl: this.data.info.pictures[0] - } - } + } + }, + /** + * 跳转到个人 + */ }) \ No newline at end of file diff --git a/pages/shortVideo/index.js b/pages/shortVideo/index.js index 36e2cae..663caa9 100644 --- a/pages/shortVideo/index.js +++ b/pages/shortVideo/index.js @@ -78,7 +78,8 @@ Page({ */ goCompany(e) { wx.navigateTo({ - url: '/pages/home/index?id=' + e.currentTarget.dataset.id, + url: '/pages/home/index' , }) + wx.setStorageSync('company_id', e.currentTarget.dataset.id) } }) \ No newline at end of file From 092f0bad148c72653b65ab0f48c47e8638b91863 Mon Sep 17 00:00:00 2001 From: zdx <731335498@qq.com> Date: Mon, 28 Dec 2020 14:12:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8F=82=E4=B8=8E=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/request.js | 4 +- app.json | 3 +- pages/user/companyMine/companyOrder.js | 29 +++ pages/user/companyMine/companyOrder.json | 6 + pages/user/companyMine/companyOrder.wxml | 16 ++ pages/user/companyMine/companyOrder.wxss | 33 +++ .../myActives/activeDetail/activeDetail.js | 109 ++++++++ .../myActives/activeDetail/activeDetail.json | 5 + .../myActives/activeDetail/activeDetail.wxml | 58 +++++ .../myActives/activeDetail/activeDetail.wxss | 245 ++++++++++++++++++ pages/user/companyMine/myActives/myActives.js | 75 ++++++ .../user/companyMine/myActives/myActives.json | 6 + .../user/companyMine/myActives/myActives.wxml | 31 +++ .../user/companyMine/myActives/myActives.wxss | 133 ++++++++++ pages/user/index.wxml | 4 +- project.config.json | 154 +++++------ 16 files changed, 832 insertions(+), 79 deletions(-) create mode 100644 pages/user/companyMine/companyOrder.js create mode 100644 pages/user/companyMine/companyOrder.json create mode 100644 pages/user/companyMine/companyOrder.wxml create mode 100644 pages/user/companyMine/companyOrder.wxss create mode 100644 pages/user/companyMine/myActives/activeDetail/activeDetail.js create mode 100644 pages/user/companyMine/myActives/activeDetail/activeDetail.json create mode 100644 pages/user/companyMine/myActives/activeDetail/activeDetail.wxml create mode 100644 pages/user/companyMine/myActives/activeDetail/activeDetail.wxss create mode 100644 pages/user/companyMine/myActives/myActives.js create mode 100644 pages/user/companyMine/myActives/myActives.json create mode 100644 pages/user/companyMine/myActives/myActives.wxml create mode 100644 pages/user/companyMine/myActives/myActives.wxss diff --git a/apis/request.js b/apis/request.js index c57eff1..07701d7 100644 --- a/apis/request.js +++ b/apis/request.js @@ -3,8 +3,8 @@ import {errInfo} from './err' import {updToken} from './updateToken' // 请求方式配置 -// const api = "https://new-web-test.cnskl.com/api/" -const api = "https://mi-org.cnskl.com/api/" +const api = "https://new-web-test.cnskl.com/api/" +// const api = "https://mi-org.cnskl.com/api/" const header = { "Accept" : "application/json" } diff --git a/app.json b/app.json index 65f1f83..4c76a63 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,7 @@ { "pages": [ + "pages/user/index", + "pages/user/companyMine/myActives/myActives", "pages/welcome/index", "pages/company/index", "pages/company/search/search", @@ -7,7 +9,6 @@ "pages/richText/richText", "pages/login/login", "pages/card/index", - "pages/user/index", "pages/mall/index", "pages/live/index", "pages/ticket/index", diff --git a/pages/user/companyMine/companyOrder.js b/pages/user/companyMine/companyOrder.js new file mode 100644 index 0000000..015fe61 --- /dev/null +++ b/pages/user/companyMine/companyOrder.js @@ -0,0 +1,29 @@ +// pages/companyOrder/companyOrder.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + type: 0, //全部0 待付款1 待发货2 待收货3 退款/售后4 + }, + + onLoad() { + + }, + + /** + * 点击按钮触发事件 + */ + menuSelect: function (e) { + console.log(e.currentTarget.dataset.id); + if (this.data.type != e.currentTarget.dataset.id) { + this.setData({ + type: e.currentTarget.dataset.id + }) + if (e.currentTarget.dataset.id == 3) { + this.selectComponent('#categoryTypeList').crowdfundcategory(this.data.company_id); + } + } + }, +}) \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder.json b/pages/user/companyMine/companyOrder.json new file mode 100644 index 0000000..2769eec --- /dev/null +++ b/pages/user/companyMine/companyOrder.json @@ -0,0 +1,6 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "项目预购", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#378fff" +} \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder.wxml b/pages/user/companyMine/companyOrder.wxml new file mode 100644 index 0000000..42ed3e9 --- /dev/null +++ b/pages/user/companyMine/companyOrder.wxml @@ -0,0 +1,16 @@ + + + + 全部 + 待付款 + 待发货 + 待收货 + 退款/售后 + + + diff --git a/pages/user/companyMine/companyOrder.wxss b/pages/user/companyMine/companyOrder.wxss new file mode 100644 index 0000000..ac6ccf0 --- /dev/null +++ b/pages/user/companyMine/companyOrder.wxss @@ -0,0 +1,33 @@ +/* 滚动菜单 */ +.scroll_menu { + background-color: #fff; + box-shadow: 0 0rpx 10px rgba(0, 0, 0, 0.1); + font-size: 28rpx; +} + +.scroll-view_H { + white-space: nowrap; + color: #000; +} + +.scroll-view-item { + height: 90rpx; + line-height: 90rpx; +} + +.scroll-view-item_H { + display: inline-block; + width: 22%; + height: 90rpx; + line-height: 90rpx; + text-align: center; + border-bottom: solid 4rpx #fff; +} + +.scroll_view_select { + border-bottom: solid 4rpx #378fff; + color: #378fff; + font-weight: 600; +} + +/* 列表 */ \ No newline at end of file diff --git a/pages/user/companyMine/myActives/activeDetail/activeDetail.js b/pages/user/companyMine/myActives/activeDetail/activeDetail.js new file mode 100644 index 0000000..a8edb50 --- /dev/null +++ b/pages/user/companyMine/myActives/activeDetail/activeDetail.js @@ -0,0 +1,109 @@ +// pages/companyModule/companyMoreVideo/companyMoreVideo.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + acted: false, //已经报名true + showBeSureActed: false, //显示确认弹窗 + indicatorDots: true, + vertical: false, + autoplay: false, + interval: 2000, + duration: 500, + active_id: '', //活动id + info: '', //详情信息 + loaded:false, + }, + onLoad(e) { + this.setData({ + active_id: e.id + }) + }, + onShow() { + this.activesDetail(this.data.active_id); + }, + + /** + * 现在报名 + */ + nowActed: function (e) { + console.log() + if (!e.currentTarget.dataset.acted) { + this.setData({ + showBeSureActed: true, + }) + } else { + wx.showToast({ + icon: 'none', + title: '已报名，等待活动开始', + }) + } + }, + /** + * 关闭弹窗 + */ + close() { + this.setData({ + showBeSureActed: false + }) + }, + /** + * 确认报名 + */ + beSure() { + wx.login({ + success:res=>{ + wx.$api.companyModule.activesEnroll(res.code,this.data.active_id).then(res => { + if(Number(this.data.info.price)>0){ + var resss=JSON.parse(res); + console.log('可支付') + wx.requestPayment({ + timeStamp: resss.timeStamp, + nonceStr: resss.nonceStr, + package: resss.package, + signType: 'MD5', + paySign: resss.paySign, + success:res=>{ + this.close(); + wx.navigateTo({ + url: '/pages/companyModule/activeSuccess/activeSuccess?cover='+this.data.info.pictures[0], + }) + }, + fail(res) { + wx.showToast({ + title: '支付失败', + }) + } + }) + + }else{ + console.log('不用支付') + this.close(); + wx.navigateTo({ + url: '/pages/companyModule/activeSuccess/activeSuccess?cover='+this.data.info.pictures[0], + }) + } + }) + } + }) + }, + /** + * 获取详情 + */ + activesDetail() { + wx.$api.companyModule.activesDetail(this.data.active_id).then(res => { + var nodes = res.content.replace(' + + + + + + + + + + + + + + + {{info.title}} + {{info.description}} + + + {{info.price > 0? '￥' + info.price:'免费'}} + 报名上限：{{info.limits}}人 + + + + + 截止时间：{{info.deadlined_at}} + 活动时间：{{info.started_at}}至{{info.ended_at}} + 活动地点：{{info.address}} + + + + 联系人电话：{{info.contact}} + + + + 活动详情 + + + + + + {{info.price> 0 ? '￥' + info.price:'免费'}} + {{!info.canEnroll?'无法报名':'立即报名'}} + + + + + + + + + 是否对该活动进行报名 + 活动名称：{{info.title}} + 确认报名 + 我再想想 + + \ No newline at end of file diff --git a/pages/user/companyMine/myActives/activeDetail/activeDetail.wxss b/pages/user/companyMine/myActives/activeDetail/activeDetail.wxss new file mode 100644 index 0000000..27ec146 --- /dev/null +++ b/pages/user/companyMine/myActives/activeDetail/activeDetail.wxss @@ -0,0 +1,245 @@ +.active_content { + background-color: #fff; + box-sizing: border-box; + padding-bottom: 10rpx; +} + +.active_cover { + width: 100%; + height: 300rpx; + position: relative; + overflow: hidden; + padding-bottom: 0; +} + +.active_cover_bg { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 0; +} + +.active_type_icon { + position: absolute; + top: 0; + left: 0; + background-color: #ffcc00; + color: #4a1900; + padding: 4rpx 20rpx; + border-radius: 10rpx 0 20rpx 0; + font-size: 24rpx; + z-index: 1; +} + +.active_title { + margin-top: 30rpx; + padding: 0 30rpx; + color: #333; + font-weight: 600; + font-size: 32rpx; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; +} + +.active_des { + margin-top: 14rpx; + padding: 0 30rpx; + color: #666; + font-size: 24rpx; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; +} + +.active_time { + margin-top: 14rpx; + /* padding: 0 10rpx; */ + color: #666; + font-size: 26rpx; + /* overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; */ +} + +.active_time image { + width: 30rpx; + position: relative; + bottom: -6rpx; + right: 0; + margin-left: 30rpx; + margin-right: 4rpx; +} + +.active_line { + margin: 20rpx 20rpx 0 20rpx; + border-bottom: solid 1rpx #f7f7f7; +} + +.active_bottom { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + font-size: 40rpx; + font-weight: 600; + color: #333; + padding: 0 30rpx; + margin-top: 20rpx; +} + +.active_bottom span { + color: #999; + font-size: 24rpx; + padding-left: 10rpx; + font-weight: normal; +} + + +.active_detail { + padding: 20rpx; + background-color: #fff; + margin-top: 20rpx; +} + +.active_detail_html { + padding: 20rpx; + background-color: #fff; + margin-top: 20rpx; + width: 100%; + box-sizing: border-box; + overflow: hidden; + padding-bottom: 150rpx; +} + +.active_detail_html img{ + width: 100%; +} + +.active_nav { + color: #333; + font-weight: 600; + font-size: 32rpx; + padding-bottom: 30rpx; +} + +/* 立即报名 */ +.active_now_act { + margin-top: 20rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + font-size: 34rpx; + font-weight: 600; + color: #333; + background-color: #fff; + padding: 20rpx 30rpx; + position: fixed; + bottom: 0; + width: 100%; + height: 120rpx; +} + +.active_now_act span { + margin-left: 60rpx; + flex: 1; + display: inline-block; + background-color: #378fff; + color: #fff; + font-size: 30rpx; + border-radius: 50rpx; + padding: 20rpx 100rpx; + text-align: center; + font-weight: 600; +} + +.acted span { + background-color: #999; +} + +.active_be_sure { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + box-sizing: border-box; + z-index: 1; +} + +.active_be_sure .bg { + background-color: rgba(0, 0, 0, 0.6); + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 2; +} + +.active_be_sure .content { + width: 600rpx; + background-color: #fff; + position: relative; + z-index: 3; + border-radius: 20rpx; + text-align: center; + padding-bottom: 30rpx; +} + +.active_be_sure .content .active_cover { + width: 100%; + height: 360rpx; + border-radius: 20rpx 20rpx 0 0; +} + +.active_be_sure .content .txt1 { + font-size: 36rpx; + font-weight: 600; + color: #333; + padding-top: 40rpx; +} + +.active_be_sure .content .txt2 { + padding-top: 20rpx; + font-size: 24rpx; + color: #999; +} + +.active_be_sure .content .txt3 { + font-size: 32rpx; + color: #fff; + background-color: #378fff; + font-weight: 600; + width: 70%; + margin-left:15%; + box-sizing: border-box; + padding: 20rpx 30rpx; + border-radius: 50rpx; + margin-top: 30rpx; +} + +.active_be_sure .content .txt4 { + font-size: 26rpx; + color: #999; + padding:20rpx 30rpx; +} + +img{ + max-width: 100%; +} \ No newline at end of file diff --git a/pages/user/companyMine/myActives/myActives.js b/pages/user/companyMine/myActives/myActives.js new file mode 100644 index 0000000..1be6ea1 --- /dev/null +++ b/pages/user/companyMine/myActives/myActives.js @@ -0,0 +1,75 @@ +// pages/companyOrder/companyOrder.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + state: 'unstart', //未开始 unstart 进行中start 已结束end + lists: [], + page: 1, + has_more: true, + }, + + onLoad() { + this.userActives(); + }, + + /** + * 点击按钮触发事件 + */ + menuSelect: function (e) { + if (this.data.state != e.currentTarget.dataset.state) { + wx.showLoading({ + title: '请求中...', + mask: true + }) + this.setData({ + state: e.currentTarget.dataset.state, + page: 1, + lists: [], + has_more: true + }) + } + this.userActives(); + }, + // 获取活动列表 + userActives() { + wx.$api.companyModule.userActives(this.data.state, this.data.page).then(res => { + setTimeout(() => { + wx.hideLoading({}) + }, 1000); + var lists = this.data.lists.concat(res.data) + if (res.page.has_more) { + this.setData({ + has_more: res.page.has_more, + page: page + 1, + lists: lists + }) + } else { + this.setData({ + has_more: res.page.has_more, + lists: lists + }) + } + }) + }, + // 触底加载更多 + onReachBottom() { + console.log('触底') + if (this.data.has_more) { + this.userActives(); + } else { + wx.showToast({ + icon: 'none', + title: '没有更多', + }) + } + }, + //跳转到详情页 + goUrl(e) { + wx.navigateTo({ + url: '/pages/companyModule/activeDetail/activeDetail?id=' + e.currentTarget.dataset.id, + }) + } +}) \ No newline at end of file diff --git a/pages/user/companyMine/myActives/myActives.json b/pages/user/companyMine/myActives/myActives.json new file mode 100644 index 0000000..8398201 --- /dev/null +++ b/pages/user/companyMine/myActives/myActives.json @@ -0,0 +1,6 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "活动参与", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#378fff" +} \ No newline at end of file diff --git a/pages/user/companyMine/myActives/myActives.wxml b/pages/user/companyMine/myActives/myActives.wxml new file mode 100644 index 0000000..6e7d77b --- /dev/null +++ b/pages/user/companyMine/myActives/myActives.wxml @@ -0,0 +1,31 @@ + + + + + 未开始 + + 进行中 + + 已结束 + + + + + 最新 + + + {{item.active.title}} + {{item.active.price> 0 ? '￥' + item.active.price:'免费'}} {{item.active.started_at}} + + 查看活动 + + + + + + + {{has_more?'~ 上拉加载更多 ~':'~ 暂无更多数据 ~'}} + \ No newline at end of file diff --git a/pages/user/companyMine/myActives/myActives.wxss b/pages/user/companyMine/myActives/myActives.wxss new file mode 100644 index 0000000..018f67d --- /dev/null +++ b/pages/user/companyMine/myActives/myActives.wxss @@ -0,0 +1,133 @@ +/* 滚动菜单 */ +.scroll_menu { + background-color: #fff; + box-shadow: 0 0rpx 10px rgba(0, 0, 0, 0.1); + font-size: 28rpx; +} + +.scroll-view_H { + white-space: nowrap; + color: #000; +} + +.scroll-view-item { + height: 90rpx; + line-height: 90rpx; +} + +.scroll-view-item_H { + display: inline-block; + width: 22%; + height: 90rpx; + line-height: 90rpx; + text-align: center; + border-bottom: solid 4rpx #fff; +} + +.scroll_view_select { + border-bottom: solid 4rpx #378fff; + color: #378fff; + font-weight: 600; +} + +/* 列表 */ + +.list_content { + margin: 20rpx; + border-radius: 10rpx; + display: flex; + flex-direction: row; + align-items: center; + box-sizing: border-box; + justify-content: center; + padding: 20rpx; + background-color: #Fff; + box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.2); + position: relative; +} + +.list_content .left { + width: 160rpx; + height: 160rpx; + border-radius: 3rpx; +} + +.list_content .right { + width: calc(100% - 160rpx); + padding: 0 0 20rpx 20rpx; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: space-between; + box-sizing: border-box; +} + +.list_content .right .title { + margin-top: 10rpx; + width: 100%; + font-size: 30rpx; + color: #333; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.list_content .right .money { + margin-top: 30rpx; + width: 100%; + font-size: 34rpx; + color: #000; + font-weight: 600; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + vertical-align: middle; +} + +.list_content .right .money span { + color: #666; + font-weight: normal; + font-size: 24rpx; + margin-left: 10rpx; +} + +.list_content .right .check { + margin-top: 10rpx; + font-size: 22rpx; + color: #fff; + background-color: #378fff; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: inline-block; + padding: 4rpx 20rpx; + border-radius: 30rpx; +} + +.has_more { + color: #999; + font-size: 26rpx; + text-align: center; + padding: 30rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + box-sizing: border-box; + padding-top: 30rpx; +} + +.has_more image { + margin-bottom: 30rpx; +} + +.fixed { + position: absolute; + top: 36rpx; + left: 20rpx; + background-color: #ffcc00; + color: #4a1900; + border-radius: 0 20rpx 20rpx 0; + font-size: 20rpx; + padding: 2rpx 12rpx; +} \ No newline at end of file diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 9d67915..6351ba4 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -59,12 +59,12 @@ 更多服务 - + 活动参与 - + diff --git a/project.config.json b/project.config.json index ad5d907..5d8defd 100644 --- a/project.config.json +++ b/project.config.json @@ -1,84 +1,90 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": true, + "es6": true, + "enhance": false, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "useMultiFrameRuntime": false, + "useApiHook": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" }, - "setting": { - "urlCheck": true, - "es6": true, - "enhance": false, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": false, - "coverView": true, - "nodeModules": true, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "useMultiFrameRuntime": false, - "useApiHook": true, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "enableEngineNative": false, - "bundle": false, - "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false, - "userConfirmedBundleSwitch": false, - "packNpmManually": false, - "packNpmRelationList": [], - "minifyWXSS": true + "enableEngineNative": false, + "bundle": false, + "useIsolateContext": true, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true + }, + "compileType": "miniprogram", + "libVersion": "2.14.0", + "appid": "wxd931d03dfe955254", + "projectname": "%E5%88%9B%E5%BB%BA%E4%B8%80%E4%B8%AA%E5%B0%8F%E7%A8%8B%E5%BA%8F", + "debugOptions": { + "hidedInDevtools": [] + }, + "scripts": {}, + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": { + "plugin": { + "list": [] }, - "compileType": "miniprogram", - "libVersion": "2.14.0", - "appid": "wxd931d03dfe955254", - "projectname": "%E5%88%9B%E5%BB%BA%E4%B8%80%E4%B8%AA%E5%B0%8F%E7%A8%8B%E5%BA%8F", - "debugOptions": { - "hidedInDevtools": [] + "game": { + "list": [] }, - "scripts": {}, - "isGameTourist": false, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "condition": { - "plugin": { - "list": [] + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [ + { + "name": "登录", + "pathName": "pages/login/login", + "query": "", + "scene": null }, - "game": { - "list": [] + { + "name": "搜索", + "pathName": "pages/company/search/search", + "query": "", + "scene": null }, - "gamePlugin": { - "list": [] + { + "name": "商城", + "pathName": "pages/mall/index", + "query": "", + "scene": null }, - "miniprogram": { - "list": [ - { - "name": "登录", - "pathName": "pages/login/login", - "query": "", - "scene": null - }, - { - "name": "搜索", - "pathName": "pages/company/search/search", - "query": "", - "scene": null - }, - { - "name": "商城", - "pathName": "pages/mall/index", - "scene": null - } - ] + { + "name": "pages/home/beSureOrder/beSureOrder", + "pathName": "pages/home/beSureOrder/beSureOrder", + "scene": null } + ] } + } } \ No newline at end of file From 5f2a66b04f9d6babf38d14c93924fdfe0582a8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Mon, 28 Dec 2020 15:27:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A8=E6=80=81tabBar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/public.js | 4 ++- app.js | 26 +++++++++++++++ app.json | 32 +++++++++++++++++++ custom-tab-bar/index.js | 43 +++++++++++++++++++++++++ custom-tab-bar/index.json | 3 ++ custom-tab-bar/index.wxml | 9 ++++++ custom-tab-bar/index.wxss | 44 ++++++++++++++++++++++++++ static/tabbar/tabbar_icon_00.png | Bin 0 -> 415 bytes static/tabbar/tabbar_icon_01.png | Bin 0 -> 791 bytes static/tabbar/tabbar_icon_02.png | Bin 0 -> 679 bytes static/tabbar/tabbar_icon_03.png | Bin 0 -> 856 bytes static/tabbar/tabbar_icon_show_00.png | Bin 0 -> 423 bytes static/tabbar/tabbar_icon_show_01.png | Bin 0 -> 750 bytes static/tabbar/tabbar_icon_show_02.png | Bin 0 -> 672 bytes static/tabbar/tabbar_icon_show_03.png | Bin 0 -> 879 bytes 15 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 custom-tab-bar/index.js create mode 100644 custom-tab-bar/index.json create mode 100644 custom-tab-bar/index.wxml create mode 100644 custom-tab-bar/index.wxss create mode 100644 static/tabbar/tabbar_icon_00.png create mode 100644 static/tabbar/tabbar_icon_01.png create mode 100644 static/tabbar/tabbar_icon_02.png create mode 100644 static/tabbar/tabbar_icon_03.png create mode 100644 static/tabbar/tabbar_icon_show_00.png create mode 100644 static/tabbar/tabbar_icon_show_01.png create mode 100644 static/tabbar/tabbar_icon_show_02.png create mode 100644 static/tabbar/tabbar_icon_show_03.png diff --git a/apis/interfaces/public.js b/apis/interfaces/public.js index 2a2691a..4e6193e 100644 --- a/apis/interfaces/public.js +++ b/apis/interfaces/public.js @@ -6,8 +6,10 @@ import {req} from "../request" const richText = (key) => req({url: "single/" + key, data: {key: "string"}}) //富文本 const getStatus = (key) => req({url: "ajax/status/" + key}) //状态查询 +const storeConfig = (data) => req({url: "wechat/mini/myComponents", data: data}) //企业工具模块配置 export default({ richText, - getStatus + getStatus, + storeConfig }) diff --git a/app.js b/app.js index ab685c2..f50a7b2 100644 --- a/app.js +++ b/app.js @@ -18,6 +18,13 @@ App({ //挂载api方法 wx.$api = apis + + //获取模版信息 + apis.publics.storeConfig({ + company_id: "17" + }).then(res=>{ + console.log(res) + }) }, globalData: { navAppInfo : { @@ -25,6 +32,25 @@ App({ envVersion : "trial", goodUrl : "/pages/goods/show?goodsId=", cardUrl : "/pages/card/index?cardid=" + }, + storeModule: { + selected : 0, + color : "#4e4f51", + selectedColor: "#0b0041", + list : [ + { + "pagePath": "/pages/mall/index", + "text": "商城", + "iconPath": "/static/tabbar/tabbar_icon_01.png", + "selectedIconPath": "/static/tabbar/tabbar_icon_show_01.png" + }, + { + "pagePath": "/pages/user/index", + "text": "我的", + "iconPath": "/static/tabbar/tabbar_icon_03.png", + "selectedIconPath": "/static/tabbar/tabbar_icon_show_03.png" + } + ] } } }) diff --git a/app.json b/app.json index 4c76a63..4924994 100644 --- a/app.json +++ b/app.json @@ -23,6 +23,38 @@ "pages/home/projectSuccess/projectSuccess", "pages/home/activeSuccess/activeSuccess" ], + "tabBar": { + "list": [ + { + "pagePath": "pages/mall/index", + "text": "首页", + "iconPath": "/static/tabbar/tabbar_icon_00.png", + "selectedIconPath": "/static/tabbar/tabbar_icon_show_00.png" + }, + { + "pagePath": "pages/mall/index", + "text": "商城", + "iconPath": "/static/tabbar/tabbar_icon_01.png", + "selectedIconPath": "/static/tabbar/tabbar_icon_show_01.png" + }, + { + "pagePath": "pages/ticket/index", + "text": "优惠", + "iconPath": "/static/tabbar/tabbar_icon_02.png", + "selectedIconPath": "/static/tabbar/tabbar_icon_show_02.png" + }, + { + "pagePath": "pages/user/index", + "text": "我的", + "iconPath": "/static/tabbar/tabbar_icon_03.png", + "selectedIconPath": "/static/tabbar/tabbar_icon_show_03.png" + } + ], + "selectedColor": "#0b0041", + "color": "#4e4f51", + "borderStyle": "white", + "custom": true + }, "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#fff", diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js new file mode 100644 index 0000000..0ebe6e5 --- /dev/null +++ b/custom-tab-bar/index.js @@ -0,0 +1,43 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + */ + +Component({ + /** + * 组件的初始数据 + */ + data: { + selected : getApp().globalData.storeModule.selected, + color : getApp().globalData.storeModule.color, + selectedColor: getApp().globalData.storeModule.selectedColor, + list : getApp().globalData.storeModule.list + }, + + /** + * 生命周期函数 + */ + pageLifetimes: { + show(){ + console.log("获取配置信息") + } + }, + + /** + * 组件的方法列表 + */ + methods: { + switchTab(e) { + const data = e.currentTarget.dataset + const url = data.path + wx.switchTab({ + url + }) + this.setData({ + selected: data.index + }) + } + } +}) \ No newline at end of file diff --git a/custom-tab-bar/index.json b/custom-tab-bar/index.json new file mode 100644 index 0000000..fba482a --- /dev/null +++ b/custom-tab-bar/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml new file mode 100644 index 0000000..e54d25a --- /dev/null +++ b/custom-tab-bar/index.wxml @@ -0,0 +1,9 @@ + + + + + + {{item.text}} + + diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss new file mode 100644 index 0000000..fe6d9b7 --- /dev/null +++ b/custom-tab-bar/index.wxss @@ -0,0 +1,44 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + */ + +.tab-bar { + position: fixed; + bottom: 0; + left: 0; + right: 0; + height: 48px; + background: white; + display: flex; + padding-bottom: env(safe-area-inset-bottom); +} + +.tab-bar-border { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 1px; + transform: scaleY(0.5); +} + +.tab-bar-item { + flex: 1; + text-align: center; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} + +.tab-bar-item cover-image { + width: 24px; + height: 24px; +} + +.tab-bar-item cover-view { + font-size: 10px; +} diff --git a/static/tabbar/tabbar_icon_00.png b/static/tabbar/tabbar_icon_00.png new file mode 100644 index 0000000000000000000000000000000000000000..fc32af06288631b3deb9284936683ed0675e3f67 GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^fgsGm3?%0U?qUH_P60k4u0Yz?FTgh-$k#v6*AIyN zqN8K{fNcK&AKw5Upoo7UkOAa^l==AskzW8rWuTvb08nK~=#+0jQ$$OG{DK*t9Cj~D z%6zv%-{$77FgdO%A}#Z@Ix3?ifC|2Qx;TbJ9DaNKG+(oVfJ5MtfP%L68=wB~zvUXf zOjN?);pr$!KEBhBs$QP$t?;BTCb#p8my(>G z-+T9-oRf*WU$_JpEYpx)-hFhk%Z2ane_l{!%l;I%Vnx#5-E1X-MH|^;zoZ5(<6dKU zY7s~5`>Ol1OWxPrIccwNY;3QDM_vRR{9o1V*W*77}FY@@jtl;3x#EGtAktrKL$60LeUNNg`PEqpq_U>KmM<&hK;2g3@ vM8YUzvBqQ%mgyQ=t))s8=eYZRua5iI+->!w@#+&`5HNVU`njxgN@xNAukfi% literal 0 HcmV?d00001 diff --git a/static/tabbar/tabbar_icon_01.png b/static/tabbar/tabbar_icon_01.png new file mode 100644 index 0000000000000000000000000000000000000000..416bb50ba87e73246c960c6717cdac7e5efa2c28 GIT binary patch literal 791 zcmeAS@N?(olHy`uVBq!ia0vp^fgsGm3?%0U?qUH_9sxcfu0Yz)Kag^?x8}-TpjqN2 zL4Lsu(-K;oG)`^jTPw5J*sr9w=HR6q>$|V63u{y`FfgTix;TbJ9DW;dbJA@E0TXkM zmUmD8|2H`))h!{hr9mrnWs!YT=GlwIQ{?4qKHNVTad!W{KGxhfd{&t|xdXP$E+`ZH za_^}7RBuNsj*X|8z6vl++0DJt}N-7ypay^_zWWDp$B^M56Py=TmdJ7BhuhSWpzq z@&7?;s7k{jd+|5o+i$OUC2{j@VU10^EbGd=sXdDp9N!j~cyQKD>Fl(I*H%8W)wYLo zeVMl~S8a)KRn|=IgELfC9A-nQXV2$nj=kSJ;l9Df^ny74x7r8pdbbuZ z9CLGeqR_EVH?@>ee|4_#<45Y>n$O+uj1x&)es_~oTSVdW9UGpk-L%wy{mR&yo_(jZ zD^=4kO

EuJzfYvvwT6-_pPO>Gs&aUKdXZIbL5hOYsozD*hYCHccrLKM;PS<>7JF z61ABUKY!o#i`ggY=fK&>+7vOVVv1>@l%%SvvTMa$lbmU%0&Tz{NDTa-0 zubycbADj8`qPPre&XtB`$Cd~Lggh3S@K{QI`K<*Dg=z#DcB`C}ke_!traC6{#gu~i z0XGe@7JQvjK25pUeN&>leGJDl6QygdN1CR5IHz>JTI{^c9NsF0DbtM`g?rX&{4{Bc z?ps|xN%i&QnbYjcJH*`U=Lv0bZ9@dzq;~;S2zFLM|M=%pRs(s<@sxN>2xO! gvwnWNAIE>Nmdmv~HTw|54NR2`p00i_>zopr0HH2myZ`_I literal 0 HcmV?d00001 diff --git a/static/tabbar/tabbar_icon_02.png b/static/tabbar/tabbar_icon_02.png new file mode 100644 index 0000000000000000000000000000000000000000..89d01a36c31b97e56579b55efaabce3a9a986248 GIT binary patch literal 679 zcmeAS@N?(olHy`uVBq!ia0vp^fgsGm3?%0U?qUH_u>n3Iu0Yz?H^A55-_JkL*DnBq zfNTiY2PhE`+27d^$!552g^d$`}u(wK0bbaegQGDaavm1YU=7h1rd?aS=y4v zffmS?1o;Isq{jYOck^(y!;9%sf(2)F10R3r+u7{7SjBWgoUhrZ%WD}J81HzxIEF+V zetYBgq}c{M3;{p86eXA$owi;5_dmTXz3Z;ZYsTnv-szV4iEKZW5=9=ASna)g^h^-H z*XdI+_k`95NoYjNP1dft^fh3~)E{SKwj}imnlG3v@s%+|^jPgbCMop`tG7A2Hz)E@``9{!Vz!n$1h)rFhd;a2$Wr`0vLW!56)|HrgCA z>*xJ4YhP#e^D~zgUSG29l(M%?m-}?HqrWy>tBBecZg1qhp7ZK59-D&;FE}jrl$`$5 zCMxuh*)_ej@;)cF@%`sFnx>oB-j$Pl^T$?sQ}snw%K!QWr>?&_=X$$c-ZR(vS3__A zT^6R$XRMONvS`Ov_V|-(ClzN-ot*oyJ6&fi#^`!rx>)UPcE1>Zb0JFb3NF*fjtv1d>wXs`Sfv`wNtgAy{2={*PrL8Ckm7r%ugw>U zT{!E=$%s|GQm$;5dlR(IA3oLIK40U~y~!G2350lejj}G_s3C&lN&?MbvS-Fa-!wa9<6(Fp%K%pr7SiT1zmU{ETlKl_Y4c? z+XDqkrjG*IlUhVHMD0$0`k41Hz`NgT!U-M8x6>55GM?$Kn&@^_`|wu7MYAlj^5(qG zU2z~mopCnPE2p#Qt|XxeB7f6*AGqK^Mw6m{JN5ECzp?<>w#&S!PC{xWt~$(695&Xhxz~j literal 0 HcmV?d00001 diff --git a/static/tabbar/tabbar_icon_show_00.png b/static/tabbar/tabbar_icon_show_00.png new file mode 100644 index 0000000000000000000000000000000000000000..64cdf86c9d07e004fa0bc9f78752fa90d6e3a857 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^fgsGm3?%0U?qUH_P60k4u0Wcb!I2U)Yt998pedpy zL4LsuPfsa2)JFREa(}ooW4A_;MXLUCu}j}wSb+-ud%8G=L>zv56{GgaqZgirY<2_6yYWTUMN2JF`=OJ2L4wL5!mPlLpq^Z&fx&Jmd&zqyZHVCM6U zOcS>o%XRG8yYFm=>7n_{>Z|OR{hlHb_BZ*;(>edo)tt6_c&%pdtQqE%J?LpqkVmv_;z4W OFnGH9xvX3-pq0c9hqioqFfoD?14W1|~aC7srr@!*3&Q7Oghmah)dK zbCb#U@BjL${AHy+j&Vve&XuS=*EO`8wDqUM=VQ|KyerNY{QmQ2$KA6%;vYQ!GvAH$ zd&vL7U$Af9Ax`sZf9E)#6U(pI@!HH5;qBm<+b_U#Y=^Xqfsk=(yn4=jQ4ecA9`To- zj1wP*I{mn}oKL&&zJ#;qXnGe zSDoiPo>R7Ish+5>in_qNOE;GuJG1Hc_Xj)f{5P)oTULE&!-Y#fuXDDF_VTeGi>{c^ zmzQ$qxZ_d@`xjY!J(*{>8A-CPJ^%Qj*tY(&wzqCP%X@ara9Ve@ilEQ0dxeTCpZH!5 zx?5H3ye@rL!Hh@T(a$*(qSpF9IiPb^Ztm_kx`vlhAAasS+kgCPwf&5c2`*2c&#K7e zJ@)NX>X+sXp+>y5E*DuVo~4VZ1_o7kHe4yoa}}e_!hU#DmHo&3^V6b?RxS4LYgX{k-c{PcQ^UZ(_{7u2F(l&f+Zi{DUMujl z@g8f4+>?LtxBUytxf|y!TeyxPzGT_IcV{&AGjOT|-MMoo#xM0*+*Bvttt;1Eh|XeU zKlC(v8&lkeLIe^{1iVo^F-0fhu=xg;gMG|FT5I>#*6Gd6epdYbfABir zXS>cCDmObXc9oCrN@{MpTb$$SIen5P(_sOwY125n?>&B$dcr?aRmR>%>EPZ6v3nNX zuD`X9Z}Z)YGv?f@sR{P+EfSlz*n56*_eq~S?p14!rf!@j*DUMx+fnS}nGgFW^OfCN zv$}n=^1qqW&$D#oiEElKXILq`I)RgYslfbwHCe7HA9!DWEoe~qTzXWr*sgunVewPj zPAtCs;m`)rohQB)o|&Aj+|4~gwqFSsAZD*L#x!CbI)DqH%I7P*EqE^kl1xUwXB8q406QZa$mQpcHgJS%42dvQMd zFO?~)*_SNbcIw*P_VwE`Zp@Ybma$#vmy*{W@h@*)SSo6DC5v8OA>9@4W)(GM&XwcM z%?%G*rZ2DB$N%E=wRE@LXBR6p{yU%ZEpKIikO+%wt@b}NSHZ9OooX^SHCJh;wFF1h z?%4Wd-HwM0f7*`+h1#1;4sm_?<#6cHvuEWW$p|9^qCHb zDKl?+gmvZ5UaVuhAf>17bey+OkjL*`XJ<)-c>JBUca_2Jpb&kDCn>U9*U7KapRh&h zmtOSlll;;;&C^oOw)yz9t$*s+Y`%Wt{e|zp-_hS8YxLr}_rxVDzf|vgq=NERO44H{J!lP_d$zu&W{c`^Q%ndws5SBwBUca&?Yu4dF68pS%t?3WbeQJ zvW)NZ46aSLmYjT1psu*pBKJuAQ$eM`?%f)}(sfKJ6FVl?9TpLkHa-3$GIGHNBb)VE zug@_&&6&n=S*M(*gy(l3gZ4*_zCMmgP7`%5FSwbPd*eWw=Z)Uj`wEug2akQV;ENKd z-`{YfVpUJ6#&1rR-LwDKEa}_yeZQjrGMRvP=||5;xGuUQspFoOyL7RC!j2r@bsKgo z{T5*OsTKV>SypcLWKApHmB(QunoAd;|n3WSgl$a)W z7teM7x8_o#*z7N+$u;vYt)Dy9WDbjh=aywq6%fo45{=yBee?Yi7sh=t zAN;u9e{bswDTm8PgomNe(%W76F z*w1G^Pb8%OvQy^r)}nc0`=09Bd;DWit)Au