Commit 691d74ee2ece2dafa1eb14cc212a241f4fd12c11
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
app-ht/modules/upgrade/views/upgrade/create.php
| ... | ... | @@ -113,10 +113,25 @@ $this->params['breadcrumbs'][] = $this->title; |
| 113 | 113 | var getUrl = '<?=Url::toRoute("/upgrade/upgrade/do-add")?>'; |
| 114 | 114 | $('#myFrom').attr('action', getUrl); |
| 115 | 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 | 119 | if (a == ""){ |
| 117 | 120 | alert("APP版本号不能为空"); |
| 118 | 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 | 135 | var cb = $("#myFrom").validate().form(); |
| 121 | 136 | if (!cb){ |
| 122 | 137 | return; |
| ... | ... | @@ -181,6 +196,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 181 | 196 | '<h4 class="info">' + file.name + '</h4>' + |
| 182 | 197 | '<p class="state">等待上传...</p>' + |
| 183 | 198 | '</div>' );*/ |
| 199 | + $("#save").attr("disabled", "disabled"); | |
| 184 | 200 | $list.html( '<div id="' + file.id + '" class="item">' + |
| 185 | 201 | '<h4 class="info">' + file.name + '</h4>' + |
| 186 | 202 | '<p class="state">等待上传...</p>' + |
| ... | ... | @@ -206,6 +222,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 206 | 222 | // 文件上传成功 |
| 207 | 223 | uploader.on( 'uploadSuccess', function( file,response) { |
| 208 | 224 | $( '#'+file.id ).find('p.state').text('已上传'); |
| 225 | + $("#save").removeAttr("disabled"); | |
| 209 | 226 | //$list.append('<input type="hidden" name="'+ids+'" value="'+response.filePath+'" />'); |
| 210 | 227 | $("input[name='path']").val(response.filePath); |
| 211 | 228 | $("input[name='size']").val(response.fileSize); | ... | ... |
domain/upgrade/UpgradeRepository.php
| ... | ... | @@ -38,7 +38,7 @@ class UpgradeRepository |
| 38 | 38 | if ($limit) { |
| 39 | 39 | $upgradeFind->limit($limit); |
| 40 | 40 | } |
| 41 | - $upgradeFind->andWhere(["is_delete" => 0]); | |
| 41 | + $upgradeFind->andWhere(["u.is_delete" => 0]); | |
| 42 | 42 | $upgradeFind->orderBy("u.id desc"); |
| 43 | 43 | $upgradeFind->asArray(); |
| 44 | 44 | $dataList = $upgradeFind->all(); |
| ... | ... | @@ -57,7 +57,7 @@ class UpgradeRepository |
| 57 | 57 | if (!empty($map)) { |
| 58 | 58 | $upgradeFind->where($map); |
| 59 | 59 | } |
| 60 | - $upgradeFind->andWhere(["is_delete" => 0]); | |
| 60 | + $upgradeFind->andWhere(["u.is_delete" => 0]); | |
| 61 | 61 | $pageCount = $upgradeFind->count(); |
| 62 | 62 | |
| 63 | 63 | return $pageCount; | ... | ... |