add

miaomiao/www/css/style.css

@@ -49,7 +49,7 @@
     
 .lglogin {
     left: 50%;
-    margin-top: 40%;
+    margin-top: 30%;
 }
 .lglogin span {
     text-align: center;
@@ -850,3 +850,7 @@ ion-tabs.tabs-color-active-calm .tab-item.tab-item-active, ion-tabs.tabs-color-a
 .popup-container .popup{
     background-color: rgba(255,255,255,1);
 }
+.checkbox input:checked:before,
+.checkbox input:checked + .checkbox-icon:before {
+    background: #00C3DA;
+    border-color: #00C3DA; }

miaomiao/www/js/controllers/account.js

@@ -1,6 +1,6 @@
 (function (app) {
-    app.controller('wechatLoginCtrl', ["$scope","userService","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","common","config",
-    function ($scope, userService, $ionicNavBarDelegate, storage, $state, msg, $http, util, common, config) {
+    app.controller('wechatLoginCtrl', ["$scope","userService","$ionicNavBarDelegate","$ionicModal", "storage", "$state", "msg", "$http", "util","common","config",
+    function ($scope, userService, $ionicNavBarDelegate,$ionicModal, storage, $state, msg, $http, util, common, config) {
             //$ionicNavBarDelegate.showBackButton(false);
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
@@ -19,78 +19,99 @@
                         //msg.error('视频上传失败');
                         msg.hide();
                     });
-                }, function (erro) {
+                }, function (error) {
                     console.log('选择视频失败');
                 });
             };
             $scope.wechat_login = function () {
-                //$state.go("loginAccount", { wechat: 'orrk51inhmfmQRXA8VvGEQfow3Es' });
-                //return;
-                delete $http.defaults.headers.common["Authorization"];
-                var scope = "snsapi_userinfo", state = "_" + (+new Date());
-                 //Wechat.auth(scope, state, function (response) {
-                 //    // alert("response:"+JSON.stringify(response));
-                 //    // var response={code:1231};
-                 //   if(response.code){
-                 //       msg.loading('登录中...');
-                 //       userService.wechat_login(response.code).then(function(result){
-                 //           msg.hide();
-                 //            // alert("wechat_login success: " + JSON.stringify(result));
-                 //           if(result.data.data.user){
-                 //               storage.setObject('user', result.data.data.user);
-                 //               storage.set('token', result.data.data.token);
-                 //               $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                 //               $scope.user=storage.getObject('user');
-                 //               $state.go('app.home');
-                 //           }else{
-                 //               $state.go("loginAccount",{wechat:result.data.data.openid})
-                 //           }
-                 //       },function(error){
-                 //            console.log("loginbywx Failed: " + JSON.stringify(error));
-                 //           $state.go("loginAccount");
-                 //       });
-                 //   }
-                 //}, function (error) {
-                 //   console.log("Failed: " + JSON.stringify(error));
-                 //});
-                userService.isTest().then(function(res){
-                   if(res.data.data){
-                       Wechat.auth(scope, state, function (response) {
-                           // var response={code:1231};
-                          if(response.code){
-                              msg.loading('登录中...');
-                              userService.wechat_login(response.code).then(function(result){
-                                  msg.hide();
-                                  if(result.data.data.user){
-                                      storage.setObject('user', result.data.data.user);
-                                      storage.set('token', result.data.data.token);
-                                      $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                                      $scope.user=storage.getObject('user');
-                                      $state.go('app.home');
-                                      if(localStorage['jpush']){
-                                        console.log("jpush: " + localStorage['jpush']);
-                                        userService.jpush({ jpush: localStorage['jpush']}).then(function (result) {}, function (erro) {});
-                                      }
-                                  }else{
-                                      $state.go("loginAccount",{wechat:result.data.data.openid})
-                                  }
-                              },function(error){
-                                   console.log("loginbywx Failed: " + JSON.stringify(error));
-                                  $state.go("loginAccount");
-                              });
-                          }
-                       }, function (error) {
-                          console.log("Failed: " + JSON.stringify(error));
-                       })
-                   }else{
-                       $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                   }
-                } )
+                if(document.getElementById('read').checked){
+                    //$state.go("loginAccount", { wechat: 'orrk51inhmfmQRXA8VvGEQfow3Es' });
+                    //return;
+                    delete $http.defaults.headers.common["Authorization"];
+                    var scope = "snsapi_userinfo", state = "_" + (+new Date());
+                    //Wechat.auth(scope, state, function (response) {
+                    //    // alert("response:"+JSON.stringify(response));
+                    //    // var response={code:1231};
+                    //   if(response.code){
+                    //       msg.loading('登录中...');
+                    //       userService.wechat_login(response.code).then(function(result){
+                    //           msg.hide();
+                    //            // alert("wechat_login success: " + JSON.stringify(result));
+                    //           if(result.data.data.user){
+                    //               storage.setObject('user', result.data.data.user);
+                    //               storage.set('token', result.data.data.token);
+                    //               $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                    //               $scope.user=storage.getObject('user');
+                    //               $state.go('app.home');
+                    //           }else{
+                    //               $state.go("loginAccount",{wechat:result.data.data.openid})
+                    //           }
+                    //       },function(error){
+                    //            console.log("loginbywx Failed: " + JSON.stringify(error));
+                    //           $state.go("loginAccount");
+                    //       });
+                    //   }
+                    //}, function (error) {
+                    //   console.log("Failed: " + JSON.stringify(error));
+                    //});
+                    userService.isTest().then(function(res){
+                    if(res.data.data){
+                        Wechat.auth(scope, state, function (response) {
+                            // var response={code:1231};
+                            if(response.code){
+                                msg.loading('登录中...');
+                                userService.wechat_login(response.code).then(function(result){
+                                    msg.hide();
+                                    if(result.data.data.user){
+                                        storage.setObject('user', result.data.data.user);
+                                        storage.set('token', result.data.data.token);
+                                        $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                                        $scope.user=storage.getObject('user');
+                                        $state.go('app.home');
+                                        if(localStorage['jpush']){
+                                            console.log("jpush: " + localStorage['jpush']);
+                                            userService.jpush({ jpush: localStorage['jpush']}).then(function (result) {}, function (error) {});
+                                        }
+                                    }else{
+                                        $state.go("loginAccount",{wechat:result.data.data.openid})
+                                    }
+                                },function(error){
+                                    console.log("loginbywx Failed: " + JSON.stringify(error));
+                                    $state.go("loginAccount");
+                                });
+                            }
+                        }, function (error) {
+                            console.log("Failed: " + JSON.stringify(error));
+                        })
+                    }else{
+                        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                    }
+                    } )
+                }
+                else{
+                    msg.error('请同意用户隐私条款');
+                }
+                
 
+            };
+            
+            // 隐私条款
+            $ionicModal.fromTemplateUrl('readClause.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                $scope.readClauseModal = modal;
+            });
+            $scope.readClause = function($event){
+                $event.stopPropagation();
+                $scope.readClauseModal.show();
             }
+            $scope.closeClause = function() {
+                $scope.readClauseModal.hide();
+            };
     }]);
-    app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",
-        function ($scope, userService,$stateParams,$ionicNavBarDelegate, storage, $state, msg, $http, util, $timeout) {
+    app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "$ionicModal","storage", "$state", "msg", "$http", "util","$timeout",
+        function ($scope, userService,$stateParams,$ionicNavBarDelegate,$ionicModal, storage, $state, msg, $http, util, $timeout) {
             //$ionicNavBarDelegate.showBackButton(false);
             delete $http.defaults.headers.common["Authorization"];
             $scope.wechat = $stateParams.wechat;
@@ -100,18 +121,24 @@
                 waitSeconds: "获取验证码"
             };
             $scope.login = function () {
-                msg.loading();
-                userService.login($scope.vm.mobile, $scope.vm.verify_code,$scope.wechat).then(function (result) {
-                //userService.login($scope.vm.mobile, $scope.vm.verify_code,124).then(function (result) {
-                    msg.hide();
-                    storage.setObject('user', result.data.data.user);
-                    storage.set('token', result.data.data.token);
-                    $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                    $scope.user=storage.getObject('user');
-                    $state.go('app.home');
-                }, function (error) {
-                    
-                });
+                if(document.getElementById('read').checked){
+                    msg.loading();
+                    userService.login($scope.vm.mobile, $scope.vm.verify_code,$scope.wechat).then(function (result) {
+                    //userService.login($scope.vm.mobile, $scope.vm.verify_code,124).then(function (result) {
+                        msg.hide();
+                        storage.setObject('user', result.data.data.user);
+                        storage.set('token', result.data.data.token);
+                        $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                        $scope.user=storage.getObject('user');
+                        $state.go('app.home');
+                    }, function (error) {
+                        
+                    });
+                }
+                else{
+                    msg.error('请同意用户隐私条款');
+                }
+                
             };
 
             //获取验证码
@@ -147,7 +174,22 @@
             };
             $scope.clear = function(){
                 document.getElementById("tel").value = "";
+            };
+            // 隐私条款
+            $ionicModal.fromTemplateUrl('readClause.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                $scope.readClauseModal = modal;
+            });
+            $scope.readClause = function($event){
+                $event.stopPropagation();
+                $scope.readClauseModal.show();
             }
