add

miaomiao/www/js/controllers/home.js

@@ -971,8 +971,8 @@
         , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
             $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
-                myService.systemInfo().then(function(result){
-                    $scope.sysInfo = result.data.data.data;
+                myService.messageInfo().then(function(result){
+                    $scope.infos = result.data.data;
                 },function(error){
 
                 });

miaomiao/www/js/controllers/my.js

@@ -93,9 +93,9 @@
             });
             //退出登陆
             $scope.logout = function(){
-                storage.remove("token");
-                storage.remove("user");
-                $state.go("login");
+                    storage.remove("token");
+                    storage.remove("user");
+                    $state.go("login");
             }
 
      }]);
@@ -444,14 +444,14 @@
                 })
             }
         }]);
-    app.controller('my_account_addCtrl', ["$scope","common","$ionicTabsDelegate", "$state", "myService", "msg"
-        , function ($scope,common,$ionicTabsDelegate, $state, myService, msg) {
+    app.controller('my_account_addCtrl', ["$scope","common","$timeout","$ionicTabsDelegate", "$state", "myService", "msg"
+        , function ($scope,common,$timeout,$ionicTabsDelegate, $state, myService, msg) {
             $scope.addpict = function () {
-                common.chooseImage().then(function (img) {
-                    common.uploadFiles(img,1).then(function (result) {
+                common.chooseImage().then(function (qrcode) {
+                    common.uploadFiles(qrcode,1).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
-                        $scope.imgs.push(config.imgServer+file);
+                        $scope.qrcode.push(config.imgServer+file);
                     }, function (error) {
                         msg.error('图片上传失败');
                     });
@@ -459,10 +459,10 @@
                     console.log('图片选择失败');
                 });
             };
-            $scope.imgs=[];
+            $scope.qrcode=[];
             $scope.deletefile = function (file) {
-                var index = $scope.imgs.indexOf(file);
-                $scope.imgs.splice(index, 1);
+                var index = $scope.qrcode.indexOf(file);
+                $scope.qrcode.splice(index, 1);
                 common.deletefile(file).then(function () {
                 })
             };
@@ -470,7 +470,8 @@
                 bank_name:'',
                 bank_number:'',
                 bank_phone:'',
-                bank_user:''
+                bank_user:'',
+                type:""
             };
             $scope.addAccount = function () {
                 var data = {
@@ -493,9 +494,9 @@
             $scope.addQrcode = function(){
                 var data = {
                     data:{
-                        bank_name:$scope.vm.bank_name,
-                        //bank_number:$scope.imgs
-                        bank_number:"https://www.baidu.com/img/bd_logo1.png"
+                        type:$scope.vm.type,
+                        qrcode:$scope.qrcode,
+                        //qrcode:"https://www.baidu.com/img/bd_logo1.png"
                     }
                 };
                 myService.addQrcode(data).then(function(result){

miaomiao/www/js/services/myservice.js

@@ -1,6 +1,12 @@
 (function (app) {
     app.factory('myService', ['$http', 'config', "util", function ($http, config, util) {
         return {
+            logout:function(){
+                return $http({
+                    url:config.server + "api/auth/logout",
+                    method:"get"
+                })
+            },
             setPassword: function (password) {
                 return $http({
                     url: config.server + '/api/auth/password',
@@ -135,7 +141,7 @@
             },
             addQrcode:function(data){
                 return $http({
-                    url:config.server + "api/my/bank/img",
+                    url:config.server + "api/my/bank/qrcode",
                     method:"post",
                     data:data
                 })

miaomiao/www/templates/account/login.html

@@ -25,7 +25,7 @@
             </div>
         </div>
         <button type="submit" ng-click="login()" class="button button-block button-calm" style="border-radius: 50px;">
-                登 录1
+                登 录
         </button>
         <div  class="lglogin">
             <span style="font-size: 15px; color: #E1E1E1">- 社交媒体登录 -</span>

miaomiao/www/templates/my/my-account-add.html

@@ -6,9 +6,7 @@
                     <ion-content>
                         <div class="list">
                             <div class="item item-input item-select" style="border-bottom: 1px solid #DDDDDD">
-                                <select ng-model="vm.bank_name">
-                                    <option value="" selected="">请选择
-                                    </option>
+                                <select ng-model="vm.bank_name" ng-init="vm.bank_name='支付宝'">
                                     <option value="支付宝" >支付宝
                                     </option>
                                     <option value="工商银行" >工商银行
@@ -57,18 +55,17 @@
                                 <span class="input-label">
                                     选择类型
                                 </span>
-                                <select ng-model="vm.bank_name">
-                                    <option value="1">微信二维码
+                                <select ng-model="vm.type">
+                                    <option value="微信二维码">微信二维码
                                     </option>
-                                    <option value="2">支付宝二维码
+                                    <option value="支付宝二维码">支付宝二维码
                                     </option>
                                 </select>
                             </div>
                             <div class="item item-input" style="border-bottom: 1px solid #DDDDDD">
-                                <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
+                                <a ng-repeat="item in qrcode" class="img-file-up">
                                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                                 </a>
-                                <!--<a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>-->
                                 <a class="btn-file-up" ng-click="addpict()">
                                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                                     <em style="font-size: 16px">上传二维码</em>

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

@@ -6,18 +6,18 @@
         <!--下拉刷新-->
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         </ion-refresher>
-            <div class="list" ng-repeat="item in items">
-                <div class="item" style="border-bottom: 1px solid #E6E6E6">
+            <div class="list" style="margin-bottom: 0" ng-repeat="item in items">
+                <div class="item" style="border-bottom: 1px solid #E6E6E6;">
                     <div ng-if="!item.qrcode">
                         <p style="font-weight:bold">{{item.bank_name}}</p>
                         <p >账号：{{item.bank_number}}</p>
                         <p >预留手机号：{{item.bank_phone}}</p>
                     </div>
                     <div ng-if="item.qrcode">
-                        <p style="font-weight:bold">{{item.bank_name}}</p>
+                        <p style="font-weight:bold">{{item.type}}</p>
                         <img ng-src="{{ item.qrcode | qrcode}}" style="max-width: 70px;"/>
                     </div>
-                    <button class="button button-stable" ng-click="destroyAccount(item.id)" style="float:right;margin-top:-70px">
+                    <button class="button button-stable" ng-click="destroyAccount(item.id)" style="float:right;margin-top:-50px">
                         删除
                     </button>
                 </div>