Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

public/assets/js/common/mallUi.js

@@ -129,18 +129,17 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) {
                     var goods_name = $(this).find(".inquiry_goods_namexs").val();
                     var num_ = $(this).find(".inquiry_numxs").val();
                     var brand = $(this).find(".inquiry_brandxs").val();
-                    if (goods_name || num_) {
-                        if (!goods_name) {
-                            liexin_pop.Tip({ title: "Part No CANNOT BE EMPTY" });
-                            arr_ = [];
-                            return false;
-                        }
-                        if (!num_) {
-                            liexin_pop.Tip({ title: "Quantity CANNOT BE EMPTY" });
-                            arr_ = [];
-                            return false;
-                        }
+                    if (!goods_name) {
+                        liexin_pop.Tip({ title: "Part No CANNOT BE EMPTY" });
+                        arr_ = [];
+                        return false;
                     }
+                    if (!num_) {
+                        liexin_pop.Tip({ title: "Quantity CANNOT BE EMPTY" });
+                        arr_ = [];
+                        return false;
+                    }
+                    
                     if (goods_name && num_) {
                         arr_.push({
                             goods_name: goods_name,
@@ -150,8 +149,8 @@ define('mallUi', ['tool', 'liexin_pop'], function (require, exports, module) {
                     }
 
                 })
+               
                 if (arr_.length == 0) {
-                    liexin_pop.Tip({ title: "Part No CANNOT BE EMPTY" })
                     return
                 }
                 $.liexin_ajax('/api/inquiry/add', 'POST', {

resources/views/auth/register.blade.php

@@ -145,7 +145,7 @@
                 </div>
                 <div class="tikup">
                     <span>*</span>
-                By clicking "Register", you acknowledge that you have read and agreed to SEMOUR’s Terms
+                By clicking "Submit", you acknowledge that you have read and agreed to SEMOUR’s Terms
                     and Conditions and Privacy Policy Statement.
                 </div>
                 <div class="tips"></div>