Home Explore Help
Sign In
super_service
/
superdesk_superservice
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

发布公告和公告列表添加企业云卡banner

黄勇成 1 year ago
parent
c9fcd8b227
commit
a0a12cc1b5
6 changed files with 57 additions and 51 deletions
Split View Show Diff Stats
  1. 35 35
      src/main/webapp/WEB-INF/pages/admin/notice/noticeAppDetail.jsp
  2. 3 2
      src/main/webapp/WEB-INF/pages/admin/notice/noticeAppPublish.jsp
  3. 3 1
      src/main/webapp/WEB-INF/pages/admin/notice/noticeAppVerify.jsp
  4. 10 9
      src/main/webapp/scripts/admin/notice/noticeAppPublish.js
  5. 4 2
      src/main/webapp/scripts/admin/notice/noticeAppVerify.js
  6. 2 2
      src/main/webapp/scripts/lib/plugins/noticePhotoClip/myCrop.js

+ 35 - 35
src/main/webapp/WEB-INF/pages/admin/notice/noticeAppDetail.jsp
View File 

@@ -32,7 +32,7 @@
 
         position: absolute;
 
         background: #fff;
 
         overflow: hidden;
 
-        
+
 
     }
 
     .w-i-tips-item{
 
         line-height: 26px;
 
@@ -140,7 +140,7 @@
 
 max-height: 180px;
 
 overflow: auto;
 
 }
 
-	
+
 
 </style>
 
 </head>
 
 <body>
 
@@ -161,7 +161,7 @@ overflow: auto;
 
                         <span class="tips-title">审核类型</span>
 
                         <span class="dialog-desc">{{noticeDetail.approvalTypeName?noticeDetail.approvalTypeName:'无'}}</span>
 
                        </div>
 
-                    </div>   
+                    </div>
 
                     <div class="detail-title-item clearfloat">
 
                         <span class="tips-title">封面图片</span>
 
                         <img :src="noticeDetail.coverUrl" alt="" class="dialog-image">
 
@@ -179,7 +179,7 @@ overflow: auto;
 
                         <span class="tips-title">摘要</span>
 
                         <span class="dialog-desc">{{noticeDetail.summaryInfo}}</span>
 
                     </div>
 
-                    
+
 
                     <div v-if="noticeDetail.auditList">
 
                         <div v-for="item in noticeDetail.auditList" :key="item.id" >
 
                         <div>
 
@@ -199,11 +199,11 @@ overflow: auto;
 
                             <span class="w-i-approve">{{item.approvalOpinion}}</span>
 
                         </div>
 
                     </div>
 
-                    </div>                                 
+                    </div>
 
                 </div>
 
             </div>
 
     </div>
 
-    <div v-if="noticeDetail.noticeType==2 &&noticeDetail.contentType==1">
 
+    <div v-if="(noticeDetail.noticeType==2||noticeDetail.noticeType==5||noticeDetail.noticeType==6||noticeDetail.noticeType==7) &&noticeDetail.contentType==1">
 
         <div class="dialog dialog-detail-con">
 
             <div class="dialog-detail-wp">
 
                 <div class="nav-title-wrap">
 
@@ -216,7 +216,7 @@ overflow: auto;
 
                     <span class="tips-title">审核类型</span>
 
                     <span class="dialog-desc">{{noticeDetail.approvalTypeName?noticeDetail.approvalTypeName:'无'}}</span>
 
                    </div>
 
-                </div>   
+                </div>
 
                 <div class="detail-title-item clearfloat">
 
                     <span class="tips-title">发布内容</span>
 
                     <span class="dialog-desc">图文消息</span>
 
@@ -234,7 +234,7 @@ overflow: auto;
 
                     <div v-html="noticeDetail.content" class="dialog-textarea-desc" readonly="readonly"></div>
 
                     <!-- <div class="dialog-textarea-desc" readonly="readonly">{{noticeDetail.content}}</div > -->
 
                 </div>
 
-                
+
 
                 <div v-if="noticeDetail.auditList">
 
                     <div v-for="item in noticeDetail.auditList" :key="item.id" >
 
                     <div>
 
@@ -254,11 +254,11 @@ overflow: auto;
 
                         <span class="w-i-approve">{{item.approvalOpinion}}</span>
 
                     </div>
 
                 </div>
 
-                </div>                                 
+                </div>
 
             </div>
 
         </div>
 
     </div>
 
-    <div v-if="noticeDetail.noticeType==2 &&noticeDetail.contentType==2">
 
