add

miaomiao/package.json

@@ -1,89 +1,89 @@
 {
-    "name": "ionic-tabs",
-    "version": "1.1.1",
-    "description": "An Ionic project",
-    "dependencies": {
-        "cordova-android": "^6.2.3",
-        "cordova-hot-code-push-plugin": "^1.5.3",
-        "cordova-ios": "^4.4.0",
-        "cordova-plugin-actionsheet": "2.3.3",
-        "cordova-plugin-camera": "file:node_modules\\cordova-plugin-camera",
-        "cordova-plugin-compat": "1.1.0",
-        "cordova-plugin-console": "~1.0.2",
-        "cordova-plugin-device": "~1.1.1",
-        "cordova-plugin-file": "4.3.2",
-        "cordova-plugin-file-transfer": "1.6.2",
-        "cordova-plugin-jcore": "^1.1.8",
-        "cordova-plugin-media-capture": "1.4.3",
-        "cordova-plugin-offbye-alipay": "git+https://github.com/offbye/cordova-plugin-alipay.git",
-        "cordova-plugin-splashscreen": "4.0.3",
-        "cordova-plugin-statusbar": "~2.1.0",
-        "cordova-plugin-wechat": "^2.0.0",
-        "cordova-plugin-whitelist": "^1.3.2",
-        "gulp": "^3.5.6",
-        "gulp-concat": "^2.2.0",
-        "gulp-minify-css": "^0.3.0",
-        "gulp-rename": "^1.2.0",
-        "gulp-sass": "^2.0.4",
-        "ionic-plugin-keyboard": "~1.0.9",
-        "jpush-phonegap-plugin": "^3.2.3",
-        "phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
+  "name": "ionic-tabs",
+  "version": "1.1.1",
+  "description": "An Ionic project",
+  "dependencies": {
+    "cordova-android": "^6.2.3",
+    "cordova-hot-code-push-plugin": "^1.5.3",
+    "cordova-ios": "^4.4.0",
+    "cordova-plugin-actionsheet": "2.3.3",
+    "cordova-plugin-camera": "file:node_modules\\cordova-plugin-camera",
+    "cordova-plugin-compat": "1.1.0",
+    "cordova-plugin-console": "~1.0.2",
+    "cordova-plugin-device": "~1.1.1",
+    "cordova-plugin-file": "4.3.2",
+    "cordova-plugin-file-transfer": "1.6.2",
+    "cordova-plugin-jcore": "^1.1.8",
+    "cordova-plugin-media-capture": "1.4.3",
+    "cordova-plugin-offbye-alipay": "git+https://github.com/offbye/cordova-plugin-alipay.git",
+    "cordova-plugin-splashscreen": "4.0.3",
+    "cordova-plugin-statusbar": "~2.1.0",
+    "cordova-plugin-wechat": "^2.0.0",
+    "cordova-plugin-whitelist": "^1.3.2",
+    "gulp": "^3.5.6",
+    "gulp-concat": "^2.2.0",
+    "gulp-minify-css": "^0.3.0",
+    "gulp-rename": "^1.2.0",
+    "gulp-sass": "^2.0.4",
+    "ionic-plugin-keyboard": "~1.0.9",
+    "jpush-phonegap-plugin": "^3.2.3",
+    "phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
+  },
+  "devDependencies": {
+    "@ionic/cli-plugin-ionic1": "1.1.2",
+    "bower": "^1.3.3",
+    "gulp-sass": "^2.3.2",
+    "gulp-util": "^2.2.14",
+    "ionic": "3.7.0",
+    "shelljs": "^0.3.0"
+  },
+  "cordovaPlugins": [
+    "cordova-plugin-device",
+    "cordova-plugin-console",
+    "cordova-plugin-statusbar",
+    "ionic-plugin-keyboard",
+    "cordova-plugin-file-transfer",
+    "phonegap-plugin-barcodescanner",
+    "cordova-plugin-whitelist",
+    "cordova-hot-code-push-plugin",
+    "cordova-plugin-camera",
+    "jpush-phonegap-plugin",
+    "cordova-plugin-wechat"
+  ],
+  "cordovaPlatforms": [
+    "android",
+    "ios"
+  ],
+  "cordova": {
+    "plugins": {
+      "cordova-plugin-actionsheet": {},
+      "cordova-plugin-compat": {},
+      "cordova-plugin-console": {},
+      "cordova-plugin-device": {},
+      "cordova-plugin-file": {},
+      "cordova-plugin-file-transfer": {},
+      "cordova-plugin-media-capture": {},
+      "cordova-plugin-splashscreen": {},
+      "cordova-plugin-statusbar": {},
+      "ionic-plugin-keyboard": {},
+      "phonegap-plugin-barcodescanner": {
+        "CAMERA_USAGE_DESCRIPTION": "请摄像头对准条码"
+      },
+      "cordova-plugin-offbye-alipay": {
+        "PARTNER_ID": "2088721135315822"
+      },
+      "cordova-plugin-whitelist": {},
+      "cordova-hot-code-push-plugin": {},
+      "cordova-plugin-camera": {},
+      "jpush-phonegap-plugin": {
+        "APP_KEY": "69838317211448192366f9d8"
+      },
+      "cordova-plugin-wechat": {
+        "WECHATAPPID": "wxc5181c0d406023e6"
+      }
     },
-    "devDependencies": {
-        "@ionic/cli-plugin-ionic1": "1.1.2",
-        "bower": "^1.3.3",
-        "gulp-sass": "^2.3.2",
-        "gulp-util": "^2.2.14",
-        "ionic": "3.7.0",
-        "shelljs": "^0.3.0"
-    },
-    "cordovaPlugins": [
-        "cordova-plugin-device",
-        "cordova-plugin-console",
-        "cordova-plugin-statusbar",
-        "ionic-plugin-keyboard",
-        "cordova-plugin-file-transfer",
-        "phonegap-plugin-barcodescanner",
-        "cordova-plugin-whitelist",
-        "cordova-hot-code-push-plugin",
-        "cordova-plugin-camera",
-        "jpush-phonegap-plugin",
-        "cordova-plugin-wechat"
-    ],
-    "cordovaPlatforms": [
-        "android",
-        "ios"
-    ],
-    "cordova": {
-        "plugins": {
-            "cordova-plugin-actionsheet": {},
-            "cordova-plugin-compat": {},
-            "cordova-plugin-console": {},
-            "cordova-plugin-device": {},
-            "cordova-plugin-file": {},
-            "cordova-plugin-file-transfer": {},
-            "cordova-plugin-media-capture": {},
-            "cordova-plugin-splashscreen": {},
-            "cordova-plugin-statusbar": {},
-            "ionic-plugin-keyboard": {},
-            "phonegap-plugin-barcodescanner": {
-                "CAMERA_USAGE_DESCRIPTION": "请摄像头对准条码"
-            },
-            "cordova-plugin-offbye-alipay": {
-                "PARTNER_ID": "2088721135315822"
-            },
-            "cordova-plugin-whitelist": {},
-            "cordova-hot-code-push-plugin": {},
-            "cordova-plugin-camera": {},
-            "jpush-phonegap-plugin": {
-                "APP_KEY": "69838317211448192366f9d8"
-            },
-            "cordova-plugin-wechat": {
-                "WECHATAPPID": "wxc5181c0d406023e6"
-            }
-        },
-        "platforms": [
-            "android"
-        ]
-    }
-}
+    "platforms": [
+      "android"
+    ]
+  }
+}

