add

miaomiao/www/.idea/workspace.xml

@@ -24,27 +24,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-13.96875">
+              <caret line="494" column="56" selection-start-line="494" selection-start-column="56" selection-end-line="494" selection-end-column="56" />
+              <folding>
+                <element signature="e#16009#17788#0" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="config.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/js/config/config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
+            <state vertical-scroll-proportion="0.13276398">
+              <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.10993485">
-              <caret line="5" column="32" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="32" />
+            <state vertical-scroll-proportion="-13.0">
+              <caret line="14" column="150" selection-start-line="14" selection-start-column="150" selection-end-line="15" selection-end-column="154" />
               <folding>
                 <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -74,20 +82,21 @@
         <option value="$PROJECT_DIR$/js/config/router.js" />
         <option value="$PROJECT_DIR$/templates/my/personalLetter.html" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
-        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/js/filters/filter.js" />
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
-        <option value="$PROJECT_DIR$/js/config/config.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/my/withdraw.html" />
+        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
+        <option value="$PROJECT_DIR$/js/config/config.js" />
       </list>
     </option>
   </component>
@@ -207,6 +216,7 @@
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16798107" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297953" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -218,7 +228,6 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -247,13 +256,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -503,13 +505,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.0">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.516667">
@@ -553,14 +548,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6754658">
-          <caret line="211" column="14" selection-start-line="211" selection-start-column="14" selection-end-line="211" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45574534">
@@ -585,70 +572,98 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.75">
-          <caret line="751" column="26" selection-start-line="751" selection-start-column="19" selection-end-line="751" selection-end-column="26" />
-          <folding />
+        <state vertical-scroll-proportion="-15.21875">
+          <caret line="121" column="36" selection-start-line="121" selection-start-column="27" selection-end-line="121" selection-end-column="36" />
+          <folding>
+            <marker date="1509699203504" expanded="true" signature="31938:31963" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="32246:32310" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="32362:32378" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="32610:32674" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="32726:32741" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="32941:32972" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="33204:33222" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="33413:33440" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="35354:35372" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="37666:37684" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="37749:37774" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="37993:38012" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="38013:38207" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="38073:38092" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="38073:38119" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="38318:38336" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="39108:39126" placeholder="..." />
+            <marker date="1509699203504" expanded="true" signature="40119:40137" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/withdraw.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.8125">
-          <caret line="760" column="31" selection-start-line="760" selection-start-column="31" selection-end-line="760" selection-end-column="31" />
+        <state vertical-scroll-proportion="-17.142857">
+          <caret line="16" column="18" selection-start-line="16" selection-start-column="18" selection-end-line="17" selection-end-column="33" />
           <folding>
-            <marker date="1509691797885" expanded="true" signature="31929:31954" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="32237:32301" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="32353:32369" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="32601:32665" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="32717:32732" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="32932:32963" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="33195:33213" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="33404:33431" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="35345:35363" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="37657:37675" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="37740:37765" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="37984:38003" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="38004:38198" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="38064:38083" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="38064:38110" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="38309:38327" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="39099:39117" placeholder="..." />
-            <marker date="1509691797885" expanded="true" signature="40110:40128" placeholder="..." />
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#input#0;n#label#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.21091205">
-          <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
+        <state vertical-scroll-proportion="-5.4">
+          <caret line="12" column="41" selection-start-line="12" selection-start-column="41" selection-end-line="12" selection-end-column="41" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.28025478">
+          <caret line="185" column="29" selection-start-line="185" selection-start-column="29" selection-end-line="185" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
+        <state vertical-scroll-proportion="0.16571428">
+          <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.10993485">
-          <caret line="5" column="32" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="32" />
+        <state vertical-scroll-proportion="-13.0">
+          <caret line="14" column="150" selection-start-line="14" selection-start-column="150" selection-end-line="15" selection-end-column="154" />
           <folding>
             <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.96875">
+          <caret line="494" column="56" selection-start-line="494" selection-start-column="56" selection-end-line="494" selection-end-column="56" />
+          <folding>
+            <element signature="e#16009#17788#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.13276398">
+          <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/js/config/config.js