+    <div v-if="(noticeDetail.noticeType==2||noticeDetail.noticeType==5||noticeDetail.noticeType==6||noticeDetail.noticeType==7) &&noticeDetail.contentType==2">
 
         <div class="dialog dialog-detail-con">
 
             <div class="dialog-detail-wp">
 
                 <div class="nav-title-wrap">
 
@@ -271,17 +271,17 @@ overflow: auto;
 
                     <span class="tips-title">审核类型</span>
 
                     <span class="dialog-desc">{{noticeDetail.approvalTypeName?noticeDetail.approvalTypeName:'无'}}</span>
 
                    </div>
 
-                </div>   
+                </div>
 
                 <div class="detail-title-item clearfloat">
 
                     <span class="tips-title">发布内容</span>
 
                     <span class="dialog-desc">跳转链接</span>
 
                 </div>
 
-               
+
 
                 <div class="detail-title-item clearfloat">
 
                     <span class="tips-title">跳转链接</span>
 
                     <span class="dialog-desc">{{noticeDetail.urlAddress}}</span>
 
                 </div>
 
-                
+
 
                 <div v-if="noticeDetail.auditList">
 
                     <div v-for="item in noticeDetail.auditList" :key="item.id" >
 
                     <div>
 
@@ -301,7 +301,7 @@ overflow: auto;
 
                         <span class="w-i-approve">{{item.approvalOpinion}}</span>
 
                     </div>
 
                 </div>
 
-                </div>                                 
+                </div>
 
             </div>
 
         </div>
 
     </div>
 
@@ -318,7 +318,7 @@ overflow: auto;
 
                     <span class="tips-title">审核类型</span>
 
                     <span class="dialog-desc">{{noticeDetail.approvalTypeName?noticeDetail.approvalTypeName:'无'}}</span>
 
                    </div>
 
-                </div>   
+                </div>
 
                 <div class="detail-title-item clearfloat">
 
                     <span class="tips-title">主题</span>
 
                     <span class="dialog-desc">{{noticeDetail.title}}</span>
 
@@ -328,7 +328,7 @@ overflow: auto;
 
                     <div v-html="noticeDetail.content" class="dialog-textarea-desc" readonly="readonly"></div>
 
                     <!-- <div class="dialog-textarea-desc" readonly="readonly">{{noticeDetail.content}}</div > -->
 
                 </div>
 
-                
+
 
                 <div v-if="noticeDetail.auditList">
 
                     <div v-for="item in noticeDetail.auditList" :key="item.id" >
 
                     <div>
 
@@ -348,7 +348,7 @@ overflow: auto;
 
                         <span class="w-i-approve">{{item.approvalOpinion}}</span>
 
                     </div>
 
                 </div>
 
-                </div>                                 
+                </div>
 
             </div>
 
         </div>
 
     </div>
 
@@ -360,7 +360,7 @@ overflow: auto;
 
                 <span class="dialog-desc" >
 
                     <span>{{item.createTime?formatTime(item.createTime):""}} </span>
 
                     <span class="mg-l-20">{{item.content}}</span>
 
-                    
+
 
                 </span>
 
             </div>
 
           </div>
 
@@ -380,7 +380,7 @@ overflow: auto;
 
         </div>
 
         <div class="detail-title-item clearfloat" v-if="showTable && showTable.length > 0">
 
             <span class="tips-title"></span>
 
-            <el-table :data="showTable" style="width: 601px;max-height: 350px;overflow: auto;" border   
+            <el-table :data="showTable" style="width: 601px;max-height: 350px;overflow: auto;" border
 
                    class="table-box-index mg-l-58"   >
 
           <el-table-column prop="department" label="部门" width="250"> </el-table-column>
 
           <el-table-column prop="username" label="用户" width="250"> </el-table-column>
 
@@ -407,8 +407,8 @@ overflow: auto;
 
 </el-dialog>
 
 
 
-	
-	
+
 
+
 
 </div>
 
 	<script type="text/javascript">
 
 		// 在页面加载好后就初始化vue实例,也可以在外面直接初始化
 
@@ -437,10 +437,10 @@ overflow: auto;
 
                         orgId:'',
 
                         readNun:'',
 
                         tbRecordList:[],
 
-						
+
 
 					}
 
 				},
 
-               
+
 
 				methods:{
 
                     formatTime(v) {
 
                         var date = new Date(v);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
 
@@ -462,7 +462,7 @@ overflow: auto;
 
                         data: {
 
                             id: _this.detailId,
 
                             orgId:_this.orgId,
 
-                          
+
 
                         },
 
                         success: function (data) {
 
                             if (data.code == 200) {
 
@@ -471,7 +471,7 @@ overflow: auto;
 
                             }
 
                         },
 
                         error: function (error) {
 
-                          
+
 
                         }
 
 		                });
 
                 },
 
