公告咨询添加周边商户banner功能

src/main/webapp/WEB-INF/pages/admin/notice/noticeAppPublish.jsp

@@ -149,15 +149,15 @@
 					height: 18px;
 					margin-right: 10px;
 				}
-				
+
 				.tv-choose-content{
 					margin-top:5px;
 					color: #333;
 					font-size: 15px;
 					max-width: 600px;
-					word-break:break-all;       
-					word-wrap:break-word; 
-					line-height: 25px;   
+					word-break:break-all;
+					word-wrap:break-word;
+					line-height: 25px;
 				}
 				.submit-btn{
 					margin-left: 20px;
@@ -274,15 +274,15 @@
 		              					<div class="sortOrg_search_div">
 		              						<input class="default-select sortOrg_search" type="text" autocomplete="off" id='sortOrg_search'/>
 			              					<span class="sortOrg_search_btn">
-			              						
+
 			              					</span>
 		              					</div>
 		              					<div class="orgName_div">
-		              						<span>已选项目:</span>	
-		              					</div>	
+		              						<span>已选项目:</span>
+		              					</div>
 		              					<div class="sortOrg_cheak_all_wrap">
 		              						<span class="item_cheak item_cheak_all"></span>
-		              						<span>所有项目</span>		
+		              						<span>所有项目</span>
 		              					</div>
 		              					<ul class="org_list">
 		              					</ul>
@@ -300,6 +300,7 @@
 									<option value="2">banner</option>
 									<option value="3">生成链接</option>
 									<option value="5">楼闪送banner</option>
+									<option value="6">周边商户banner</option>
 								</select>
 							</div>
 							<div id="part-wp" class="part-wp choose-publish-con">
@@ -320,7 +321,7 @@
 						</form:form>
 					</div>
 					<div>
-						
+
 						<!-- 公告 -->
 						<div id="announcement" class=" app-publish-wrapper clearfloat">
 							<div class="announcement-left main-content-mode-wp">
@@ -410,7 +411,7 @@
 													</span>
 													<label class="checkbox-con" for="wx" >小程序端</label>
 												</div>
-												
+
 												<div class="checkbox-wp" >
 													<span class="checkbox-input">
 														<input type="checkbox" id="public" class="check-item" data-type="3" name="public" />
@@ -426,7 +427,7 @@
 												</span>
 												<label class="checkbox-con" for="pushMsg">模板消息</label>
 											</div>
-											
+
 										</div>
 									</div>
 									<div class="public-item-wp clearfloat public-extra-wp">
@@ -436,29 +437,29 @@
 												<span class="radio-input">
 													<input type="radio" id="pb-all" data-type="1"  class="radio-item" name="public"  checked="checked" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-all">公众号所有粉丝<span style="font-weight:normal">（公众号所有粉丝会受到公众号推送）</span></label>
 											</div>
 											<div class="radio-wp radio-block" >
 												<span class="radio-input">
 													<input type="radio" id="pb-item" data-type="2"  class="radio-item" name="public" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-item">项目所有用户<span style="font-weight:normal">（登录过楼宇之窗的用户才会受到公众号推送）</span></label>
 											</div>
 											<div class="radio-wp radio-block" >
 												<span class="radio-input">
 													<input type="radio" id="pb-some" data-type="3" class="radio-item" name="public" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-some">项目部分用户</label>
-												
+
 											</div>
 											<div class="radio-wp radio-block" >
 												<span class="radio-input">
 													<input type="radio" id="pb-some" data-type="4" class="radio-item" name="public" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-some">部门/分组发送</label>
 												<button class="btn-blue-stp choose-dep-stp" @click="chooseHandler">选择部门/分组</button>
 											</div>
@@ -484,14 +485,14 @@
 													<span class="radio-input">
 														<input type="radio" id="msg-yes" data-type="1" class="radio-item" name="msg" >
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="msg-yes">是</label>
 												</div>
 												<div class="radio-wp " style="margin-right: 15px;">
 													<span class="radio-input">
 														<input type="radio" id="msg-no" data-type="0" class="radio-item" name="msg" >
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="msg-no">否</label>
 												</div>
 											</div>
@@ -499,7 +500,7 @@
 										<div class="msg-tips-list">注：加入消息列表后会在公众号消息列表展示，加入列表发送微信推送每日只能发送一次。</div>
 									</div>
 									</div>
-									
+
 									<div class="approve-type-edit">
 									<div class="msg-list-wp clearfloat approvael-result">
 										<span class="tips">审核结果</span>
@@ -509,7 +510,7 @@
 													<span class="radio-input">
 														<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="status-pass">通过</label>
 
 												</div>
@@ -517,7 +518,7 @@
 													<span class="radio-input">
 														<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="status-fail">不通过</label>
 												</div>
 											</div>
@@ -548,8 +549,8 @@
 										<button class="btn-yellow-110 submit-btn">提交发送</button>
 									</div>
 							</div>
-						
-							
+
+
 						</div>
 						<!-- 生成链接 -->
 						<div id="line" class="main-content-mode-wp app-publish-wrapper">
@@ -574,7 +575,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-pass">通过</label>
 
 											</div>
@@ -582,7 +583,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-fail">不通过</label>
 											</div>
 										</div>
@@ -667,29 +668,29 @@
 										<span class="radio-input">
 											<input type="radio" id="pb-all" data-type="1"  class="radio-item" name="publicLink"  checked="checked" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-all">公众号所有粉丝<span style="font-weight:normal">（公众号所有粉丝会受到公众号推送）</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-item" data-type="2"  class="radio-item" name="publicLink" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-item">项目所有用户<span style="font-weight:normal">（登录过楼宇之窗的用户才会受到公众号推送）</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some" data-type="3" class="radio-item" name="publicLink" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some">项目部分用户</label>
-										
+
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some" data-type="4" class="radio-item" name="publicLink" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some">部门/分组发送</label>
 										<button class="btn-blue-stp choose-dep-stp" @click="chooseHandler">选择部门/分组</button>
 									</div>
@@ -716,7 +717,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-pass">通过</label>
 
 											</div>
@@ -724,7 +725,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-fail">不通过</label>
 											</div>
 										</div>
@@ -746,7 +747,7 @@
 										<label class="checkbox-con" for="pushMsg">开启</label>
 									</div>
 								</div>
-								
+
 							</div>
 							<div class="msg-temples-tips">开启后会给公众号所有粉丝发送微信模版消息通知</div> -->
 							<div class="btns-wp">
@@ -792,7 +793,7 @@
 										</span>
 										<label class="checkbox-con" for="app2">APP端</label>
 									</div>
-									<div class="checkbox-wp" 
+									<div class="checkbox-wp"
 									v-if="contextBasePath=='wx.palmnest.com' || contextBasePath=='superdesk.avic-s.com' || contextBasePath=='localhost:8085'">
 										<span class="checkbox-input">
 											<input type="checkbox" id="wx2" class="check-item" data-type="2" name="wx2" />
@@ -815,7 +816,7 @@
 										<label class="checkbox-con" for="pushBannerImage">模板消息</label>
 									</div>
 
-									
+
 								</div>
 							</div>
 							 <div class="public-item-wp clearfloat public-extra-banner-wp">
@@ -825,28 +826,28 @@
 										<span class="radio-input">
 											<input type="radio" id="pb-all1" data-type="1"  class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-all1">公众号所有粉丝<span style="font-weight:normal">（公众号所有粉丝会受到公众号推送）</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-item1" data-type="2"  class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-item1">项目所有用户<span style="font-weight:normal">（登录过楼宇之窗的用户才会受到公众号推送）</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some1" data-type="3" class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some1">项目部分用户</label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some" data-type="4" class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some">部门/分组发送</label>
 										<button class="btn-blue-stp choose-dep-stp" @click="chooseHandler">选择部门/分组</button>
 									</div>
@@ -862,7 +863,7 @@
 									  </el-tag>
 									  </div>
 								</div>
-							</div> 
+							</div>
 						<!--	<div class="msg-list-wp clearfloat public-extra-wp">
 								<span class="tips">加入消息列表</span>
 								<div class="msg-list-con">
@@ -871,14 +872,14 @@
 											<span class="radio-input">
 												<input type="radio" id="msg-yes" data-type="1" class="radio-item" name="msg1" >
 												<span class="radio-inner"></span>
-											</span>		
+											</span>
 											<label class="radio-con" for="msg-yes">是</label>
 										</div>
 										<div class="radio-wp " style="margin-right: 15px;">
 											<span class="radio-input">
 												<input type="radio" id="msg-no" data-type="0" class="radio-item" name="msg1" >
 												<span class="radio-inner"></span>
-											</span>		
+											</span>
 											<label class="radio-con" for="msg-no">否</label>
 										</div>
 									</div>
@@ -895,7 +896,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-pass">通过</label>
 
 											</div>
@@ -903,7 +904,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-fail">不通过</label>
 											</div>
 										</div>
@@ -976,7 +977,7 @@
 						  <div style="overflow-y: scroll;height: 440px;">
 							<div v-if=" searchDataList.deptList && searchDataList.deptList.length>0">
 							<div class="search-rs-title">部门</div>
-							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.deptList" :key="item.id" 
+							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.deptList" :key="item.id"
 							  :class="{'line-top': index != 0}">
 							  <div class="cell-box">
 								<div class="tag-size" v-on:click="searchDataHandler(item)">
@@ -989,7 +990,7 @@
 						  </div>
 							<div v-if="searchDataList.groupList&&searchDataList.groupList.length>0">
 							<div class="search-rs-title" >分组</div>
-							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.groupList" :key="item.id" 
+							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.groupList" :key="item.id"
 							  :class="{'line-top': index != 0}">
 							  <div class="cell-box">
 								<div class="tag-size" v-on:click="searchDataHandler(item)">
@@ -1002,7 +1003,7 @@
 						  </div>
 						  </div>
 						</div>
-					   <div class="default-data-wrap" v-show="true"> 
+					   <div class="default-data-wrap" v-show="true">
 					  <div class="tree-group-box box-top10 box-right15">
 						<el-menu :default-active="activeIndex" mode="horizontal" @select="handleSelect">
 						  <el-menu-item index="1" v-if="indexType == 1||indexType == 0">部门</el-menu-item>
@@ -1012,7 +1013,7 @@
 					  <div style="overflow-y: scroll;height: 400px;" v-if="activeIndex == 1">
 						  <el-tree :data="dataTree"  default-expand-all node-key="id" @node-click="handleNodeClick"
 						  :filter-node-method="filterNodeHandler"  :expand-on-click-node="false"
-							  ref="tree" highlight-current  :props="defaultProps"> 
+							  ref="tree" highlight-current  :props="defaultProps">
 						<span class="custom-tree-node" slot-scope="{node, data}">
 						<span @mouseover="showTip(data.id)" @mouseout="hideTip"  class="el-tree-node-name">
 						  <span v-if="data.childList&&data.childList.length>0||data.levels==0"
@@ -1020,12 +1021,12 @@
 						  <span v-else class="span-button ico_docu"></span>
 						  <span>{{node.label}}</span>
 						  </span>
-						  <span v-if="backSelectedDepHandler(data.id)" class="radio-icon el-icon-check icon-check-item"></span> 
+						  <span v-if="backSelectedDepHandler(data.id)" class="radio-icon el-icon-check icon-check-item"></span>
 						</span>
 						</el-tree>
 					  </div>
 					  <div style="overflow-y: scroll;height: 385px;" v-if="activeIndex == 2">
-						<div class="list-box click-cursor" v-for="(item, index) in tagList" :key="item.id" 
+						<div class="list-box click-cursor" v-for="(item, index) in tagList" :key="item.id"
 							  :class="{'line-top': index != 0}">
 						  <div class="cell-box">
 							<div class="tag-size" v-on:click="tagBtnHandler(item)">
@@ -1036,7 +1037,7 @@
 						  </div>
 						</div>
 					  </div>
-					 </div>  
+					 </div>
 					</div>
 					<div style="margin-left:10px;float: left;width: 1px;height: 480px; background: #F3F3F3"></div>
 					<div style="margin-left:10px;float:left;width: 250px;">
@@ -1196,9 +1197,9 @@
 							newArr.push(resultObj)
 							}
 					   this.identityList=[...newArr]
