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 0000000..1532415
Binary files /dev/null and b/assets/icon/help/join-group.png differ
diff --git a/assets/icon/help/newbie.png b/assets/icon/help/newbie.png
new file mode 100644
index 0000000..840d700
Binary files /dev/null and b/assets/icon/help/newbie.png differ
diff --git a/assets/icon/help/share.png b/assets/icon/help/share.png
new file mode 100644
index 0000000..cf8630b
Binary files /dev/null and b/assets/icon/help/share.png differ
diff --git a/pages/help/index/index.js b/pages/help/index/index.js
index b9bdb2e..07c34e0 100644
--- a/pages/help/index/index.js
+++ b/pages/help/index/index.js
@@ -54,7 +54,13 @@ Page({
})
})
},
-
+ navToHowToUse(){
+ if(this.data.appConfig&&this.data.appConfig.url_how_to_use){
+ wx.navigateTo({
+ url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_how_to_use)}`,
+ })
+ }
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/help/index/index.wxml b/pages/help/index/index.wxml
index c1d3db7..9687267 100644
--- a/pages/help/index/index.wxml
+++ b/pages/help/index/index.wxml
@@ -71,13 +71,31 @@
-->
-
+
+
+ 新手指南
+ 使用流程
+
+
+
+ 加福利群
+ 领优惠券
+
+
+
+
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;