Skip to content

Commit 94927b7

Browse files
dreamofeidreamofei
committed
修改sideMenu和滚动大图的高度，添加问题解答，修改页脚
1 parent 13219b2 commit 94927b7

8 files changed

Lines changed: 419 additions & 74 deletions

File tree

‎Libs/Css/Custom/main.css‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
}
4545

4646
.sideMenuAndSlideImg {
47-
height: 550px;
47+
/*height: 550px;*/
48+
height: 450px;
4849
padding: 0px;
4950
}
5051

@@ -186,3 +187,9 @@
186187
padding: 9px 0;
187188
color:#727171;
188189
}
190+
.qaCategory a{
191+
color: #3b3b3b;
192+
}
193+
.qaCategory a:hover{
194+
color: #d7000f;
195+
}

‎Libs/Js/app.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
.when('/', {
44
templateUrl: 'Views/main.html'
55
})
6-
//.when('/sample', {
7-
// templateUrl: 'Views/sample/index.html'
8-
//})
6+
.when('/sample', {
7+
templateUrl: 'Views/sample/index.html'
8+
})
99
//.when('/sample/s2', {
1010
// templateUrl: 'Views/sample/s2.html'
1111
//})

‎Libs/Js/ctrls/mainCtrl.js‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
], isFocus: false
111111
},
112112
{
113-
name: "高清网络光端机", url: "#/", child: [
113+
name: "数字监控专用光端机", url: "#/", child: [
114114
{ name: "100M（百兆）高清系列", url: "#/", img: "/Sources/imgs/R1.png" },
115115
{ name: "1000M（千兆）高清系列", url: "#/", img: "/Sources/imgs/R1.png" }
116116
], isFocus: false
@@ -170,7 +170,7 @@
170170
}
171171

172172
})
173-
.controller('QANewsCtrl', function ($scope) {
173+
.controller('QANewsCtrl', function ($scope,qaDataService) {
174174
//news
175175
$scope.news = [
176176
{ content: "新闻一。。。。", url: "#/", isFocus: false },
@@ -191,33 +191,38 @@
191191
//qa
192192
//$scope.qaZoneLeftImg = "/Sources/imgs/wdBox.png";
193193
$scope.qaZoneLeftImg = "/Sources/realImgs/others/FAQ.jpg";
194-
$scope.qaList = [
195-
{
196-
question: "了空间了空间浪费空间？",
197-
answer: "了空间链接了解了了时间段里疯狂就死定了拉开距离龙聚楼酒楼。",
198-
url: "#/"
199-
},
200-
{
201-
question: "欧赔，门将离开了我我我？",
202-
answer: "路肩路肩了解空间抛弃破IPIQ颇为家里快急死了到家了抛弃破费破量减少了空间刻录机你，没呢，吗。",
203-
url: "#/"
204-
},
205-
{
206-
question: "户名称来看及？",
207-
answer: "我我我我ijoiiouosuf看见了看见了看见了健康了健康记录劈破。",
208-
url: "#/"
209-
},
210-
{
211-
question: "品牌空间关闭接口卡啦啦啦？",
212-
answer: "哦IE偶奇偶及皮肤鹿鼎记佛经里看见的怕看见了家里快乐偶奇偶及皮肤鹿鼎记佛经里看见的怕看见了家里快乐偶奇偶及皮肤鹿鼎记佛经里看见的怕看见了家里快乐。",
213-
url: "#/"
214-
},
215-
{
216-
question: "两句话给帮忙看看匹配进口零距离？",
217-
answer: "我看见了建瓯盘欺骗记录到快来看才看见哦自己哦了。",
218-
url: "#/"
219-
}
220-
];
194+
//$scope.qaList = [
195+
// {
196+
// question: "了空间了空间浪费空间？",
197+
// answer: "了空间链接了解了了时间段里疯狂就死定了拉开距离龙聚楼酒楼。",
198+
// url: "#/"
199+
// },
200+
// {
201+
// question: "欧赔，门将离开了我我我？",
202+
// answer: "路肩路肩了解空间抛弃破IPIQ颇为家里快急死了到家了抛弃破费破量减少了空间刻录机你，没呢，吗。",
203+
// url: "#/"
204+
// },
205+
// {
206+
// question: "户名称来看及？",
207+
// answer: "我我我我ijoiiouosuf看见了看见了看见了健康了健康记录劈破。",
208+
// url: "#/"
209+
// },
210+
// {
211+
// question: "品牌空间关闭接口卡啦啦啦？",
212+
// answer: "哦IE偶奇偶及皮肤鹿鼎记佛经里看见的怕看见了家里快乐偶奇偶及皮肤鹿鼎记佛经里看见的怕看见了家里快乐偶奇偶及皮肤鹿鼎记佛经里看见的怕看见了家里快乐。",
213+
// url: "#/"
214+
// },
215+
// {
216+
// question: "两句话给帮忙看看匹配进口零距离？",
217+
// answer: "我看见了建瓯盘欺骗记录到快来看才看见哦自己哦了。",
218+
// url: "#/"
219+
// }
220+
//];
221+
$scope.qaList = qaDataService.getCategory(1).data;
222+
$scope.tabFocus = function (index) {
223+
$scope.qaList = qaDataService.getCategory(index).data;
224+
}
225+
221226

222227
$scope.setScroll = function () {
223228
var speed = 30;

‎Libs/Js/ctrls/sample/sample.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
mainMoudle.controller('testSample', ['$scope', function ($scope) {
2+
$scope.name = "HElloWWW";
3+
alert("111");
4+
5+
var category1 = [
6+
'jljdljadfoojo',
7+
'就看见了',
8+
'来了阿斯顿发圣诞',
9+
'jljdlj就拉开了adfoojo'
10+
];
11+
var category2 = [
12+
'category2jljdljadfoojo',
13+
'category2就看见了',
14+
'category2来了阿斯顿发圣诞',
15+
'category2jljdlj就拉开了adfoojo'
16+
];
17+
18+
$scope.category = category1;
19+
20+
$scope.over1 = function () {
21+
$scope.category = category1;
22+
}
23+
$scope.over2 = function () {
24+
$scope.category = category2;
25+
}
26+
27+
}]);

0 commit comments

Comments
 (0)