-					
+
 					  console.log("最后选中11111",this.identityList)
-				
+
 					 });
 					},
 
@@ -1313,7 +1314,7 @@
 									} else {
 									return isYN;
 									}
-									} ,  
+									} ,
 									backSelectedHandler(id, isIndex = false) {
 									let isYN = false;
 									let seleIndex = -1;
@@ -1331,7 +1332,7 @@
 									} else {
 									return isYN;
 									}
-								}, 
+								},
 								chooseHandler(){
 									var $dom =$("#announcement");
 									var $domBanner=$("#graphic");
@@ -1353,9 +1354,9 @@
 										}
 										this.identityList=newArr
 										$(".dialog-pop").show();
-										
+
 									}
-									
+
 								},
 								// 分组
 							tagBtnHandler(data) {
@@ -1386,7 +1387,7 @@
 								type: "POST",
 								dataType: "json",
 								data: {
-									orgId:_this.dataForm.orgId,//项目Id 
+									orgId:_this.dataForm.orgId,//项目Id
 									virtId: _this.inputUser,//
 								},
 								success: function (data) {
@@ -1437,7 +1438,7 @@
 										if (data.code == 200) {
 											var result=data.data
 											_this.chooseDepList=result.deptGroupJson
-										} 
+										}
 									}
 								});
 						},