@@ -1,8 +1,8 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-           // server: 'http://q8.9026.com/',
-           // imgServer: 'http://q8.9026.com/attachment/'
+            //server: 'http://q8.9026.com/',
+            //imgServer: 'http://q8.9026.com/attachment/'
        // server: 'http://localhost:8092/',
       //  imgServer: 'http://localhost:8092/attachment/',
       server: 'http://miao.beiyuesi.com/',

miaomiao/www/js/controllers/home.js

@@ -209,8 +209,8 @@
         });
     }]);
 
-    app.controller('dreamDetailCtrl', ["$scope","$location","$ionicHistory","$timeout", "$state", "WechatService","$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$timeout", "$ionicScrollDelegate", "$interval"
-        , function ($scope,$location, $ionicHistory,$timeout,$state,WechatService,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $timeout, $ionicScrollDelegate, $interval) {
+    app.controller('dreamDetailCtrl', ["$scope","$location","$ionicHistory","$timeout","$ionicLoading", "$state", "WechatService","$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$ionicScrollDelegate", "$interval"
+        , function ($scope,$location, $ionicHistory,$timeout,$ionicLoading,$state,WechatService,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $ionicScrollDelegate, $interval) {
             var dream_user_id = $stateParams.dream_user_id;
             var id = $stateParams.id;
             var interaction_id = $stateParams.interaction_id;
@@ -236,7 +236,7 @@
                     $scope.$apply(function(){
                         $scope.load(id,dream_user_id,interaction_id);
                     });
-                }, 5000);
+                }, 50000);
 
             });
             $scope.$on('$ionicView.afterLeave', function () {
@@ -341,7 +341,7 @@
                 if($scope.dream.top3user[0])$scope.sort.first = $scope.dream.top3user[0].avatar;
                 if($scope.dream.top3user[1])$scope.sort.second = $scope.dream.top3user[1].avatar;
                 if($scope.dream.top3user[2])$scope.sort.third = $scope.dream.top3user[2].avatar;
-                $scope.calcmultiplier();
+                //$scope.calcmultiplier();
                 msg.hide();
             }, function (error) {
                 msg.hide();
@@ -462,19 +462,19 @@
             alert('播放完毕');
         };
         //实时计算支持乘数
-        $scope.calcmultiplier = function () {
-            $scope.multi.promise = $interval(function () {
-                
-                var date = new Date();
-                var inter = date.getTime() - $scope.multi.b.getTime();
-                var minutes = Math.floor(inter / (60 * 1000));
-                var number = $scope.multi.a * minutes + $scope.multi.c;//js浮点运算会失真,根据muti.a的可能值范围，比如乘以100再除以100
-                if (number<=1) {
-                    number = 1;
-                }
-                $scope.multi.result = Math.round(number * 100 / 100);
-            },1000);
-        };
+        //$scope.calcmultiplier = function () {
+        //    $scope.multi.promise = $interval(function () {
+        //
+        //        var date = new Date();
+        //        var inter = date.getTime() - $scope.multi.b.getTime();
+        //        var minutes = Math.floor(inter / (60 * 1000));
+        //        var number = $scope.multi.a * minutes + $scope.multi.c;//js浮点运算会失真,根据muti.a的可能值范围，比如乘以100再除以100
+        //        if (number<=1) {
+        //            number = 1;
+        //        }
+        //        $scope.multi.result = Math.round(number * 100 / 100);
+        //    },1000);
+        //};
         $scope.supportDream = function (data) {
             if(!$scope.vm.coin){
                 msg.error("请选择梦想币数量！");
@@ -491,7 +491,12 @@
                     $scope.user = result.data.data;
                 });
                 $interval.cancel($scope.multi.promise);
-                msg.text("发送成功");
+                msg.text("发送成功",1000);
+                //$ionicLoading.show({template:'发送成功'});
+                //$timeout(function(){
+                //    debugger;
+                //    $ionicLoading.hide();
+                //}, 20000);
             });
 
         };
