Skip to content

Commit 4c4dc32

Browse files
dreamofeidreamofei
committed
常见问题解答模块基本完成
1 parent 361bd47 commit 4c4dc32

6 files changed

Lines changed: 54 additions & 15 deletions

File tree

‎Libs/Js/app.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
//.when('/sample/s2', {
1010
// templateUrl: 'Views/sample/s2.html'
1111
//})
12-
.when('/qaList', {
12+
.when('/qaList/:id', {
1313
templateUrl: 'Views/qa/qaList.html'
1414
})
15+
.when('/qaDetail/:catetogyId/:qaId', {
16+
templateUrl: 'Views/qa/qaDetail.html'
17+
})
1518
.otherwise({
1619
redirectTo: '/'
1720
});

‎Libs/Js/ctrls/mainCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@
218218
// url: "#/"
219219
// }
220220
//];
221-
$scope.qaList = qaDataService.getCategory(1).data;
221+
$scope.qaCategory = qaDataService.getCategory(1);
222222
$scope.tabFocus = function (index) {
223-
$scope.qaList = qaDataService.getCategory(index).data;
223+
$scope.qaCategory = qaDataService.getCategory(index);
224224
}
225225

226226

‎Libs/Js/ctrls/qa/qaCtrls.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1-
mainMoudle.controller('qaSideMenuCtrl',['$scope','qaDataService', function ($scope,qaDataService) {
1+
mainMoudle.controller('qaSideMenuCtrl', ['$scope', 'qaDataService', '$routeParams', function ($scope, qaDataService, $routeParams) {
22
$scope.sideMenu = qaDataService.all();
3-
$scope.qaList = qaDataService.getCategory(1).data;
3+
$scope.qaCategory = qaDataService.getCategory($routeParams.id);
44

55
$scope.changeCategory = function (index) {
6-
$scope.qaList = qaDataService.getCategory(index+1).data;
6+
$scope.qaCategory = qaDataService.getCategory(index + 1);
77
}
88
}])
9+
.controller('qaDetailCtrl', function ($scope, qaDataService, $routeParams) {
10+
var qaCategory=qaDataService.getCategory($routeParams.catetogyId);
11+
$scope.qa = qaDataService.getQa(qaCategory, $routeParams.qaId);
12+
13+
$scope.sideMenu = qaDataService.all();
14+
$scope.changeCategory = function (index) {
15+
$scope.qaCategory = qaDataService.getCategory(index + 1);
16+
}
17+
})
918

1019
;

‎Views/main.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ <h3 style="margin-top:10px;" class="col-md-6"><i class="fa fa-question-circle fa
9999
</div>
100100
<div class="col-md-8">
101101
<div class="row qaCategory">
102-
<a href="#/" class="btn btn-lg" ng-mouseenter="tabFocus(1)">脉冲</a>丨
103-
<a href="#/" class="btn btn-lg" ng-mouseenter="tabFocus(2)">张力</a>丨
104-
<a href="#/" class="btn btn-lg" ng-mouseenter="tabFocus(3)">振动</a>丨
105-
<a href="#/" class="btn btn-lg" ng-mouseenter="tabFocus(4)">光端机</a>
102+
<a href="#/qaList/1" class="btn btn-lg" ng-mouseenter="tabFocus(1)">脉冲</a>丨
103+
<a href="#/qaList/2" class="btn btn-lg" ng-mouseenter="tabFocus(2)">张力</a>丨
104+
<a href="#/qaList/3" class="btn btn-lg" ng-mouseenter="tabFocus(3)">振动</a>丨
105+
<a href="#/qaList/4" class="btn btn-lg" ng-mouseenter="tabFocus(4)">光端机</a>
106106
</div>
107107
<div class="row">
108108
<div class="qaScroll qa-news-zone" id="qaScroll">
109109
<div id="qaScroll{{i}}" ng-repeat="i in [1,2]" on-finish-render="setScroll()">
110-
<dl ng-repeat="qa in qaList">
110+
<dl ng-repeat="qa in qaCategory.data">
111111
<dt>
112-
<i class="fa fa-question-circle fa-margin"></i><a ng-href="{{qa.url}}">{{qa.question}}</a>
112+
<i class="fa fa-question-circle fa-margin"></i><a ng-href="{{qa.url}}qaDetail/{{qaCategory.id}}/{{qa.id}}">{{qa.question}}</a>
113113
</dt>
114114
<dd>
115115
<i class="fa fa-quote-left fa-margin"></i>{{qa.answerIntro}}<i class="fa fa-quote-right"></i>

‎Views/qa/qaDetail.html‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<div class="row zoneSplit"></div>
2+
<div class="row" ng-controller="qaDetailCtrl">
3+
<div class="col-md-offset-1 col-md-2 sideMenuAndSlideImg zone">
4+
<h3><i class="fa fa-list-ul fa-margin" style="color: #d7000f;padding-left:10px;"></i>常识解答</h3>
5+
<div class="sideMenu">
6+
<div ng-repeat="menu in sideMenu" class="qaCategory sideMenuItem" ng-click="changeCategory($index)" style="cursor:pointer;">
7+
<a href="#/qaList/{{$index+1}}">{{menu.name}}</a><i class="fa fa-angle-right pull-right" style="padding-right:35px;"></i>
8+
</div>
9+
</div>
10+
11+
</div>
12+
<div class="col-md-8 sideMenuAndSlideImg zone" style="overflow-y: scroll;">
13+
14+
<div style="padding:30px;">
15+
<dl>
16+
<dt>
17+
<i class="fa fa-question-circle fa-margin"></i>{{qa.question}}
18+
</dt><hr/>
19+
<dd>
20+
<i class="fa fa-quote-left fa-margin"></i>{{qa.answer}}<i class="fa fa-quote-right"></i>
21+
</dd>
22+
</dl>
23+
</div>
24+
25+
</div>
26+
</div>

‎Views/qa/qaList.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44
<h3><i class="fa fa-list-ul fa-margin" style="color: #d7000f;padding-left:10px;"></i>常识解答</h3>
55
<div class="sideMenu">
66
<div ng-repeat="menu in sideMenu" class="qaCategory sideMenuItem" ng-click="changeCategory($index)" style="cursor:pointer;">
7-
<a href="">{{menu.name}}</a><i class="fa fa-angle-right pull-right" style="padding-right:35px;"></i>
7+
<a href="#/qaList/{{$index+1}}">{{menu.name}}</a><i class="fa fa-angle-right pull-right" style="padding-right:35px;"></i>
88
</div>
99
</div>
1010

1111
</div>
1212
<div class="col-md-8 sideMenuAndSlideImg zone" style="overflow-y: scroll;">
1313

1414
<div style="padding:30px;">
15-
<dl ng-repeat="qa in qaList">
15+
<h3>{{qaCategory.name}}</h3><hr />
16+
<dl ng-repeat="qa in qaCategory.data">
1617
<dt>
17-
<i class="fa fa-question-circle fa-margin"></i><a ng-href="{{qa.url}}">{{qa.question}}</a>
18+
<i class="fa fa-question-circle fa-margin"></i><a ng-href="{{qa.url}}qaDetail/{{qaCategory.id}}/{{qa.id}}">{{qa.question}}</a>
1819
</dt>
1920
<dd>
2021
<i class="fa fa-quote-left fa-margin"></i>{{qa.answerIntro}}<i class="fa fa-quote-right"></i>

0 commit comments

Comments
 (0)