Explorar el Código

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/jitao-portal

dengzhiguo hace 6 años
padre
commit
2868234959

+ 6 - 0
src/css/newMenu/special.css

@@ -4,6 +4,12 @@
     float: left;
     padding-top: 40px;
 }
+body{
+    user-select: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+}
 
 .specialLeft .input-append{
     width: 100%;

+ 5 - 2
src/js/newMenu/patentList.js

@@ -176,7 +176,7 @@ $(function () {
             }
         })
     }
-    function loadDate(pageNo) {
+    function loadDate(pageNo=1) {
         $('.loading').show();
         $.ajax({
             method: "get",
@@ -199,6 +199,8 @@ $(function () {
                 if (data && data.error.length) {
                     msg(data.error[0].message)
                 };
+                //销量数组
+                var xLArr = [12,20,55,16,38,20,16,29,26,20,35,9,19,47,16,29,15,19,5,12,20,35,16,28,20,16,9,26,4,15,55,19,7,16,29,15,39,16]
                 let times = new Date().getTime();
                 if (data.data && data.data.list.length) {
                     let nub = data.data.list.length;
@@ -217,12 +219,13 @@ $(function () {
                                         <p>
                                         <span class="companyImg"></span>
                                         <a href="javascript:(0)" class="companyName">${thisdata.companyName}</a>
-                                        <span class="number">销量 : ${thisdata.dealCount?thisdata.dealCount:0}</span>
+                                        <span class="number">销量 : ${parseInt(xLArr[parseInt(pageNo)+i])}</span>
                                         </p>
                                 </div>
                             </div>
                         </li>
                         `);
+                        /* thisdata.dealCount?thisdata.dealCount:0 */
                     };
                 };
                 $('.loading').hide().stop(true, true);

+ 7 - 4
src/js/newMenu/serviceList.js

@@ -181,7 +181,7 @@ $(function () {
         })
     }
 
-    function loadDate(pageNo) {
+    function loadDate(pageNo=1) {
         $('.loading').show();
         $.ajax({
             method: "get",
@@ -202,10 +202,12 @@ $(function () {
                 if(data&&data.error.length){
                     msg(data.error[0].message)
                 };
+                /* 销量数组 */
+                var xLArr = [12,20,55,16,38,20,16,29,26,20,35,9,19,47,16,29,15,19,5,12,20,35,16,28,20,16,9,26,4,15,55,19,7,16,29,15,39,16]
                 let times = new Date().getTime();
-                if (data.data && data.data.list.length) {
+               if (data.data && data.data.list.length) {
                     let nub = data.data.list.length;
-                    for (let i = 0; i < nub; i++) {
+                    for (let i = 0; i <nub; i++) {
                         let thisdata = data.data.list[i],
                              news = formatDuring(times)-formatDuring(thisdata.releaseDate);
                              var introd=thisdata.introduce?(thisdata.introduce).replace(/<\/?.+?>/g,""):thisdata.introduce;
@@ -221,10 +223,11 @@ $(function () {
                                     </div>
                                     <div class="btnTxts">
                                         <a href="javascript:(0)" class="companyName"><span class="glyphicon glyphicon-user"></span>${thisdata.companyName?thisdata.companyName:''}</a>
-                                        <span class="number">销量 : ${thisdata.dealCount?thisdata.dealCount:0}</span>
+                                        <span class="number">销量 : ${parseInt(xLArr[parseInt(pageNo)+i])}</span>
                                     </div> 
                                 </div>
                         </li>`);
+                        /* thisdata.dealCount?thisdata.dealCount:0 */
                     };
                 };
                 $('.loading').hide().stop(true,true);

+ 23 - 3
src/js/newMenu/special.js

@@ -7,7 +7,7 @@ $(function(){
     var thePageNo = 1,
         thePageLength = 1,
         dataList = {},
-        pageSize = 6;
+        pageSize =5;
    init();
    function init(){
         //写答案、写想法
@@ -52,6 +52,7 @@ $(function(){
                     };
                     _this.find('span').text(parseInt(nut)+1);
                     _this.removeClass('active');
+                    fabulousAnimate(_this);
                 }
             })
         });
@@ -66,6 +67,27 @@ $(function(){
             proDate();
         })
     };
+    //随机颜色
+    function randowColor(){
+        return '#'+Math.floor(Math.random()*0xffffff).toString(16);
+    };
+    //点赞特效
+    function fabulousAnimate(_this){
+        _this.append('<i>+1</i>');
+        let len = _this.find('i').length;
+        for(let i =0;i<len;i++){
+            _this.find('i').eq(i).css({
+                position:'absolute',
+                left:'20px',
+                zIndex:20+i,
+                top:(-15-i*8)+'px',
+                color:randowColor(),
+            });
+            setTimeout(()=>{
+                _this.find('i').eq(i).hide(150).remove();
+            },(i+1)*500)
+        }
+    }
     //切换全部分类
     function tabData(){
         $('.spType li').click(function(){
@@ -205,7 +227,6 @@ $(function(){
     //顾问数据
     function loadDate(pageNo) {
         $('.loading').show();
-        pageSize=6;
         $.ajax({
             method: "get",
             dataType: "json",
@@ -364,7 +385,6 @@ $(function(){
     }
 
     //关注
-   
     function colFun(){
         $('.txt .heart').click(function (e) {
             e.preventDefault();

+ 22 - 0
src/js/newMenu/specialDetail.js

@@ -147,12 +147,34 @@ $(function(){
                         msg(data.error[0].message);
                         return;
                     }
+                    fabulousAnimate(_this);
                     _this.find('span').text(parseInt(nut)+1);
                     _this.removeClass('active');
                 }
             })
         });
     };
+    //随机颜色 
+    function randowColor(){
+        return '#'+Math.floor(Math.random()*0xffffff).toString(16);
+    };
+    //点赞特效
+    function fabulousAnimate(_this){
+        _this.append('<i>+1</i>');
+        let len = _this.find('i').length;
+        for(let i =0;i<len;i++){
+            _this.find('i').eq(i).css({
+                position:'absolute',
+                left:'40px',
+                zIndex:20+i,
+                top:(-15-i*8)+'px',
+                color:randowColor(),
+            });
+            setTimeout(()=>{
+                _this.find('i').eq(i).hide(150).remove();
+            },(i+1)*500)
+        }
+    }
     //f分页
     function pages() {
         $('.pagination').on('click', 'li', function (e) {

+ 2 - 2
webpack.config.js

@@ -515,7 +515,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.190:80';
+    let staticHost = 'http://192.168.0.188:80';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -547,7 +547,7 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.0.188',
             port: 80,
             allowedHosts: ['192.168.0.190', '192.168.0.99', '192.168.0.20','192.168.0.17'],
             headers: {

+ 48 - 48
webpack/entry.config.js

@@ -54,197 +54,197 @@ module.exports = {
         'newMenu/specialDetail': './src/js/newMenu/specialDetail.js',
     },
     watch: {
-        'index': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'index': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/index.js'
         ],
-        'search': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'search': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/search.js'
         ],
-         'aboutUs': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'aboutUs': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
         ],
-        'contactUs': ['webpack-dev-server/client?http://192.168.0.190',
+        'contactUs': ['webpack-dev-server/client?http://192.168.0.188',
             'webpack/hot/only-dev-server',
             './src/js/contactUs.js'
         ],
-        'register': ['webpack-dev-server/client?http://192.168.0.190',
+        'register': ['webpack-dev-server/client?http://192.168.0.188',
             'webpack/hot/only-dev-server',
             './src/js/register.js'
         ],
-        'thinkTank': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank.js'
         ],
-        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementDetail.js'
         ],
-        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandDetail.js'
         ],
-        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyDetail.js'
         ],
-        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/thinkerDetail.js'
         ],
-        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyList.js'
         ],
         // newsApp 
-        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/newsDetailApp.js'
         ],
-        'news/appCognizance': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'news/appCognizance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/appCognizance.js'
         ],
-        'news/agreement': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'news/agreement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/agreement.js'
         ],
         /* 2018-06 新版科技需求 */
-        'newMenu/demand': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/demand': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/demand.js'
         ],
-        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/achievement.js'
         ],
-        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/achievementList.js'
         ],
-        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/demandList.js'
         ],
-        'newMenu/services': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/services': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/services.js'
         ],
-        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/serviceList.js'
         ],