@@ -503,7 +508,6 @@
         };
 
          $scope.add = function(is_collection){
-             debugger;
             var data = {
                 id:id,
                 title:$scope.vm.title,
@@ -605,7 +609,7 @@
                                 alert(orderID);
                                 $timeout(function () {
                                     $scope.closeRechargeModal();
-                                }, 500);
+                                }, 1000);
                                 homeService.myInfo().then(function (result) {
                                     $scope.user = result.data.data;
                                 });
@@ -635,7 +639,7 @@
                             // $scope.clicksub = false;
                             $timeout(function () {
                                 $scope.closeRechargeModal();
-                            }, 500);
+                            }, 1000);
                             $scope.load(id,dream_user_id,interaction_id);
                             // courseService.orderStatus(orderID, $scope.paytype).then(function (result) {
                                 

miaomiao/www/js/controllers/my.js

@@ -121,11 +121,11 @@
                 myService.showAccount().then(function(result){
                     $scope.accountId = result.data.data;
                     var items = result.data.data;
-                    if(items.length==0){
-                        msg.text("请先添加账户");
-                        $state.go("app.my_account_add");
-                        return 
-                    }
+                    //if(items.length==0){
+                    //    msg.text("请先添加账户");
+                    //    $state.go("app.my_account_add");
+                    //    return
+                    //}
                     $scope.pays=[];
                     angular.forEach(items,function(item){
                         if(item.bank_name!=null) {

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

@@ -13,7 +13,8 @@
             <div class="col dreamButton">
                 <button ng-click="openSupport()" class="button button-outline button-calm" style="border: 1px solid #00C3DA">
                     支持乘数<br>
-                    ×{{multi.result}}
+                    <!--×{{multi.result}}-->
+                    ×{{dream.number}}
                 </button>
             </div>
             <div ng-if="timer!='已结束'" class="col dreamButton">

miaomiao/www/templates/my/payExplain.html

@@ -8,10 +8,11 @@
                         <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{item.avatar}}" />
                     </div>
                     <div style="float:left; width: 81%; margin-left: 10px; height: 60px; overflow: hidden">
-                        <h2> {{item.from_name}} </h2>
+                        <h2> {{item.op}} </h2>
                         <div>
                             <div class="fl">{{item.created_at}}</div>
-                            <div class="fr" ng-if="item.from_id==item.to_id" style="font-weight: bolder; font-size: 16px">+{{item.to_amount}}</div>
+                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op!='提现'" style="font-weight: bolder; font-size: 16px">+{{item.to_amount}}</div>
+                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op=='提现'" style="font-weight: bolder; font-size: 16px">-{{item.to_amount}}</div>
                             <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.to_id" style="font-weight: bolder; font-size: 16px">+{{item.to_amount}}</div>
                             <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.from_id" style="font-weight: bolder; font-size: 16px">-{{item.to_amount}}</div>
                         </div>

miaomiao/www/templates/my/withdraw.html

@@ -1,22 +1,25 @@
 <ion-view view-title="选择提现方式" >
     <ion-content>
-        <div class="list myprofile">
-            <label class="item item-select item-select-width">
+        <div class='padding' style="color: #666666" ui-sref="app.my_account_add" ng-if="accountId.length==0">还未添加账户，点击前去添加</div>
+        <div ng-if="accountId.length!=0">
+            <div class="list myprofile">
+                <label class="item item-select item-select-width">
              <span class="input-label">
                  提现到
              </span>
-                <select name="pay" ng-model="vm.pay" ng-options="pay.value for pay in pays track by pay.id" >
-                </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.cash">
-            </label>
-        </div>
-        <div class="padding">
-            <button class="button button-block button-calm" ng-click="withdraw()">
-                提交
-            </button>
+                    <select name="pay" ng-model="vm.pay" ng-options="pay.value for pay in pays track by pay.id" >
+                    </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.cash">
+                </label>
+            </div>
+            <div class="padding">
+                <button class="button button-block button-calm" ng-click="withdraw()">
+                    提交
+                </button>
+            </div>
         </div>
     </ion-content>
 </ion-view>