diff --git a/manifest.json b/manifest.json index be71bc2..b6a99a5 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,10 @@ "autoclose" : true, "delay" : 0 }, - "modules" : {}, + "modules" : { + "Barcode" : {}, + "Camera" : {} + }, "distribute" : { "android" : { "permissions" : [ @@ -45,7 +48,24 @@ "UniversalLinks" : "" } }, - "ad" : {} + "ad" : {}, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + }, + "amap" : { + "name" : "", + "__platform__" : [ "ios", "android" ], + "appkey_ios" : "", + "appkey_android" : "" + } + }, + "push" : { + "unipush" : { + "version" : "2", + "offline" : false + } + } } } }, diff --git a/pages.json b/pages.json index c8309b8..f51ec38 100644 --- a/pages.json +++ b/pages.json @@ -299,6 +299,12 @@ "navigationBarTextStyle": "white" } } + ,{ + "path": "pages/activity/map", + "style": { + "navigationBarTitleText": "地图" + } + } ], "tabBar": { "color": "#000000", diff --git a/pages/activity/map.vue b/pages/activity/map.vue new file mode 100644 index 0000000..ec3c501 --- /dev/null +++ b/pages/activity/map.vue @@ -0,0 +1,37 @@ + + + \ No newline at end of file diff --git a/pages/activity/publish.vue b/pages/activity/publish.vue index 1743c52..7e18eec 100644 --- a/pages/activity/publish.vue +++ b/pages/activity/publish.vue @@ -77,7 +77,7 @@ border="none"> 添加活动具体位置 - + @@ -198,7 +198,9 @@ const inputtextInfo = (e) => { console.log("测试输入1:", e); } - +const gotomap = () => { + proxy.$tab.navigateTo('/pages/activity/map') +} const submitForm = (type) => { if (uFormRef.value) { diff --git a/pages/mine/myActivity/index.vue b/pages/mine/myActivity/index.vue index f301788..15da2ff 100644 --- a/pages/mine/myActivity/index.vue +++ b/pages/mine/myActivity/index.vue @@ -227,6 +227,7 @@ onPullDownRefresh((options) => { console.log("下拉刷新,", queryParams.value); getList(); }) +//按照条件查询 const tabsClick = (index) => { removePage() if (index.state == 9) { diff --git a/pages/mine/myActivity/info.vue b/pages/mine/myActivity/info.vue index 46d7efc..f14aa21 100644 --- a/pages/mine/myActivity/info.vue +++ b/pages/mine/myActivity/info.vue @@ -7,7 +7,7 @@ - + @@ -26,50 +26,69 @@ + @click="showqr = true"> + 签到二维码 - + - + + + + 发布审核时间:{{ actiInfoList.startTime }} + 审核状态:审核中 + + + + + + 发布审核时间:{{ actiInfoList.startTime }} + 审核状态:未通过 + 未通过原因:{{actiInfoList.auditAdvice}} + + + + - - - - - - 已报名:{{ actiInfoList.elroll }}人 - - - - - - + + + + 已报名:{{ actiInfoList.elroll }}人 - - - - - 已签到:{{ actiInfoList.qrcodeElroll }}人 - + + + + + + 已报名:{{ actiInfoList.elroll }}人 + + + + + + 已签到:{{ actiInfoList.qrcodeElroll }}人 + + + - - + + + style="width: 600rpx; height: 600rpx"> + @@ -77,7 +96,7 @@