Browse Source

智库咨询

ws2z3gr2017 7 years ago
parent
commit
440fc4b81a
4 changed files with 933 additions and 35 deletions
  1. 10 4
      src/css/Technologytrading.css
  2. 820 0
      src/js/DicIndustryList.js
  3. 74 18
      src/js/Technologytrading.js
  4. 29 13
      template/Technologytrading.html

+ 10 - 4
src/css/Technologytrading.css

@@ -52,11 +52,11 @@ background-size: 1200px 215px;margin:0 auto;position: relative;}
 body{background: #f5f5f5;}
 .container{width: 1200px;}
 .industry{background: #ffffff;overflow: hidden;margin-bottom: 30px;}
-.industry_left{float: left;width: 300px;text-align: center;padding-top: 40px;background: #2a9ee2;height: 100%;}
+.industry_left{float: left;width: 300px;height:938px;text-align: center;padding-top: 40px;background: #2a9ee2;}
 
 .industry_left h3{font-size: 24px;margin-bottom: 22px;color: #FFFFFF;font-weight:normal;}
 .industry_left ul li a{font-size:16px ;color: #ffffff;}
-.industry_left ul li{line-height: 36px;height: 36px;}
+.industry_left ul li{line-height: 36px;height: 36px;cursor: pointer;}
 .title_details{width: 840px;clear: both;margin-bottom: 36px;}
 .industry_right{float: left;padding-left: 30px;width: 870px;}
 .title_details ol {width: 100%;overflow: hidden;border-bottom: 1px solid #CCCCCC;}
@@ -67,13 +67,14 @@ body{background: #f5f5f5;}
 .act{color:#074d88 !important;border-bottom: 1px solid #074d88!important;}
 .action_li{box-shadow: 0 0 10px 0 #ddd inset}
 .checked_no{display:none;}
+.main_details{overflow: hidden;width:840px;height:790px;}
 .main_details ul{overflow: hidden;}
 .main_details ul li{width: 260px;height:380px;float: left;position: relative;z-index: 10;box-shadow: 0 0 15px #CCCCCC;margin-left: 10px;margin-right: 10px;margin-bottom: 20px;}
 
 .title_details ol li{float: left;padding-left: 12px;padding-right: 12px;font-size: 24px;color: #333333;border-bottom: 1px solid transparent;line-height: 50px;}
 .act{color:#074d88 !important;border-bottom: 1px solid #074d88!important;}
 .main_details ul{overflow: hidden;}
-.main_details ul li{width: 260px;float: left;position: relative;z-index: 10;box-shadow: 0 0 15px #CCCCCC;margin-left: 10px;margin-right: 10px;margin-bottom: 20px;}
+.main_details ul li{width: 260px;height:380px;float: left;position: relative;z-index: 10;box-shadow: 0 0 15px #CCCCCC;margin-left: 10px;margin-right: 10px;margin-bottom: 20px;}
 
 .main_details ul li img{;width: 260px;}
 .main_details ul li .details_fix{position: absolute;top: 145px;background: rgba(131,146,145,0.5);z-index: 12;width: 260px;height: 70px;text-align: center;color: #FFFFFF;}
@@ -98,7 +99,12 @@ body{background: #f5f5f5;}
 .details_text p b{font-weight:normal;color: #333333;width:160px;height:40px ;display: inline-block;vertical-align: top; }
 .details_text a{width: 80px;height: 26px;display: inline-block;background: #ffb200;border-radius: 10px;float: right;line-height: 26px;text-align: center;color: #ffffff;margin-right: 30px;margin-bottom: 16px;}
 
-.pagination_box{width: 600px;margin-bottom: 50px;}
+.pagination_box{width: 100%;height:50px;text-align: right;}
+.pagination_box>div{width:200px;height:50px;overflow: hidden;}
+.paging_box{overflow: hidden;}
+.paging_box>span{line-height: 50px;font-size: 16px;color:#F68705;width:25px;text-align: center;
+    display: inline-block;cursor: pointer;}
+.paging_box>span.action_span{font-weight: bold;}
 .pagination_box  .totalCount{ float:right; line-height: 74px;margin-right: 20px;color: #999;}
 .pagination_box .pagination{float: right;}
 .pagination_box .pagination li{float: left;}

+ 820 - 0
src/js/DicIndustryList.js

@@ -0,0 +1,820 @@
+const industryList = [{
+    value: 464,
+    label: "教育休闲",
+    children: [{
+        value: 542,
+        label: "其他教育休闲"
+    }, {
+        value: 541,
+        label: "休闲娱乐"
+    }, {
+        value: 540,
+        label: "玩具"
+    }, {
+        value: 539,
+        label: "体育"
+    }, {
+        value: 538,
+        label: "办公文教"
+    }, {
+        value: 258,
+        label: "乐器"
+    }, {
+        value: 127,
+        label: "工艺美术"
+    }]
+}, {
+    value: 463,
+    label: "包装印刷",
+    children: [{
+        value: 560,
+        label: "包装"
+    }, {
+        value: 534,
+        label: "包装袋、箱"
+    }, {
+        value: 533,
+        label: "印刷"
+    }, {
+        value: 436,
+        label: "标签、标牌"
+    }, {
+        value: 435,
+        label: "器皿、容器"
+    }, {
+        value: 355,
+        label: "造纸"
+    }, {
+        value: 354,
+        label: "纸类包装"
+    }, {
+        value: 353,
+        label: "纸浆"
+    }, {
+        value: 181,
+        label: "包装材料"
+    }, {
+        value: 180,
+        label: "其他包装印刷"
+    }, {
+        value: 179,
+        label: "记录媒介复制"
+    }, {
+        value: 176,
+        label: "装订"
+    }]
+}, {
+    value: 462,
+    label: "电气自动化",
+    children: [{
+        value: 555,
+        label: "电气电工"
+    }, {
+        value: 550,
+        label: "电池充电器"
+    }, {
+        value: 549,
+        label: "其他电气自动化"
+    }, {
+        value: 373,
+        label: "人工智能"
+    }, {
+        value: 372,
+        label: "自动化元件"
+    }, {
+        value: 371,
+        label: "自动化应用"
+    }, {
+        value: 370,
+        label: "控制系统"
+    }, {
+        value: 241,
+        label: "电力绝缘"
+    }, {
+        value: 238,
+        label: "电力"
+    }, {
+        value: 237,
+        label: "电线、电缆"
+    }, {
+        value: 236,
+        label: "发电机"
+    }, {
+        value: 235,
+        label: "电动机"
+    }, {
+        value: 234,
+        label: "变压器、稳压器"
+    }, {
+        value: 233,
+        label: "开关、插座、插头"
+    }]
+}, {
+    value: 461,
+    label: "采矿冶金",
+    children: [{
+        value: 572,
+        label: "金属合金冶炼铸造"
+    }, {
+        value: 571,
+        label: "非金属开采冶炼"
+    }, {
+        value: 570,
+        label: "黑色金属开采冶炼"
+    }, {
+        value: 569,
+        label: "有色金属开采冶炼"
+    }, {
+        value: 552,
+        label: "其他采矿冶金"
+    }, {
+        value: 512,
+        label: "石油天然气开采提炼"
+    }, {
+        value: 511,
+        label: "煤炭开采冶炼"
+    }, {
+        value: 192,
+        label: "矿业设备"
+    }]
+}, {
+    value: 460,
+    label: "航空航天",
+    children: [{
+        value: 567,
+        label: "飞行器"
+    }, {
+        value: 545,
+        label: "其他航空航天"
+    }, {
+        value: 510,
+        label: "卫星导航"
+    }, {
+        value: 509,
+        label: "卫星通信"
+    }, {
+        value: 508,
+        label: "航空运行保障系统"
+    }, {
+        value: 507,
+        label: "空中管理系统"
+    }, {
+        value: 506,
+        label: "民用飞机"
+    }]
+}, {
+    value: 459,
+    label: "海洋开发",
+    children: [{
+        value: 561,
+        label: "海底勘探"
+    }, {
+        value: 546,
+        label: "其他海洋开发"
+    }, {
+        value: 505,
+        label: "海洋船舶"
+    }, {
+        value: 504,
+        label: "渔业捕捞"
+    }, {
+        value: 503,
+        label: "海洋渔业资源保护与监测"
+    }, {
+        value: 502,
+        label: "海洋能源利用"
+    }, {
+        value: 501,
+        label: "海底矿产利用"
+    }, {
+        value: 500,
+        label: "海水养殖"
+    }, {
+        value: 497,
+        label: "海水淡化"
+    }]
+}, {
+    value: 458,
+    label: "农林牧业",
+    children: [{
+        value: 579,
+        label: "农副产品深加工"
+    }, {
+        value: 554,
+        label: "养殖"
+    }, {
+        value: 553,
+        label: "种植"
+    }, {
+        value: 496,
+        label: "其他农业牧业"
+    }, {
+        value: 495,
+        label: "农副产品贮藏与保鲜"
+    }, {
+        value: 494,
+        label: "农机用具"
+    }, {
+        value: 493,
+        label: "饲料、肥料及添加剂"
+    }, {
+        value: 492,
+        label: "病虫害防治"
+    }, {
+        value: 491,
+        label: "家畜良种胚胎育种"
+    }, {
+        value: 489,
+        label: "动植物新品培育"
+    }]
+}, {
+    value: 457,
+    label: "医药与医疗",
+    children: [{
+        value: 547,
+        label: "其他医药与医疗"
+    }, {
+        value: 488,
+        label: "生物化工"
+    }, {
+        value: 487,
+        label: "医疗器械"
+    }, {
+        value: 486,
+        label: "新剂型及制剂"
+    }, {
+        value: 485,
+        label: "化学药物"
+    }, {
+        value: 484,
+        label: "中药、天然药物"
+    }, {
+        value: 483,
+        label: "生物医药"
+    }]
+}, {
+    value: 456,
+    label: "电子信息",
+    children: [{
+        value: 472,
+        label: "其他电子信息"
+    }, {
+        value: 471,
+        label: "智能交通"
+    }, {
+        value: 470,
+        label: "信息安全"
+    }, {
+        value: 469,
+        label: "广播电视"
+    }, {
+        value: 468,
+        label: "通信"
+    }, {
+        value: 467,
+        label: "硬件/数码"
+    }, {
+        value: 466,
+        label: "微电子"
+    }, {
+        value: 465,
+        label: "软件"
+    }, {
+        value: 291,
+        label: "网络"
+    }, {
+        value: 286,
+        label: "电子元器件"
+    }]
+}, {
+    value: 375,
+    label: "新型材料",
+    children: [{
+        value: 473,
+        label: "金属材料"
+    }, {
+        value: 382,
+        label: "其他新材料技术"
+    }, {
+        value: 381,
+        label: "纳米及超细材料"
+    }, {
+        value: 378,
+        label: "无机非金属材料"
+    }, {
+        value: 377,
+        label: "高分子材料"
+    }, {
+        value: 376,
+        label: "生物医用材料"
+    }]
+}, {
+    value: 31,
+    label: "仪器仪表",
+    children: [{
+        value: 566,
+        label: "实验仪器"
+    }, {
+        value: 565,
+        label: "分析仪器"
+    }, {
+        value: 564,
+        label: "检测仪器"
+    }, {
+        value: 563,
+        label: "压力仪表"
+    }, {
+        value: 562,
+        label: "温度仪表"
+    }, {
+        value: 527,
+        label: "其他仪器仪表"
+    }, {
+        value: 526,
+        label: "光学仪器"
+    }, {
+        value: 525,
+        label: "计时仪器"
+    }]
+}, {
+    value: 26,
+    label: "橡胶塑料",
+    children: [{
+        value: 578,
+        label: "塑料原料与制品"
+    }, {
+        value: 577,
+        label: "橡胶原料与制品"
+    }, {
+        value: 207,
+        label: "其他橡胶塑料"
+    }, {
+        value: 206,
+        label: "橡塑加工与制造"
+    }, {
+        value: 205,
+        label: "合成材料及其助剂"
+    }]
+}, {
+    value: 25,
+    label: "交通运输",
+    children: [{
+        value: 576,
+        label: "物流仓储"
+    }, {
+        value: 575,
+        label: "公路运输"
+    }, {
+        value: 442,
+        label: "电梯、缆车"
+    }, {
+        value: 441,
+        label: "摩托车"
+    }, {
+        value: 440,
+        label: "自行车"
+    }, {
+        value: 363,
+        label: "装卸搬运"
+    }, {
+        value: 362,
+        label: "管道运输"
+    }, {
+        value: 361,
+        label: "水路运输"
+    }, {
+        value: 360,
+        label: "铁路运输"
+    }, {
+        value: 200,
+        label: "其他交通运输"
+    }, {
+        value: 198,
+        label: "公路管理与养护"
+    }, {
+        value: 197,
+        label: "城市公共交通系统"
+    }, {
+        value: 195,
+        label: "航空运输"
+    }, {
+        value: 194,
+        label: "汽车"
+    }]
+}, {
+    value: 20,
+    label: "安全防护",
+    children: [{
+        value: 556,
+        label: "防盗预警"
+    }, {
+        value: 432,
+        label: "交通安全"
+    }, {
+        value: 430,
+        label: "防身"
+    }, {
+        value: 174,
+        label: "其他安全防护"
+    }, {
+        value: 173,
+        label: "作业安防"
+    }, {
+        value: 172,
+        label: "救生"
+    }, {
+        value: 171,
+        label: "运动防护"
+    }, {
+        value: 170,
+        label: "军用安防"
+    }, {
+        value: 169,
+        label: "消防"
+    }, {
+        value: 168,
+        label: "监控"
+    }]
+}, {
+    value: 19,
+    label: "环保和资源",
+    children: [{
+        value: 557,
+        label: "噪声污染治理"
+    }, {
+        value: 548,
+        label: "其他环保和资源"
+    }, {
+        value: 544,
+        label: "节能环保"
+    }, {
+        value: 482,
+        label: "生态保护"
+    }, {
+        value: 481,
+        label: "环境监测"
+    }, {
+        value: 480,
+        label: "固体废弃物污染处理"
+    }, {
+        value: 348,
+        label: "清洁生产与循环经济"
+    }, {
+        value: 167,
+        label: "资源利用与开发"
+    }, {
+        value: 163,
+        label: "大气污染防治"
+    }, {
+        value: 161,
+        label: "水污染治理"
+    }]
+}, {
+    value: 18,
+    label: "机械",
+    children: [{
+        value: 523,
+        label: "光机电一体化"
+    }, {
+        value: 428,
+        label: "模具"
+    }, {
+        value: 427,
+        label: "机械检测"
+    }, {
+        value: 426,
+        label: "机械清洗清理"
+    }, {
+        value: 425,
+        label: "机械制冷"
+    }, {
+        value: 424,
+        label: "铸造/热处理"
+    }, {
+        value: 423,
+        label: "雕刻切割"
+    }, {
+        value: 422,
+        label: "机械干燥"
+    }, {
+        value: 421,
+        label: "机械分离"
+    }, {
+        value: 420,
+        label: "机械过滤"
+    }, {
+        value: 419,
+        label: "减速机/变速机"
+    }, {
+        value: 418,
+        label: "泵"
+    }, {
+        value: 417,
+        label: "阀门"
+    }, {
+        value: 346,
+        label: "机械输送"
+    }, {
+        value: 345,
+        label: "电焊"
+    }, {
+        value: 344,
+        label: "机械粉碎"
+    }, {
+        value: 341,
+        label: "发动机"
+    }, {
+        value: 340,
+        label: "机床"
+    }, {
+        value: 339,
+        label: "内燃机"
+    }, {
+        value: 300,
+        label: "液压机"
+    }, {
+        value: 160,
+        label: "其他机械"
+    }, {
+        value: 159,
+        label: "通用零部件"
+    }]
+}, {
+    value: 17,
+    label: "新能源",
+    children: [{
+        value: 543,
+        label: "风能"
+    }, {
+        value: 479,
+        label: "其他新能源"
+    }, {
+        value: 478,
+        label: "能量转换与储存"
+    }, {
+        value: 477,
+        label: "核能及氢能"
+    }, {
+        value: 476,
+        label: "潮汐能"
+    }, {
+        value: 475,
+        label: "生物质能"
+    }, {
+        value: 474,
+        label: "地热能"
+    }, {
+        value: 416,
+        label: "太阳能 "
+    }]
+}, {
+    value: 15,
+    label: "化学化工",
+    children: [{
+        value: 522,
+        label: "化工生产"
+    }, {
+        value: 521,
+        label: "日用化学"
+    }, {
+        value: 520,
+        label: "合成化学"
+    }, {
+        value: 519,
+        label: "涂料、颜料、油墨"
+    }, {
+        value: 518,
+        label: "农药"
+    }, {
+        value: 517,
+        label: "肥料"
+    }, {
+        value: 516,
+        label: "基础化学"
+    }, {
+        value: 515,
+        label: "精炼石油"
+    }, {
+        value: 413,
+        label: "专用化学"
+    }, {
+        value: 140,
+        label: "其他化学化工"
+    }, {
+        value: 580,
+        label: "盐湖化工"
+    }]
+}, {
+    value: 7,
+    label: "轻工纺织",
+    children: [{
+        value: 559,
+        label: "皮革"
+    }, {
+        value: 558,
+        label: "纺织"
+    }, {
+        value: 551,
+        label: "其他轻工纺织"
+    }, {
+        value: 532,
+        label: "毛皮"
+    }, {
+        value: 529,
+        label: "编织物"
+    }, {
+        value: 528,
+        label: "棉及化纤印染精加工"
+    }, {
+        value: 86,
+        label: "服装服饰"
+    }, {
+        value: 85,
+        label: "制鞋"
+    }]
+}, {
+    value: 5,
+    label: "家居用品",
+    children: [{
+        value: 574,
+        label: "护理用品"
+    }, {
+        value: 573,
+        label: "卫浴"
+    }, {
+        value: 402,
+        label: "餐具"
+    }, {
+        value: 401,
+        label: "厨具"
+    }, {
+        value: 308,
+        label: "日常用品"
+    }, {
+        value: 307,
+        label: "家用电器"
+    }, {
+        value: 73,
+        label: "其他家居用品"
+    }, {
+        value: 72,
+        label: "家居照明"
+    }, {
+        value: 68,
+        label: "家具"
+    }, {
+        value: 67,
+        label: "家居清洁"
+    }, {
+        value: 63,
+        label: "家居饰品"
+    }]
+}, {
+    value: 4,
+    label: "建筑建材",
+    children: [{
+        value: 400,
+        label: "建筑电气"
+    }, {
+        value: 399,
+        label: "采暖空调"
+    }, {
+        value: 398,
+        label: "建筑照明"
+    }, {
+        value: 397,
+        label: "建筑通风"
+    }, {
+        value: 396,
+        label: "建筑给排水"
+    }, {
+        value: 305,
+        label: "建筑装潢"
+    }, {
+        value: 304,
+        label: "建筑材料"
+    }, {
+        value: 65,
+        label: "其他建筑建材"
+    }, {
+        value: 62,
+        label: "建筑施工"
+    }, {
+        value: 61,
+        label: "管件、管材"
+    }, {
+        value: 58,
+        label: "建筑装饰"
+    }, {
+        value: 57,
+        label: "建筑结构"
+    }]
+}, {
+    value: 2,
+    label: "食品饮料",
+    children: [{
+        value: 568,
+        label: "方便食品"
+    }, {
+        value: 537,
+        label: "茶类"
+    }, {
+        value: 535,
+        label: "焙烤类"
+    }, {
+        value: 393,
+        label: "果蔬类"
+    }, {
+        value: 392,
+        label: "水产类"
+    }, {
+        value: 391,
+        label: "肉类"
+    }, {
+        value: 390,
+        label: "粗粮"
+    }, {
+        value: 389,
+        label: "调味及发酵"
+    }, {
+        value: 388,
+        label: "食用油"
+    }, {
+        value: 387,
+        label: "酒类酿造"
+    }, {
+        value: 302,
+        label: "甜品类"
+    }, {
+        value: 99,
+        label: "乳品"
+    }, {
+        value: 50,
+        label: "其他食品饮料"
+    }, {
+        value: 49,
+        label: "食品添加剂"
+    }, {
+        value: 48,
+        label: "食品加工"
+    }, {
+        value: 46,
+        label: "饮料类"
+    }]
+}, {
+    value: 589,
+    label: "钒钛产业",
+    children: [{
+        value: 590,
+        label: "钒钛资源"
+    }, {
+        value: 591,
+        label: "钒钛冶金"
+    }, {
+        value: 592,
+        label: "钒钛化工"
+    }, {
+        value: 593,
+        label: "钒钛钢"
+    }, {
+        value: 594,
+        label: "钒钛新材料"
+    }, {
+        value: 595,
+        label: "其他"
+    }]
+}]
+
+module.exports = {
+    industryObject: industryList,
+    getIndustryCategory(categoryA, categoryB) {
+        let fieldList = [];
+        for (let i = 0; i < industryList.length; i++) {
+            fieldList.push({
+                value: industryList[i].value,
+                label: industryList[i].label
+            });
+            if (industryList[i].children) {
+                for (let j = 0; j < industryList[i].children.length; j++) {
+                    fieldList.push({
+                        value: industryList[i].children[j].value,
+                        label: industryList[i].children[j].label
+                    });
+                };
+            }
+        };
+        fieldList.sort(function (a, b) {
+            return a.value - b.value
+        });
+        let fieldKey = "";
+        fieldList.map(function (item) {
+            if (categoryA == item.value) {
+                fieldKey = item.label;
+            };
+            if (categoryB == item.value) {
+                fieldKey = fieldKey + "/" + item.label;
+            };
+        });
+        return fieldKey;
+    }
+}

+ 74 - 18
src/js/Technologytrading.js

@@ -5,24 +5,52 @@ import '../css/main_banner.css';
 import './public.js';
 import './main_banner.js';
 import '../css/Technologytrading.css';
-
+import {
+    industryObject,
+    getIndustryCategory
+    } from './DicIndustryList';
+//实现行业分类的页面加载
+(function(){
+    var ul_html="";
+    for(var i=0;i<industryObject.length;i++){
+        ul_html+="<li value='"+industryObject[i].value+"'><a href='javascript:;'>"+industryObject[i].label+"</a></li>";
+    }
+    $(".industry_ul").html(ul_html);
+    $(".industry_ul li:first").addClass("action_li");
+})();
+//实现行业分类和右边内容的显示
 (function(){
     $(".title_details ol li").click(function(){
         $(this).addClass("act").siblings().removeClass("act");
         var left_val=$(".industry_ul li.action_li").val();
         var right_val = $(this).val();
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            url: globalConfig.context + "/portal/search/demandList",
-            data: {
-                category:left_val,
-                fieldA:right_val
-            },
-            success: function (data) {
-                console.log(data);
-            }
-        })
+        if($(this).index()==0){
+            $.ajax({
+                method: "get",
+                dataType: "json",
+                url: globalConfig.context + "/portal/search/demandList",
+                data: {
+                    fieldA:left_val,
+                    category:right_val
+                },
+                success: function (data) {
+                    console.log(data);
+                }
+            })
+        }else{
+            $.ajax({
+                method: "get",
+                dataType: "json",
+                url: globalConfig.context + "/portal/search/demandList",
+                data: {
+                    fieldA:left_val,
+                    dataCategory :right_val
+                },
+                success: function (data) {
+                    console.log(data);
+                }
+            })
+        }
     });
     $(".industry_ul li").click(function() {
         $(".title_details ol li").eq(0).addClass("act").siblings().removeClass("act");
@@ -34,19 +62,47 @@ import '../css/Technologytrading.css';
             dataType: "json",
             url: globalConfig.context + "/portal/search/demandList",
             data: {
-                category:left_val,
-                fieldA:right_val
+                fieldA:left_val,
+                category:right_val
             },
             success: function (data) {
                 console.log(data);
             }
         })
-    })
-     var industry = $('.industry').innerHeight();
-    $('.industry_left').height(industry)
+    });
+    //实现右侧内容的分页功能
+    $(".pagination_box").on("click","span",function(){
+        $(this).addClass("action_span").siblings().removeClass("action_span");
+        var page_length=$(this).attr("value");
+        console.log(page_length);
+        $(".main_details").scrollTop((page_length-1)*800);
+        console.log($(".main_details").scrollTop());
+    });
+    function paging(data){
+        var a=parseInt(10*Math.random());
+        var paging_html="";
+        for(var i=0;i<60;i++){
+            $("#demandList_patent").append("<li>"+i+"</li>")
+        }
+        var b=Math.ceil((60+5)/6);
+       for(var j=1;j<=b;j++){
+           paging_html+="<span value="+j+">"+j+"</span>"
+       }
+        $(".paging_box").html(paging_html).width(b*25);
+
+        $(".pagination_box span:first").addClass("action_span");
+    }
+    paging(5);
+
+
 })();
 
+<<<<<<< HEAD
  
+=======
+
+   
+>>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
 
 
 

+ 29 - 13
template/Technologytrading.html

@@ -9,10 +9,17 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>科技服务</title>
+<<<<<<< HEAD
    <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />
     <link rel="stylesheet" href="../src/css/public.css" />
     <link rel="stylesheet" href="../src/css/main_banner.css" />
     <link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
+=======
+    <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />-->
+    <!--<link rel="stylesheet" href="../src/css/public.css" />-->
+    <!--<link rel="stylesheet" href="../src/css/main_banner.css" />-->
+    <!--<link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
+>>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
 
 </head>
 <body>  	
@@ -159,23 +166,15 @@
 			<div class="industry_left">
 				<h3>行业分类</h3>
 				<ul class="industry_ul">
-					<li class="action_li" value="0"><a href="javascript:;">医学类</a></li>
-					<li value="1"><a href="javascript:;">教育咨询</a></li>
-					<li value="2"><a href="javascript:;">航天航空</a></li>
-					<li value="3"><a href="javascript:;">医学类</a></li>
-					<li value="4"><a href="javascript:;">教育咨询</a></li>
-					<li value="5"><a href="javascript:;">航天航空</a></li>
-					<li value="6"><a href="javascript:;">医学类</a></li>
-					<li value="7"><a href="javascript:;">教育咨询</a></li>
-					<li value="8"><a href="javascript:;">航天航空</a></li>
+
 				</ul>
 			</div>
 			<div class="industry_right">
 				<div class="title_details">
 					<ol>
-						<li class="act" value="999" id="patent">专利交易</li>
-						<li value="0" id="attorn">精品技术转让</li>
-						<li value="1" id="nedd">精品创业需求</li>
+						<li class="act" value="0" id="patent">专利交易</li>
+						<li value="1" id="attorn">精品技术转让</li>
+						<li value="0" id="nedd">精品创业需求</li>
 					</ol>
 				</div>
 				<div class="main_details checked">
@@ -251,7 +250,17 @@
 
 					</ul>
 				</div>			
-				<div class="pagination_box"></div>
+				<div class="pagination_box">
+					<div>
+						<div class="paging_box">
+							<!--<span value="1" class="action_span">1</span>-->
+							<!--<span value="2" >2</span>-->
+							<!--<span value="3" >3</span>-->
+							<!--<span value="4" >4</span>-->
+						</div>
+					</div>
+
+				</div>
 			</div>
 		</div>
 	<div>
@@ -395,10 +404,17 @@
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
 
+<<<<<<< HEAD
 <!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
 <script type="text/javascript" src="../src/js/Technologytrading.js"></script>
 <script type="text/javascript" src="../src/js/public.js"></script>
 <script type="text/javascript" src="../src/js/main_banner.js" ></script>-->
+=======
+<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>-->
+<!--<script type="text/javascript" src="../src/js/Technologytrading.js"></script>-->
+<!--<script type="text/javascript" src="../src/js/public.js"></script>-->
+<!--<script type="text/javascript" src="../src/js/main_banner.js" ></script>-->
+>>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
 
 
 </html>