video

miaomiao/www/.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="905" mnemonic="1" />
+    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="906" mnemonic="1" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
@@ -24,11 +24,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
+      <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="0.60987264">
-              <caret line="752" column="35" selection-start-line="752" selection-start-column="35" selection-end-line="752" selection-end-column="35" />
+            <state vertical-scroll-proportion="-17.28125">
+              <caret line="761" column="14" selection-start-line="761" selection-start-column="14" selection-end-line="761" selection-end-column="14" />
               <folding>
                 <element signature="e#16009#17788#0" expanded="false" />
               </folding>
@@ -36,51 +36,50 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-16.3125">
-              <caret line="746" column="32" selection-start-line="746" selection-start-column="28" selection-end-line="746" selection-end-column="32" />
+            <state vertical-scroll-proportion="-7.5833335">
+              <caret line="327" column="32" selection-start-line="324" selection-start-column="52" selection-end-line="327" selection-end-column="32" />
               <folding>
-                <marker date="1509787362313" expanded="true" signature="32047:32072" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="32355:32419" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="32471:32487" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="32719:32783" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="32835:32850" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="33050:33081" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="33313:33331" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="33522:33549" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="35463:35481" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="37775:37793" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="37858:37883" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="38102:38121" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="38122:38316" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="38182:38201" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="38182:38228" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="38427:38445" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="39217:39235" placeholder="..." />
-                <marker date="1509787362313" expanded="true" signature="40228:40246" placeholder="..." />
+                <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#2;n#div#0;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#2;n#div#0;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#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#3;n#div#0;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#3;n#div#0;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#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
-        <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="6" column="29" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="29" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+      <file leaf-file-name="my.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-8.821428">
-              <caret line="13" column="76" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
-              <folding />
+            <state vertical-scroll-proportion="0.62261146">
+              <caret line="793" column="34" selection-start-line="793" selection-start-column="34" selection-end-line="793" selection-end-column="34" />
+              <folding>
+                <marker date="1509934567847" expanded="true" signature="32089:32114" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="32397:32461" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="32513:32529" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="32761:32825" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="32877:32892" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="33092:33123" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="33355:33373" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="33564:33591" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="35505:35523" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="37833:37851" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="37952:37966" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="38223:38242" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="38243:38437" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="38303:38322" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="38303:38349" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="38548:38566" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="39338:39356" placeholder="..." />
+                <marker date="1509934567847" expanded="true" signature="40349:40367" placeholder="..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -88,8 +87,8 @@
       <file leaf-file-name="add.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-25.75">
-              <caret line="34" column="35" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="35" />
+            <state vertical-scroll-proportion="-30.4375">
+              <caret line="40" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
               <folding />
             </state>
           </provider>
@@ -126,13 +125,13 @@
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/templates/my/withdraw.html" />
         <option value="$PROJECT_DIR$/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
         <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
       </list>
@@ -288,8 +287,13 @@
           <line>8</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/js/controllers/home.js</url>
+          <line>752</line>
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="4" />
+      <option name="time" value="5" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -492,13 +496,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24363057">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="53" selection-end-line="72" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.39171976">
@@ -597,21 +594,10 @@
         </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.0">
-          <caret line="324" column="44" selection-start-line="324" selection-start-column="44" selection-end-line="324" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
-          <folding>
-            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -619,7 +605,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="32" column="25" selection-start-line="26" selection-start-column="19" selection-end-line="32" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -627,69 +612,91 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="6" column="29" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="29" />
+          <caret line="13" column="76" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.821428">
-          <caret line="13" column="76" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
+        <state vertical-scroll-proportion="0.33280253">
+          <caret line="126" column="51" selection-start-line="126" selection-start-column="48" selection-end-line="126" selection-end-column="51" />
+          <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.071428575">
+          <caret line="4" column="17" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="17" />
           <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="-17.28125">
+          <caret line="761" column="14" selection-start-line="761" selection-start-column="14" selection-end-line="761" selection-end-column="14" />
+          <folding>
+            <element signature="e#16009#17788#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-25.75">
-          <caret line="34" column="35" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="35" />
+        <state vertical-scroll-proportion="-30.4375">
+          <caret line="40" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-16.3125">
-          <caret line="746" column="32" selection-start-line="746" selection-start-column="28" selection-end-line="746" selection-end-column="32" />
+        <state vertical-scroll-proportion="-7.5833335">
+          <caret line="327" column="32" selection-start-line="324" selection-start-column="52" selection-end-line="327" selection-end-column="32" />
           <folding>
