From 97b055718bc931117298f679499ed62b9502b485 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 25 三月 2024 16:49:57 +0800 Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs --- src/main/webapp/static/js/appVersion/appVersion.js | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/static/js/appVersion/appVersion.js b/src/main/webapp/static/js/appVersion/appVersion.js index eb9c691..db58cec 100644 --- a/src/main/webapp/static/js/appVersion/appVersion.js +++ b/src/main/webapp/static/js/appVersion/appVersion.js @@ -1,4 +1,5 @@ var pageCurr; +var odtotr; layui.config({ base: baseUrl + "/static/layui/lay/modules/" }).use(['table','laydate', 'form', 'admin','upload'], function(){ @@ -135,6 +136,7 @@ // 鐩戝惉琛屽伐鍏蜂簨浠� table.on('tool(appVersion)', function(obj){ var data = obj.data; + odtotr = data switch (obj.event) { case 'edit': showEditModel(data); @@ -177,15 +179,36 @@ parent.location.reload() }) }else{ - admin.open({ - type: 1, - area: '600px', - title: 'APP涓嬭浇', - content: $('#qrCode').html(), - success: function (layero, dIndex) { + var ipAddress = ''; + $.ajax({ + url: baseUrl+"/appVersion/downloadApp/getIp", + headers: {'token': localStorage.getItem('token')}, + method: 'POST', + cache: false, + processData: false, + contentType: false, + success: function (res) { + ipAddress = res.data + admin.open({ + type: 1, + area: '400px', + title: 'APP涓嬭浇', + content: + `<div> + <img class="template-code" + src="${baseUrl}/mac/code/auth?type=2¶m=${ipAddress}/${baseUrl}/appVersion/downloadApp/${data.path}" + width="100%"> + </div> + <div style="height: 50px;display: flex;align-items: center;justify-content: center"> + <button class="layui-btn layui-btn-sm" lay-event="down" onclick="download()">涓嬭浇鍒版湰鍦�</button> + </div>`, + success: function (layero, dIndex) { + } + }) } }) + // window.open(baseUrl + "/appVersion/downloadApp/" + data.path); } break; @@ -301,3 +324,10 @@ page: {curr: pageCurr} }); } + +function download() { + console.log(1) + layer.closeAll(); + window.open(baseUrl + "/appVersion/downloadApp/" + odtotr.path); +} + -- Gitblit v1.9.1