add

miaomiao/www/css/style.css

@@ -192,8 +192,7 @@ overflow:auto;
 .subcontent img{
     width:20%;
     margin: 10px 5% 10px 0;
-    max-height: 60px;
-    border-radius:50%;
+    border-radius:100%;
 }
     .subcontent i {
         font-size: 1.5rem;
@@ -331,6 +330,9 @@ padding:18px;
 .re-border {
 padding-right:3px;  
 }
+a:visited,a:link{
+    text-decoration: none;
+}
 .recharge{
     letter-spacing: 1px;
 }

miaomiao/www/img/icon_follow2.svg

@@ -0,0 +1,12 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="37.77" height="34.67" viewBox="0 0 37.77 34.67">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #00c3da;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <title>icon_follow2</title>
+  <path class="cls-1" d="M20.41,36.53l.86.79a1.38,1.38,0,0,0,1.81,0l.86-.79C35.87,25.7,39.08,21.68,39.08,16.07A8.79,8.79,0,0,0,30.29,7,9.59,9.59,0,0,0,23,10.49l-.87,1.05-.87-1.05A9.59,9.59,0,0,0,14.07,7a8.79,8.79,0,0,0-8.79,9.06c0,5.61,3.22,9.63,15.14,20.47ZM3.29,16.15A10.88,10.88,0,0,1,14.18,5a11.64,11.64,0,0,1,8,3.31,11.64,11.64,0,0,1,8-3.31A10.88,10.88,0,0,1,41.07,16.15c0,6.45-3.37,10.66-15.64,21.82l-.84.78a3.58,3.58,0,0,1-4.8,0L18.94,38C6.66,26.81,3.29,22.6,3.29,16.15Z" transform="translate(-3.29 -5)"/>
+</svg>

miaomiao/www/js/config/router.js

@@ -143,6 +143,15 @@
                 }
             }
         })
+            .state('app.attention', {
+                url: '/my/attention',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/attention.html',
+                        controller: 'attentionCtrl'
+                    }
+                }
+            })
         .state('app.my_dream', {
             url: '/my/dream',
             views: {
@@ -179,6 +188,16 @@
                 }
             }
         })
+
+            .state('app.personalLetter', {
+                url: '/my/message/personalLetter',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/personalLetter.html',
+                        controller: 'personalLetterCtrl'
+                    }
+                }
+            })
         .state('app.my_recharge', {
             url: '/my/recharge',
             views: {
@@ -197,6 +216,42 @@
                 }
             }
         })
+            .state('app.aboutMiao', {
+                url: '/my/aboutMiao',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/aboutMiao.html',
+                        controller: 'aboutMiaoCtrl'
+                    }
+                }
+            })
+            .state('app.payExplain', {
+                url: '/my/payExplain',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/payExplain.html',
+                        controller: 'payExplainCtrl'
+                    }
+                }
+            })
+            .state('app.withdraw', {
+                url: '/my/withdraw',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/withdraw.html',
+                        controller: 'withdrawCtrl'
+                    }
+                }
+            })
+            .state('app.contact', {
+                url: '/my/contact',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/contact.html',
+                        controller: 'contactCtrl'
+                    }
+                }
+            })
         if (localStorage['token']) {
             $urlRouterProvider.otherwise('/app/home');
         } else {

miaomiao/www/js/controllers/my.js

@@ -95,6 +95,48 @@
             }
 
      }]);
