YanaDH 7 anos atrás
pai
commit
1ddd0e176c

+ 15 - 0
miaomiao/www/.vscode/launch.json

xqd
@@ -0,0 +1,15 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "启动程序",
+            "program": "${file}"
+        }
+    ]
+}

+ 0 - 1
miaomiao/www/js/controllers/my.js

xqd
@@ -119,7 +119,6 @@
                 //     msg.error(error.data.message)
                 // })
                 myService.info(type=2).then(function(res){
-                    debugger;
                     $scope.info = res.data.data;
                 })
             };

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

xqd xqd
@@ -21,7 +21,7 @@
             </a>
         </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()" ng-class="screenWidth" style="background: #252525; z-index: 999999;">
             <img src="img/dream1.png" style="width: 100%;" alt="">
@@ -33,8 +33,8 @@
             <img src="img/dream3.png" style="width: 100%;" alt="">
         </div>
         <!-- 新手引导 结束 -->
-        <div ng-if="step!=2&&step!=3&&step!=4">
-            <div ng-if="type==1 && user.id != dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
+        <div ng-if="step!=2&&step!=3&&step!=4" style="position: relative;">
+            <div ng-if="type==1 && user.id != dream.user_id" style="position: absolute; bottom: 0; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
                 <div class="row">
                     <div class="col dreamButton">
                         <button ng-click="openSupport()" class="button button-outline button-calm" style="border: 1px solid #00C3DA">

+ 58 - 59
miaomiao/www/templates/home/index.html

xqd xqd
@@ -29,6 +29,7 @@
     <ion-side-menus>
         <ion-side-menu-content drag-content="false">
             <ion-content>
+                <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)"></ion-refresher>
                 <!-- 新手引导 开始 -->
                 <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="">
@@ -39,77 +40,75 @@
                 <!-- 新手引导 结束 -->
                 <div ng-if="step!=0&&step!=1">
                     <!--下拉刷新-->
-                    <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
-                        </ion-refresher>
-                        <div class="tabs-striped tabs-top">
-                            <div class="tabs" style="top: 0px">
-                                <a ng-class="type=='hot'?'tab-item active':'tab-item'" ng-click="changetype('hot')">
-                                    热门
-                                </a>
-                                <a ng-class="type=='trend'?'tab-item active':'tab-item'" ng-click="changetype('trend')">
-                                    潮流
-                                </a>
-                                <a ng-class="type=='news'?'tab-item active':'tab-item'" ng-click="changetype('news')">
-                                    最新
-                                </a>
-                            </div>
+                    <div class="tabs-striped tabs-top">
+                        <div class="tabs" style="top: 0px">
+                            <a ng-class="type=='hot'?'tab-item active':'tab-item'" ng-click="changetype('hot')">
+                                热门
+                            </a>
+                            <a ng-class="type=='trend'?'tab-item active':'tab-item'" ng-click="changetype('trend')">
+                                潮流
+                            </a>
+                            <a ng-class="type=='news'?'tab-item active':'tab-item'" ng-click="changetype('news')">
+                                最新
+                            </a>
                         </div>
