bug fixed

web/building_saas/main/html/main.html

@@ -596,8 +596,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a href="javascript:void(0);" class="btn btn-primary" id="property_ok" data-dismiss="modal">确定</a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -728,8 +728,8 @@
                         </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="componentsCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a href="javascript:void(0);" id="glj_selected_conf" class="btn btn-primary">确定</a>
+                    <button type="button" id="componentsCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -759,8 +759,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="classCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <button type="button" href="javascript:void(0);" id="class_selected_conf" class="btn btn-primary" disabled >确定</button>
+                    <button type="button" id="classCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -781,8 +781,8 @@
                         <div class="modal-auto-height col-12" style="overflow: hidden" id="fee_rate_sheet"></div>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" id="frCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>
                         <a href="javascript:void(0);" id="fee_selected_conf" class="btn btn-primary">确定</a>
+                        <button type="button" id="frCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     </div>
                 </div>
             </div>
@@ -848,8 +848,8 @@
 
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <a href="javascript:void(0);" class="btn btn-primary" id="calcBaseConf">确定</a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                 </div>
             </div>
         </div>
@@ -963,8 +963,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <button type="button" class="btn btn-primary" id="zlfb_confirm">确定</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                 </div>
             </div>
         </div>
@@ -1011,9 +1011,9 @@
                     </div>
                 </div>
                 <div class="modal-footer">
+                    <button  class="btn btn-primary" id="calc_installation_fee_confirm">确定</button>
                     <button type="button" class="btn btn-link" id="btn_reset_to_default">恢复默认值</button>
                   <!--  <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>-->
-                    <button  class="btn btn-primary" id="calc_installation_fee_confirm">确定</button>
                 </div>
             </div>
         </div>
@@ -1047,8 +1047,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <button class="btn btn-primary" id="select_position_confirm">确定</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                 </div>
             </div>
         </div>
@@ -1070,8 +1070,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" id="more_feeRule_concel" data-dismiss="modal">取消</button>
                     <button class="btn btn-primary" id="more_feeRule_confirm">确定</button>
+                    <button type="button" class="btn btn-secondary" id="more_feeRule_concel" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -1092,8 +1092,8 @@
                 </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" id="modify_feeRule_concel" data-dismiss="modal">取消</button>
                     <button class="btn btn-primary" id="modify_feeRule_confirm">确定</button>
+                    <button type="button" class="btn btn-secondary" id="modify_feeRule_concel" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -1120,8 +1120,8 @@
                     <button type="button" class="btn btn-primary" id="uploadExample">示例</button>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <a href="javascript:void(0);" class="btn btn-primary" id="uploadConfirm">确定导入</a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                 </div>
             </div>
         </div>
@@ -1157,8 +1157,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <button class="btn btn-primary" id="paste_confirm">确定</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                 </div>
             </div>
         </div>