-        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/serviceDetails.js'
         ],
-        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/shopList.js'
         ],
-        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/patentList.js'
         ],
-        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/tradingIndex.js'
         ],
-        'newMenu/patent': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/patent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/patent.js'
         ],
-        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/companyProfile.js'
         ],
-        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguarding.js'
         ],
-        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/evaluate.js'
         ],
-        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserList.js'
         ],
-        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserDetail.js'
         ],
-        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviser.js'
         ],
-        'newMenu/safeguardingList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/safeguardingList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguardingList.js'
         ],
-        'newMenu/safeguardingDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/safeguardingDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguardingDetail.js'
         ],
-        'newMenu/brandBuild': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/brandBuild': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/brandBuild.js'
         ],
-        'newMenu/marketOpen': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/marketOpen': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/marketOpen.js'
         ],
-        'newMenu/taxFinance': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/taxFinance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/taxFinance.js'
         ],
-        'newMenu/governmentSupport': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/governmentSupport': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/governmentSupport.js'
         ],
-        'newMenu/assessment': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/assessment': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/assessment.js'
         ],
-        'newMenu/Invitation': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/Invitation': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/Invitation.js'
         ],
-        'newMenu/invRegister': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/invRegister': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/invRegister.js'
         ],
-        'newMenu/video': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/video': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/video.js'
         ],
-        'newMenu/videoDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/videoDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/videoDetail.js'
         ],
-        'facilitator': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'facilitator': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/facilitator/facilitator.js'
         ],
-        'newMenu/special': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/special': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/special.js'
         ],
-        'newMenu/specialDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/specialDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/specialDetail.js'
         ],