-                        <div class="icontent">
-                            <ion-slide-box style="height: 150px" auto-play="true" slide-interval="2000"  does-continue="true">
-                                <ion-slide ng-repeat="banner in index.banners">
-                                    <div class="box banner"><img ng-src="{{banner.value}}" style="width: 100%; " /></div>
-                                </ion-slide>
-                            </ion-slide-box>
-                            <!-- end 轮播图-->
-                            <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA;height:80px;">
-                                <div class="col col-10" style="margin-top: 7%" ng-click="next(1)">
-                                    <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
-                                </div>
-                                <div class="col" style="overflow: hidden; padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
-                                    <div style="position: relative; display: inline-block; width: 33%; text-align: center; height: 100%;" class="subcontent" ng-repeat="user in index.users">
-                                        <span style="border-radius: 100%; position: absolute; right: 5%; width: 22px; height: 22px; line-height: 22px; border-radius: 100%; font-size: 13px; background-color: #EF4941;">新</span>
-                                        <img ng-click="clickAvatar(user.id,user.dream_id)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" class="chosenClass" style="width: 70%;" />
-                                    </div>
-                                </div>
-                                <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
-                                    <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem; color: #00C3DA;"></i>
+                    </div>
+                    <div class="icontent">
+                        <ion-slide-box style="height: 150px" auto-play="true" slide-interval="2000"  does-continue="true">
+                            <ion-slide ng-repeat="banner in index.banners">
+                                <div class="box banner"><img ng-src="{{banner.value}}" style="width: 100%; " /></div>
+                            </ion-slide>
+                        </ion-slide-box>
+                        <!-- end 轮播图-->
+                        <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA;height:80px;">
+                            <div class="col col-10" style="margin-top: 7%" ng-click="next(1)">
+                                <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
+                            </div>
+                            <div class="col" style="overflow: hidden; padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
+                                <div style="position: relative; display: inline-block; width: 33%; text-align: center; height: 100%;" class="subcontent" ng-repeat="user in index.users">
+                                    <span style="border-radius: 100%; position: absolute; right: 5%; width: 22px; height: 22px; line-height: 22px; border-radius: 100%; font-size: 13px; background-color: #EF4941;">新</span>
+                                    <img ng-click="clickAvatar(user.id,user.dream_id)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" class="chosenClass" style="width: 70%;" />
                                 </div>
                             </div>
-                            <div style="background:#E6E6E6;height:10px;">
+                            <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
+                                <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem; color: #00C3DA;"></i>
                             </div>
-                            <div class="list">
-                                <div class="item mainitem" ng-repeat="item in index.dreams">
-                                    <div class="row">
-                                        <div class="col avatarCol">
-                                            <div class="fl" style="width: 27%">
-                                                <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id)" />
-                                            </div>
-                                            <div class="myblock">
-                                                <div>{{item.user.nickname}}<span class="age">{{item.user.birthday | getage}}岁</span></div>
-                                                <div class="mysecond">{{item.user.city}}<span class="sign" ng-if="item.signs!=''" ng-repeat="sign in item.signs">{{sign}}</span></div>
-                                            </div>
+                        </div>
+                        <div style="background:#E6E6E6;height:10px;">
+                        </div>
+                        <div class="list">
+                            <div class="item mainitem" ng-repeat="item in index.dreams">
+                                <div class="row">
+                                    <div class="col avatarCol">
+                                        <div class="fl" style="width: 27%">
+                                            <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id)" />
                                         </div>
-                                        <div class="col" style="text-align:right">
-                                            <div style="margin-top:4px">
-                                                <img ng-src="img/icon_follow.svg" class="iheart">
-                                                <span style="color: #F16571">{{item.care_num + item.add_care_number}}</span>
-                                                <span>人关注</span>
-                                            </div>
-                                            <div class="mysecond">{{item.end_time | lastDate}}</div>
+                                        <div class="myblock">
+                                            <div>{{item.user.nickname}}<span class="age">{{item.user.birthday | getage}}岁</span></div>
+                                            <div class="mysecond">{{item.user.city}}<span class="sign" ng-if="item.signs!=''" ng-repeat="sign in item.signs">{{sign}}</span></div>
                                         </div>
                                     </div>
-                                    <div ng-click="toDetail(item.id)">
-                                        <img ng-src="{{item.img.pic}}">
-                                        <div class="homeDream">
-                                            <p style="font-size: 16px">{{ item.name }}</p>
-                                            <p>{{ item.about }}</p>
+                                    <div class="col" style="text-align:right">
+                                        <div style="margin-top:4px">
+                                            <img ng-src="img/icon_follow.svg" class="iheart">
+                                            <span style="color: #F16571">{{item.care_num + item.add_care_number}}</span>
+                                            <span>人关注</span>
                                         </div>
+                                        <div class="mysecond">{{item.end_time | lastDate}}</div>
+                                    </div>
+                                </div>
+                                <div ng-click="toDetail(item.id)">
+                                    <img ng-src="{{item.img.pic}}">
+                                    <div class="homeDream">
+                                        <p style="font-size: 16px">{{ item.name }}</p>
+                                        <p>{{ item.about }}</p>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <!--上拉更多-->
-                        <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
+                    </div>
+                    <!--上拉更多-->
+                    <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
                 </div>
             </ion-content>
         </ion-side-menu-content>