+    app.controller('aboutMiaoCtrl', ["$scope", "$state", "myService", "msg","storage"
+        , function ($scope, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+
+            });
+
+        }]);
+    app.controller('withdrawCtrl', ["$scope", "$state", "myService", "msg","storage"
+        , function ($scope, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+
+            });
+
+        }]);
+    app.controller('payExplainCtrl', ["$scope", "$state", "myService", "msg","storage"
+        , function ($scope, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+
+            });
+
+        }]);
+    app.controller('contactCtrl', ["$scope", "$state", "myService", "msg","storage"
+        , function ($scope, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+
+            });
+
+        }]);
+    app.controller('attentionCtrl', ["$scope", "$state", "myService", "msg","storage"
+        , function ($scope, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+
+            });
+
+        }]);
+    app.controller('personalLetterCtrl', ["$scope", "$state", "myService", "msg","storage"
+        , function ($scope, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+
+            });
+
+        }]);
     app.controller('rechargeCtrl', ["$scope", "$state", "myService", "msg"
   , function ($scope, $state, myService, msg) {
        $scope.$on('$ionicView.beforeEnter', function () {
@@ -139,11 +181,9 @@
   , function ($scope, $state, myService, msg) {
       $scope.$on('$ionicView.beforeEnter', function () {
             myService.myDream().then(function(result){
-              console.log(result.data.data);
               $scope.dreams = result.data.data;
             });
           myService.myInfo().then(function(result){
-              console.log(result.data.data);
               $scope.user = result.data.data
           });
       });

miaomiao/www/templates/home/index.html

@@ -55,7 +55,7 @@
                 <div class="item mainitem" ng-repeat="item in index.dreams">
                     <div class="row">
                         <div class="col">
-                            <img ng-src="{{item.user.avatar}}"  ng-click="toUserDetail(item.id)" />
+                            <img style="border-radius: 100%" ng-src="{{item.user.avatar}}"  ng-click="toUserDetail(item.id)" />
                             <div  class="myblock">
                                <div>{{item.user.nickname}}<span>{{item.user.birthday | getage}}岁</span></div>
                                 <div class="mysecond">{{item.user.city}}</div>

miaomiao/www/templates/my/aboutMiao.html

@@ -0,0 +1,5 @@
+<ion-view view-title="关于瞄瞄">
+    <ion-content style="color: #F2F2F2;">
+        1.测试文本
+    </ion-content>
+</ion-view>

miaomiao/www/templates/my/attention.html

@@ -0,0 +1,49 @@
+<ion-view view-title="瞄瞄">
+    <ion-nav-buttons side="right">
+        <button class="button button-clear homeIcon">
+            <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
+        </button>
+        <button class="button button-clear button-small" style="padding-top: 3px;">
+            <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
+        </button>
+    </ion-nav-buttons>
+    <ion-content>
+        <div class="list padding">
+            <div class="item reply-item" ng-click="toDetail(dream.id)">
+                <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF">
+                    <div style="float:left;">
+                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />-->
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
+                        <h2>瞄瞄</h2>
+                        <p>成都市</p>
+                        <p>个性签名</p>
+                    </div>
+                </div>
+                <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF">
+                    <div style="float:left;">
+                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />-->
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
+                        <h2>瞄瞄</h2>
+                        <p>成都市</p>
+                        <p>个性签名</p>
+                    </div>
+                </div>
+                <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF">
+                    <div style="float:left;">
+                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />-->
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
+                        <h2>瞄瞄</h2>
+                        <p>成都市</p>
+                        <p>个性签名</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </ion-content>
+</ion-view>

miaomiao/www/templates/my/contact.html

@@ -0,0 +1,25 @@
+<ion-view view-title="联系客服" >
+    <ion-content>
+        <div class="addcontent list">
+            <div class="item" style="color: #7B7B7B">请输入您的问题</div>
+            <div class="item itemjs">
+                <textarea rows="7" cols="50" ng-model="vm.about" style="border: 1px solid #D7D7D7;padding: 10px;width: 98%;"></textarea>
+            </div>
+            <div class="item" style="color: #7B7B7B">您的收件邮箱</div>
+            <div class="item item-input-inset itemjs">
+                <label class="item-input-wrapper" style="background: #fff; border: 1px solid #D7D7D7; margin: 0 12px 0 5px">
+                    <input type="text" ng-model="vm.name">
+                </label>
+            </div>
+        </div>
+        <div class="padding">
+            <div class="row">
+                <div class="col">
+                    <button type="submit"  class="button button-block button-calm" style="border-radius: 30px" ng-click="add()">
+                        提交
+                    </button>
+                </div>
+            </div>
+        </div>
+    </ion-content>
+</ion-view>

miaomiao/www/templates/my/index.html

@@ -53,6 +53,10 @@
                 <img class="fl" src="img/icon_mydream.svg">
                 <em style="line-height: 30px">我的梦想</em>
             </a>
+            <a class="item" ui-sref="app.attention">
+                <img class="fl" src="img/icon_follow2.svg">
+                <em style="line-height: 30px">我的关注</em>
+            </a>
             <a class="item" ui-sref="app.my_collect">
                 <img class="fl" src="img/icon_collect.svg">
                 <em style="line-height: 30px">我的收藏</em>

miaomiao/www/templates/my/my-message.html

@@ -24,7 +24,7 @@
                     300条回复消息
                 </i>
             </a>
-            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+            <a class="item" ui-sref="app.personalLetter" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">私信</em>
                 <i class="fr" style="color: #B3B3B3">
                     哈哈哈

miaomiao/www/templates/my/my-recharge.html

@@ -1,6 +1,6 @@
 <ion-view view-title="充值">
     <ion-nav-buttons side="right">
-        <button class="button button-clear">
+        <button class="button button-clear" ui-sref="app.payExplain">
             支付说明
         </button>
     </ion-nav-buttons>
@@ -16,7 +16,7 @@
                         <div class="re-num">{{vm.coin}}</div>
                     </div>
                     <div class="col col-33" style="padding: 30px 0 0 20px">
-                        <a style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
+                        <a ui-sref="app.withdraw" style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
                     </div>
                 </div>
             </div>

miaomiao/www/templates/my/my-setting.html

@@ -1,11 +1,11 @@
 <ion-view view-title="设置">
     <ion-content>
         <div class="list list-user-set list-set-arrow">
-            <a class="item item-icon-left">
+            <a class="item item-icon-left" ui-sref="app.aboutMiao">
                 <i class="icon ion-clipboard"></i>
                 <em class="fl">关于瞄瞄</em>
             </a>
-            <a class="item item-icon-left">
+            <a class="item item-icon-left" ui-sref="app.contact">
                 <i class="icon ion-ios-telephone-outline"></i>
                 <em class="fl">联系客服</em>
             </a>

miaomiao/www/templates/my/payExplain.html

@@ -0,0 +1,5 @@
+<ion-view view-title="支付说明">
+    <ion-content style="color: #F2F2F2;">
+        1.测试文本
+    </ion-content>
+</ion-view>

miaomiao/www/templates/my/personalLetter.html

@@ -0,0 +1,18 @@
+<ion-view view-title="私信">
+    <ion-content>
+        <div class="list list-user-set" style="color: #737373">
+            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+                来自 <em style="color: #000">瞄瞄</em> 的私信
+                <p>测试文本</p>
+            </a>
+            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+                来自 <em style="color: #000">瞄瞄</em> 的私信
+                <p>测试文本</p>
+            </a>
+            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+                来自 <em style="color: #000">瞄瞄</em> 的私信
+                <p>测试文本</p>
+            </a>
+        </div>
+    </ion-content>
+</ion-view>

miaomiao/www/templates/my/withdraw.html

@@ -0,0 +1,32 @@
+<ion-view view-title="选择提现方式" >
+    <ion-content>
+        <div class="list myprofile">
+            <label class="item item-input ">
+                <span class="input-label">昵称</span>
+                <input name="signture" style="text-align: right" type="text" placeholder="请输入昵称" ng-model="vm.nickname">
+            </label>
+            <label class="item item-select item-select-width">
+             <span class="input-label">
+                 提现到
+             </span>
+                <select name="pay" ng-model="vm.pay">
+                    <option value="0">支付宝</option>
+                    <option value="1">中国邮政</option>
+                </select>
+            </label>
+            <label class="item item-input ">
+                <span class="input-label">账号</span>
+                <input name="signture" style="text-align: right" type="text" placeholder="请输入账号" ng-model="vm.signture">
+            </label>
+            <label class="item item-input ">
+                <span class="input-label">手机号</span>
+                <input name="work" style="text-align: right" type="text" placeholder="请输入手机号" ng-model="vm.phone">
+            </label>
+        </div>
+        <div class="padding">
+            <button class="button button-block button-calm" ng-click="saveMaterial()">
+                提交
+            </button>
+        </div>
+    </ion-content>
+</ion-view>