tod 2019/4/15

修改所有的页面弹框属性
使所有的弹框不能点击空白处关闭，无关闭按钮的弹框添加关闭按钮
共修改24处（一处可有多个弹框）

src/main/ui/static/activity/encourage/encourage.js

@@ -29,6 +29,7 @@ define(['angular', 'uiRouter'], function (angular) {
         $scope.loadEvents();
         $scope.newEvent = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/activity/encourage/templates/encourage_modify.html',
                 controller: 'newEncourageEventCtrl'
             }).result.then(function () {
@@ -145,6 +146,7 @@ define(['angular', 'uiRouter'], function (angular) {
             $scope.loadUseLogs(1);
             $scope.modifyEvent = function () {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/activity/encourage/templates/encourage_modify.html',
                     controller: 'modifyEventCtrl',
                     resolve: {

src/main/ui/static/commons/services/commonDialog.js

@@ -73,6 +73,7 @@ define(['../app', 'angular'], function (app, angular) {
             },
             inputText:function (cfg) {
                 return $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl:'/static/commons/templates/text_input.html',
                     size: cfg.size || 'sm',
                     resolve:{

src/main/ui/static/commons/services/orderService.js

@@ -6,6 +6,7 @@ define(['../app'], function (app) {
     app.factory('orderService', ['$uibModal', function ($uibModal) {
         function openDetail(url) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/commons/templates/order_detail.html',
                 controller: 'orderDetailDialogCtrl',
                 resolve: {

src/main/ui/static/commons/templates/order_detail.html

@@ -215,4 +215,7 @@
             </table>
         </div>
     </div>
+    <div class="form-group">
+        <button class="btn btn-danger" type="button" ng-click="$dismiss()">Cancel</button>
+    </div>
 </div>

src/main/ui/static/config/bdprize/bdprize.js

@@ -113,6 +113,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
         $scope.loadRateConfigs();
         $scope.editRateConfig = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html',
                 controller: 'bdRateConfigCtrl',
                 resolve: {
@@ -126,6 +127,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
         };
         $scope.editBDLevels = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html',
                 size: 'lg',
                 controller: 'bdLevelConfigCtrl'
@@ -133,6 +135,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
         };
         $scope.editCommissionConfig = function (monModal) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/bdprize/templates/bd_commission_config_dialog.html',
                 controller: 'bdCommissionConfigCtrl',
                 size: 'lg',

src/main/ui/static/config/managers/manager.js

@@ -41,6 +41,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         $scope.listManagers();
         $scope.modifyManager = function (manager) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/managers/templates/modify.html',
                 controller: 'modifyManagerDialogCtrl',
                 resolve: {

src/main/ui/static/config/notice/notice.js

@@ -61,6 +61,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
 
         $scope.showNotice = function (notice) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/commons/templates/notice_detail.html',
                 controller: 'noticePreviewCtrl',
                 resolve: {

src/main/ui/static/config/organizations/organizations.js

@@ -506,6 +506,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         $scope.listManagers();
         $scope.modifyManager = function (manager) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/managers/templates/modify.html',
                 controller: 'modifyManagerCtrl',
                 resolve: {
@@ -531,6 +532,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         };
         $scope.newManager = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/managers/templates/new_manager.html',
                 controller: 'newManagerCtrl',
                 resolve: {

src/main/ui/static/config/sysconfigs/sysconfigs.js

@@ -275,6 +275,7 @@ define(['angular', 'uiRouter'], function (angular) {
             };
             $scope.moveFunction = function (func) {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/permission_choose_module.html',
                     controller: 'permissionChooseModuleDialogCtrl',
                     resolve: {
@@ -292,6 +293,7 @@ define(['angular', 'uiRouter'], function (angular) {
             };
             $scope.editFunctionInfo = function (func) {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/func_info_edit.html',
                     controller: 'permissionFuncEditDialogCtrl',
                     resolve: {
@@ -334,6 +336,7 @@ define(['angular', 'uiRouter'], function (angular) {
             $scope.modules = modules.data;
             $scope.newModule = function () {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/permission_module_dialog.html',
                     controller: 'moduleNewCtrl',
                     resolve: {
@@ -347,6 +350,7 @@ define(['angular', 'uiRouter'], function (angular) {
             };
             $scope.editModule = function (mod) {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/permission_module_dialog.html',
                     controller: 'moduleEditCtrl',
                     resolve: {
@@ -422,6 +426,7 @@ define(['angular', 'uiRouter'], function (angular) {
         };
         $scope.addUnSub = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/sysconfigs/templates/add_mail_unsub.html',
                 controller: 'addUnSubDialogCtrl',
                 size: 'sm'
@@ -464,6 +469,7 @@ define(['angular', 'uiRouter'], function (angular) {
     app.controller('permissionPartnerConfigRootCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) {
         $scope.authorizeRole = function (roleMask) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/sysconfigs/templates/permissionPartner_authorize_dialog.html',
                 controller: 'permissionPartnerAuthorizeDialogCtrl',
                 size: 'lg',
@@ -528,6 +534,7 @@ define(['angular', 'uiRouter'], function (angular) {
             };
             $scope.moveFunction = function (func) {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/permissionPartner_choose_module.html',
                     controller: 'permissionPartnerChooseModuleDialogCtrl',
                     resolve: {
@@ -545,6 +552,7 @@ define(['angular', 'uiRouter'], function (angular) {
             };
             $scope.editFunctionInfo = function (func) {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/PartnerFunc_info_edit.html',
                     controller: 'permissionPartnerFuncEditDialogCtrl',
                     resolve: {
@@ -580,6 +588,7 @@ define(['angular', 'uiRouter'], function (angular) {
             $scope.modules = modules.data;
             $scope.newPartnerModule = function () {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/permissionPartner_module_dialog.html',
                     controller: 'partnerModuleNewCtrl',
                     resolve: {
@@ -596,6 +605,7 @@ define(['angular', 'uiRouter'], function (angular) {
             };
             $scope.editPartnerModule = function (mod) {
                 $uibModal.open({
+                    backdrop: 'static', keyboard: false,
                     templateUrl: '/static/config/sysconfigs/templates/permissionPartner_module_dialog.html',
                     controller: 'partnerModuleEditCtrl',
                     resolve: {

src/main/ui/static/config/sysconfigs/templates/add_mail_unsub.html

@@ -8,6 +8,12 @@
         <div class="form-group">
             <button class="btn btn-success pull-right" ng-click="save()">Add</button>
         </div>
+        <div>
+            <h6></h6>
+        </div>
+        <div class="form-group pull-right">
+            <button class="btn btn-danger" ng-click="$dismiss()">Cancel</button>
+        </div>
 
     </div>
 </div>

src/main/ui/static/menu/managerMenu.js

@@ -64,6 +64,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
 
         $scope.editRateConfig = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html',
                 controller: 'bdRateConfigCtrl',
                 resolve: {
@@ -77,6 +78,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         };
         $scope.editBDLevels = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html',
                 controller: 'bdLevelConfigCtrl'
             })

src/main/ui/static/payment/merchantid/merchant_id_manager.js

@@ -182,6 +182,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
           $scope.loadTempSubMerchantId(1);
           $scope.save = function () {
               $uibModal.open({
+                  backdrop: 'static', keyboard: false,
                   templateUrl: '/static/payment/merchantid/templates/new_common_sub_merchant_id.html',
                   controller: 'newCommonSubMerchantIdCtrl'
               }).result.then(function () {

src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html

@@ -15,10 +15,14 @@
                             <div class="form-group">
                                 <button class="btn btn-primary btn-block" ng-click="saveSubMerchantId()">save</button>
                             </div>
+                            <div class="form-group">
+                                <button class="btn btn-primary btn-block btn-danger" ng-click="$dismiss()">Cancel</button>
+                            </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+
 </div>

src/main/ui/static/payment/product/product_manager.js

@@ -68,6 +68,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.addProduct = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/payment/product/templates/add_product.html',
                 controller: 'managerAddProductDialogCtrl',
                 resolve: {
@@ -81,6 +82,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.editProduct = function (product) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/payment/product/templates/add_product.html',
                 controller: 'managerAddProductDialogCtrl',
                 resolve: {

src/main/ui/static/payment/product/templates/add_product.html

@@ -111,10 +111,15 @@
                 <!--</div>-->
                 <!--</div>-->
                 <!--end 商品二维码-->
-                <div class="btn-group margin-bottom margin-top">
-                    <button ng-disabled="goodForm.$dirty&&goodForm.$invalid" class="btn btn-success" type="button"
-                            ng-click="save(goodForm)">Save
-                    </button>
+                <div class="modal-footer">
+                    <div class="btn-group margin-bottom margin-top">
+                        <button ng-disabled="goodForm.$dirty&&goodForm.$invalid" class="btn btn-success" type="button"
+                                ng-click="save(goodForm)">Save
+                        </button>
+                    </div>
+                    <div class="btn-group margin-bottom margin-top">
+                        <button class="btn btn-danger" type="button" ng-click="$dismiss()">Cancel</button>
+                    </div>
                 </div>
             </div>
         </div>

src/main/ui/static/risk/risk.js

@@ -262,6 +262,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
         };
         $scope.addAttention = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/risk/templates/risk_add.html',
                 controller: 'newRiskCtrl'
             }).result.then(function () {
@@ -271,6 +272,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
 
         $scope.editAttention = function (attention) {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/risk/templates/risk_merchant_edit.html',
                 controller: 'editRiskCtrl',
                 resolve:{
@@ -331,6 +333,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
         };
         $scope.save = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/risk/templates/new_customer_blacklist.html',
                 controller: 'newCustomerBlackListCtrl'
             }).result.then(function () {

src/main/ui/static/risk/templates/new_customer_blacklist.html

@@ -19,6 +19,9 @@
                             <div class="form-group">
                                 <button class="btn btn-primary btn-block" ng-click="addCustomer()">save</button>
                             </div>
+                            <div class="form-group">
+                                <button class="btn btn-primary btn-block btn-danger" ng-click="$dismiss()">Cancel</button>
+                            </div>
                         </form>
                     </div>
                 </div>