From 99bbd2f96dfa2b4ff94c183d2eda3f1b740f3933 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 19 Feb 2022 17:46:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
leafletMapOur/grabOrdersMap/js/vueMain.js | 27 ++++++++++---
pages/home/home.vue | 21 ++++++++--
pages/registerUser/registerUser.vue | 21 ++++++++++
3 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/leafletMapOur/grabOrdersMap/js/vueMain.js b/leafletMapOur/grabOrdersMap/js/vueMain.js
index 72c6676..1fb8810 100644
--- a/leafletMapOur/grabOrdersMap/js/vueMain.js
+++ b/leafletMapOur/grabOrdersMap/js/vueMain.js
@@ -39,6 +39,19 @@
onPosition: false, //持续定位指示
},
methods: {
+ setUniAppMsg(data) {
+ // console.log(data)
+ // console.log(uni)
+ uni.postMessage({
+ data: {
+ action: 'message'
+ }
+ });
+ uni.getEnv(function(res) {
+ console.log('当前环境：' + JSON.stringify(res));
+ });
+
+ },
openAPP(type) {
// console.log(type)
let that = this;
@@ -50,9 +63,10 @@
});
} else if (that.data.butCT == "begin") {
// 开始任务
- // uni.navigateTo({
- // url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.data)
- // });
+ this.setUniAppMsg({
+ type: "begin",
+ data: that.data
+ })
}
} else {
this.$confirm('是否参与活动：' + this.data.rname + "?", '提示', {
@@ -103,7 +117,7 @@
district: "西湖区",
id: 37,
integral: "222",
- iscation: "0",
+ iscation: "1",
jnum: 3,
line: "LINESTRING(115.8995839881188 28.687205773173343,115.89391916267935 28.678966027079593,115.90404718391959 28.673644524394046,115.91211526863638 28.681369286356936)",
num: 1,
@@ -116,7 +130,7 @@
serid: "1123598821738675201,",
team: "你,他,它",
time: "2022-02-18 14:15:52",
- type: "0",
+ type: "2",
url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
}
//url解码
@@ -633,7 +647,8 @@
if (res.state === true || res.state === false) {
that.map.invalidateSize(true);
}
- document.getElementsByClassName("dingwei")[0].style.bottom = res.height + 10 + "px";
+ document.getElementsByClassName("dingwei")[0].style.bottom = res.height +
+ 10 + "px";
},
});
this.domMove.init();
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8835c0e..151c9ca 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -71,7 +71,7 @@
<!-- 头部按钮 end -->
<!-- 公告 start -->
- <view class="notice-box">
+ <!-- <view class="notice-box">
<image src="/static/images/home/notice.png" class="img" mode="widthFix"></image>
<view class="notice-info">
<navigator hover-class="none" class="notice-cell" v-for="(item, index) in noticeList" :key="index">
@@ -80,14 +80,16 @@
<u-icon name="arrow-right" size="12" color="#C9C9C9"></u-icon>
</navigator>
</view>
+ </view> -->
+ <view class="notice-class">
+ <u-notice-bar :speed="160" :duration="2000" :isCircular="true" :more-icon="true" mode="horizontal" type="none" :list="gdlist"></u-notice-bar>
</view>
<!-- 公告 end -->
-
<!-- 新闻模块 start -->
<view class="news">
<navigator hover-class="none" url="/pages/news/list" class="cell">
- <view class="ctitle">温馨提示</view>
+ <view class="ctitle">资讯</view>
<view hover-class="bg-light" class="more" @click="goArticle()">
更多
<u-icon name="arrow-right" color="#A6ABB5" size="16"></u-icon>
@@ -144,7 +146,10 @@
newsList: [],
navButton: [],
serviceButton: [],
- tabbar:this.$store.state.tabbar
+ tabbar:this.$store.state.tabbar,
+ gdlist: [
+ '国家发改委：防止和避免“放松防控”和“过度防控”'
+ ]
};
},
onShow() {
@@ -416,6 +421,13 @@
}
}
}
+
+ .notice-class{
+ background: #ffffff;
+ border-radius: 15px 15px 15px 15px;
+ margin: 0 20rpx;
+ padding: 20rpx 20rpx;
+ }
.notice-box {
display: flex;
@@ -434,7 +446,6 @@
.notice-info {
flex: 1;
-
.notice-cell:first-of-type {
margin-bottom: 15rpx;
}
diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 6a2b82f..46cdfdf 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -35,7 +35,12 @@
(功能研发中)
</u-form-item>
</u-form>
-
+ <view class="agree">
+ 注册即代表同意
+ <text class="a">《用户协议》</text>
+ 和
+ <text class="a">《隐私政策》</text>
+ </view>
<div v-show="mapShow">
<div class="login-map-bc" @click="mapShow = false">
@@ -619,4 +624,18 @@
.registerUser {
padding: 0 1.2rem;
}
+
+ .agree {
+ margin: 27rpx 95rpx 0;
+ font-size: 22rpx;
+ font-family: Adobe Heiti Std;
+ font-weight: normal;
+ color: #cacaca;
+ line-height: 34rpx;
+
+ .a {
+ color: #000000;
+ }
+ }
+
</style>
--
Gitblit v1.9.3