+            $scope.closeClause = function() {
+                $scope.readClauseModal.hide();
+            };
+
         }]);
   
 })(angular.module('app.controllers'));

miaomiao/www/js/controllers/my.js

@@ -400,9 +400,10 @@
                 });
             });
         }]);
-    app.controller('rechargeCtrl', ["$scope","$ionicModal","$timeout","$ionicHistory","$ionicTabsDelegate", "$state", "myService", "msg"
-  , function ($scope,$ionicModal,$timeout, $ionicHistory,$ionicTabsDelegate,$state, myService, msg) {
+    app.controller('rechargeCtrl', ["$scope","$ionicModal","$timeout","$ionicHistory","$ionicTabsDelegate", "$state", "myService","userService", "msg"
+  , function ($scope,$ionicModal,$timeout, $ionicHistory,$ionicTabsDelegate,$state, myService,userService, msg) {
         $scope.$on('$ionicView.beforeEnter', function () {
+            $scope.showWithdraw = true;
             $ionicTabsDelegate.showBar(false);
             $scope.vm = {
                
@@ -412,6 +413,14 @@
                 $scope.vm.number = '';
                 $scope.vm.payType = 2;
             });
+            userService.isTest().then(function(res){
+                if(res.data.data){
+                    $scope.showWithdraw = true;
+                }
+                else{
+                    $scope.showWithdraw = false;
+                }
+            })
             if($scope.ios.isIOS){
                 var productIds = ['apple100000','apple100001','apple100002','apple100003','apple100004']; // <- Add your product Ids here
                 msg.loading();

miaomiao/www/js/services/msgservice.js

@@ -23,7 +23,7 @@
                 template = template || "";
                 var n = {
                     template: '<i class="icon ion-ios-close-outline pop-msg"></i><br>' + template,
-                    duration: 1000
+                    duration: 2000
                 };
                 if (noBackdrop) n["noBackdrop"] = true;
                 $ionicLoading.show(n);

miaomiao/www/templates/account/login.html

@@ -6,6 +6,29 @@
             <div class="lgsocial">
                 <img ng-click="wechat_login()" ng-src="img/icon_wechat.svg"/>
             </div>
-        </div>
+        </div>   
+        <div style="text-align: center; margin-top: 10px;">
+            <label class="checkbox" style="vertical-align: -10px;">
+                <input style="width: 20px; height: 20px;" type="checkbox" checked="" id="read">
+            </label>
+            <p style="white-space: normal; color: #666666; display: inline-block;">
+                我已阅读并同意 <span ng-click="readClause($event)" style="color: #00C3DA">用户隐私条款</span>
+            </p>
+        </div>   
+        
     </ion-content>
+    <script id="readClause.html" type="text/ng-template">
+        <div class="modal">
+            <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
+                <h1 class="title">用户隐私条款</h1>
+                <button class="button button-clear" ng-click="closeClause()">关闭</button>
+            </ion-header-bar>
+            <ion-content>
+                <div style="margin: 15px; color: #666666;">
+                    隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款
+                    隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款
+                </div>
+            </ion-content>
+        </div>
+    </script>
 </ion-view>

miaomiao/www/templates/account/loginAccount.html

@@ -27,5 +27,29 @@
         <button type="submit" ng-click="login()" class="button button-block button-calm" style="border-radius: 50px;">
             注 册
         </button>
+ 
+        <div style="margin-top: 20px;">
+            <label class="checkbox" style="vertical-align: -10px;">
+                <input style="width: 20px; height: 20px;" type="checkbox" checked="" id="read">
+            </label>
+            <p style="white-space: normal; color: #666666; display: inline-block;">
+                我已阅读并同意 <span ng-click="readClause($event)" style="color: #00C3DA">用户隐私条款</span>
+            </p>
+        </div>
+        
     </ion-content>
+    <script id="readClause.html" type="text/ng-template">
+        <div class="modal">
+            <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
+                <h1 class="title">用户隐私条款</h1>
+                <button class="button button-clear" ng-click="closeClause()">关闭</button>
+            </ion-header-bar>
+            <ion-content>
+                <div style="margin: 15px; color: #666666;">
+                    隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款
+                    隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款隐私条款
+                </div>
+            </ion-content>
+        </div>
+    </script>
 </ion-view>

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

@@ -556,7 +556,7 @@
     <script id="commentPic.html" type="text/ng-template">
         <div class="modal">
             <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
-                <h1 class="title">评论</h1>
+                <h1 class="title">互动</h1>
                 <button class="button button-clear" ng-click="closeCommentPic()">关闭</button>
             </ion-header-bar>
             <ion-content>

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

@@ -15,7 +15,7 @@
                         <div>剩余梦想币</div>
                         <div class="re-num">{{vm.coin}}</div>
                     </div>
-                    <div class="col col-33" style="padding: 30px 0 0 20px">
+                    <div ng-if="showWithdraw" class="col col-33" style="padding: 30px 0 0 20px">
                         <a ng-click="withdraw()" style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
                     </div>
                 </div>