@@ -484,7 +484,7 @@ overflow: auto;
 
                     })
 
                         .then(() => {
 
                             _this.exprotHandler();
 
-                        
+
 
                         })
 
                         .catch(() => {});
 
                     },
 
@@ -524,8 +524,8 @@ overflow: auto;
 
              //contentType 图文类型： 1 图文消息 ；2 跳转链接
 
 		 * 显示详情弹窗 noticeType 创建公告类型 1 公告 2 banner图文链接 3 banner跳转链接 4 生成链接
 
 		 * @param id
 
-         * 
-         * 
+         *
 
+         *
 
 		 */
 
             ajaxDetail(id){
 
                 let	_this = this
 
@@ -613,9 +613,9 @@ overflow: auto;
 
                             }else{
 
                                 _this.showTable=[]
 
                             }
 
-                            
-                          
-                           
+
 
+
 
+
 
                         }
 
                     },
 
                     error: function (error) {
 
@@ -630,9 +630,9 @@ overflow: auto;
 
                 if (r != null) return unescape(r[2]);
 
                 return null;
 
 			},
 
-			
-			
-					
+
 
+
 
+
 
 		},
 
         created(){
 
             var id = this.getQueryString("id")
 
@@ -652,4 +652,4 @@ overflow: auto;
 
 
 
 </body>
 
-</html>
 
+</html>

+ 3 - 2
src/main/webapp/WEB-INF/pages/admin/notice/noticeAppPublish.jsp
View File 

@@ -301,6 +301,7 @@
 
 									<option value="3">生成链接</option>
 
 									<option value="5">楼闪送banner</option>
 
 									<option value="6">周边商户banner</option>
 
+									<option value="7">企业云卡banner</option>
 
 								</select>
 
 							</div>
 
 							<div id="part-wp" class="part-wp choose-publish-con">
 
@@ -1502,8 +1503,8 @@
 
 				<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.5'/>"></script>
 
-				<script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppPublish.js?v=20220525.1'/>"></script>
 
+				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/myCrop.js?v=20230331.1'/>"></script>
 
+				<script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppPublish.js?v=20230331.1'/>"></script>
 
 			</body>
 
 
 			</html>

+ 3 - 1
src/main/webapp/WEB-INF/pages/admin/notice/noticeAppVerify.jsp
View File 

@@ -97,6 +97,8 @@
 
                 <option value="2">banner</option>
 
                 <option value="3">生成链接</option>
 
                 <option value="5">楼闪送banner</option>
 
+                <option value="6">周边商户banner</option>
 
+                <option value="7">企业云卡banner</option>
 
               </select>
 
             </div>
 
             <div class=" part-wp">
 
@@ -145,7 +147,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=20230323.1'/>"></script>
 
+      <script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppVerify.js?v=20230324.1'/>"></script>
 
     </body>
 
 
     </html>

+ 10 - 9
src/main/webapp/scripts/admin/notice/noticeAppPublish.js
View File 

@@ -293,7 +293,7 @@ $(function () {
 
 			//选择发布类型变化
 
 			$("#state").on("change", function () {
 
 
-				//noticeType 公告类型： 1 公告 ；2 banner图；3 跳转链接 5：楼闪送
 
+				//noticeType 公告类型： 1 公告 ；2 banner图；3 跳转链接 5：楼闪送banner 6：周边商户banner 7：企业云卡banner
 
 				//选择公告和跳转链接时contentType传1
 
 				noticeType = $(this).val();
 
 				//初始化 bannerLink
 
@@ -305,6 +305,7 @@ $(function () {
 
 				$("#graphic .tv-choose-content").hide();
 
 				$("#link .tv-choose-content").hide();
 
 				$(".img-wrapper").removeClass("cover-img-cover");
 
+				console.log('noticeType == ', noticeType);
 
 				if (!noticeType) { //发布类型没选择
 
 					//各个类型内容隐藏
 
 					//$(".img-wrapper").css("background-image", "url(../images/admin/notice_cover.png)");
 
@@ -316,7 +317,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 || noticeType == 6) {
 
+				} else if (noticeType == 2 || noticeType == 5 || noticeType == 6 || noticeType == 7) {
 
 					//$(".img-wrapper").css("background-image", "url(../images/admin/notice_cover.png)");
 
 					if (noticeType == 5 || noticeType == 6) {
 
 						console.log('替换样式112233');
 
@@ -347,7 +348,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 || $("#state").val()==6){
 
+					if($("#state").val()==5 || $("#state").val()==6 || $("#state").val()==7){
 
 						$(".app-publish-wrapper").eq(3).find('.port-wp').css('visibility','hidden');
 
 					}else{
 
 						$(".app-publish-wrapper").eq(3).find('.port-wp').css('visibility','visible');
 
@@ -356,7 +357,7 @@ $(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 || $("#state").val()==6){
 
+					if($("#state").val()==5 || $("#state").val()==6 || $("#state").val()==7){
 
 						$(".app-publish-wrapper").eq(2).find('.port-wp').css('visibility','hidden');
 
 					}else{
 
 						$(".app-publish-wrapper").eq(2).find('.port-wp').css('visibility','visible');
 
@@ -1139,7 +1140,7 @@ $(function () {
 
 						formData.append("isMessageList", isMessageList);
 
 
 				} else if (type == 2) {
 
-					if(noticeType == 5||noticeType == 6){
 
+					if(noticeType == 5||noticeType == 6||noticeType == 7){
 
 						isApp = 0;
 
 						isWechat = 1;
 
 						positionTypeArr.push(2);
 
@@ -1208,7 +1209,7 @@ $(function () {
 
 						}
 
 					};
 
 				} else if (type == 3) {
 
-					if(noticeType == 5||noticeType == 6){
 
+					if(noticeType == 5||noticeType == 6||noticeType == 7){
 
 						isApp = 0;
 
 						isWechat = 1;
 
 						positionTypeArr.push(2);
 
@@ -1900,7 +1901,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.noticeType == 6) && data.contentType == 1) {
 
+			} else if ((data.noticeType == 2 || data.noticeType == 5  || data.noticeType == 6 || data.noticeType == 7) && data.contentType == 1) {
 
 
 				projectOrgId = !!data.orgId ? data.orgId+',' : data.orgIds;
 
 				var orgArr = projectOrgId.split(',');
 
@@ -1984,7 +1985,7 @@ $(function () {
 
 				if(data.isApp == 1){
 
 					$('#graphic input:checkbox[name="app2"]').prop("checked", true)
 
 				};
 
-			} else if ((data.noticeType == 2 || data.noticeType == 5 || data.noticeType == 6) && data.contentType == 2) {
 
+			} else if ((data.noticeType == 2 || data.noticeType == 5 || data.noticeType == 6 || data.noticeType == 7) && data.contentType == 2) {
 
 
 				projectOrgId = !!data.orgId ? data.orgId+',' : data.orgIds;
 
 				var orgArr = projectOrgId.split(',');
 
@@ -2003,7 +2004,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||data.noticeType == 6){
 
+				if(data.noticeType == 5||data.noticeType == 6||data.noticeType == 7){
 
 					$(".app-publish-wrapper").eq(2).find('.port-wp').css('visibility','hidden');
 
 				}
 
 				$(".choose-publish-con").show();

+ 4 - 2
src/main/webapp/scripts/admin/notice/noticeAppVerify.js
View File 

@@ -623,10 +623,12 @@ $(function () {
 
                       return 'banner'
 
                   } else if (data.notice_type == 3) {
 
                       return '生成链接'
 
-                  }else if (data.notice_type == 5) {
 
+                  } else if (data.notice_type == 5) {
 
                       return '楼闪送banner'
 
-                  }else if (data.notice_type == 6) {
 
+                  } else if (data.notice_type == 6) {
 
 					  return '周边商户banner'
 
+				  } else if (data.notice_type == 7) {
 
+					  return '企业云卡banner'
 
 				  } else {
 
                   	return ''
 
 				  }

+ 2 - 2
src/main/webapp/scripts/lib/plugins/noticePhotoClip/myCrop.js
View File 

@@ -175,7 +175,7 @@ window.onload = function () {
 
      					$("#imgCutConfirm").attr("disabled",false);
 
      				}
 
      			});
 
-            }else if(($("#state").val()==2 || $("#state").val()==5 || $("#state").val()==6) && $("#content").val()==1 ){//图文
 
+            }else if(($("#state").val()==-1 || $("#state").val()==2 || $("#state").val()==5 || $("#state").val()==6|| $("#state").val()==7) && $("#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 || $("#state").val()==6) && $("#content").val()==2 ){//跳转链接
 
+            }else if(($("#state").val()==-1||$("#state").val()==2 || $("#state").val()==5 || $("#state").val()==6|| $("#state").val()==7) && $("#content").val()==2 ){//跳转链接
 
 	           	 $("#link #showImg").attr("src", fileImg);
 
 	           	 $("#link").find("#showImg").attr("src", fileImg);
 
 	             //控制图片大小不大于1M