@@ -1469,7 +1470,7 @@
 								},
 								error: function(err){
 
-								} 
+								}
 							});
 							},
 						},
@@ -1481,7 +1482,7 @@
 							 if (id) {
 								this.ajaxDetail(id)
 							}
-						 	
+
 						},
 					})
 				})
@@ -1496,13 +1497,13 @@
 				</script>
 				<script type="text/javascript" src="${ctx }/scripts/admin/cjqt.js"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/base64Tool.js?v=1.0.4'/>"></script>
-				
+
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/jquery.min.js'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/exif.js'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/bootstrap.min.js'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/cropper.js'/>"></script>
-				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/myCrop.js?v=1.0.4'/>"></script>
-				<script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppPublish.js?v=2222222'/>"></script>
+				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/myCrop.js?v=1.0.5'/>"></script>
+				<script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppPublish.js?v=20220525.1'/>"></script>
 			</body>
 
-			</html>
+			</html>

src/main/webapp/WEB-INF/pages/admin/notice/noticeAppVerify.jsp

@@ -145,7 +145,7 @@
       <script type="text/html" id="indexTpl">
         {{d.LAY_TABLE_INDEX+1}}
       </script>
-      <script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppVerify.js?v=2022.03.03.21.2'/>"></script>
+      <script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppVerify.js?v=2022.05.25.1'/>"></script>
     </body>
 
     </html>

