From 73ebcf34c4a3ea3f72ce27523817d36fda5aa494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Sat, 1 Mar 2025 17:54:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=89=8B=E6=8C=87=E5=BC=95=EF=BC=8C?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=EF=BC=8C=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/common.js | 6 +++- assets/icon/help/join-group.png | Bin 0 -> 2237 bytes assets/icon/help/newbie.png | Bin 0 -> 1625 bytes assets/icon/help/share.png | Bin 0 -> 1494 bytes pages/help/index/index.js | 8 +++++- pages/help/index/index.wxml | 22 ++++++++++++-- pages/help/index/index.wxss | 28 ++++++++++++++++++ pages/my/index/index.js | 5 ++++ pages/my/index/index.wxml | 7 +++++ pages/my/index/index.wxss | 31 ++++++++++++++++++++ pages/my/promation/wx-group/index.js | 38 ++++++++++++++++++++++--- pages/my/promation/wx-group/index.wxml | 14 +++++++-- pages/my/promation/wx-group/index.wxss | 10 +++++++ 13 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 assets/icon/help/join-group.png create mode 100644 assets/icon/help/newbie.png create mode 100644 assets/icon/help/share.png diff --git a/api/common.js b/api/common.js index 8489a1b..a2937ac 100644 --- a/api/common.js +++ b/api/common.js @@ -6,7 +6,11 @@ export default { getConfig:()=>request.get('/api/config'), community:{ list:(data)=>request.get('/api/community',data), - detail:(community_id)=>request.get(`/api/community/${community_id}`) + detail:(community_id)=>request.get(`/api/community/${community_id}`), + /** + *data:{community_id,latitude,longitude} + * */ + wxGroup:(community_id,data)=>request.get(`/api/community/${community_id}/qrcode`,data) }, address:{ list(commityId){ diff --git a/assets/icon/help/join-group.png b/assets/icon/help/join-group.png new file mode 100644 index 0000000000000000000000000000000000000000..1532415bd567750643e23f085de2fdf03eefd16b GIT binary patch literal 2237 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一键登录 --> - + + + 新手指南 + 使用流程 + + + + 加福利群 + 领优惠券 + + + + diff --git a/pages/help/index/index.wxss b/pages/help/index/index.wxss index b17fd14..3bcd656 100644 --- a/pages/help/index/index.wxss +++ b/pages/help/index/index.wxss @@ -111,6 +111,34 @@ .order-button{ margin:40rpx 20rpx!important; } +.action-bar{ + display: flex; + background-color: #fff; + text-align: center; + margin:36rpx 20rpx; + border-radius: 20rpx; +} +.action-bar .item{ + flex:1; + padding:34rpx 40rpx 30rpx 40rpx +} +.action-bar .share{ + background-color: #fff; +} +.action-bar .title{ + font-size: 28rpx; + font-weight: 500; + margin-top:26rpx; + color: var(--main-font-color); +} +.action-bar .sub-title{ + font-size: 24rpx; + color: #888888; + margin-top:20rpx; +} +.action-bar .icon{ + width:52rpx;height:52rpx; +} .promotion-panel{ border: 1rpx solid rgba(255, 195, 0, 0.5); diff --git a/pages/my/index/index.js b/pages/my/index/index.js index ac6ac8d..ca861ff 100644 --- a/pages/my/index/index.js +++ b/pages/my/index/index.js @@ -42,6 +42,11 @@ Page({ // bgHeight:'100%' // }); }, + applyPartnert(){ + wx.navigateTo({ + url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_partner_apply)}`, + }) + }, shareFriend(){ }, diff --git a/pages/my/index/index.wxml b/pages/my/index/index.wxml index afa947c..5915535 100644 --- a/pages/my/index/index.wxml +++ b/pages/my/index/index.wxml @@ -67,4 +67,11 @@ + + + 招募城市合伙人 + + + 人人都有金饭碗, 钱多事好离家近 + \ No newline at end of file diff --git a/pages/my/index/index.wxss b/pages/my/index/index.wxss index d72d71f..e3b55ee 100644 --- a/pages/my/index/index.wxss +++ b/pages/my/index/index.wxss @@ -95,4 +95,35 @@ } .cell.is-button:hover{ background-color: #fff; +} + +.recruit-view{ + box-shadow: 0px 3px 6px 2px rgba(0, 0, 0, 0.04); + background: linear-gradient(270deg, #FCF7E8 34%, #FCF1CE 76%); + margin:30rpx 20rpx; + border-radius: 20rpx; + color: #DFAB00; + padding:30rpx 30rpx 30rpx 40rpx; +} +.recruit-view .title{ + display: flex; + align-items: center; +} +.recruit-view .title .button{ + font-size: 26rpx; + font-weight: normal; + background: linear-gradient(180deg, #FFE285 0%, #FFC91B 100%); + box-shadow: 0px 3px 4px 0px rgba(196, 149, 0, 0.2); + padding:14rpx 26rpx; + line-height: 1; + color: #664E00; +} +.recruit-view .title .text{ + font-size: 42rpx; + flex:1 +} +.recruit-view .sub-title{ + font-size: 29rpx; + margin-top:26rpx; + font-style: italic; } \ No newline at end of file diff --git a/pages/my/promation/wx-group/index.js b/pages/my/promation/wx-group/index.js index 4eb7948..8cf93dc 100644 --- a/pages/my/promation/wx-group/index.js +++ b/pages/my/promation/wx-group/index.js @@ -1,5 +1,6 @@ import commonApi from '../../../../api/common'; -import {getStatusNavBarHeight} from '../../../../utils/util' +import {getStatusNavBarHeight} from '../../../../utils/util'; +const app = getApp(); Page({ /** @@ -8,23 +9,52 @@ Page({ data: { detail:{}, navbarHeight:getStatusNavBarHeight(), - test:'' + communityId:'', + positioning:false, + positioningError:false, + detailPosition:{}, + qrcodeLoading:false }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + this.data.communityId = options.communityId; this.setData({ navbarHeight:getStatusNavBarHeight() }) - commonApi.community.detail(options.communityId).then((data)=>{ + commonApi.community.detail(this.data.communityId).then((data)=>{ this.setData({ detail:data }) }) + this.getWxGroupQrcode(); + }, + getWxGroupQrcode(){ + this.setData({ + positioning:true, + qrcodeLoading:true + }) + app.getLocation().then((data)=>{ + this.setData({ + positioning:false, + positioningError:false + }) + commonApi.community.wxGroup(this.data.communityId,{latitude:data.latitude,longitude:data.longitude}).then((res)=>{ + this.setData({ + detailPosition:res, + qrcodeLoading:false + }) + }) + }).catch(()=>{ + this.setData({ + positioning:false, + qrcodeLoading:false, + positioningError:true + }) + }) }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/my/promation/wx-group/index.wxml b/pages/my/promation/wx-group/index.wxml index f06ab1d..b596032 100644 --- a/pages/my/promation/wx-group/index.wxml +++ b/pages/my/promation/wx-group/index.wxml @@ -18,8 +18,18 @@ - + + + + 定位失败 + + 超出服务距离 + 无法显示二维码 + + + - 点击图中二维码识别 + 点击图中二维码识别 \ No newline at end of file diff --git a/pages/my/promation/wx-group/index.wxss b/pages/my/promation/wx-group/index.wxss index 48e5b32..f43dfe6 100644 --- a/pages/my/promation/wx-group/index.wxss +++ b/pages/my/promation/wx-group/index.wxss @@ -58,10 +58,20 @@ page{ text-align: center; border-radius: 30rpx; border:20rpx solid rgba(254, 196, 0, 0.15); + display: flex; + align-items: center; + justify-content: center; + font-size: 36rpx; + color: rgba(153, 153, 153, 0.8); + line-height: 66rpx; } .qrcode-area .image{ width:100%;height:100%; } +.qrcode-area .retry{ + text-decoration: underline; + color: red; +} .bottom .tips{ font-size: 36rpx; font-weight: 500;