-            <marker date="1509787362313" expanded="true" signature="32047:32072" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="32355:32419" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="32471:32487" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="32719:32783" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="32835:32850" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="33050:33081" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="33313:33331" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="33522:33549" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="35463:35481" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="37775:37793" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="37858:37883" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="38102:38121" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="38122:38316" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="38182:38201" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="38182:38228" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="38427:38445" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="39217:39235" placeholder="..." />
-            <marker date="1509787362313" expanded="true" signature="40228:40246" placeholder="..." />
+            <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#div#0;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#2;n#div#0;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#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#3;n#div#0;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#3;n#div#0;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#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#3;n#div#0;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">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60987264">
-          <caret line="752" column="35" selection-start-line="752" selection-start-column="35" selection-end-line="752" selection-end-column="35" />
+        <state vertical-scroll-proportion="0.62261146">
+          <caret line="793" column="34" selection-start-line="793" selection-start-column="34" selection-end-line="793" selection-end-column="34" />
           <folding>
-            <element signature="e#16009#17788#0" expanded="false" />
+            <marker date="1509934567847" expanded="true" signature="32089:32114" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="32397:32461" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="32513:32529" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="32761:32825" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="32877:32892" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="33092:33123" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="33355:33373" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="33564:33591" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="35505:35523" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="37833:37851" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="37952:37966" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="38223:38242" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="38243:38437" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="38303:38322" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="38303:38349" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="38548:38566" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="39338:39356" placeholder="..." />
+            <marker date="1509934567847" expanded="true" signature="40349:40367" placeholder="..." />
           </folding>
         </state>
       </provider>

miaomiao/www/js/controllers/home.js

@@ -757,9 +757,7 @@
                 });
             };
             $scope.deletevideo = function (file) {
-                common.deletefile(file).then(function (res) {
-                },function(erro){
-                    alert(JSON.stringify(erro));
+                common.deletefile(file).then(function () {
                 })
             };
           $ionicModal.fromTemplateUrl('recharge-modal.html', {

miaomiao/www/js/controllers/my.js

@@ -767,6 +767,7 @@
             $scope.goMes = function(is_reply,is_url,dream_id,is_end,message,user_id,info,attr_id){
                 //发送私信
                 if(is_reply==1){
+                    $scope.vm.content='';
                     var myPopup = $ionicPopup.show({
                         template : '<div>' +
                             '<textarea autofocus style="border: 1px solid #D0D0D0" name="" id="" cols="30" rows="8"  ng-model="vm.content" placeholder="对他的好意给予感谢的回复"></textarea onf>' +
@@ -858,8 +859,8 @@
             }
        }]);
 
-    app.controller('messageReplyCtrl', ["$scope","$location","$ionicPopup","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"
-       , function ($scope,$location,$ionicPopup,$ionicTabsDelegate, $state, myService, msg, $ionicModal) {
+    app.controller('messageReplyCtrl', ["$scope","$location","$ionicPopup","$ionicTabsDelegate", "$state","config", "myService", "msg", "$ionicModal"
+       , function ($scope,$location,$ionicPopup,$ionicTabsDelegate, $state,config, myService, msg, $ionicModal) {
            $scope.$on('$ionicView.beforeEnter', function () {
                $scope.load();
            });
@@ -874,7 +875,7 @@
                 if(attr_id==7){
                     if(video!=null){
                         var letterTemplate = '<div style="text-align: center">' +
-                            '<video src="'+video+'" style="width: 100%; height: 100%"></video>' +
+                            '<video ng-src=" ' +config.imgServer+video+' " width="100%" style="height: 350px;" class="centerme" controls="controls" ></video>' +
                             '<p>'+info+'</p>' +
                             '</div>';
                     }

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

@@ -99,14 +99,14 @@
                 </div>
                 <div class="item" style="padding:0 5px; border-top: 1px solid #E6E6E6;">
                     <div class="row">
-                        <!--<div class="col" style="text-align:left">-->
-                            <!--<p style="color: #FF6600; font-size: 16px">{{dream.get_coin}}</p>-->
-                            <!--<p>目前已获梦想币</p>-->
-                        <!--</div>-->
                         <div class="col" style="text-align:left">
                             <h2>{{dream.coin}}</h2>
                             <p>我要求的梦想币</p>
                         </div>
+                        <div ng-if="user.id == dream.user.id" class="col" style="text-align: right">
+                            <p style="color: #FF6600; font-size: 16px">{{dream.get_coin}}</p>
+                            <p>目前已获梦想币</p>
+                        </div>
                     </div>
                     <div class="reply-bar">
                         <div ng-if="100*dream.get_coin/dream.coin<100" style="width: {{100*dream.get_coin/dream.coin}}%;">