大司空云计价1.0

.jshintrc

@@ -14,5 +14,5 @@
   "node":true,
   "undef":true,
   "asi":false,
-  "predef":['define']
+  "predef": ["define","$"]
 }

app/service/cloudBuildEditionService.js

@@ -7,11 +7,11 @@ const hash=require('../class/hash');
 const urlObj=require("url");
 
 //测试服务器
-//var curingUrl ='https://yhuat.smartcost.com.cn/cld';
+//var curingUrl ='https://uat.smartcost.com.cn/cld';
 //正式服务器
-//var curingUrl ='https://yhyun.smartcost.com.cn/cld';
+var curingUrl ='https://yun.smartcost.com.cn/cld';
 //本地跑
-var curingUrl ="http://qa.smartcost.com.cn:6060/cld";
+//var curingUrl ="http://qa.smartcost.com.cn:6060/cld";
 
 
 

app/service/cloudEditionService.js

@@ -9,9 +9,9 @@ const urlObj=require("url");
 //测试服务器
 //var curingUrl ='https://yhuat.smartcost.com.cn/cld';
 //正式服务器
-//var curingUrl ='https://yhyun.smartcost.com.cn/cld';
+var curingUrl ='https://yhyun.smartcost.com.cn/cld';
 //本地跑
-var curingUrl ="http://qa.smartcost.com.cn:2060/cld";
+//var curingUrl ="http://qa.smartcost.com.cn:2060/cld";
 
 
 

global/js/cloud/buildHtml.js