miaomiao/plugins/android.json

@@ -37,23 +37,6 @@
         },
         "cordova-plugin-statusbar": {
             "PACKAGE_NAME": "com.miaomiao.app"
-        },
-        "cordova-plugin-wechat": {
-            "WECHATAPPID": "wxc5181c0d406023e6",
-            "PACKAGE_NAME": "com.miaomiao.app"
-        },
-        "cordova-plugin-whitelist": {
-            "PACKAGE_NAME": "com.miaomiao.app"
-        },
-        "ionic-plugin-keyboard": {
-            "PACKAGE_NAME": "com.miaomiao.app"
-        },
-        "jpush-phonegap-plugin": {
-            "APP_KEY": "69838317211448192366f9d8",
-            "PACKAGE_NAME": "com.miaomiao.app"
-        },
-        "phonegap-plugin-barcodescanner": {
-            "PACKAGE_NAME": "com.miaomiao.app"
         }
     },
     "dependent_plugins": {

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="906" mnemonic="1" />
+    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="907" mnemonic="1" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
@@ -24,14 +24,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
         <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 vertical-scroll-proportion="0.1544586">
+              <caret line="375" column="17" selection-start-line="375" selection-start-column="17" selection-end-line="375" selection-end-column="17" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -39,8 +37,8 @@
       <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="-7.5833335">
-              <caret line="327" column="32" selection-start-line="324" selection-start-column="52" selection-end-line="327" selection-end-column="32" />
+            <state vertical-scroll-proportion="-2.9833333">
+              <caret line="93" column="40" selection-start-line="93" selection-start-column="36" selection-end-line="93" selection-end-column="40" />
               <folding>
                 <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" />
@@ -55,45 +53,6 @@
           </provider>
         </entry>
       </file>
-      <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="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>
-      </file>
-      <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="-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>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -132,8 +91,8 @@
         <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" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
       </list>
     </option>
   </component>
@@ -177,7 +136,7 @@
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="E:/Graduation design/huiwei/www" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -287,24 +246,12 @@
           <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="5" />
     </breakpoint-manager>
     <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$/templates/my/care.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -316,9 +263,7 @@
       <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" />
-          <folding>
-            <element signature="e#16009#17788#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -368,9 +313,7 @@
       <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" />
-          <folding>
-            <element signature="e#16009#17788#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -420,9 +363,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
-          <folding>
-            <element signature="e#16009#17788#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -639,28 +580,53 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/../cordova-hcp.json">
       <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 vertical-scroll-proportion="0.03015873">
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="22" />
+          <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="-30.4375">
-          <caret line="40" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
+        <state vertical-scroll-proportion="-16.84375">
+          <caret line="48" column="34" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="34" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3535032">
+          <caret line="761" column="34" selection-start-line="761" selection-start-column="34" selection-end-line="761" selection-end-column="34" />
+          <folding>
+            <marker date="1509938614013" expanded="true" signature="32124:32149" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="32432:32496" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="32548:32564" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="32796:32860" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="32912:32927" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="33127:33158" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="33390:33408" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="33599:33626" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="35540:35558" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="37868:37886" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="37987:38001" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="38258:38277" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="38278:38472" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="38338:38357" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="38338:38384" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="38583:38601" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="39373:39391" placeholder="..." />
+            <marker date="1509938614013" expanded="true" signature="40384:40402" placeholder="..." />
+          </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="-7.5833335">
-          <caret line="327" column="32" selection-start-line="324" selection-start-column="52" selection-end-line="327" selection-end-column="32" />
+        <state vertical-scroll-proportion="-2.9833333">
+          <caret line="93" column="40" selection-start-line="93" selection-start-column="36" selection-end-line="93" selection-end-column="40" />
           <folding>
             <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" />
@@ -674,30 +640,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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 vertical-scroll-proportion="0.1544586">
+          <caret line="375" column="17" selection-start-line="375" selection-start-column="17" selection-end-line="375" selection-end-column="17" />
+          <folding />
         </state>
       </provider>
     </entry>

miaomiao/www/js/controllers/home.js

@@ -388,7 +388,7 @@
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
-                                webpageUrl: config.server + "/admin/share/view?id=" + id
+                                webpageUrl: config.server + "/admin/share/view?id=" + id + '&user_id = ' + $scope.user.id
                             }
                         },
                         scene: Wechat.Scene.SESSION
@@ -758,14 +758,10 @@
                 });
             };
             $scope.deletevideo = function (file) {
-<<<<<<< HEAD
-                common.deletefile(file).then(function () {
-=======
                 $scope.video = {};
                 common.deletefile(file).then(function (res) {
                 },function(erro){
                     alert(JSON.stringify(erro));
->>>>>>> 94527470eb93fceb0a3c2643bb3eab4824efcd58
                 })
             };
           $ionicModal.fromTemplateUrl('recharge-modal.html', {

miaomiao/www/js/controllers/my.js

@@ -759,6 +759,7 @@
                 });
             };
             $scope.deletevideo = function (file) {
+                $scope.video = {};
                 common.deletefile(file).then(function (res) {
                 },function(erro){
                     alert(JSON.stringify(erro));

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

@@ -92,7 +92,7 @@
                             <p>剩余时间</p>
                         </div>
                         <div ng-if="user.id == dream.user.id" class="col" style="text-align:right">
-                            <h2>{{dream.score/100000000000000}}</h2>
+                            <h2>{{dream.mark}}</h2>
                             <p>当前获得梦想分数</p>
                         </div>
                     </div>