OTHER_COMPANY_PROJECTS / ota

Download as
Browse Code »

Commit 691d74ee2ece2dafa1eb14cc212a241f4fd12c11

Authored by 曹明
1 parent 8237f912
Exists in master

app-ht(v1.8.6 build 15) 

1.版本管理报错修复。
2.版本管理上传安装包的时候把确认上传按钮禁止操作。
Showing 3 changed files with 20 additions and 3 deletions   Show diff stats
app-ht/config/params.php
  Diff comments   View file @691d74e
1 <?php 1 <?php
2 return [ 2 return [
3 - 'VERSION' => 'v1.8.6 build 14', 3 + 'VERSION' => 'v1.8.6 build 15',
4 'MANUFACTURE_ROLE_ID' => 1 4 'MANUFACTURE_ROLE_ID' => 1
5 ]; 5 ];
6 \ No newline at end of file 6 \ No newline at end of file
app-ht/modules/upgrade/views/upgrade/create.php
  Diff comments   View file @691d74e
@@ -113,10 +113,25 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -113,10 +113,25 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
113 var getUrl = '<?=Url::toRoute("/upgrade/upgrade/do-add")?>'; 113 var getUrl = '<?=Url::toRoute("/upgrade/upgrade/do-add")?>';
114 $('#myFrom').attr('action', getUrl); 114 $('#myFrom').attr('action', getUrl);
115 var a = $("input[name='version']").val(); 115 var a = $("input[name='version']").val();
  116 + var package_name = $("input[name='package_name']").val();
  117 + var manufacture_id = $("input[name='manufacture_id']").val();
  118 + var path = $("input[name='path']").val();
116 if (a == ""){ 119 if (a == ""){
117 alert("APP版本号不能为空"); 120 alert("APP版本号不能为空");
118 return false; 121 return false;
119 } 122 }
  123 + if (package_name == ""){
  124 + alert("安装包名不能为空");
  125 + return false;
  126 + }
  127 + if (manufacture_id == ""){
  128 + alert("请选择厂商");
  129 + return false;
  130 + }
  131 + if (path == ""){
  132 + alert("请上传安装包");
  133 + return false;
  134 + }
120 var cb = $("#myFrom").validate().form(); 135 var cb = $("#myFrom").validate().form();
121 if (!cb){ 136 if (!cb){
122 return; 137 return;
@@ -181,6 +196,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -181,6 +196,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
181 '<h4 class="info">' + file.name + '</h4>' + 196 '<h4 class="info">' + file.name + '</h4>' +
182 '<p class="state">等待上传...</p>' + 197 '<p class="state">等待上传...</p>' +
183 '</div>' );*/ 198 '</div>' );*/
  199 + $("#save").attr("disabled", "disabled");
184 $list.html( '<div id="' + file.id + '" class="item">' + 200 $list.html( '<div id="' + file.id + '" class="item">' +
185 '<h4 class="info">' + file.name + '</h4>' + 201 '<h4 class="info">' + file.name + '</h4>' +
186 '<p class="state">等待上传...</p>' + 202 '<p class="state">等待上传...</p>' +
@@ -206,6 +222,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -206,6 +222,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
206 // 文件上传成功 222 // 文件上传成功
207 uploader.on( 'uploadSuccess', function( file,response) { 223 uploader.on( 'uploadSuccess', function( file,response) {
208 $( '#'+file.id ).find('p.state').text('已上传'); 224 $( '#'+file.id ).find('p.state').text('已上传');
  225 + $("#save").removeAttr("disabled");
209 //$list.append('<input type="hidden" name="'+ids+'" value="'+response.filePath+'" />'); 226 //$list.append('<input type="hidden" name="'+ids+'" value="'+response.filePath+'" />');
210 $("input[name='path']").val(response.filePath); 227 $("input[name='path']").val(response.filePath);
211 $("input[name='size']").val(response.fileSize); 228 $("input[name='size']").val(response.fileSize);
domain/upgrade/UpgradeRepository.php
  Diff comments   View file @691d74e
@@ -38,7 +38,7 @@ class UpgradeRepository @@ -38,7 +38,7 @@ class UpgradeRepository
38 if ($limit) { 38 if ($limit) {
39 $upgradeFind->limit($limit); 39 $upgradeFind->limit($limit);
40 } 40 }
41 - $upgradeFind->andWhere(["is_delete" => 0]); 41 + $upgradeFind->andWhere(["u.is_delete" => 0]);
42 $upgradeFind->orderBy("u.id desc"); 42 $upgradeFind->orderBy("u.id desc");
43 $upgradeFind->asArray(); 43 $upgradeFind->asArray();
44 $dataList = $upgradeFind->all(); 44 $dataList = $upgradeFind->all();
@@ -57,7 +57,7 @@ class UpgradeRepository @@ -57,7 +57,7 @@ class UpgradeRepository
57 if (!empty($map)) { 57 if (!empty($map)) {
58 $upgradeFind->where($map); 58 $upgradeFind->where($map);
59 } 59 }
60 - $upgradeFind->andWhere(["is_delete" => 0]); 60 + $upgradeFind->andWhere(["u.is_delete" => 0]);
61 $pageCount = $upgradeFind->count(); 61 $pageCount = $upgradeFind->count();
62 62
63 return $pageCount; 63 return $pageCount;