一堆小程序的东西

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/MapDataController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.example.nngkxxdp.entity.MapData;
 import com.example.nngkxxdp.entity.MapVo;
@@ -123,6 +124,16 @@ public class MapDataController {
         return SendUtil.send(true, ConstStr.RESULT_SUCCESS, mapDataService.getMapDataAll());
     }
 
+    @GetMapping("getMapDataType")
+    public Map<String, Object> getMapDataType(String dictType,String type,String title) {
+//        if (StrUtil.isEmpty(dictType)){
+//            return SendUtil.send(false, ConstStr.RESULT_FAILED, "");
+//        }
+        return SendUtil.send(true, ConstStr.RESULT_SUCCESS, mapDataService.getMapDataType(dictType,type,title));
+    }
+
+
+
     @PostMapping("/longitudeLatitude")
     public Map<String, Object> longitudeLatitude(@RequestParam("dataString") String dataString) {
         if (Blank.isEmpty(dataString)) {

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/MapDataDao.java

@@ -114,4 +114,6 @@ public interface MapDataDao {
 	List<MapDo> queryMapPage(@Param("mapVo") MapVo mapVo, @Param("page") int page, @Param("size") int size);
 
 	long pageCount(@Param("mapVo") MapVo mapVo);
+
+	List<MapData> getMapDataType(@Param("dictType") String[] dictType, @Param("type") String type, @Param("title") String title);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/Impl/MiniLoginServiceImpl.java

@@ -188,7 +188,9 @@ public class MiniLoginServiceImpl implements MiniLoginService {
         String s = JSONUtil.toJsonStr(jsonObject);
 
         String post = HttpUtil.post(MiniConstant.PHONENUMBER+redisUtil.get("access_token"), s);
+        log.info("微信请求"+post);
         WxPhoneVo wxPhoneVo = JSONUtil.toBean(new JSONObject(post), WxPhoneVo.class);
+
         return wxPhoneVo;
     }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/service/MapDataService.java

@@ -86,4 +86,6 @@ public interface MapDataService {
 
 	Map<String, Object> queryMap(String name, String type, String dictType);
 	Map<String, Object> queryMapPage(MapVo mapVo);
+
+	List<MapData> getMapDataType(String dictType, String type,String title);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/MapDataServiceImpl.java

@@ -1,6 +1,8 @@
 package com.example.nngkxxdp.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.example.nngkxxdp.dao.MapDataDao;
 import com.example.nngkxxdp.entity.MapData;
@@ -236,4 +238,13 @@ public class MapDataServiceImpl implements MapDataService {
         }
         return SendUtil.send(false, ConstStr.RESULT_FAILED);
     }
+
+    @Override
+    public List<MapData> getMapDataType(String dictType, String type,String title) {
+        String[] split = null;
+        if (StrUtil.isNotEmpty(dictType)){
+             split = dictType.split(",");
+        }
+        return mapDataDao.getMapDataType(split, type,title);
+    }
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/task/WxTask.java

@@ -39,7 +39,7 @@ public class WxTask {
     private RedisUtil redisUtil;
 
     /**
-     * TODO 网站更新需要需将该定时任务取消
+     * TODO 网站更新需将此定时任务取消
      */
 //    @Scheduled(cron = "0 0 0/2 * * ?")
     public void getWxToken(){

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

@@ -304,4 +304,24 @@
         </where>
     </select>
 
+    <select id="getMapDataType" resultType="com.example.nngkxxdp.entity.MapData">
+        SELECT
+        <include refid="all_base_data"/>
+        FROM s_map
+        <where>
+            <if test="dictType!=null and dictType!=''">
+                and dict_type in
+                <foreach collection="dictType" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="type!=null and type!=''">
+                and type = #{type}
+            </if>
+            <if test="title!=null and title!=''">
+                and dep like  CONCAT('%',#{title},'%')
+            </if>
+        </where>
+    </select>
+
 </mapper>

nnzwminiapp/pages/api/canteen-request.js

@@ -27,7 +27,7 @@ const request = (options) => {
 				'mini-token': `${token}`
 			},
 			success: function (res) {
-				console.log("network-res=>", res);
+				// console.log("network-res=>", res);
 				if (res.data.msg == '请重新登录' && !res.data.result && token != null && token != '') {
 					wx.showModal({
 						title: '未授权',
@@ -45,7 +45,7 @@ const request = (options) => {
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}

nnzwminiapp/pages/api/index-api.js

@@ -11,12 +11,12 @@ const request = (options) => {
 							'content-type': 'application/json;charset=UTF-8'
 					},
 					success: function (res) {
-							console.log("network-res=>", res);
+							// console.log("network-res=>", res);
 							// 返回成功信息
 							resolve(res.data)    
 					},
 					fail: function (error) {
-							console.log("network-err=>", error);
+							// console.log("network-err=>", error);
 							// 返回错误信息
 							reject(error)
 					}
@@ -26,6 +26,7 @@ const request = (options) => {
 
 export function yjzjList() {
 	const params = {'siteId': 254, 'pageSize': 10}
+	// https://www.cqna.gov.cn/IGI/opinion/web/list?siteId=254&pageSize=10
   return request({
     url: `/IGI/opinion/web/list`,
 		method: 'GET',

nnzwminiapp/pages/api/index-api2.js

@@ -11,12 +11,12 @@ const request = (options) => {
 							'content-type': 'application/json;charset=UTF-8'
 					},
 					success: function (res) {
-							console.log("network-res=>", res);
+							// console.log("network-res=>", res);
 							// 返回成功信息
 							resolve(res.data)    
 					},
 					fail: function (error) {
-							console.log("network-err=>", error);
+							// console.log("network-err=>", error);
 							// 返回错误信息
 							reject(error)
 					}

nnzwminiapp/pages/api/request.js

@@ -27,7 +27,7 @@ const request = (options) => {
 				'mini-token': `${token}`
 			},
 			success: function (res) {
-				console.log("network-res=>", res);
+				// console.log("network-res=>", res);
 				if (res.data.msg == '请重新登录' && !res.data.result && token != null && token != '') {
 					wx.showModal({
 						title: '未授权',
@@ -45,7 +45,7 @@ const request = (options) => {
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}
@@ -63,12 +63,12 @@ const request2 = (options) => {
 				'content-type': 'application/json;charset=UTF-8'
 			},
 			success: function (res) {
-				console.log("network-res=>", res);
+				// console.log("network-res=>", res);
 				// 返回成功信息
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}

nnzwminiapp/pages/api/yxna-api.js

@@ -11,12 +11,12 @@ const request = (options) => {
 							'content-type': 'application/json;charset=UTF-8'
 					},
 					success: function (res) {
-							console.log("network-res=>", res);
+							// console.log("network-res=>", res);
 							// 返回成功信息
 							resolve(res.data)    
 					},
 					fail: function (error) {
-							console.log("network-err=>", error);
+							// console.log("network-err=>", error);
 							// 返回错误信息
 							reject(error)
 					}
@@ -38,4 +38,13 @@ export function getDocumentPageFront(data) {
     method: 'GET',
     data: data
   })
-}
+}
+
+
+export function getMapDataType(data) {
+	return request({
+	  url: `mapdata/getMapDataType`,
+	  method: 'GET',
+	  data: data
+	})
+  }

nnzwminiapp/pages/articlDetail/articlDetail.js

@@ -42,7 +42,7 @@ Page({
   },
   initPage() {
     info(this.data.chnlid, this.data.docid).then(res => {
-	  console.log(res);
+	  // console.log(res);
 	  let swiperLists = [];
       if (res.result) {
 		let imgs =  res.data.DOCATTACHPICFIELD;
@@ -52,9 +52,9 @@ Page({
 			for (const imgOne of imgName) {
 				let one = "/webpic"
 				let two = "/"+imgOne.slice(0,8)
-				console.log(two);
+				// console.log(two);
 				let three = "/"+imgOne.slice(0,10)+"/"
-				console.log(three);
+				// console.log(three);
 				swiperLists.push(IMGPATH+one+two+three+imgOne)
 			}
 			
@@ -66,7 +66,7 @@ Page({
 			}
 		}
 		
-		console.log(swiperLists);
+		// console.log(swiperLists);
 		if(swiperLists.length<=0){
 			this.setData({
 				imgShow:false
@@ -135,4 +135,10 @@ Page({
       title: this.data.data.DOCTITLE
     };
   },
+
+  onShareTimeline() {
+    return {
+      title: this.data.data.DOCTITLE
+    };
+  }
 })

nnzwminiapp/pages/aticleList/aticleList.js

@@ -56,7 +56,7 @@ Page({
 		wx.setNavigationBarTitle({
 			title: options.title
 		})
-		console.log(options);
+		// console.log(options);
 		this.setData({
 			titleText:options.title,
 			aclist:[],
@@ -164,7 +164,7 @@ Page({
 					var s = res.data
 					s= s.substring(22,s.length-1)
 					s = JSON.parse(s)
-					console.log(s);
+					// console.log(s);
 					var d = [];
 					var size = s.length
 					if (size < 1) {

nnzwminiapp/pages/dataCenter/dataCenter.js

@@ -16,12 +16,12 @@ const request = (options) => {
 				'content-type': 'application/json;charset=UTF-8'
 			},
 			success: function (res) {
-				console.log("network-res=>", res);
+				// console.log("network-res=>", res);
 				// 返回成功信息
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}
@@ -701,9 +701,9 @@ Page({
 					let dateNum = [];
 					let alloneBasis = [];
 					let quarter = [];
-					console.log("financial");
-					console.log(list);
-					console.log(list.length);
+					// console.log("financial");
+					// console.log(list);
+					// console.log(list.length);
 					for (let i = 0; i < list.length; i++) {
 						if (list[i].subData[0].data.firstThridQuarter) {
 							for (let j = 1; j <= 4; j++) {

nnzwminiapp/pages/dataCenter/dataCenter.wxml

@@ -225,7 +225,7 @@
               近30天受理
             </view>
             <view style="display: flex;color: #333333;">
-              <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.finished}}</view>
+              <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.accepting}}</view>
               <view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
             </view>
           </view>
@@ -237,7 +237,7 @@
               近30天办理
             </view>
             <view style="display: flex;color: #333333;">
-              <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.accepting}}</view>
+              <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.finished}}</view>
               <view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
             </view>
           </view>

nnzwminiapp/pages/dataCenterXXTJ/dataCenterXXTJ.js

@@ -16,12 +16,12 @@ const request = (options) => {
 				'content-type': 'application/json;charset=UTF-8'
 			},
 			success: function (res) {
-				console.log("network-res=>", res);
+				// console.log("network-res=>", res);
 				// 返回成功信息
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}

nnzwminiapp/pages/dataCenterXXTJ/dataCenterXXTJ.wxml

@@ -35,7 +35,7 @@
             近30天受理
           </view>
           <view style="display: flex;color: #333333;">
-            <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.finished}}</view>
+            <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.accepting}}</view>
             <view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
           </view>
         </view>
@@ -47,7 +47,7 @@
             近30天办理
           </view>
           <view style="display: flex;color: #333333;">
-            <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.accepting}}</view>
+            <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.finished}}</view>
             <view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
           </view>
         </view>

nnzwminiapp/pages/dataCenterZWTJ/dataCenterZWTJ.js

@@ -17,12 +17,12 @@ const request = (options) => {
 				'content-type': 'application/json;charset=UTF-8'
 			},
 			success: function (res) {
-				console.log("network-res=>", res);
+				// console.log("network-res=>", res);
 				// 返回成功信息
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}

nnzwminiapp/pages/dataCenterZWTJ/dataCenterZWTJ.wxml

@@ -11,7 +11,7 @@
 			<view class="lineTextGroups">
 				<view class="lineTextGroup">
 					<text style="color: #999999;">申报</text>
-					<text style="color:#333333; font-size: 32rpx; font-weight: bold;">{{weekWork.applicationNumberNetwork}}</text>
+					<text style="color:#333333; font-size: 32rpx; font-weight: bold;">{{weekWork.applicationNumberNetwork+weekWork.applicationNumberWindow}}</text>
 				</view>
 				<view class="verticalbar"></view>
 				<view class="lineTextGroup">
@@ -38,7 +38,7 @@
 			<view class="lineTextGroups">
 				<view class="lineTextGroup">
 					<text style="color: #999999;">申报</text>
-					<text style="color:#333333; font-size: 32rpx; font-weight: bold;">{{monthWork.applicationNumberNetwork}}</text>
+					<text style="color:#333333; font-size: 32rpx; font-weight: bold;">{{monthWork.applicationNumberNetwork+monthWork.applicationNumberWindow}}</text>
 				</view>
 				<view class="verticalbar"></view>
 				<view class="lineTextGroup">
@@ -65,7 +65,7 @@
 			<view class="lineTextGroups">
 				<view class="lineTextGroup">
 					<text style="color: #999999;">申报</text>
-					<text style="color:#333333; font-size: 32rpx; font-weight: bold;">{{yearWork.applicationNumberNetwork}}</text>
+					<text style="color:#333333; font-size: 32rpx; font-weight: bold;">{{yearWork.applicationNumberNetwork+yearWork.applicationNumberWindow}}</text>
 				</view>
 				<view class="verticalbar"></view>
 				<view class="lineTextGroup">
@@ -95,8 +95,7 @@
 		</view>
 		<view class="box2ItemContent" style="background-image: url({{imgUrl}}xdzONq.png);">
 			<view class="countGroup">
-				<view class="countbox two">{{departmentSort.secondNumber}}
-        <span style="color: #999999;font-size: 24rpx;margin-left: 10rpx;">件</span></view>
+				<view class="countbox two">{{departmentSort.secondNumber}}<span style="color: #999999;font-size: 24rpx;margin-left: 10rpx;">件</span></view>
 				<view class="countbox one">{{departmentSort.firstNumber}}<span style="color: #999999;font-size: 24rpx;margin-left: 10rpx;">件</span></view>
 				<view class="countbox three">{{departmentSort.thirdNumber}}<span style="color: #999999;font-size: 24rpx;margin-left: 10rpx;">件</span></view>
 			</view>

nnzwminiapp/pages/dataCenterZWTJ/dataCenterZWTJ.wxss

@@ -192,12 +192,13 @@ page {
 
 .namebox {
   width: 30%;
-  height: 80rpx;
+  height: 70rpx;
   float: left;
   text-align: center;
   font-size: 25rpx;
   margin-left: 5rpx;
   margin-right: 5rpx;
+  overflow:hidden;
 }
 
 .nameone {
@@ -375,7 +376,7 @@ page {
   float: left;
   text-align: left;
   font-size: 23rpx;
-  display: flex;
+  /* display: flex; */
   justify-content: center;
   align-items: center;
 }
@@ -400,4 +401,5 @@ page {
 	100%{
 		bottom: 60%;
 	}
-}
+}
+/* overflow:hidden; */

nnzwminiapp/pages/dataCenterZWTJ/tableContent.wxml

@@ -4,7 +4,7 @@
 		<view wx:if="{{item.state === '在办'}}" style="margin-top: 25rpx; margin-left: 15rpx; width: 63rpx;height: 33rpx;line-height: 33rpx; background: #0655b6;border-radius: 4rpx;text-align: center; color: #fff;">在办</view>
 	</view>
 	<view style="text-align: left; width: 180rpx;">{{item.acceptedDepartment}}</view>
-	<view style="text-align: left; width: 180rpx;">{{item.handlingName}}</view>
+	<view style="text-align: left; width: 180rpx; overflow:hidden;text-overflow:ellipsis;white-space:nowrap">{{item.handlingName}}</view>
 	<view style="text-align: left; width: 120rpx;">{{filter.formateDate(item.acceptDate)}}</view>
 	<view style="text-align: left; width: 120rpx;margin-left: 10rpx;">{{filter.formateDate(item.commitmentDate)}}</view>
 </view>

nnzwminiapp/pages/index/communicateList.wxml

@@ -1,12 +1,12 @@
 <view style="padding-top: 20rpx">
   <!-- 列表 -->
-  <view wx:for="{{yjzjDataList}}" wx:for-item="item" wx:for-index="index" wx:key="index" style="height: 150rpx;width: 100%;display:flex;border-bottom: 4rpx solid #F5F5F5;margin-bottom: 20rpx" bindtap="goYjzjDetail" data-theme="{{ item.theme }}" data-item="{{ item.htmlContent }}">
+  <view wx:for="{{yjzjDataList}}" wx:for-item="item" wx:for-index="index" wx:key="index" style="height: 150rpx;width: 100%;display:flex;border-bottom: 4rpx solid #F5F5F5;margin-bottom: 20rpx"data-tag = "{{index}}" bindtap="goYjzjDetail" data-theme="{{ item.id }}" data-item="{{ item.htmlContent }}">
     <view style="height: 140rpx;width: 100%;">
       <view style="height: 99rpx;width: 100%;font-size: 26rpx;line-height:33rpx;overflow: hidden;text-overflow: ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;color: #666666;">
         {{ item.theme }}
       </view>
       <view style="display:flex;align-items:center;height: 45rpx;width: 100%;font-size: 22rpx;color: #999999;padding-top: 3rpx">
-        征集时间：{{ item.beginTime}} - {{ item.endTime }}
+        征集时间：{{ item.beginTime}} 至 {{ item.endTime }}
       </view>
     </view>
     <!-- 图片 -->

nnzwminiapp/pages/index/index.js

@@ -223,8 +223,8 @@ Page({
 		// 视频推荐是否为空数据
 		isVideoEmpty: false,
 		// 意见征集list
-    yjzjDataList: [],
-    scroll_height:"",
+		yjzjDataList: [],
+		scroll_height:"",
 		// 在线调查
 		investigatePage: 1,
 		investigateList: [],
@@ -286,61 +286,71 @@ Page({
 				id: '1',
 				name: "重庆市南岸区人民政府",
 				img: imgUrl + 'index-media-icon1.png',
-				ewm: "index_ewm_logo_1.png"
+				ewm: "index_ewm_logo_1.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '2',
 				name: "南岸文旅",
 				img: imgUrl + 'index-media-icon2.png',
-				ewm: "index_ewm_logo_2.png"
+				ewm: "index_ewm_logo_2.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '3',
 				name: "南岸发布",
 				img: imgUrl + 'index-media-icon3.png',
 				ewm: "index_ewm_logo_3.jpg",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '4',
 				name: "南岸国资",
 				img: imgUrl + 'index-media-icon4.png',
-				ewm: "index_ewm_logo_4.png"
+				ewm: "index_ewm_logo_4.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '5',
 				name: "重庆南岸消防",
 				img: imgUrl + 'index-media-icon5.png',
-				ewm: "index_ewm_logo_5.png"
+				ewm: "index_ewm_logo_5.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '6',
 				name: "南岸生态环境",
 				img: imgUrl + 'index-media-icon6.png',
-				ewm: "index_ewm_logo_6.png"
+				ewm: "index_ewm_logo_6.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '7',
 				name: "南岸健康卫士",
 				img: imgUrl + 'index-media-icon7.png',
-				ewm: "index_ewm_logo_7.png"
+				ewm: "index_ewm_logo_7.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '8',
 				name: "南岸公安",
 				img: imgUrl + 'index-media-icon8.png',
-				ewm: "index_ewm_logo_8.png"
+				ewm: "index_ewm_logo_8.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '9',
 				name: "遇见南坪",
 				img: imgUrl + 'index-media-icon9.png',
-				ewm: "index_ewm_logo_9.png"
+				ewm: "index_ewm_logo_9.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '10',
 				name: "书香南岸",
 				img: imgUrl + 'index-media-icon10.png',
-				ewm: "index_ewm_logo_10.png"
+				ewm: "index_ewm_logo_10.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			// {
 			// 	id: '11',
@@ -352,49 +362,57 @@ Page({
 				id: '12',
 				name: "广阳岛绿色发展公司",
 				img: imgUrl + 'index-media-icon13.png',
-				ewm: "index_ewm_logo_13.jpg"
+				ewm: "index_ewm_logo_13.jpg",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '13',
 				name: "南岸人力社保",
 				img: imgUrl + 'index-media-icon14.png',
-				ewm: "index_ewm_logo_14.png"
+				ewm: "index_ewm_logo_14.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '14',
 				name: "广阳湾智创生态城",
 				img: imgUrl + 'index-media-icon15.png',
-				ewm: "index_ewm_logo_15.jpg"
+				ewm: "index_ewm_logo_15.jpg",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '15',
 				name: "南岸健康",
 				img: imgUrl + 'index-media-icon18.png',
-				ewm: "index_ewm_logo_18.jpg"
+				ewm: "index_ewm_logo_18.jpg",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '16',
 				name: "重庆市南岸区天文街道",
 				img: imgUrl + 'index-media-icon17.png',
-				ewm: "index_ewm_logo_17.png"
+				ewm: "index_ewm_logo_17.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '17',
 				name: "南岸智慧城管",
 				img: imgUrl + 'index-media-icon16.png',
-				ewm: "index_ewm_logo_16.png"
+				ewm: "index_ewm_logo_16.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '18',
 				name: "重庆市南岸区南坪街道",
 				img: imgUrl + 'index-media-icon19.png',
-				ewm: "index_ewm_logo_19.png"
+				ewm: "index_ewm_logo_19.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 			{
 				id: '19',
 				name: "南岸司法",
 				img: imgUrl + 'index-media-icon12.png',
-				ewm: "index_ewm_logo_12.png"
+				ewm: "index_ewm_logo_12.png",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			},
 		],
 		// 媒体矩阵南岸发布
@@ -552,9 +570,9 @@ Page({
     // 判断机型
     wx.getSystemInfo({
       success: res => {
-        console.log(res);
+        // console.log(res);
         let system =  res.system.split(" ")
-        console.log(system);
+        // console.log(system);
         if (res.safeArea.top > 20 && system[0]=='iOS') { //iphonex，xr，xs
           scroll_height =  scroll_height-70
         }
@@ -804,12 +822,12 @@ Page({
 			wx.request({
 				url: 'https://www.gov.cn/pushinfo/v150203/pushinfo.jsonp?pushInfoJsonpCallBack=pushInfoJsonpCallBack&_=1669609973471',
 				success: res => {
-					console.log(res);
+					// console.log(res);
 					if (res.statusCode == 200) {
 						var s = res.data
 						s = s.substring(22, s.length - 1)
 						s = JSON.parse(s)
-						console.log(s);
+						// console.log(s);
 						var d = [];
 						var size = s.length <= 5 ? s.length : 5
 						for (let i = 0; i < size; i++) {
@@ -932,12 +950,12 @@ Page({
 			wx.request({
 				url: 'https://www.gov.cn/pushinfo/v150203/pushinfo.jsonp?pushInfoJsonpCallBack=pushInfoJsonpCallBack&_=1669609973471',
 				success: res => {
-					console.log(res);
+					// console.log(res);
 					if (res.statusCode == 200) {
 						var s = res.data
 						s = s.substring(22, s.length - 1)
 						s = JSON.parse(s)
-						console.log(s);
+						// console.log(s);
 						var d = [];
 						var size = s.length <= 5 ? s.length : 5
 						if (size < 1) {
@@ -1081,6 +1099,7 @@ Page({
 				this.setData({
 					'yjzjDataList': list
 				})
+				wx.setStorageSync('yjzjDataList', list)
 			}
 		})
 	},
@@ -1138,14 +1157,14 @@ Page({
 		const id = e.target.dataset.id
 		const siteId = e.target.dataset.siteid
 		wx.navigateTo({
-			url: '/pages/web/web?wxUrl=' + encodeURIComponent(`https://www.cqna.gov.cn/personalCenter/answerSheet/answerSheet.html?siteId=${siteId}&metadataId=${id}`),
+			url: '/pages/web/web?wxUrl='+siteId+'&metadataId='+id ,
 		})
 	},
 	goYjzjDetail(e) {
-		const html = e.currentTarget.dataset.item
+		// const html = e.currentTarget.dataset.item
 		const title = e.currentTarget.dataset.theme
 		wx.navigateTo({
-			url: `/pages/yjzjDetail/yjzjDetail?html=${encodeURIComponent(html)}&title=${title}`
+			url: `/pages/yjzjDetail/yjzjDetail?title=${title}`
 		})
 	},
 	// 日期格式化
@@ -1241,8 +1260,9 @@ Page({
 		})
 	},
 	gotoReleaseDetail(e) {
+		// console.log(e.currentTarget.dataset.url);
 		wx.navigateTo({
-			url: '/pages/web/web?wxUrl=' + encodeURIComponent(e.currentTarget.dataset.url),
+			url: '/pages/web/web?gzUrl='+e.currentTarget.dataset.url,
 		})
 	},
 	// 获取媒体矩阵今日头条数据
@@ -1286,7 +1306,7 @@ Page({
 								code: res.code
 							}
 							login(data).then(res => {
-								console.log(res)
+								// console.log(res)
 								cacheSet('token', res.data.token, 3600 * 24)
 								// wx.setStorageSync("token", res.data.data)
 							})
@@ -1382,8 +1402,9 @@ Page({
 			ewmName: e.target.dataset.name,
 			ewmUrl: e.target.dataset.ewm
 		})
+		// e.target.dataset.url
 		wx.navigateTo({
-			url: '/pages/web/web?url=https://www.cqna.gov.cn/data/newMedia/officialAccounts.html',
+			url: '/pages/web/web?url='+e.target.dataset.url,
 		})
 	},
 	closeDialog() {
@@ -1461,6 +1482,11 @@ Page({
 		return {
 			title: '首页'
 		}
+	},
+	onShareTimeline(){
+		return {
+			title: '首页'
+		}
 	}
 
 })

nnzwminiapp/pages/index/index.wxml

@@ -373,7 +373,7 @@
 						</view>
 						<!-- 入口 -->
 						<view style="height: 129rpx;width:100%;position: absolute;bottom:0rpx;">
-							<view class="zmhd-title-font">与南岸政府的对话</view>
+							<view class="zmhd-title-font">与南岸政府对话</view>
 							<view style="padding-left: 38rpx;padding-top: 10rpx;">
 								<view style="background: linear-gradient(90deg, #FF9B3B 0%, #FAB982 100%);" class="center-analysis-enter-button-item">
 									进入 ></view>
@@ -493,10 +493,10 @@
 									<view style="display: flex;justify-content: flex-start;flex-wrap: wrap">
 										<!-- 选项 -->
 										<view wx:for="{{mediaSelectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="{{index % 2 === 0?'media-icon-1':'media-icon-2'}}">
-											<view bindtap="showLogoDialog" data-name="{{item.name}}" data-ewm="{{item.ewm}}" style="display: flex;align-items:center;justify-content:center;margin-right: 4rpx">
+											<view bindtap="showLogoDialog" data-name="{{item.name}}" data-ewm="{{item.ewm}}" data-url = "{{item.url}}" style="display: flex;align-items:center;justify-content:center;margin-right: 4rpx">
 												<image src="{{item.img}}" style="height:44rpx;width:44rpx;"></image>
 											</view>
-											<view bindtap="showLogoDialog" data-name="{{item.name}}" data-ewm="{{item.ewm}}" style="display: flex;align-items:center;justify-content:center">{{item.name}}</view>
+											<view bindtap="showLogoDialog" data-name="{{item.name}}" data-ewm="{{item.ewm}}" data-url = "{{item.url}}" style="display: flex;align-items:center;justify-content:center">{{item.name}}</view>
 										</view>
 									</view>
 								</swiper-item>

nnzwminiapp/pages/index/investigation.wxml

@@ -6,7 +6,7 @@
         {{ item.title }}
       </view>
       <view data-siteid="{{item.siteId}}" data-id="{{item.id}}" style="display:flex;align-items:center;height: 45rpx;width: 100%;font-size: 22rpx;color: #999999;padding-top: 3rpx">
-        调查时间：{{ item.startTime}} - {{ item.endTime }}
+        调查时间：{{ item.startTime}} 至 {{ item.endTime }}
       </view>
     </view>
     <!-- 图片 -->

nnzwminiapp/pages/leaveMessage/leaveMessage.js

@@ -15,7 +15,7 @@ Page({
 	},
 	// 留言
 	bindPickerChange: function (e) {
-		console.log('picker发送选择改变，携带值为', e.detail.value)
+		// console.log('picker发送选择改变，携带值为', e.detail.value)
 		this.setData({
 			index: e.detail.value
 		})
@@ -34,7 +34,7 @@ Page({
 	
    // 已选下拉框 
    mySelect1(e) {
-	 console.log(e)
+	//  console.log(e)
 	 var name = e.currentTarget.dataset.name 
 	 this.setData({
 	   grade_name1: name,

nnzwminiapp/pages/login/login.js

@@ -23,7 +23,6 @@ Page({
 		showLogin: false,
 		deda: 0,
 		loadText: "登录中..."
-		
 	},
 
 	/**
@@ -88,7 +87,7 @@ Page({
 			})
 			return
 		}
-		console.log(e.detail.code)
+		// console.log(e.detail.code)
 		var phoneCode = e.detail.code
 		wx.login({
 			success(res) {
@@ -118,6 +117,12 @@ Page({
 						showLogin: true
 					})
 					login(data).then(res => {
+						that.setData({
+							showLogin: false,
+							deda: 0,
+							loadText: "登录中..."
+						})
+						clearInterval(int)
 						if (res.result) {
 							cacheSet('token', res.data.token, 3600 * 24)
 							// wx.setStorageSync("token", res.data.token)
@@ -128,12 +133,7 @@ Page({
 							// 返回上一页携带登录标志
 							let pages = getCurrentPages();
 							let prevPage = pages[pages.length - 2];
-							that.setData({
-								showLogin: false,
-								deda: 0,
-								loadText: "登录中..."
-							})
-							clearInterval(int)
+							
 
 							prevPage.setData({
 								loginReturnFlag: true

nnzwminiapp/pages/map/map.wxml

@@ -14,7 +14,7 @@
   <view class="main">
     <view wx:if="{{showSearch}}" class="top_search">
       <view class="input-icon">
-        <input type="text" enterkeyhint="search" confirm-type="search" bindconfirm="searchTap" name="" id="" value="{{searchVal}}" bindchange="searchTap" bindinput="getSearchVal" class="inp" placeholder="请输入您要搜索的内容" />
+        <input type="text" enterkeyhint="search" confirm-type="search" bindconfirm="searchTap" name="" id="" value="{{searchVal}}"  bindinput="getSearchVal" class="inp" placeholder="请输入您要搜索的内容" />
         <image src="{{imgUrl}}/ss2.png" class="inp-icon1" bindtap="searchTap"></image>
       </view>
     </view>
@@ -47,8 +47,12 @@
 
       <view class="left-map">
         <view class="bttom-tab show-first">
-          <t-grid wx:for="{{type}}" wx:for-item="typeitem" wx:key wx:for-index="keys" class="block">
-            <t-grid-item bindtap="popview" wx:for="{{typeitem}}" data-index="{{keys}}" wx:key="index2" data-id="{{item.id}}" wx:for-item="item" text="{{item.name}}" image="{{item.image}}" />
+          <t-grid wx:for="{{type}}" wx:for-item="typeitem" wx:for-index="keys" class="block">
+            
+            <t-grid-item bindtap="popview" wx:for="{{typeitem}}" data-index="{{keys}}" wx:key="index2" data-id="{{item.id}}" wx:for-item="item" text="{{item.name}}">
+              <!-- image=" {{imgUrl+ item.image}}" -->
+              <image src="{{imgUrl+ item.image}}" class="gridiamge"/>
+            </t-grid-item>
           </t-grid>
 
         </view>
@@ -72,12 +76,14 @@
 
 <view class="popup-box" wx:if="{{showIndex}}" bindtap="closePopup"></view>
 <view class="info-bottom" wx:if="{{showIndex}}">
+  <view class="title">点位信息</view>
   <view class="row-info">
+    
     <view class="pop-value">
-      <scroll-view scroll-y="true" style="height:350rpx">
-        <view style="width:50%;float: left;" wx:for="{{popData}}" bindtap="changeInfo"  wx:for-item="item" data-data="{{item.data}}" wx:index="{{index}}" wx:key="index">
-          <image src="{{imgUrl}}/flex.png" class="icon-pop" style="float: left;"></image>
-          <text class="text-pop">{{item.popName}}</text>
+      <scroll-view scroll-y="true" style="height:350rpx;margin-left: 50rpx;">
+        <view style="width:50%;float: left; height: 38rpx; margin: 20rpx 0;  " wx:for="{{popData}}" bindtap="changeInfo"  wx:for-item="item" data-data="{{item}}" wx:index="{{index}}" wx:key="index">
+          <image src="https://www.cqna.gov.cn/mnazw/applet/ding.png" class="icon-pop" style="float: left;"></image>
+          <text class="text-pop">{{item.name}}</text>
         </view>
       </scroll-view>
     </view>

nnzwminiapp/pages/map/map.wxss

@@ -1239,8 +1239,12 @@ a {
   position: fixed;
   z-index: 2001;
   width: 100%;
+  height: 550rpx;
   bottom: 0;
-  background-color: #d8ecff;
+  background-image: url(https://www.cqna.gov.cn/mnazw/applet/mapbg.png);
+  background-size: cover;
+  /* background-repeat: no-repeat; */
+  background-color: #fff;
   border-top-left-radius: 10rpx;
   border-top-right-radius: 10rpx;
 }
@@ -1249,24 +1253,26 @@ a {
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin: 15rpx 88rpx;
+  margin: 0 88rpx;
   font-size: 32rpx;
+  height: 55rpx;
 }
 
 .row-info view {
-  padding: 10rpx 0;
+  /* padding: 10rpx 0; */
 }
 
 .pop-value {
   margin-top: 40rpx;
   height: 400rpx;
-  width: 100%;
-  background-color: #d8ecff;
+  width: 650rpx;
+  /* background-color: #d8ecff; */
 }
 
 .icon-pop {
-  width: 30rpx;
-  height: 35rpx;
+  width: 28rpx;
+  height: 38rpx;
+  display: block;
 }
 
 .text-pop {
@@ -1274,10 +1280,13 @@ a {
   margin-left: 15rpx;
   text-overflow: ellipsis;
   overflow: hidden;
-  width: 200rpx;
+  /* width: 100%; */
   float: left;
-  height: 35rpx;
-  line-height: 35rpx;
+  height: 38rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  line-height: 38rpx;
+  text-align: center;
 }
 
 .item-title {
@@ -1370,4 +1379,18 @@ a {
   background-color: #10B891;
   box-shadow: 0px 4px 25px 2px rgb(16 184 145 / 34%);
   border-radius: 5rpx;
+}
+.title{
+  width: 100%;
+    height: 100rpx;
+    text-align: center;
+    line-height: 156rpx;
+    font-size: 35rpx;
+    font-weight: bold;
+}
+
+.gridiamge{
+  width: 80rpx;
+  height: 98rpx;
+  margin-bottom: -15rpx;
 }

nnzwminiapp/pages/myCenter/myCenter.js

@@ -45,7 +45,7 @@ Page({
         wx.showActionSheet({
             itemList: ['退出登录'],
             success(res) {
-                console.log(res.tapIndex)
+                // console.log(res.tapIndex)
                 wx.clearStorageSync();
                 that.setData({
                     show: false,
@@ -54,7 +54,7 @@ Page({
                 })
             },
             fail(res) {
-                console.log(res.errMsg)
+                // console.log(res.errMsg)
             }
         })
     },

nnzwminiapp/pages/nais/nais.js

@@ -171,7 +171,7 @@ Page({
     wx.getSystemInfo({
       success: res => {
         let system =  res.system.split(" ")
-        console.log(system);
+        // console.log(system);
         if (res.safeArea.top > 20 && system[0]=='iOS') { //iphonex，xr，xs
           scroll_height =  scroll_height-70
          }
@@ -219,24 +219,28 @@ Page({
 			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/",
 		})
 	},
+	// 区位条件
 	gotoMore2() {
 		wx.navigateTo({
-			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/qwtj/202208/t20220819_11023225.html",
+			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/qwtj/202306/t20230606_12033765.html",
 		})
 	},
+	// 人文底蕴
 	gotoMore3() {
 		wx.navigateTo({
-			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/rwdy/202208/t20220819_11023321.html",
+			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/rwdy/202306/t20230606_12033824.html",
 		})
 	},
+	// 资源优势
 	gotoMore4() {
 		wx.navigateTo({
-			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/zyys/202208/t20220819_11023272.html",
+			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/zyys/202306/t20230606_12033786.html",
 		})
 	},
+	// 产业特色
 	gotoMore5() {
 		wx.navigateTo({
-			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/cyts/202208/t20220819_11023368.html",
+			url: '/pages/web/web?url=' + "https://www.cqna.gov.cn/zjna/nagk/cyts/202306/t20230606_12033851.html",
 		})
 	},
 	gotoMore6() {

nnzwminiapp/pages/newsPaper/newsPaper.js

@@ -77,7 +77,7 @@ Page({
 		// 	}
 		// })
 		getVideoRecommend().then(res=>{
-			console.log(res);
+			// console.log(res);
 			if(res.result){
 				this.setData({
 					pageData:res.data
@@ -86,7 +86,7 @@ Page({
 		})
 	},
 	gotoWeb:function (data) {
-		console.log(data.currentTarget.dataset.contenturl);
+		// console.log(data.currentTarget.dataset.contenturl);
 		let url = data.currentTarget.dataset.contenturl
 		wx.navigateTo({
 			url: '/pages/web/web?url='+url,

nnzwminiapp/pages/publics/fileDetail/fileDetail.js

@@ -62,7 +62,7 @@ Page({
 				res.data.data.DOCHTMLCON = res.data.data.CONTENT.replace(/<img [^>]*src="([^'"]+)[^>]*>/gi,
 					function (match, capture) {
             // 替换小图片地址
-            console.log(capture);
+            // console.log(capture);
 						if (capture.split("/").length > 1) {
 							return match.replace(/src=['"]([^'"]+)[^>]/gi, 'src="' + 'https://www.cqna.gov.cn' +
 								capture +
@@ -72,14 +72,14 @@ Page({
 							capture +
 							'"');
           });
-        console.log(res.data.data.DOCHTMLCON);
+        // console.log(res.data.data.DOCHTMLCON);
         res.data.data.DOCHTMLCON = res.data.data.DOCHTMLCON.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
         .replace(/&lt;/g, '<')
         .replace(/&gt;/g, '>')
         .replace(/&amp;nbsp;/g, ' ')
         .replace(/&quot;/g, '\"');
         res.data.data.DOCHTMLCON = res.data.data.DOCHTMLCON.replace(/\<span/gi, '<span class="fontSize"');
-        console.log(res.data.data.DOCHTMLCON)
+        // console.log(res.data.data.DOCHTMLCON)
 				this.setData({
 					articles: res.data.data
 				})

nnzwminiapp/pages/publics/government/government.js

@@ -315,7 +315,6 @@ Page({
 		this.getCountySystem();
 		// 获取公开内容数据
 		this.getPublicContent();
-    console.log();
 		if (options.index) {
 			this.setData({
 				currentTab: parseInt(options.index)

nnzwminiapp/pages/publics/index/index.js

@@ -177,7 +177,7 @@ Page({
     wx.getSystemInfo({
       success: res => {
         let system =  res.system.split(" ")
-        console.log(system);
+        // console.log(system);
         if (res.safeArea.top > 20 && system[0]=='iOS') { //iphonex，xr，xs
           scroll_height =  scroll_height-70
         }
@@ -199,7 +199,7 @@ Page({
 			url: 'https://data.cqna.gov.cn/mini/hlw/getAllLeader',
 			method: 'GET',
 			success: res => {
-        console.log(res.data.data);
+        // console.log(res.data.data);
 				this.setData({
 					leaderList: res.data.data,
 					isZFLDLoading: false
@@ -330,7 +330,7 @@ Page({
 		})
 	},
 	goToGovernment(e) {
-    console.log(e.currentTarget.dataset.index);
+    // console.log(e.currentTarget.dataset.index);
     if (e.currentTarget.dataset.index == 2) {
       wx.navigateTo({
 				url: '/pages/web/web?url=https://www.cqna.gov.cn/zwgk_254/fdzdgknr/zcwj/xzgfxwj/',

nnzwminiapp/pages/publics/interpretation/interpretation.js

@@ -79,9 +79,9 @@ Page({
 						for (let i=0;i<temp.length;i++) {
 							// 截取logo图片
               let url = temp[i].DOCPUBURL.substring(0, temp[i].DOCPUBURL.lastIndexOf("/") + 1)
-              console.log(url);
+            //   console.log(url);
               let logo = temp[i].LOGOURL.substring(temp[i].LOGOURL.lastIndexOf("FileName=") + "fileName=".length)
-              console.log(logo);
+            //   console.log(logo);
               if (logo==''||logo==null) {
                 temp[i].logoImg = '../../images/zw.jpg'
               }else{
@@ -110,7 +110,7 @@ Page({
 		})
   },
   gotoWeb(e) {
-    console.log(e);
+    // console.log(e);
 		wx.navigateTo({
 			url: '/pages/web/web?url=' + e.currentTarget.dataset.url
 		})

nnzwminiapp/pages/publics/publicContent/publicContent.js

@@ -55,7 +55,7 @@ Page({
 			url: `https://data.cqna.gov.cn/mini/hlw/info?channelId=${chennelId}&docId=${docId}`,
 			method: 'GET',
 			success: res => {
-				console.log(res);
+				// console.log(res);
 				res.data.data.DOCPUBTIME = res.data.data.DOCPUBTIME.split(" ")[0];
 				res.data.data.DOCHTMLCON = res.data.data.CONTENT.replace(/\<p/gi, '<p class="fontSize"');
 				res.data.data.DOCHTMLCON = res.data.data.CONTENT.replace(/<img [^>]*src="([^'"]+)[^>]*>/gi,

nnzwminiapp/pages/serve/serve.js

@@ -19,7 +19,7 @@ Page({
 			url: 'https://zwykb.cq.gov.cn/inspur/county/compound?regionCode=500108',
 			method: 'POST',
 			success: res => {
-        console.log(res);
+        // console.log(res);
 				res.data.data.DISSSATIS_RATE = Math.floor(res.data.data.DISSSATIS_NUM / (res.data.data.TOTAL_NUM - res.data.data.SATIS_NUM) * 10000) / 100;
 				res.data.data.SATIS_RATE = Math.floor(res.data.data.SATIS_NUM / res.data.data.TOTAL_NUM * 10000) / 100;
 				this.setData({
@@ -82,7 +82,7 @@ Page({
     wx.getSystemInfo({
       success: res => {
         let system =  res.system.split(" ")
-        console.log(system);
+        // console.log(system);
         if (res.safeArea.top > 20 && system[0]=='iOS') { //iphonex，xr，xs
           scroll_height =  scroll_height-70
         }

nnzwminiapp/pages/videoRecommend/videoRecommend.js

@@ -26,7 +26,7 @@ Page({
 	},
 
 	getNanVideo() {
-		console.log(this.data.lastId);
+		// console.log(this.data.lastId);
 		wx.showLoading({
 			title: '加载中'
 		})

nnzwminiapp/pages/web/web.js

@@ -22,15 +22,23 @@ Page({
 				url: options.url + '?se=' + options.se
 			})
 		} else if (options.wxUrl && options.wxUrl != '') {
+			let siteId = options.wxUrl;
+			let id = options.metadataId;
 			// 代表是微信文章 需要转义
+			let url = "https://www.cqna.gov.cn/personalCenter/answerSheet/answerSheet.html?siteId="+siteId+"&metadataId="+id;
 			this.setData({
-				url: decodeURIComponent(options.wxUrl)
+				url: url
 			})
-		} else {
+		} else if(options.gzUrl && options.wxUrl != ''){
+			this.setData({
+				url: options.gzUrl
+			})
+		}
+		else {
 			// 微信跳转回将url带入参数去除 特定规则'|'=='?',')'=='='
 			let data = options.url.replace('|','?')
 			data = data.replace(')','=')
-			console.log(data);
+			// console.log(data);
 			this.setData({
 				url: data
 			})
@@ -94,7 +102,7 @@ Page({
 		}
 	},
 	getMessage(e){
-		console.log(e.detail.data[0].from);
+		// console.log(e.detail.data[0].from);
 		if(e.detail.data[0].from!=null){
 			wx.navigateToMiniProgram({
 				appId: 'wxfc86707bae655315',

nnzwminiapp/pages/yjzjDetail/yjzjDetail.js

@@ -1,4 +1,7 @@
 // pages/yjzjDetail/yjzjDetail.js
+import {
+	yjzjList
+} from "../api/index-api"
 Page({
 
 	/**
@@ -13,14 +16,45 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad(options) {
-		const title = options.title
-		wx.setNavigationBarTitle({
+		let title = options.title
+		
+		let list =  wx.getStorageSync('yjzjDataList')
+		if(list==null){
+			yjzjList().then(res => {
+				var list = []
+				if (res.statusCode == 200 && res.datas.pageInfo.totalResults > 0) {
+					list = res.datas.data
+					for (var i = 0; i < list.length; i++) {
+						list[i].beginTime = this.formatDateNumber(new Date(list[i].beginTime * 1))
+						list[i].endTime = this.formatDateNumber(new Date(list[i].endTime * 1))
+					}
+					wx.setStorageSync('yjzjDataList', list)
+				}
+			})
+			list =  wx.getStorageSync('yjzjDataList')
+		}
+		let html
+		list.forEach(item => {
+			if (item.id == title) {
+        html = item.htmlContent
+        title = item.theme
+			}
+    })
+    wx.setNavigationBarTitle({
 			title: title
 		})
-		var html = decodeURIComponent(options.html)
+		// console.log(options);
+		// var html = decodeURIComponent(options.html)
+		// console.log(html);
+		let str_replace = function (search, replace, subject) {
+			return subject.split(search).join(replace);
+		}
+		html = str_replace('/IGI/upload/file', 'https://www.cqna.gov.cn/IGI/upload/file', html);
+
+		html = str_replace("<img", "<img style='max-width:100%;height:auto;'", html);
 		this.setData({
-      'html': html,
-      title: title
+			'html': html,
+			title: title
 		})
 	},
 
@@ -70,8 +104,8 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage() {
-    return {
-      title: this.data.title
-    };
+		return {
+			title: this.data.title
+		};
 	}
 })

nnzwminiapp/pages/zmhd/zmhd.wxml

@@ -2,7 +2,7 @@
 	<!-- 对话 -->
 	<view style="border-radius: 10rpx;height: 342rpx;width: 700rpx;background-color: #2FA0F3;background-image: url({{imgUrl}}zmhd-click-good-blud.png);background-size:cover;">
 		<view>
-			<view class="na-communicate-title" style="padding-left: 27rpx;padding-top: 66rpx;">与南岸政府的对话</view>
+			<view class="na-communicate-title" style="padding-left: 27rpx;padding-top: 66rpx;">与南岸政府对话</view>
 			<view class="na-communicate-content" style="width: 533rpx;padding-left: 29rpx;padding-top: 32rpx;">听取您的意见、接受您的监督，为您解决实际问题, 优化经济社会发展环境，转变政府职能，打造和谐南岸， 促进我区经济社会发展。</view>
 		</view>
 	</view>

nnzwminiapp/pagesPublic/pages/album/album.js

@@ -15,12 +15,12 @@ const request = (options) => {
 							'content-type': 'application/json;charset=UTF-8'
 					},
 					success: function (res) {
-							console.log("network-res=>", res);
+							// console.log("network-res=>", res);
 							// 返回成功信息
 							resolve(res.data)    
 					},
 					fail: function (error) {
-							console.log("network-err=>", error);
+							// console.log("network-err=>", error);
 							// 返回错误信息
 							reject(error)
 					}

nnzwminiapp/pagesPublic/pages/albumDetail/albumDetail.js

@@ -16,12 +16,12 @@ const request = (options) => {
 							'content-type': 'application/json;charset=UTF-8'
 					},
 					success: function (res) {
-							console.log("network-res=>", res);
+							// console.log("network-res=>", res);
 							// 返回成功信息
 							resolve(res.data)    
 					},
 					fail: function (error) {
-							console.log("network-err=>", error);
+							// console.log("network-err=>", error);
 							// 返回错误信息
 							reject(error)
 					}

nnzwminiapp/pagesPublic/pages/albumEdit/albumEdit.js

@@ -112,7 +112,7 @@ Page({
 					})
 				},
 				complete: function (result) {
-					console.log(result.errMsg)
+					// console.log(result.errMsg)
 				}
 			})
 		}
@@ -143,14 +143,14 @@ Page({
 	},
 	// 日期切换
 	bindDateChange(e) {
-		console.log('picker发送选择改变，携带值为', e.detail.value)
+		// console.log('picker发送选择改变，携带值为', e.detail.value)
 		this.setData({
 			vestingDate: e.detail.value
 		})
 	},
 	// 作品年代切换
 	bindPickerChange: function (e) {
-		console.log('picker发送选择改变，携带值为', e.detail.value)
+		// console.log('picker发送选择改变，携带值为', e.detail.value)
 		this.setData({
 			pictureType: e.detail.value
 		})

nnzwminiapp/pagesPublic/pages/api/index-api.js

@@ -11,12 +11,12 @@ const request = (options) => {
 							'content-type': 'application/json;charset=UTF-8'
 					},
 					success: function (res) {
-							console.log("network-res=>", res);
+							// console.log("network-res=>", res);
 							// 返回成功信息
 							resolve(res.data)    
 					},
 					fail: function (error) {
-							console.log("network-err=>", error);
+							// console.log("network-err=>", error);
 							// 返回错误信息
 							reject(error)
 					}

nnzwminiapp/pagesPublic/pages/api/index-api2.js

@@ -11,12 +11,12 @@ const request = (options) => {
 							'content-type': 'application/json;charset=UTF-8'
 					},
 					success: function (res) {
-							console.log("network-res=>", res);
+							// console.log("network-res=>", res);
 							// 返回成功信息
 							resolve(res.data)    
 					},
 					fail: function (error) {
-							console.log("network-err=>", error);
+							// console.log("network-err=>", error);
 							// 返回错误信息
 							reject(error)
 					}

nnzwminiapp/pagesPublic/pages/api/request.js

@@ -27,7 +27,7 @@ const request = (options) => {
 				'mini-token': `${token}`
 			},
 			success: function (res) {
-        console.log("network-res=>", res);
+        // console.log("network-res=>", res);
         if(res.data.msg == '请重新登录' && !res.data.result && token != null && token != '') {
           wx.showModal({
             title: '未授权',
@@ -45,7 +45,7 @@ const request = (options) => {
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}

nnzwminiapp/pagesPublic/pages/api/yxna-api.js

@@ -11,12 +11,12 @@ const request = (options) => {
 				'content-type': 'application/json;charset=UTF-8'
 			},
 			success: function (res) {
-				console.log("network-res=>", res);
+				// console.log("network-res=>", res);
 				// 返回成功信息
 				resolve(res.data)
 			},
 			fail: function (error) {
-				console.log("network-err=>", error);
+				// console.log("network-err=>", error);
 				// 返回错误信息
 				reject(error)
 			}

nnzwminiapp/pagesPublic/pages/menu/menu.js

@@ -335,13 +335,7 @@ Page({
         return
       }
       var jsonStr = res.data.data.dishesList
-      console.log(1231231);
-      console.log(jsonStr);
-      console.log(JSON.parse(jsonStr));
       var menuList = JSON.parse(jsonStr)
-      console.log(1231231);
-      console.log(menuList);
-      console.log(1231231);
       this.setData({
         'menuOrigin': menuList
       })
@@ -636,7 +630,7 @@ Page({
           formData.append('userId', wx.getStorageSync('userid'));
           formData.appendFile('files', res.tempFiles[0].tempFilePath);
           let data = formData.getData();
-          console.log(data);
+          // console.log(data);
           request({
             url: '/mini/canteen/updateDishesPic',
             method: 'POST',

nnzwminiapp/pagesPublic/pages/myCollection/myCollection.js

@@ -23,7 +23,7 @@ Page({
 			'userId': wx.getStorageSync('userid')
 		}
 		getFavorite(params).then(res => {
-			console.log(res)
+			// console.log(res)
 			if(res.result){
 				this.setData({
 					collectionList: res.data,
@@ -95,7 +95,7 @@ Page({
 		};
 	},
 	toInfo(e){
-		console.log(e);
+		// console.log(e);
 		wx.navigateTo({
 		  url: '/pages/web/web?url='+e.currentTarget.dataset.url,
 		})

nnzwminiapp/pagesPublic/pages/work-order/work-order.js

@@ -99,7 +99,6 @@ Page({
     onReady() {
     },
     loadMore(){
-console.log(123);
     },
     /**
      * 生命周期函数--监听页面显示
@@ -145,7 +144,7 @@ console.log(123);
      */
     onReachBottom() {
         console.log("上拉加载....");
-        console.log(this.data.page2);
+        
         if (this.data.currentIndex == 1) {
             if (this.data.total2 <= limit) {
                 return;
@@ -227,7 +226,7 @@ console.log(123);
      * @param {*} e 
      */
     typePickerChange(e) {
-        console.log('picker发送选择改变，携带值为', e.detail.value)
+        
         this.setData({
             index: e.detail.value
         });