Home Explore Help
Register Sign In
roobe
/
miao
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

add

YanaDH 7 years ago
parent
b56d7d1be2
commit
cb9431e26b
10 changed files with 40 additions and 27 deletions
Unified View Show Diff Stats
  1. 6 6
      miaomiao/www/css/style.css
  2. BIN
      miaomiao/www/img/dream1.png
  3. BIN
      miaomiao/www/img/dream2.png
  4. BIN
      miaomiao/www/img/dream3.png
  5. BIN
      miaomiao/www/img/home1.png
  6. BIN
      miaomiao/www/img/home2.png
  7. 3 3
      miaomiao/www/index.html
  8. 25 11
      miaomiao/www/js/controllers/home.js
  9. 3 4
      miaomiao/www/templates/home/dream-detail.html
  10. 3 3
      miaomiao/www/templates/home/index.html

+ 6 - 6
miaomiao/www/css/style.css
View File 

@@ -141,16 +141,16 @@ overflow:auto;
 
     /*border: 2px solid #fboxff;*/
 
     /*border: 2px solid #fboxff;*/
 
 /*}*/
 
 /*}*/
 
 .screenWidth2{
 
 .screenWidth2{
 
-    padding-top: 40px;
 
-    padding-bottom: 28px;
 
+    padding-bottom: 25px;
 
 }
 
 }
 
 .screenWidth1{
 
 .screenWidth1{
 
-    padding-top: 25px;
 
-    padding-bottom: 20px;
 
+    padding-bottom: 19px;
 
 }
 
 }
 
 .screenWidth0{
 
 .screenWidth0{
 
-    padding-top: 5px;
 
-    padding-bottom: 22px;
 
+    padding-bottom: 7px;
 
+}
 
+.screenWidthX{
 
+    padding-bottom: 43%;
 
 }
 
 }
 
 .chosenClass{
 
 .chosenClass{
 
     border: 2px solid #FE3939;
 
     border: 2px solid #FE3939;

BIN
miaomiao/www/img/dream1.png
View File


BIN
miaomiao/www/img/dream2.png
View File


BIN
miaomiao/www/img/dream3.png
View File


BIN
miaomiao/www/img/home1.png
View File


BIN
miaomiao/www/img/home2.png
View File


+ 3 - 3
miaomiao/www/index.html
View File 

@@ -40,9 +40,9 @@
 
   </head>
 
   </head>
 
   <body ng-app="app">
 
   <body ng-app="app">
 
     <ion-nav-bar class="calm-bg">
 
     <ion-nav-bar class="calm-bg">
 
-      <ion-nav-back-button>
 
-        返回
 
-      </ion-nav-back-button>
 
+        <ion-nav-back-button>
 
+            返回
 
+        </ion-nav-back-button>
 
     </ion-nav-bar>
 
     </ion-nav-bar>
 
     <ion-nav-view></ion-nav-view>
 
     <ion-nav-view></ion-nav-view>
 
   </body>
 
   </body>

+ 25 - 11
miaomiao/www/js/controllers/home.js
View File 

@@ -2,19 +2,26 @@
 
     app.controller('homeCtrl', ["$scope", "$ionicTabsDelegate","storage", "$http", 'config', 'myService', "$state", "$ionicSlideBoxDelegate", "msg", "$ionicPopover", "homeService", "$ionicPopup", "$timeout", "$ionicSideMenuDelegate", "$rootScope"
 
     app.controller('homeCtrl', ["$scope", "$ionicTabsDelegate","storage", "$http", 'config', 'myService', "$state", "$ionicSlideBoxDelegate", "msg", "$ionicPopover", "homeService", "$ionicPopup", "$timeout", "$ionicSideMenuDelegate", "$rootScope"
 
         , function ($scope, $ionicTabsDelegate,storage, $http, config,  myService, $state, $ionicSlideBoxDelegate, msg, $ionicPopover, homeService, $ionicPopup, $timeout, $ionicSideMenuDelegate, $rootScope) {
 
         , function ($scope, $ionicTabsDelegate,storage, $http, config,  myService, $state, $ionicSlideBoxDelegate, msg, $ionicPopover, homeService, $ionicPopup, $timeout, $ionicSideMenuDelegate, $rootScope) {
 
         $scope.$on('$ionicView.enter', function () {
 
         $scope.$on('$ionicView.enter', function () {
 
-            $ionicTabsDelegate.showBar(true);
 
+            $ionicTabsDelegate.showBar(false);
 
             $scope.load(false);
 
             $scope.load(false);
 
             $ionicSlideBoxDelegate.start();
 
             $ionicSlideBoxDelegate.start();
 
             $scope.step = storage.getObject('user').step;
 
             $scope.step = storage.getObject('user').step;
 
+            if($scope.step > 1){
 
+                $ionicTabsDelegate.showBar(true);
 
+            }
 
             var width = window.screen.width;
 
             var width = window.screen.width;
 
-            if(width>300&width<370){
 
-                $scope.screenWidth = 0;
 
+            var height = window.screen.height;
 
+            if(width==375 && height==812){
 
+                $scope.screenWidth = "screenWidthX";
 
+            }
 
+            else if(width>300 && width<370){
 
+                $scope.screenWidth = "screenWidth0";
 
             }
 
             }
 
-            else if(width>=370&width<400){
 
-                $scope.screenWidth = 1;
 
+            else if(width>=370 && width<400){
 
+                $scope.screenWidth = "screenWidth1";
 
             }
 
             }
 
             else{
 
             else{
 
-                $scope.screenWidth = 2;
 
+                $scope.screenWidth = "screenWidth2";
 
             }
 
             }
 
             homeService.messageInfo().then(function(result){
 
             homeService.messageInfo().then(function(result){
 
                 $scope.infos = result.data.data;
 
                 $scope.infos = result.data.data;
 
@@ -35,6 +42,9 @@
 
 
 
         $scope.changeStep = function(){
 
         $scope.changeStep = function(){
 
             $scope.step = $scope.step + 1;
 
             $scope.step = $scope.step + 1;
 
+            if($scope.step > 1){
 
+                $ionicTabsDelegate.showBar(true);
 
+            }
 
             homeService.changeStep().then(function(result){
 
             homeService.changeStep().then(function(result){
 
                 if(result.data.status_code==0){
 
                 if(result.data.status_code==0){
 
                     storage.setObject('user', result.data.data);
 
                     storage.setObject('user', result.data.data);
 
@@ -292,14 +302,18 @@
 
             $scope.$on('$ionicView.beforeEnter', function () {
 
             $scope.$on('$ionicView.beforeEnter', function () {
 
                 $scope.step = storage.getObject('user').step;
 
                 $scope.step = storage.getObject('user').step;
 
                 var width = window.screen.width;
 
                 var width = window.screen.width;
 
-                if(width>300&width<370){
 
-                    $scope.screenWidth = 0;
 
+                var height = window.screen.height;
 
+                if(width==375 && height==812){
 
+                    $scope.screenWidth = "screenWidthX";
 
+                }
 
+                else if(width>300 && width<370){
 
+                    $scope.screenWidth = "screenWidth0";
 
                 }
 
                 }
 
-                else if(width>=370&width<400){
 
-                    $scope.screenWidth = 1;
 
+                else if(width>=370 && width<400){
 
+                    $scope.screenWidth = "screenWidth1";
 
                 }
 
                 }
 
                 else{
 
                 else{
 
-                    $scope.screenWidth = 2;
 
+                    $scope.screenWidth = "screenWidth2";
 
                 }
 
                 }
 
                 $scope.video = {};
 
                 $scope.video = {};
 
                 msg.loading();
 
                 msg.loading();

+ 3 - 4
miaomiao/www/templates/home/dream-detail.html
View File 

@@ -23,13 +23,13 @@
 
     </div>
 
     </div>
 
     <ion-content style="background: #fff" ng-click="cancelSupport()">
 
     <ion-content style="background: #fff" ng-click="cancelSupport()">
 
         <!-- 新手引导 开始 -->
 
         <!-- 新手引导 开始 -->
 
-        <div ng-if="step==2" ng-click="changeStep()" style="background: #252525; z-index: 999999;">
 
+        <div ng-if="step==2" ng-click="changeStep()" ng-class="screenWidth" style="background: #252525; z-index: 999999;">
 
             <img src="img/dream1.png" style="width: 100%;" alt="">
 
             <img src="img/dream1.png" style="width: 100%;" alt="">
 
         </div>
 
         </div>
 
-        <div ng-if="step==3" ng-click="changeStep()" style="background: #252525; z-index: 999999;">
 
+        <div ng-if="step==3" ng-click="changeStep()" ng-class="screenWidth" style="background: #252525; z-index: 999999;">
 
             <img src="img/dream2.png" style="width: 100%;" alt="">
 
             <img src="img/dream2.png" style="width: 100%;" alt="">
 
         </div>
 
         </div>
 
-        <div ng-if="step==4" ng-click="changeStep()" style="background: #252525; z-index: 999999;">
 
+        <div ng-if="step==4" ng-click="changeStep()" ng-class="screenWidth" style="background: #252525; z-index: 999999;">
 
             <img src="img/dream3.png" style="width: 100%;" alt="">
 
             <img src="img/dream3.png" style="width: 100%;" alt="">
 
         </div>
 
         </div>
 
         <!-- 新手引导 结束 -->
 
         <!-- 新手引导 结束 -->
 
@@ -314,7 +314,6 @@
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
     </ion-content>
 
     </ion-content>
 
-    
             <script id="interaction-modal.html" type="text/ng-template">
 
             <script id="interaction-modal.html" type="text/ng-template">
 
                 <div class="modal">
 
                 <div class="modal">
 
                     <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
 
                     <ion-header-bar class="bar-calm bar bar-header has-tabs-top">

+ 3 - 3
miaomiao/www/templates/home/index.html
View File 

@@ -30,10 +30,10 @@
 
         <ion-side-menu-content drag-content="false">
 
         <ion-side-menu-content drag-content="false">
 
             <ion-content>
 
             <ion-content>
 
                 <!-- 新手引导 开始 -->
 
                 <!-- 新手引导 开始 -->
 
-                <div ng-if="step==0" ng-click="changeStep()" ng-class="{'screenWidth2':screenWidth==2,'screenWidth1':screenWidth==1,'screenWidth0':screenWidth==0}" style="background: #252525; z-index: 999999;">
 
-                    <img src="img/home1.png" style="width: 100%;" alt="">
 
+                <div ng-if="step==0" ng-click="changeStep()" ng-class="screenWidth" style="background: #252525; z-index: 999999;">
 
+                    <img src="img/home1.png" style="width: 100%; height: 100%;" alt="">
 
                 </div>
 
                 </div>
 
-                <div ng-if="step==1" ng-click="changeStep()" ng-class="{'screenWidth2':screenWidth==2,'screenWidth1':screenWidth==1,'screenWidth0':screenWidth==0}" style="background: #252525; z-index: 999999;">
 
+                <div ng-if="step==1" ng-click="changeStep()" ng-class="screenWidth" style="background: #252525; z-index: 999999;">
 
                     <img src="img/home2.png" style="width: 100%;" alt="">
 
                     <img src="img/home2.png" style="width: 100%;" alt="">
 
                 </div>
 
                 </div>
 
                 <!-- 新手引导 结束 -->
 
                 <!-- 新手引导 结束 -->