Merge branch '3.0.2_online'

Conflicts:
	modules/users/controllers/user_controller.js
	modules/users/models/user_model.js
	web/users/html/user-buy.html
	web/users/js/login.js

config/gulpConfig.js

@@ -238,7 +238,6 @@ module.exports = {
         'web/building_saas/complementary_ration_lib/js/explanatory.js',
         'web/building_saas/complementary_ration_lib/js/jobContent.js',
         'web/building_saas/complementary_ration_lib/js/annotation.js',
-        'public/web/scMathUtil.js',
         'public/web/common_ajax.js',
         'public/web/ztree_common.js',
         'public/web/ration_glj_units.js',

gulpfile.js

@@ -116,7 +116,6 @@ let compleRation_rationOptions = {
     injectList: [
         'web/dest/scripts/compleRation_ration.all.min.' + version + '.js',
         'web/dest/css/compleRation_ration.all.min.' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -133,7 +132,6 @@ let compleRation_gljOptions = {
     injectList: [
         'web/dest/scripts/compleRation_glj.all.min.' + version + '.js',
         'web/dest/scripts/compleRation_glj.all.min.' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -150,7 +148,6 @@ let compleRation_coeOptions = {
     injectList: [
         'web/dest/scripts/compleRation_coe.all.min.' + version + '.js',
         'web/dest/scripts/compleRation_coe.all.min.' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 };
@@ -167,7 +164,6 @@ let compleRation_instOptions = {
     injectList: [
         'web/dest/scripts/compleRation_inst.all.min.' + version + '.js',
         'web/dest/scripts/compleRation_inst.all.min.' + version + '.css',
-        'web/dest/scripts/common.all.min.'+version+'.js',
         'web/dest/css/common.all.min.' + version + '.css'
     ]
 }

modules/users/models/user_model.js

@@ -358,7 +358,7 @@ class UserModel extends BaseModel {
             });
             if (compilationInfo !== undefined && compilationInfo.isUpgrade === true) {
                 version = '大司空云计价(专业版)';
-                if (compilationInfo.lock !== undefined && compilationInfo.lock !== 0) {
+                if (compilationInfo.lock !== undefined && compilationInfo.lock !== '') {
                     lock = compilationInfo.lock;
                 }
             }

web/building_saas/unit_price_file/index.js

@@ -253,7 +253,7 @@ let unitPriceObj = {
   },
   showSubDatas:function(){
     let parentData = this.getSelectedUnitPrice();
-    this.mixRatioList = mixRatioMap[gljUtil.getIndex(parentData)];
+    this.mixRatioList = parentData?mixRatioMap[gljUtil.getIndex(parentData)]:[];
     this.mixRatioList = this.mixRatioList?this.mixRatioList:[];
     this.setMixRatioData(this.mixRatioList);
     let sel = this.subSheet.getSelections()[0];

web/users/html/user-buy.html

@@ -75,16 +75,16 @@
                             </div>
                             <div class="col-sm-5 mb-5">
                                 <div class="card pro-version">
-                                  <div class="card-body d-flex justify-content-between">
-                                      <h3 class="card-title">专业版</h3>
-                                      <div>
-                                          <div class="d-inline-block mr-3">
-                                            <img width="24" src="/web/building_saas/img/vip.png">购买
-                                          </div>
-                                          <div class="d-inline-block">
-                                              <img width="24" src="/web/building_saas/img/vip2.png">借用
-                                          </div>
-                                      </div>
+                                    <div class="card-body d-flex justify-content-between">
+                                        <h3 class="card-title">专业版</h3>
+                                        <div>
+                                            <div class="d-inline-block mr-3">
+                                                <img width="24" src="/web/building_saas/img/vip.png">购买
+                                            </div>
+                                            <div class="d-inline-block">
+                                                <img width="24" src="/web/building_saas/img/vip2.png">借用
+                                            </div>
+                                        </div>
                                       <!--<p class="card-text">-->
                                       <!--&lt;!&ndash;<ul class="pl-3">-->
                                           <!--<li>创建单位工程无限制</li>-->
@@ -105,13 +105,13 @@
                                                 <% } %>
                                             </div>
                                             <div class="ml-auto text-right">
-                                            <% if (compilation.isUpgrade === undefined || compilation.isUpgrade !== true) { %>
-                                            <a href="javascript:void(0);" class="btn btn-primary btn-sm getcategory" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>">立即激活</a>
-                                            <% if (compilation.deadline !== undefined && compilation.deadline !== '') { %><span class="d-block text-danger">已到期：<%= compilation.deadline %></span><% } %>
-                                            <% } else { %>
-                                            <a href="javascript:void(0);" class="btn btn-outline-secondary btn-sm getcategory" data-title="<%= compilation.name %>" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>"><i class="fa fa-check"></i> 已激活</a>
-                                            <% if (compilation.deadline !== undefined && compilation.deadline !== '') { %><span class="d-block text-muted">限期：<%= compilation.deadline %></span><% } %>
-                                            <% } %>
+                                                <% if (compilation.isUpgrade === undefined || compilation.isUpgrade !== true) { %>
+                                                <a href="javascript:void(0);" class="btn btn-primary btn-sm getcategory" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>">立即激活</a>
+                                                <% if (compilation.deadline !== undefined && compilation.deadline !== '') { %><span class="d-block text-danger">已到期：<%= compilation.deadline %></span><% } %>
+                                                <% } else { %>
+                                                <a href="javascript:void(0);" class="btn btn-outline-secondary btn-sm getcategory" data-title="<%= compilation.name %>" data-upgrade="<%= compilation.isUpgrade %>" data-category="<%= compilation.categoryID %>"><i class="fa fa-check"></i> 已激活</a>
+                                                <% if (compilation.deadline !== undefined && compilation.deadline !== '') { %><span class="d-block text-muted">到期：<%= compilation.deadline %></span><% } %>
+                                                <% } %>
                                             </div>
                                         </li>
                                         <% }) %>

web/users/js/login.js

@@ -278,7 +278,7 @@ function login() {
             // $("#captcha-box").html('正在加载验证码');
         },
         success: function(response) {
-            // $("#captcha-box").html('');
+            $("#captcha-box").html('');
             if (response.success === 0) {
                 alert('验证码初始化失败!');
                 return false;
@@ -307,14 +307,14 @@ function login() {
                     var result = catpchaObj.getValidate();
                     if (!result) {return alert('请完成验证');}
                     $('#login').attr('disabled', true);
-                    // let geetest_challenge = $('input[name="geetest_challenge"]').val();
-                    // let geetest_validate = $('input[name="geetest_validate"]').val();
-                    // let geetest_seccode = $('input[name="geetest_seccode"]').val();
+                    let geetest_challenge = $('input[name="geetest_challenge"]').val();
+                    let geetest_validate = $('input[name="geetest_validate"]').val();
+                    let geetest_seccode = $('input[name="geetest_seccode"]').val();
 
                     const postData = {
-                        geetest_challenge: result.geetest_challenge,
-                        geetest_validate: result.geetest_validate,
-                        geetest_seccode: result.geetest_seccode,
+                        geetest_challenge: geetest_challenge,
+                        geetest_validate: geetest_validate,
+                        geetest_seccode: geetest_seccode,
                     };
                     if ($('#changeLogin').attr('data-status') === 'user') {
                         let account = $("#inputEmail").val();