src/main/webapp/scripts/admin/notice/noticeAppPublish.js

@@ -316,7 +316,7 @@ $(function () {
 					//$(".img-wrapper").css("background-image", "url(../images/admin/notice_cover.png)");
 					$(".app-publish-wrapper").eq(0).show().siblings().hide();
 					$(".choose-publish-con").hide();
-				} else if (noticeType == 2 || noticeType == 5) {
+				} else if (noticeType == 2 || noticeType == 5 || noticeType == 6) {
 					//$(".img-wrapper").css("background-image", "url(../images/admin/notice_cover.png)");
 					$(".app-publish-wrapper").hide();
 					$(".choose-publish-con").show();
@@ -326,8 +326,8 @@ $(function () {
 					contentType = 1; //选择公告和跳转链接时contentType传1
 					$(".app-publish-wrapper").eq(1).show().siblings().hide();
 					$(".choose-publish-con").hide();
-					
-					
+
+
 				}
 
 			});
@@ -343,7 +343,7 @@ $(function () {
 					//$(".img-wrapper").css("background-image", "url(../images/admin/notice_cover.png)");
 					$(".app-publish-wrapper").eq(3).show().siblings().hide();
 					$(".choose-publish-con").show();
-					if($("#state").val()==5){
+					if($("#state").val()==5 || $("#state").val()==6){
 						$(".app-publish-wrapper").eq(3).find('.port-wp').css('visibility','hidden');
 					}else{
 						$(".app-publish-wrapper").eq(3).find('.port-wp').css('visibility','visible');
@@ -352,17 +352,17 @@ $(function () {
 					//$(".img-wrapper").css("background-image", "url(../images/admin/notice_cover.png)");
 					$(".app-publish-wrapper").eq(2).show().siblings().hide();
 					$(".choose-publish-con").show();
-					if($("#state").val()==5){
+					if($("#state").val()==5 || $("#state").val()==6){
 						$(".app-publish-wrapper").eq(2).find('.port-wp').css('visibility','hidden');
 					}else{
 						$(".app-publish-wrapper").eq(2).find('.port-wp').css('visibility','visible');
 					}
-					
+
 				}
 			});
 			//公告选择公众号发布端口
 			// $(" #announcement .port-con .checkbox-wp .check-item").on("click",function(){
-			// 	if(!($("#announcement").is(':hidden')) && 
+			// 	if(!($("#announcement").is(':hidden')) &&
 			// 	($(".port-con").find('input:checkbox[name="public"]').prop("checked")||$(".port-con").find('input:checkbox[name="pushMsg"]').prop("checked"))){
 			// 		if($(this).data("type")==3 || $(this).data("type")==1){
 			// 			$("#announcement .public-extra-wp").show();
@@ -372,7 +372,7 @@ $(function () {
 			// 			 $("#announcement .search-wp").remove();
 			// 		}
 			// 		if($(this).data("type")==3){
-						
+
 			// 		}else{
 			// 			$("#announcement .public-extra-msglist").hide();
 			// 		}
@@ -381,13 +381,13 @@ $(function () {
 			// 		$("#announcement .public-extra-wp").hide();
 			// 		$("#announcement .public-extra-msglist").hide();
 			// 	}
-				
+
 			// });
 			//公告选择公众号发布端口 图文与模板消息只能选择1个 新需求 20211109
 			// var $dom =$("#announcement");
 			// $dom.find('input:checkbox[name="wx"]').prop("checked")
 			$(" #announcement .port-con .checkbox-wp .check-item").on("click",function(){
-				if(!($("#announcement").is(':hidden')) && 
+				if(!($("#announcement").is(':hidden')) &&
 				($("#announcement .port-con").find('input:checkbox[name="public"]').prop("checked")  )){//图文选中 模板消息不可以点击
 					console.log(4444444)
 					//图文选中 设置模板消息隐藏
@@ -397,7 +397,7 @@ $(function () {
 					//$('input:radio:first').attr('checked', 'checked');
 					//公众号所有粉丝 --隐藏部门的选中的值
 					// $("#announcement").find("input:radio[name='public']:first").prop('checked', true);
-					// $("#announcement .tv-choose-content").hide();	
+					// $("#announcement .tv-choose-content").hide();
 					$("#announcement .search-wp").remove();
 				}
 				// else if(!($("#announcement").is(':hidden')) &&  //图文不选中  模板消息可以点击
@@ -410,7 +410,7 @@ $(function () {
 				// 	$("#announcement .tv-choose-content").hide();
 				// 	$("#announcement .search-wp").remove();
 				// }
-				else if(!($("#announcement").is(':hidden')) &&  // 模板消息选中 图文不可以点击 
+				else if(!($("#announcement").is(':hidden')) &&  // 模板消息选中 图文不可以点击
 				( $("#announcement .port-con").find('input:checkbox[name="pushMsg"]').prop("checked"))){
 					console.log(33333)
 					$("#announcement .public-extra-wp").show();
@@ -428,7 +428,7 @@ $(function () {
 					$(".port-con").find('input:checkbox[name="public"]').show();
 					$(".port-con").find('input:checkbox[name="pushMsg"]').show();
 				}
-				
+
 			});
 			//banner 跳转链接选择公众号发布端口
 			$("#link .port-con .checkbox-wp .check-item").on("click",function(){
@@ -473,7 +473,7 @@ $(function () {
 				if(type==4){
 					$("#announcement .tv-choose-content").show();
 				}else{
-					$("#announcement .tv-choose-content").hide();	
+					$("#announcement .tv-choose-content").hide();
 				}
 			});
 
@@ -489,9 +489,9 @@ $(function () {
 					$("#graphic .search-wp").remove();
 				}
 				if(type==4){
-					$("#graphic .tv-choose-content").show();	
+					$("#graphic .tv-choose-content").show();
 				}else{
-					$("#graphic .tv-choose-content").hide();	
+					$("#graphic .tv-choose-content").hide();
 				}
 			});
 
@@ -507,9 +507,9 @@ $(function () {
 					$("#link .search-wp").remove();
 				}
 				if(type==4){
-					$("#link .tv-choose-content").show();	
+					$("#link .tv-choose-content").show();
 				}else{
-					$("#link .tv-choose-content").hide();	
+					$("#link .tv-choose-content").hide();
 				}
 			});
 			//各个公告切换
@@ -1025,8 +1025,8 @@ $(function () {
 
 
 			var  isPushTemplate=0
-				
-				
+
+
 			if(type==1){
 				//推送消息
 				if ($dom.find('input:checkbox[name="pushMsg"]').prop("checked")) {
@@ -1118,12 +1118,12 @@ $(function () {
 								return false;
 							}
 						}
-						
+
 					}
 
 					var depListNotice=$("#announcement .tv-choose-content").val()
 					if($dom.find("input:radio[name='public']:checked").data("type")==4 && depListNotice){
-						formData.append("deptGroupJson", depListNotice);	
+						formData.append("deptGroupJson", depListNotice);
 					}else{
 						formData.append("deptGroupJson", "");
 					}
@@ -1135,7 +1135,7 @@ $(function () {
 						formData.append("isMessageList", isMessageList);
 
 				} else if (type == 2) {
-					if(noticeType == 5){
+					if(noticeType == 5||noticeType == 6){
 						isApp = 0;
 						isWechat = 1;
 						positionTypeArr.push(2);
@@ -1204,7 +1204,7 @@ $(function () {
 						}
 					};
 				} else if (type == 3) {
-					if(noticeType == 5){
+					if(noticeType == 5||noticeType == 6){
 						isApp = 0;
 						isWechat = 1;
 						positionTypeArr.push(2);
@@ -1277,7 +1277,7 @@ $(function () {
 				formData.append("isApp", isApp);
 				formData.append("positionType", positionType);
 
-			
+
 
 				//添加审核类型
 				let approvetye=$("#approvalType").val()
@@ -1350,7 +1350,7 @@ $(function () {
 			console.log("部分选择",$("#announcement .tv-choose-content").val());
 			if (func == 'add') {
 				_this.throttle(_this.ajaxCreateApp(type, formData, ue, $dom), 5000);
-				
+
 			} else {
 				_this.ajaxCreatePreviewApp(type, formData, ue, $dom);
 				// _this.previewPhone(type);
@@ -1364,7 +1364,7 @@ $(function () {
 					handler.apply(this, arguments);
 					lastTime = nowTime;
 				}
-		 
+
 			}
 		},
 
@@ -1821,11 +1821,11 @@ $(function () {
 					$("#announcement .port-con").find('input:checkbox[name="pushMsg"]').hide();
 					if(data.publicObj==1){
 						$('#announcement input:radio[name="public"]').eq(0).prop("checked", true);
-						$("#announcement .tv-choose-content").hide();	
+						$("#announcement .tv-choose-content").hide();
 					}else if(data.publicObj==2){
 						var $dom = permPublish ? $('#announcement input:radio[name="public"]').eq(1) : $('#announcement input:radio[name="public"]').eq(0)
 						$dom.prop("checked", true);
-						$("#announcement .tv-choose-content").hide();	
+						$("#announcement .tv-choose-content").hide();
 					}else if(data.publicObj==3){
 						var $dom = permPublish ? $('#announcement input:radio[name="public"]').eq(2) : $('#announcement input:radio[name="public"]').eq(1)
 						   $dom.prop("checked", true);
@@ -1835,7 +1835,7 @@ $(function () {
 						_this.getProjectSearch($(".search-select-wp"),2,function(allData){
 				        	_this.searchChooseEvent(2,$(".search-select-wp"),allData,data.userIds)
 				        });
-						$("#announcement .tv-choose-content").hide();	
+						$("#announcement .tv-choose-content").hide();
 					}else if(data.publicObj==4){
 						var $dom = permPublish ? $('#announcement input:radio[name="public"]').eq(3) : $('#announcement input:radio[name="public"]').eq(1)
 						$dom.prop("checked", true);
@@ -1850,11 +1850,11 @@ $(function () {
 					$("#announcement .public-extra-msglist").hide();
 					if(data.publicObj==1){
 						$('#announcement input:radio[name="public"]').eq(0).prop("checked", true);
-						$("#announcement .tv-choose-content").hide();	
+						$("#announcement .tv-choose-content").hide();
 					}else if(data.publicObj==2){
 						var $dom = permPublish ? $('#announcement input:radio[name="public"]').eq(1) : $('#announcement input:radio[name="public"]').eq(0)
 						$dom.prop("checked", true);
-						$("#announcement .tv-choose-content").hide();	
+						$("#announcement .tv-choose-content").hide();
 					}else if(data.publicObj==3){
 						var $dom = permPublish ? $('#announcement input:radio[name="public"]').eq(2) : $('#announcement input:radio[name="public"]').eq(1)
 						   $dom.prop("checked", true);
@@ -1864,7 +1864,7 @@ $(function () {
 						_this.getProjectSearch($(".search-select-wp"),2,function(allData){
 				        	_this.searchChooseEvent(2,$(".search-select-wp"),allData,data.userIds)
 				        });
-						$("#announcement .tv-choose-content").hide();	
+						$("#announcement .tv-choose-content").hide();
 					}else if(data.publicObj==4){
 						var $dom = permPublish ? $('#announcement input:radio[name="public"]').eq(3) : $('#announcement input:radio[name="public"]').eq(1)
 						   $dom.prop("checked", true);
@@ -1896,7 +1896,7 @@ $(function () {
 					// $('#announcement input:radio[name="public"]').attr("disabled", true);
 					// $('#announcement input:radio[name="msg"]').attr("disabled", true);
 				}
-			} else if ((data.noticeType == 2 || data.noticeType == 5) && data.contentType == 1) {
+			} else if ((data.noticeType == 2 || data.noticeType == 5 || data.noticeType == 6) && data.contentType == 1) {
 
 				projectOrgId = !!data.orgId ? data.orgId+',' : data.orgIds;
 				var orgArr = projectOrgId.split(',');
@@ -1942,7 +1942,7 @@ $(function () {
 				if(data.isPushTemplate == 1){
 					if(data.publicObj==1){
 						$('#graphic input:radio[name="publicBanner"]').eq(0).prop("checked", true);
-						$("#graphic .tv-choose-content").hide();	
+						$("#graphic .tv-choose-content").hide();
 					}else if(data.publicObj==2){
 						$('#graphic input:radio[name="publicBanner"]').eq(1).prop("checked", true);
 						$("#graphic .tv-choose-content").hide();
@@ -1980,7 +1980,7 @@ $(function () {
 				if(data.isApp == 1){
 					$('#graphic input:checkbox[name="app2"]').prop("checked", true)
 				};
-			} else if ((data.noticeType == 2 || data.noticeType == 5) && data.contentType == 2) {
+			} else if ((data.noticeType == 2 || data.noticeType == 5 || data.noticeType == 6) && data.contentType == 2) {
 
 				projectOrgId = !!data.orgId ? data.orgId+',' : data.orgIds;
 				var orgArr = projectOrgId.split(',');
@@ -1999,7 +1999,7 @@ $(function () {
 				$("#link #showImg").attr("src",data.coverUrl)
 				$(".img-wrapper").css("background-image", "url(" + data.coverUrl + ")");
 				$(".app-publish-wrapper").eq(2).show().siblings().hide();
-				if(data.noticeType == 5){
+				if(data.noticeType == 5||data.noticeType == 6){
 					$(".app-publish-wrapper").eq(2).find('.port-wp').css('visibility','hidden');
 				}
 				$(".choose-publish-con").show();

src/main/webapp/scripts/admin/notice/noticeAppVerify.js

@@ -625,7 +625,11 @@ $(function () {
                       return '生成链接'
                   }else if (data.notice_type == 5) {
                       return '楼闪送banner'
-                  }
+                  }else if (data.notice_type == 6) {
+					  return '周边商户banner'
+				  } else {
+                  	return ''
+				  }
               }
             },{
 							field: 'title',

src/main/webapp/scripts/lib/plugins/noticePhotoClip/myCrop.js

@@ -151,7 +151,7 @@ window.onload = function () {
      		                 $dom.find("#showImg").data("url",data.data.preview);
      		            	 $dom.find(".img-wrapper").css("background-image", "url(" + fileImg + ")");
      		            	 $dom.find("#photoBtn").val("更换图片");
-     		            	 
+
      		            	 $dom.find("#inputImage").val("");
      		            	$("#imgCutConfirm").attr("disabled",false);
      		            	var typeImg = "image/" + '';
@@ -175,7 +175,7 @@ window.onload = function () {
      					$("#imgCutConfirm").attr("disabled",false);
      				}
      			});
-            }else if(($("#state").val()==2 || $("#state").val()==5) && $("#content").val()==1 ){//图文
+            }else if(($("#state").val()==2 || $("#state").val()==5 || $("#state").val()==6) && $("#content").val()==1 ){//图文
             	 $("#graphic #showImg").attr("src", fileImg);
                  //控制图片大小不大于1M
                  // if ((upload(fileImg, typeImg || "image/png").get("pictures")).size < 1024 * 1024) {
@@ -188,7 +188,7 @@ window.onload = function () {
                  //   console.log('图片大于1M')
                  //   layer.alert('图片大小须在1M以内!');
                  // }
-            }else if(($("#state").val()==2 || $("#state").val()==5) && $("#content").val()==2 ){//跳转链接
+            }else if(($("#state").val()==2 || $("#state").val()==5 || $("#state").val()==6) && $("#content").val()==2 ){//跳转链接
 	           	 $("#link #showImg").attr("src", fileImg);
 	           	 $("#link").find("#showImg").attr("src", fileImg);
 	             //控制图片大小不大于1M
@@ -233,7 +233,7 @@ window.onload = function () {
     inputImage.onchange = function () {
       var files = this.files;
       var file;
-      
+
       if (cropper && files && files.length) {
         file = files[0];
 
@@ -251,4 +251,4 @@ window.onload = function () {
     inputImage.parentNode.className += ' disabled';
   }
 
-};
+};