Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

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="902" 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,51 +24,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="config.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <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="0.044392522">
-              <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
+            <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>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+      <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="-13.5">
-              <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+            <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#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+                <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="my-collect.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.14285715">
-              <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="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-25.357143">
-              <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>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -100,15 +84,15 @@
         <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$/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$/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/my.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
       </list>
     </option>
   </component>
@@ -121,7 +105,7 @@
     <option name="x" value="1358" />
     <option name="y" value="-8" />
     <option name="width" value="2576" />
-    <option name="height" value="1452" />
+    <option name="height" value="1456" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -152,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" />
@@ -222,25 +206,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="2576" height="1452" extended-state="0" />
+    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
     <editor active="true" />
     <layout>
       <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="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" />
       <window_info id="Terminal" 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="9" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
       <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="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="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.3297953" 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" />
-      <window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -263,18 +247,11 @@
           <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="4" />
+      <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">
@@ -286,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>
@@ -338,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>
@@ -390,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>
@@ -466,13 +437,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">
@@ -501,13 +465,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.46195653">
-          <caret line="47" column="25" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="25" />
-        </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">
@@ -550,40 +507,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5985401">
-          <caret line="19" column="79" selection-start-line="19" selection-start-column="68" selection-end-line="19" selection-end-column="79" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <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$/templates/my/withdraw.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-17.142857">
@@ -609,69 +532,118 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.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="false" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <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="488" column="32" selection-start-line="488" selection-start-column="32" selection-end-line="488" selection-end-column="32" />
-          <folding>
-            <element signature="e#16009#17788#0" expanded="false" />
-          </folding>
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.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" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <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="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+          <caret line="32" column="25" selection-start-line="26" selection-start-column="19" selection-end-line="32" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.5">
-          <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="true" />
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-25.357143">
-          <caret line="32" column="25" selection-start-line="26" selection-start-column="19" selection-end-line="32" selection-end-column="25" />
+        <state vertical-scroll-proportion="0.0">
+          <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/my/my-collect.html">
+    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.14285715">
-          <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
+        <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$/../cordova-hcp.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <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="-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>
-            <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="true" />
+            <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$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <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" />
+            <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">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.044392522">
-          <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
+        <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>

miaomiao/www/js/config/config.js

@@ -1,11 +1,11 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-            //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/',
-      imgServer: 'http://miao.beiyuesi.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/',
+        imgServer: 'http://miao.beiyuesi.com/attachment/'
     });
 })(angular.module('app'));

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
@@ -740,7 +740,9 @@
 
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
+                    msg.loading();
                     common.uploadFiles(file, 2).then(function (result) {
+                        msg.hide();
                         var response = JSON.parse(result.response);
                         $scope.video.server = response.data.file;
                         var file = config.imgServer+response.data.file;
@@ -748,7 +750,8 @@
                         $scope.video.file = response.data.file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
                     }, function (error) {
-                        msg.error('视频上传失败');
+                        //msg.error('视频上传失败');
+                        msg.hide();
                     });
                 }, function (erro) {
                     console.log('选择视频失败');

miaomiao/www/js/controllers/my.js

@@ -742,20 +742,24 @@
             };
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
+                    msg.loading();
                     common.uploadFiles(file, 2).then(function (result) {
+                        msg.hide();
                         var response = JSON.parse(result.response);
                         var file = config.imgServer+response.data.file;
                         $scope.video.isOK = true;
                         $scope.video.file = response.data.file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
                     }, function (error) {
-                        msg.error('视频上传失败');
+                        //msg.error('视频上传失败');
+                        msg.hide();
                     });
                 }, function (erro) {
                     console.log('选择视频失败');
                 });
             };
             $scope.deletevideo = function (file) {
+                $scope.video = {};
                 common.deletefile(file).then(function (res) {
                 },function(erro){
                     alert(JSON.stringify(erro));
@@ -764,6 +768,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>' +
@@ -855,8 +860,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();
            });
@@ -871,7 +876,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

@@ -92,21 +92,21 @@
                             <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>
                 </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}}%;">

server/app/Http/Controllers/Api/V1/PayController.php

@@ -166,10 +166,10 @@ class PayController extends Controller
                     $order->save();
 
                     //记日志
-                    $_ops = AccountLog::getAllop();
-                    $this->logAccount($_ops[AccountLog::TYPE_CASH], $u->id, $u->name,$order->amount,
+                    $_types = AccountLog::getAllType();
+                    $this->logAccount($_types[AccountLog::TYPE_CASH], $u->id, $u->name,$order->amount,
                         AccountLog::OP_CHARGE,
-                        $_ops[AccountLog::TYPE_COIN], $u->id,$u->name,$order->price,$out_trade_no,$u->avatar);
+                        $_types[AccountLog::TYPE_COIN], $u->id,$u->name,$order->price,$out_trade_no,$u->avatar);
 
                     \Log::info('支付完成');