@@ -12,6 +12,7 @@ function fnStructureCuringUser(data){
     $.each(data, function(k, v) {
         html+='<tr curingInfoEdi dataCid="'+setUndefined(v.client_id)+'" data='+setUndefined(v.ssoId)+' dataId="'+setUndefined(v._id)+'" data-toggle="modal" data-target="">';
         html+='<td>'+setUndefined(v.mobile)+'</td>';
+        html+='<td>'+setUndefined(v.qq)+'</td>';
         html+='<td>'+setUndefined(v.company)+'</td>';
         html+='<td>'+setUndefined(v.clientInfo.clientname)+'</td>';
         html+='<td>'+setUndefined(v.clientInfo.companyname)+'</td>';

global/js/cloud/curingHtml.js

@@ -12,6 +12,7 @@ function fnStructureCuringUser(data){
     $.each(data, function(k, v) {
         html+='<tr curingInfoEdi dataCid="'+setUndefined(v.client_id)+'" data='+setUndefined(v.ssoId)+' dataId="'+setUndefined(v._id)+'" data-toggle="modal" data-target="">';
         html+='<td>'+setUndefined(v.mobile)+'</td>';
+        html+='<td>'+setUndefined(v.qq)+'</td>';
         html+='<td>'+setUndefined(v.company)+'</td>';
         html+='<td>'+setUndefined(v.clientInfo.clientname)+'</td>';
         html+='<td>'+setUndefined(v.clientInfo.companyname)+'</td>';

package.json

@@ -23,6 +23,11 @@
     "sequelize": "^5.19.4"
   },
   "devDependencies": {
+    "grunt": "^1.0.4",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-jshint": "^2.1.0",
+    "grunt-contrib-uglify": "^4.0.1",
+    "grunt-contrib-watch": "^1.1.0",
     "pino-pretty": "^3.5.0"
   }
 }

views/cloud/build.html

@@ -1,23 +1,7 @@
 <% include ../header.html %>
 <script src="<%= WEB_SITE_GLOBAL %>js/jquery-3.4.1.min.js"></script>
 
-
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/build.min.js"></script>
-
-<!-- 
-<script src="<%= WEB_SITE_GLOBAL %>js/pagination/page.js"></script>
-<script src="<%= WEB_SITE_GLOBAL %>js/tools.js"></script>
-
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/buildFN.js"></script>
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/build.js"></script>
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/buildHtml.js"></script>
-
-<script src="<%= WEB_SITE_GLOBAL %>js/columnShow/columnShow.js"></script>
-
-<script src="<%= WEB_SITE_GLOBAL %>js/contacts/buildHtml.js"></script>
- -->
-
-
+<% include buildJs.html %>
 
 <style>
     input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
@@ -156,44 +140,44 @@
                                                 	
                                                   <li class="mb-2">
                                                     <div class="custom-control custom-switch">
-                                                      <input type="checkbox" name="columnShow" column="2" class="custom-control-input"  id="lie1">
-                                                      <label class="custom-control-label" for="lie1">企业名称</label>
+                                                      <input type="checkbox" name="columnShow" column="2" class="custom-control-input"  id="lie2">
+                                                      <label class="custom-control-label" for="lie2">企业名称</label>
                                                     </div>
                                                   </li>
                                                   <li class="mb-2">
                                                     <div class="custom-control custom-switch">
-                                                      <input type="checkbox" name="columnShow" column="3" class="custom-control-input" id="lie2">
-                                                      <label class="custom-control-label" for="lie2">CLD联系人</label>
+                                                      <input type="checkbox" name="columnShow" column="3" class="custom-control-input" id="lie3">
+                                                      <label class="custom-control-label" for="lie3">CLD联系人</label>
                                                     </div>
                                                   </li>
                                                   <li class="mb-2">
                                                     <div class="custom-control custom-switch">
-                                                      <input type="checkbox" name="columnShow" column="4" class="custom-control-input" id="lie3">
-                                                      <label class="custom-control-label" for="lie3">公司</label>
+                                                      <input type="checkbox" name="columnShow" column="4" class="custom-control-input" id="lie4">
+                                                      <label class="custom-control-label" for="lie4">公司</label>
                                                     </div>
                                                   </li>
                                                   <li class="mb-2">
                                                     <div class="custom-control custom-switch">
-                                                      <input type="checkbox" name="columnShow" column="5" class="custom-control-input" id="lie4" checked="">
-                                                      <label class="custom-control-label" for="lie4">最近登录</label>
+                                                      <input type="checkbox" name="columnShow" column="5" class="custom-control-input" id="lie5" checked="">
+                                                      <label class="custom-control-label" for="lie5">最近登录</label>
                                                     </div>
                                                   </li>
                                                   <li class="mb-2">
                                                     <div class="custom-control custom-switch">
-                                                      <input type="checkbox" name="columnShow" column="6" class="custom-control-input" id="lie5">
-                                                      <label class="custom-control-label" for="lie5">最近使用</label>
+                                                      <input type="checkbox" name="columnShow" column="6" class="custom-control-input" id="lie6">
+                                                      <label class="custom-control-label" for="lie6">最近使用</label>
                                                     </div>
                                                   </li>
                                                   <li class="mb-2">
                                                     <div class="custom-control custom-switch">
-                                                      <input type="checkbox" name="columnShow" column="7" class="custom-control-input" id="lie6">
-                                                      <label class="custom-control-label" for="lie6">登录时长</label>
+                                                      <input type="checkbox" name="columnShow" column="7" class="custom-control-input" id="lie7">
+                                                      <label class="custom-control-label" for="lie7">登录时长</label>
                                                     </div>
                                                   </li>
                                                   <li class="mb-2">
                                                     <div class="custom-control custom-switch">
-                                                      <input type="checkbox" name="columnShow" column="8" class="custom-control-input" id="lie7">
-                                                      <label class="custom-control-label" for="lie7">注册时间</label>
+                                                      <input type="checkbox" name="columnShow" column="8" class="custom-control-input" id="lie8">
+                                                      <label class="custom-control-label" for="lie8">注册时间</label>
                                                     </div>
                                                   </li>
                                                 </ul>

views/cloud/cloudMenu.html

@@ -21,7 +21,7 @@
                     </a>
                 </li>
                
-                <li data="/cloud/build/edition" do >
+                <li data="/cloud/build/edition" do style="display:none" >
                     <a href="/cloud/build/edition" title="大司空云计价" data-filter-tags="application intel marketing dashboard">
                         <span class="nav-link-text">大司空云计价</span>
                     </a>

views/cloud/curing.html

@@ -2,21 +2,8 @@
 
 <script src="<%= WEB_SITE_GLOBAL %>js/jquery-3.4.1.min.js"></script>
 
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curing.min.js"></script>
+<% include curingJs.html %>
 
-<!-- 
-<script src="<%= WEB_SITE_GLOBAL %>js/tools.js"></script>
-
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/page.js"></script>
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curing.js"></script>
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curingFN.js"></script>
-<script src="<%= WEB_SITE_GLOBAL %>js/cloud/curingHtml.js"></script>
-
-
-<script src="<%= WEB_SITE_GLOBAL %>js/contacts/buildHtml.js"></script>
-
-<script src="<%= WEB_SITE_GLOBAL %>js/columnShow/columnShow.js"></script>
- -->
 <style>
     input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
         -webkit-appearance: none !important;