Merge branch 'dev'

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/MapData.java

@@ -112,4 +112,9 @@ public class MapData implements Serializable {
 	 */
 	private Date updateTime;
 
+	/**
+	 * 地点标签
+	 */
+	private String labels;
+
 }

nngkxxdp/src/main/resources/mapper/MapDataDao.xml

@@ -92,7 +92,7 @@
         id
         , dict_type, address, content, dep, img, gzh, sptype, tel,
 		time, url, type, tag, tag2, tag3, specialtype, create_time,
-		update_time
+		update_time,labels
     </sql>
 
     <!-- 批量保存地图数据 -->

nnzwminiapp/app.json

@@ -46,7 +46,8 @@
     "pages/map/map",
     "pages/map-vr/map-vr",
     "pages/aticle1/aticle",
-    "pages/aticle2/aticle"
+    "pages/aticle2/aticle",
+    "pages/nnzzd/nnzzd"
   ],
   "requiredPrivateInfos": [
     "getLocation",

nnzwminiapp/pages/nnzzd/nnzzd-item.wxml

@@ -0,0 +1,13 @@
+<view>
+    <scroll-view class="item-he" scroll-y>
+        <view class="item-main" wx:for="{{5}}">
+            <view class="item-right">
+                <view class="item-title" style="background-image: url('{{imgUrl}}nnzzditemtitle.png');">新闻标题</view>
+                <view class="item-c">
+                    <view class="item-context">拉卡机了咖啡机垃圾分类卡机了咖啡机阿里斯顿积分栏</view>
+                </view>
+            </view>
+        </view>
+        <view style="height:40rpx"></view>
+    </scroll-view>
+</view>

nnzwminiapp/pages/nnzzd/nnzzd.js

@@ -0,0 +1,89 @@
+// pages/nnzzd/nnzzd.js
+
+import {
+	imgUrl,
+  request,
+  request2
+} from "../api/request"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    dyrs:1000,
+    imgUrl:imgUrl,
+    eventDataList: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    request({
+        url: '/mini/page?page=1&limit=9999',
+        method: 'GET'
+    }).then(res => {
+        this.setData({
+            eventDataList: res.data
+        })
+    })
+    request({
+        url: '/mini/getSubscribeNumber',
+        method: 'GET'
+    }).then(res => {
+        this.setData({
+            dyrs: res.data
+        })
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

nnzwminiapp/pages/nnzzd/nnzzd.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "南岸早知道"
+}

nnzwminiapp/pages/nnzzd/nnzzd.wxml

@@ -0,0 +1,28 @@
+<!--pages/nnzzd/nnzzd.wxml-->
+<view style="height: 1972rpx;">
+    <view class="title" style="background-image: url('{{imgUrl}}nnzzditembg.png');">
+        <view class="titleTitle">
+        </view>
+        <view class="tips" > 
+            <view class="tips-left">
+                <image class="tips-icon" src="https://img1.imgtp.com/2023/07/12/jLlqS9XQ.png" />
+                <view class="tips-text">南岸最新资讯</view>
+            </view>
+            <view class="tips-right">
+                <image class="tips-icon" src="https://img1.imgtp.com/2023/07/12/SpLoEPXM.png" />
+                <view class="tips-text">动态掌握全面</view>
+            </view>
+            <view ></view>
+        </view>
+        <view class="dy" bindtap="dy()"></view>
+        <view class="dyrs"><view class="dysl1">已订阅人数</view><view class="dys2">{{dyrs}}↑</view></view>
+    </view>
+    <view class="news" style="background-image: url('{{imgUrl}}nnzzdtitlebg.png'); margin-top: -102rpx;">
+        <view class="newsbg">
+
+            <include src="nnzzd-item.wxml"/>
+        </view>
+        
+    </view>
+    
+</view>

nnzwminiapp/pages/nnzzd/nnzzd.wxss

@@ -0,0 +1,147 @@
+/* pages/nnzzd/nnzzd.wxss */
+.title{
+    width: 100%;
+    height: 900rpx;
+    
+    background-size: contain;
+    background-repeat: no-repeat;
+    padding-top: 60rpx;
+}
+.news{
+    width: 100%;
+    height: 1120rpx;
+    background-size: contain;
+    background-repeat: no-repeat;
+}
+.newsbg{
+    width: 86.5%;
+    height: 100%;
+    margin: 0 auto;
+    position: relative;
+    background: #efefef;
+}
+.titleTitle{
+    background-image: url(https://img1.imgtp.com/2023/07/12/9nTrRBU3.png);
+    width: 450rpx;
+    height: 100rpx;
+    background-size: contain;
+    background-repeat: no-repeat;
+    margin: 0 auto 0;
+}
+.tips{
+    width: 60%;
+    height: 40rpx;
+    margin: 0 auto;
+}
+.tips-left{
+    width: 50%;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align: center;
+    float: left;
+    color: #f0f4fa;
+}
+
+.tips-right{
+    width: 50%;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align: center;
+    float: left;
+    color: #f0f4fa;
+    text-align: center;
+	display: table-cell;
+	vertical-align: middle;
+}
+.tips-icon{
+    /* display: block; */
+    width:  28rpx;
+    height: 28rpx;
+    /* float: left; */
+    /* margin: auto 0; */
+}
+.tips-text{
+    margin-top: -4rpx;
+    font-size: 28rpx;
+    float: right;
+}
+.dy{
+    width: 300rpx;
+    height: 80rpx;
+    background-image: url(https://img1.imgtp.com/2023/07/12/35zNfCJb.png);
+    background-size: contain;
+    background-repeat: no-repeat;
+    margin: 30rpx auto 0;
+}
+.dyrs{
+    width: 600rpx;
+    height: 50rpx;
+    margin: 30rpx auto 0;
+    font-size: 30rpx;
+    text-align: center;
+    color: #fff;
+    
+}
+.dysl1{
+    width: 50%;
+    float: left;
+    height: 50rpx;
+    line-height: 50rpx;
+    text-align: right;
+}
+.dys2{
+    width: 45%;
+    float: left;
+    height: 50rpx;
+    line-height: 50rpx;
+    text-align: left;
+    font-size: 38rpx;
+    font-weight: bold;
+    background: linear-gradient(to top,#fff3e8, #f1d2ab);
+    -webkit-background-clip: text;
+    color: transparent;
+}
+.dyicon{
+    width: 30rpx;
+    height: 50rpx;
+}
+.item-he{
+    height: 1120rpx; 
+}
+.item-main{
+    width: 95%;
+    min-height:300rpx;
+    margin: 0 auto;
+    /* background-color: #d1ddf8; */
+}
+.item-title{
+    width: 525rpx;
+    height: 65rpx;
+    margin: 0 auto;
+    text-align: center;
+    color: #fff;
+    font-weight: bold;
+    background-size: contain;
+    background-repeat: no-repeat;
+    margin-bottom: 12rpx;
+
+}
+.item-right{
+    width: 90%;
+    min-height: 334rpx;
+    margin: 0 auto 40rpx;
+    
+}
+.item-c{
+    width: 100%;
+    /* border-radius: 10rpx; */
+    min-height: 334rpx;
+    background: #fff;
+    padding-top: 20rpx;
+}
+.item-context{
+    width: 93%;
+    margin: 0 auto;
+    color: #666666;
+
+}