YanaDH 7 years ago
parent
commit
d0bc500ef3

+ 212 - 169
miaomiao/.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -24,54 +24,46 @@
       <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-8.55">
-              <caret line="19" column="63" selection-start-line="19" selection-start-column="63" selection-end-line="19" selection-end-column="63" />
+            <state vertical-scroll-proportion="-2.1166666">
+              <caret line="311" column="87" selection-start-line="311" selection-start-column="87" selection-end-line="311" selection-end-column="92" />
               <folding>
-                <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;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="true">
-        <entry file="file://$PROJECT_DIR$/www/templates/my/my-dream.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.46178344">
-              <caret line="23" column="46" selection-start-line="23" selection-start-column="46" selection-end-line="23" selection-end-column="46" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-134.4375">
-              <caret line="826" column="31" selection-start-line="826" selection-start-column="31" selection-end-line="826" selection-end-column="31" />
+            <state vertical-scroll-proportion="-13.0625">
+              <caret line="814" column="63" selection-start-line="814" selection-start-column="63" selection-end-line="814" selection-end-column="63" />
               <folding>
-                <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="35523:35548" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="35795:35859" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="35911:35927" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="36123:36187" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="36239:36254" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="36454:36485" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="36717:36735" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="36926:36953" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="38930:38948" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="41242:41260" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="41321:41340" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="41603:41621" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="41682:41701" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="42473:42491" placeholder="..." />
+                <marker date="1509616960651" expanded="true" signature="43484:43502" placeholder="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="account.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="83" column="104" selection-start-line="83" selection-start-column="104" selection-end-line="83" selection-end-column="104" />
+            <state vertical-scroll-proportion="0.35429937">
+              <caret line="380" column="38" selection-start-line="380" selection-start-column="38" selection-end-line="380" selection-end-column="38" />
               <folding />
             </state>
           </provider>
@@ -89,20 +81,23 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/www/templates/my/my-message-reply.html" />
-        <option value="$PROJECT_DIR$/www/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php" />
         <option value="$PROJECT_DIR$/www/js/services/msgservice.js" />
-        <option value="$PROJECT_DIR$/www/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/www/templates/my/my-recharge.html" />
         <option value="$PROJECT_DIR$/www/js/config/router.js" />
         <option value="$PROJECT_DIR$/www/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/www/templates/my/payDetail.html" />
-        <option value="$PROJECT_DIR$/www/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/www/js/config/config.js" />
         <option value="$PROJECT_DIR$/www/templates/account/loginAccount.html" />
         <option value="$PROJECT_DIR$/www/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/www/js/config/config.js" />
+        <option value="$PROJECT_DIR$/www/templates/my/my-message-reply.html" />
+        <option value="$PROJECT_DIR$/www/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/www/templates/my/my-dream.html" />
+        <option value="$PROJECT_DIR$/www/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/www/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/www/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/www/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/www/js/controllers/home.js" />
       </list>
     </option>
   </component>
@@ -120,7 +115,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" />
@@ -221,7 +216,7 @@
     <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="Gulp" 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="3" side_tool="true" content_ui="tabs" />
@@ -267,12 +262,23 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <caret line="18" column="29" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="29" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
           <folding>
-            <element signature="n#style#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#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -282,19 +288,21 @@
         <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>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35523:35548" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35795:35859" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35911:35927" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36123:36187" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36239:36254" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36454:36485" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36717:36735" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36926:36953" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="38930:38948" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41242:41260" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41321:41340" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41603:41621" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41682:41701" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="42473:42491" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="43484:43502" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -303,9 +311,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -314,19 +320,21 @@
         <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>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35523:35548" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35795:35859" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35911:35927" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36123:36187" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36239:36254" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36454:36485" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36717:36735" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36926:36953" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="38930:38948" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41242:41260" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41321:41340" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41603:41621" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41682:41701" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="42473:42491" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="43484:43502" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -334,10 +342,8 @@
     <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="2" column="74" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="74" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -346,27 +352,54 @@
         <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>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35523:35548" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35795:35859" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35911:35927" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36123:36187" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36239:36254" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36454:36485" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36717:36735" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36926:36953" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="38930:38948" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41242:41260" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41321:41340" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41603:41621" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41682:41701" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="42473:42491" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="43484:43502" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-18.321428">
-          <caret line="75" column="59" selection-start-line="75" selection-start-column="59" selection-end-line="77" selection-end-column="39" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="2" column="74" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="74" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+      <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>
+            <marker date="1509616960651" expanded="true" signature="35523:35548" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35795:35859" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35911:35927" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36123:36187" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36239:36254" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36454:36485" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36717:36735" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36926:36953" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="38930:38948" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41242:41260" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41321:41340" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41603:41621" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41682:41701" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="42473:42491" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="43484:43502" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -384,27 +417,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/services/myservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16277258">
-          <caret line="11" column="62" selection-start-line="11" selection-start-column="62" selection-end-line="11" selection-end-column="62" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4201278">
           <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6168224">
-          <caret line="238" column="21" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -412,7 +428,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24203822">
           <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -424,29 +439,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.785714">
-          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/account/login.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-4.071429">
           <caret line="6" column="77" selection-start-line="6" selection-start-column="77" selection-end-line="6" selection-end-column="77" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -454,7 +450,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -470,14 +465,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3415605">
           <caret line="13" column="32" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="32" />
-          <folding>
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#i#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -485,61 +472,117 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.18550955">
           <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="15" selection-end-column="26" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#a#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#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#a#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#a#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#1;n#div#0;n#a#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#1;n#div#0;n#a#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$/www/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="83" column="104" selection-start-line="83" selection-start-column="104" selection-end-line="83" selection-end-column="104" />
+        <state vertical-scroll-proportion="0.5194704">
+          <caret line="81" column="65" selection-start-line="81" selection-start-column="65" selection-end-line="81" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7205414">
+          <caret line="213" column="69" selection-start-line="213" selection-start-column="59" selection-end-line="213" selection-end-column="69" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.11801242">
+          <caret line="8" column="60" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-134.4375">
-          <caret line="826" column="31" selection-start-line="826" selection-start-column="31" selection-end-line="826" selection-end-column="31" />
+        <state vertical-scroll-proportion="-2.0714285">
+          <caret line="2" column="176" selection-start-line="2" selection-start-column="176" selection-end-line="2" selection-end-column="176" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-sys.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.7142856">
+          <caret line="4" column="147" selection-start-line="4" selection-start-column="147" selection-end-line="4" selection-end-column="147" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-7.9666667">
+          <caret line="26" column="50" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#3;n#div#1;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$/www/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3420635">
+          <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
           <folding>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.55">
-          <caret line="19" column="63" selection-start-line="19" selection-start-column="63" selection-end-line="19" selection-end-column="63" />
+        <state vertical-scroll-proportion="-2.1166666">
+          <caret line="311" column="87" selection-start-line="311" selection-start-column="87" selection-end-line="311" selection-end-column="92" />
           <folding>
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-dream.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/add/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.14444445">
+          <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+          <folding>
+            <element signature="n#style#0;n#video#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.0625">
+          <caret line="814" column="63" selection-start-line="814" selection-start-column="63" selection-end-line="814" selection-end-column="63" />
+          <folding>
+            <marker date="1509616960651" expanded="true" signature="35523:35548" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35795:35859" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="35911:35927" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36123:36187" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36239:36254" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36454:36485" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36717:36735" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="36926:36953" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="38930:38948" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41242:41260" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41321:41340" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41603:41621" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="41682:41701" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="42473:42491" placeholder="..." />
+            <marker date="1509616960651" expanded="true" signature="43484:43502" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.46178344">
-          <caret line="23" column="46" selection-start-line="23" selection-start-column="46" selection-end-line="23" selection-end-column="46" />
+        <state vertical-scroll-proportion="0.35429937">
+          <caret line="380" column="38" selection-start-line="380" selection-start-column="38" selection-end-line="380" selection-end-column="38" />
           <folding />
         </state>
       </provider>

+ 4 - 4
miaomiao/www/js/config/config.js

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

+ 29 - 30
miaomiao/www/js/controllers/account.js

xqd
@@ -29,37 +29,36 @@
                  //}, function (error) {
                  //   console.log("Failed: " + JSON.stringify(error));
                  //});
-                //$state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
                 userService.isTest().then(function(res){
-                    if(res.data.data){
-                        Wechat.auth(scope, state, function (response) {
-                            // alert("response:"+JSON.stringify(response));
-                            // var response={code:1231};
-                           if(response.code){
-                               msg.loading('登录中...');
-                               userService.wechat_login(response.code).then(function(result){
-                                   msg.hide();
-                                    // alert("wechat_login success: " + JSON.stringify(result));
-                                   if(result.data.data.user){
-                                       storage.setObject('user', result.data.data.user);
-                                       storage.set('token', result.data.data.token);
-                                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                                       $scope.user=storage.getObject('user');
-                                       $state.go('app.home');
-                                   }else{
-                                       $state.go("loginAccount",{wechat:result.data.data.openid})
-                                   }
-                               },function(error){
-                                    console.log("loginbywx Failed: " + JSON.stringify(error));
-                                   $state.go("loginAccount");
-                               });
-                           }
-                        }, function (error) {
-                           console.log("Failed: " + JSON.stringify(error));
-                        })
-                    }else{
-                        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                    }
+                   if(res.data.data){
+                       Wechat.auth(scope, state, function (response) {
+                           // alert("response:"+JSON.stringify(response));
+                           // var response={code:1231};
+                          if(response.code){
+                              msg.loading('登录中...');
+                              userService.wechat_login(response.code).then(function(result){
+                                  msg.hide();
+                                   // alert("wechat_login success: " + JSON.stringify(result));
+                                  if(result.data.data.user){
+                                      storage.setObject('user', result.data.data.user);
+                                      storage.set('token', result.data.data.token);
+                                      $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                                      $scope.user=storage.getObject('user');
+                                      $state.go('app.home');
+                                  }else{
+                                      $state.go("loginAccount",{wechat:result.data.data.openid})
+                                  }
+                              },function(error){
+                                   console.log("loginbywx Failed: " + JSON.stringify(error));
+                                  $state.go("loginAccount");
+                              });
+                          }
+                       }, function (error) {
+                          console.log("Failed: " + JSON.stringify(error));
+                       })
+                   }else{
+                       $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                   }
                 } )
 
             }

+ 1 - 1
miaomiao/www/js/controllers/home.js

xqd
@@ -384,7 +384,7 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '<br/>' + $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '\n' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,

+ 44 - 22
miaomiao/www/js/controllers/my.js

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -697,10 +697,6 @@
                 }
                 else {
                     $state.go("app.message_sys");
-                    //myService.systemInfo().then(function(result){
-                    //},function(error){
-                    //
-                    //});
                 }
             };
             //支持消息
@@ -790,6 +786,7 @@
             $scope.imgs = [];
             $scope.video = {};
             $scope.addpict = function () {
+                alert('选择图片');
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
@@ -809,6 +806,7 @@
                 })
             };
             $scope.addvideo = function () {
+                alert('选择视频');
                 common.chooseVideo().then(function (file) {
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
@@ -829,7 +827,7 @@
                     alert(JSON.stringify(erro));
                 })
             };
-            $scope.goMes = function(is_reply,is_url,dream_id,is_end,message,user_id){
+            $scope.goMes = function(is_reply,is_url,dream_id,is_end,message,user_id,info,attr_id){
                 //发送私信
                 if(is_reply==1){
                     var myPopup = $ionicPopup.show({
@@ -849,7 +847,7 @@
                             '<div class="img-file-up" ng-if="video.isOK">' +
                             '<div style="position:relative;">' +
                             '<em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>' +
-                            '<video ng-src="{{video.file | trustUrl}}" poster="{{video.vpic}}" controls="controls"></video>' +
+                            '<video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls"></video>' +
                             '</div>' +
                             '</div>' +
                             '</div>',
@@ -865,8 +863,8 @@
                                     var data = {
                                         to_user_id:user_id,
                                         content:$scope.vm.content,
-                                        image:$scope.imgs,
                                         video:$scope.video.file,
+                                        image:$scope.imgs,
                                         //image:['http://img0.imgtn.bdimg.com/it/u=2398075737,160631337&fm=214&gp=0.jpg']
                                     };
                                     myService.sendLetter(data).then(function(result){
@@ -889,8 +887,8 @@
                     }
                 }
                 //梦想结束
-                else if(is_end==1){
-                    var endTemplate = '<div style="text-align: center"><p>恭喜你成功地你的梦想迈出最大的一步,照接下来的步骤做就可以领取你的梦想资金啦!</p>' +
+                else if(is_end==1&&attr_id==6){
+                    var endTemplate = '<div style="text-align: center"><p>恭喜你成功地你的梦想迈出最大的一步,</p>' +
                         '<p>要取出全部梦想资金,</p>' +
                         '<p>你需要亲自问候你的梦主</p>' +
                         '<p>致出最诚挚的感谢</p>' +
@@ -907,7 +905,7 @@
                                         msg.success('该梦想暂无梦主!');
                                     }
                                     else {
-                                        msg.success('确定见面,期待与梦主的相见吧!');
+                                        msg.success('确定见面,期待相见吧!');
                                     }
                                 }
                             })
@@ -935,7 +933,7 @@
                }, function (error) {
                });
            };
-            $scope.goMes = function(info,img,is_max,mes,video,attr_id,dream_id){
+            $scope.goMes = function(info,img,is_max,mes,video,attr_id,dream_id,to_user_id,is_end,is_url){
                 //收到私信
                 if(attr_id==7){
                     if(video!=null){
@@ -951,24 +949,48 @@
                             '<p>'+info+'</p>' +
                             '</div>';
                     }
-                    msg.confirm('私信',letterTemplate,'梦想页').then(function(){
-                        if($location.path()=="/app/home/message/reply"){
-                            $state.go('app.home_dreamdetail',{id:dream_id,type:2});
-                        }
-                        else {
-                            $state.go('app.my_dreamdetail',{id:dream_id,type:2});
+                    msg.confirm('私信',letterTemplate,'梦想页').then(function(result){
+                        if(result==true){
+                            if($location.path()=="/app/home/message/reply"){
+                                $state.go('app.home_dreamdetail',{id:dream_id,type:2});
+                            }
+                            else {
+                                $state.go('app.my_dreamdetail',{id:dream_id,type:2});
+                            }
                         }
                     })
                 }
                 //成为梦主
-                else if(is_max==1){
+                else if(is_max==1&&is_end==1){
                     var maxTemplate = '<div style="text-align: center"><p>'+ mes +'</p>' +
                         '<p>'+ info +'</p>' +
-                        //'<p>小蝶将以你提供的微信/电话联系你,并到你越好的地点亲自感谢你给予的支持和鼓励。</p>' +
-                        //'<p>如果你不希望见面或者不想要梦想者拥有你的联系方式,请按《不要见面的按钮或者联系客服》</p>' +
-                        //'<p>请按《不要见面的按钮或者联系客服》</p>' +
                         '</div>';
-                    msg.confirm('恭喜你!',maxTemplate);
+                    msg.confirm('恭喜你!',maxTemplate).then(function(result){
+                        if(result==true){
+                            myService.sure_meet2(to_user_id,1).then(function(res){
+                                if(res.data.status_code==0) {
+                                    msg.success('确定见面,期待相见吧!');
+                                }
+                            })
+                        }
+                        else {
+                            myService.sure_meet2(to_user_id,0).then(function(res){
+                                if(res.data.status_code==0){
+                                    msg.success('已取消见面!');
+                                }
+                            })
+                        }
+                    })
+                }//确认见面/扫一扫
+                else if(is_max==0&&is_url==0){
+                    var maxTemplate = '<div style="text-align: center"><p>'+ mes +'</p>' +
+                        '</div>';
+                    msg.alert('恭喜你!',maxTemplate).then(function(result){
+
+                    })
+                }
+                else if(is_end==0&&is_url==0){
+
                 }
                 else {
                     if($location.path()=="/app/home/message/reply"){

+ 1 - 1
miaomiao/www/templates/add/index.html

xqd
@@ -27,7 +27,7 @@
                 <div class="img-file-up" ng-if="video.isOK">
                     <div style="position:relative;">
                         <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
-                        <video ng-src="{{video.file | trustUrl}}" poster="{{video.vpic}}" controls="controls">
+                        <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>
                 </div>

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

xqd
@@ -323,7 +323,7 @@
                 <div class="img-file-up" ng-if="video.isOK">
                     <div style="position:relative;">
                         <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
-                        <video ng-src="{{video.file | trustUrl}}" poster="{{video.vpic}}" controls="controls">
+                        <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>
                 </div>

+ 1 - 1
miaomiao/www/templates/home/index.html

xqd
@@ -27,7 +27,7 @@
         <button class="button button-clear" ui-sref="app.home_search" style="margin-top:-3px">
             <i class="icon iconfont icon-sousuo"></i>
         </button>
-        <button class="button button-clear" style="height: 37px; margin-top: 0.6px" ui-sref="app.message">
+        <button class="button button-clear" style="height: 37px; margin-top: 1px" ui-sref="app.message">
             <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
             <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
         </button>

+ 5 - 6
miaomiao/www/templates/my/my-dream.html

xqd
@@ -24,13 +24,12 @@
                        <h2>{{dream.name}}</h2>
                        <p>{{dream.about}}</p>
                    </div>
-                   {{dream.end_time|lastDate}}
-                   <div ng-if="100*dream.get_coin/dream.coin<100" style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                       {{dream.end_time|lastDate}}进行中
+                   <div ng-if="dream.type_name=='进行中'" style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
+                       进行中
                    </div>
-                   <div ng-if="dream.end_time|lastDate=='已结束'" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
-                       {{dream.end_time|lastDate}}已结束
-                       <!--<p style="color: #DBDBDB; margin-top: 5px">已结束</p>-->
+                   <div ng-if="dream.type_name!='进行中'" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
+                       已结束
+                       <p style="color: #DBDBDB; margin-top: 5px">{{dream.type_name}}</p>
                    </div>
                </div>
 

+ 1 - 1
miaomiao/www/templates/my/my-message-reply.html

xqd
@@ -1,6 +1,6 @@
 <ion-view view-title="支持消息">
     <ion-content>
-        <div class="list list-user-set" ng-click="goMes(item.info,item.image,item.is_max,item.message,item.video,item.attr_id,item.dream_id)" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
+        <div class="list list-user-set" ng-click="goMes(item.info,item.image,item.is_max,item.message,item.video,item.attr_id,item.dream_id,item.user.id,item.is_end,item.is_url)" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
             <a class="item" style="border-bottom: 1px solid #EAEAEA">
                 <p style="white-space: normal">{{item.message}}</p>
             </a>

+ 1 - 1
miaomiao/www/templates/my/my-message-sys.html

xqd
@@ -2,7 +2,7 @@
     <ion-content>
         <div style="color: #B3B3B3" ng-if="sysInfos==''">暂时还没有梦想消息哦</div>
         <div class="list" ng-repeat="sysInfo in sysInfos">
-            <a ng-click="goMes(sysInfo.is_reply,sysInfo.is_url,sysInfo.dream_id,sysInfo.is_end,sysInfo.message,sysInfo.user_id)" class="item item-icon-left">
+            <a ng-click="goMes(sysInfo.is_reply,sysInfo.is_url,sysInfo.dream_id,sysInfo.is_end,sysInfo.message,sysInfo.user_id,sysInfo.info,sysInfo.attr_id)" class="item item-icon-left">
                 <i class="icon ion-volume-medium"></i>
                 <p style="white-space: normal">{{sysInfo.message}}</p>
             </a>

+ 1 - 1
server/app/Console/Commands/DreamDJS.php

xqd
@@ -138,7 +138,7 @@ class DreamDJS extends Command
                                 'dream_id'=>$item->id,
                                 'is_url'=>1,
                                 'type_id'=>2,
-                                'attr_id'=>8,
+                                'attr_id'=>9,
                             ];
                             SystemInfoModel::firstOrCreate($arr3);
                         }

+ 89 - 39
server/app/Http/Controllers/Admin/Dream/InfoController.php

xqd xqd xqd xqd xqd xqd xqd
@@ -15,6 +15,7 @@ use App\Models\DreamInfoModel;
 use App\Models\SupportDreamModel;
 use App\Models\SystemInfoModel;
 use App\Models\UserCareDream;
+use App\Widget\Tools\VideoUpload;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Dream\Criteria\MultiWhere;
@@ -79,9 +80,22 @@ class InfoController extends Controller
             $data['sign'] = join(',',$data['sign']);
         }
         $pics = (array) request('pic');
-        if (empty($pics)) {
-            $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
-            return $this->showWarning('请添加图片',$url);
+        if (request("file")) {
+            $file = request("file");
+            $fileSize = $file->getSize();
+            $size =  200 * 1024 * 1024;
+            if ($fileSize > $size) {
+                return back()->with('error','请上传小于200MB的文件!');
+            }
+            $mimeType = [
+                'video/mp4',
+            ];
+            $fileMimeType = $file->getMimeType();
+            if (!empty($mimeType) && !in_array($fileMimeType, $mimeType)) {
+                return back()->with('error','File type allow MP4!');
+            }
+            if (!$file = VideoUpload::mvFile('file')) return back()->with('error','上传失败');
+            $data["video"] = $file;
         }
         $data['created_at'] = date('Y-m-d H:i:s');
         $data['updated_at'] = date('Y-m-d H:i:s');
@@ -96,15 +110,17 @@ class InfoController extends Controller
         DreamInfoModel::where('id',$id)->update(compact('code'));*/
         if($id) {
             $arr = [];
-            foreach ($pics['url'] as $pic) {
-                $arr[] = [
-                    'pic'=>getenv('APP_URL').$pic,
-                    'dream_id'=>$id,
-                    'created_at'=>date("Y-m-d H:i:s"),
-                    'updated_at'=>date("Y-m-d H:i:s"),
-                ];
+            if (!empty($pics)) {
+                foreach ($pics['url'] as $pic) {
+                    $arr[] = [
+                        'pic'=>getenv('APP_URL').$pic,
+                        'dream_id'=>$id,
+                        'created_at'=>date("Y-m-d H:i:s"),
+                        'updated_at'=>date("Y-m-d H:i:s"),
+                    ];
+                }
+                DreamImages::insert($arr);
             }
-            DreamImages::insert($arr);
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
             $url[] = array('url'=>U( 'Dream/Info/create'),'title'=>'继续添加');
             $this->showMessage('添加成功',$url);
@@ -125,12 +141,18 @@ class InfoController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($reqeust->get('id'));
+        if (empty($data->video)) {
+            $data->is_video = 0;
+        }else{
+            $data->is_video = 1;
+        }
         $imgs = $data->imgs;
         $arr = [];
         foreach ($imgs as $pic) {
             $arr[] = $pic['pic'];
         }
         $data->imgs = $arr;
+//        dd($data);
         $data['sign'] = explode(',',$data['sign']);
         $signs = BaseSettingsModel::where('category','sign')->orderBy('id')->get();
         return view('admin.dream.info.edit',compact('data','signs'));
@@ -143,7 +165,7 @@ class InfoController extends Controller
         $data = (array) request('data');
         if ($data['status']==2) { //审核不过
             $info = [
-                'user_id' => $data['user_id'],
+                'to_user_id' => $data['user_id'],
                 'message' => ' 你的梦想被暂停,客服会在短时间内联络你',
                 'type_id' => 1,
                 'attr_id' => 5,
@@ -172,37 +194,65 @@ class InfoController extends Controller
             $data['score'] = (log($care_num) + ($a/$t) + $b)*100000000 ;
         }
         $pics = (array) request('pic');
-        if (empty($pics)) {
-            $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
-            return $this->showWarning('请添加图片',$url);
+        if (request("file")) {
+            $file = request("file");
+            $fileSize = $file->getSize();
+            $size =  200 * 1024 * 1024;
+            if ($fileSize > $size) {
+                return back()->with('error','请上传小于200 MB的文件!');
+            }
+            $mimeType = [
+                'video/mp4',
+            ];
+            $fileMimeType = $file->getMimeType();
+            if (!empty($mimeType) && !in_array($fileMimeType, $mimeType)) {
+                return back()->with('error','File type allow MP4!');
+            }
+            if (!$file = VideoUpload::mvFile('file')) return back()->with('error','上传失败');
+            $data["video"] = $file;
+        }else{
+//            更新是视频不存在则删除
+            $dream = $this->repository->find(request('id'));
+            if (is_file('.'.str_replace(getenv('APP_URL'),'',$dream->video))) {
+                unlink('.'.str_replace(getenv('APP_URL'),'',$dream->video));
+            }
+            $dream->video = '';
+            $dream->save();
         }
-        $old_data_pics =  $this->repository->find(request('id'))->imgs->toArray();
-        $old_pics = array_column($old_data_pics,'pic');
-        $a = array_diff($pics['url'],$old_pics);
-        $b = array_diff($old_pics,$pics['url']);
-        if (!empty($a) || !empty($b)) {       //有图片变化执行
-            //        删除以前图片 重新插入
-            if (!empty($b)) {
-                foreach ($b as $old_pic){
-                    if (is_file('.'.str_replace(getenv('APP_URL'),'',$old_pic))) {
-                        unlink('.'.str_replace(getenv('APP_URL'),'',$old_pic));
+        if (!empty($pics)) {
+//            图片不为空
+            $old_data_pics =  $this->repository->find(request('id'))->imgs->toArray();
+            $old_pics = array_column($old_data_pics,'pic');
+            $a = array_diff($pics['url'],$old_pics);
+            $b = array_diff($old_pics,$pics['url']);
+            if (!empty($a) || !empty($b)) {       //有图片变化执行
+                //        删除以前图片 重新插入
+                if (!empty($b)) {
+                    foreach ($b as $old_pic){
+                        if (is_file('.'.str_replace(getenv('APP_URL'),'',$old_pic))) {
+                            unlink('.'.str_replace(getenv('APP_URL'),'',$old_pic));
+                        }
+                        BaseAttachmentModel::where('url',$old_pic)->delete();
+                        DreamImages::where('pic',$old_pic)->delete();
                     }
-                    BaseAttachmentModel::where('url',$old_pic)->delete();
-                    DreamImages::where('pic',$old_pic)->delete();
                 }
+                $arr = [];                         //插入新的图片
+                foreach ($a as $pic) {
+                    $arr[] = [
+                        'pic'=>getenv('APP_URL').$pic,
+                        'dream_id'=>request('id'),
+                        'created_at'=>date('Y-m-d H:i:s'),
+                        'updated_at'=>date('Y-m-d H:i:s'),
+                    ];
+                }
+                DreamImages::insert($arr);
             }
-            $arr = [];                         //插入新的图片
-            foreach ($a as $pic) {
-                $arr[] = [
-                    'pic'=>getenv('APP_URL').$pic,
-                    'dream_id'=>request('id'),
-                    'created_at'=>date('Y-m-d H:i:s'),
-                    'updated_at'=>date('Y-m-d H:i:s'),
-                ];
-            }
-            DreamImages::insert($arr);
         }
-        $ok = $this->repository->update(request('id'),$data);
+        if (request("file")) {
+            $ok = $this->repository->update(request('id'),$data);
+        }else{
+            $ok=1;
+        }
         if ($data['status'] == 1) {   //审核通过
             $message = '你的梦想《'.$data['name'].'》已被批准,离你实现梦想又更进一步啦~ ';
             $info = [
@@ -212,7 +262,7 @@ class InfoController extends Controller
             SystemInfoModel::create($info);
 
 //            长连接
-            $this->jPush($message,'',$data['user_id']);
+//            $this->jPush($message,'',$data['user_id']);
         }
         if($ok) {
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');

+ 3 - 2
server/app/Http/Controllers/Admin/User/Cash/OutController.php

xqd
@@ -100,11 +100,12 @@ class OutController extends Controller
                 $message = '你提现的¥'.$data['cash'].'已经到账啦,去实现梦想吧!喵~';
             }
             $arr = [
-                'type_id'=>2,
+                'type_id'=>1,
+                'attr_id'=>4,
                 'to_user_id'=>$data['user_id'],
                 'message'=>$message,
             ];
-            SystemInfoModel::create($arr);
+            SystemInfoModel::firstOrCreate($arr);
         }
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {

+ 26 - 3
server/app/Http/Controllers/Api/V1/AuthController.php

xqd xqd xqd
@@ -101,13 +101,21 @@ class AuthController extends Controller
 //        $openid='';
 //        if(!$arr['errcode'])$openid = $arr['openid'];
         \Log::info('openid: ' . $wechat);
+        $user = UserInfoModel::where('wechat',$wechat)->first();
 
         $jpush = $request->jpush;
         $key = $this->keySmsCode . $phone;
         $code = Cache::store('file')->get($key);
         $password = 123456;
         if ($request->verify_code != $code) return $this->error(ErrorCode::SERVICE_CODE_FAILED);
-        $user = UserInfoModel::where('phone',$phone)->first();
+        if(empty($user)){
+            $user = UserInfoModel::where('phone',$phone)->first();
+        }else{
+            $phone_user = UserInfoModel::where('phone',$phone)->first();
+            if(!empty($phone_user)){
+                return $this->error(ErrorCode::USER_DOES_EXIST);
+            }
+        }
         if (empty($user)) {
             $user = UserInfoModel::create([
                 'phone'=>$phone,
@@ -120,6 +128,7 @@ class AuthController extends Controller
         }else{
             //用户已经存在,重新绑定
             $user->wechat=$wechat;
+            $user->phone=$phone;
             $user->password=bcrypt(123456);
             $user->save();
         }
@@ -192,12 +201,26 @@ class AuthController extends Controller
         $arr = json_decode($res, true);
         $openid='';
         if(!isset($arr['errcode']))$openid = $arr['openid'];
+        if(!empty($openid)){
+            $url = "https://api.weixin.qq.com/sns/userinfo?access_token=".$arr['access_token']."&openid=".$openid."&lang=zh_CN";
+            $userInfoJson = file_get_contents($url);     //file_get_contents获取指定路由返回的数据
+            $userInfo = json_decode($userInfoJson, true);
+            \Log::info('userInfo: ' . $userInfoJson);
+        }
         \Log::info('openid: ' . $openid);
         if($openid!='')$user = UserInfoModel::where('wechat',$openid)->first();
         \Log::info($user);
-        if (empty($user)) {
+        if (empty($user)||$user->phone=='') {
             \Log::info('empty: ' . empty($user));
-//            return $this->error(ErrorCode::LOGIN_FAILED);
+            if(empty($user)){
+                UserInfoModel::create([
+                    'wechat'=>$openid,
+                    'nickname'=>$userInfo['nickname'],
+                    'avatar'=>$userInfo['headimgurl'],
+                    'status'=>1,
+                    'password'=>bcrypt(123456)
+                ]);
+            }
             return $this->api(['openid' => $openid]);
         }else{
             $token = $user->createToken($user->phone)->accessToken;

+ 4 - 1
server/app/Http/Controllers/Api/V1/DreamController.php

xqd
@@ -627,17 +627,20 @@ class DreamController extends Controller
             $info2 = [
                 'to_user_id' => $dream->user_id,
                 'message' => $message,
+                'dream_id' => $request->id,
                 'user_id' => $user->id,
                 'is_reply' => 1,
                 'type_id' => 1,
                 'attr_id' => 2,
             ];
-            SystemInfoModel::create($info2);
+            SystemInfoModel::firsrtOrCreate($info2);
             //            长连接
             $this->jPush($message,'',$dream->user_id);
         }else{
             UserCareDream::where('user_id',$user->id)->
             where('dream_id',$request->id)->delete();
+//            取消收藏删除系统消息
+            SystemInfoModel::where('to_user_id',$dream->user_id)->where('dream_id',$request->id)->delete();
         }
 
         //            并且同时会关注这个梦想者

+ 5 - 2
server/app/Http/Controllers/Api/V1/MyController.php

xqd xqd xqd xqd xqd
@@ -263,6 +263,7 @@ class MyController extends Controller
         if (count($data1) > 0) {
             if (count($data1) >= 5) {
                 $data1[0]['message'] = "已经有".count($data1)."个人支持了你的梦想!";
+                $data2[0]['is_url'] = 1;
                 $new_data1[] = $data1[0];
             }else{
                 $new_data1 = $data1;
@@ -273,6 +274,7 @@ class MyController extends Controller
         if (count($data2) > 0) {
             if (count($data2) >= 5) {
                 $data2[0]['message'] = "已经有".count($data2)."个人收藏了你的梦想!";
+                $data2[0]['is_url'] = 1;
                 $new_data2[] = $data2[0];
             }else{
                 $new_data2 = $data2;
@@ -283,6 +285,7 @@ class MyController extends Controller
         if (count($data3) > 0) {
             if (count($data3) >= 5) {
                 $data3[0]['message'] = "你的互动已经有".count($data3)."个留言啦!快点击看看!";
+                $data2[0]['is_url'] = 1;
                 $new_data3[] = $data3[0];
             }else{
                 $new_data3 = $data3;
@@ -351,7 +354,7 @@ class MyController extends Controller
                         "is_max" => 0,
                         "is_ok" => 0,
                         "is_end" => 0,
-                        "is_url" => 0,
+                        "is_url" => 1,
                         "type_id" => 2,
                     ];
                 }
@@ -1353,7 +1356,7 @@ class MyController extends Controller
      *  "status": true,
      *  "status_code": 0,
      *  "message": "",
-     *  "data": 0  
+     *  "data": 0  0表示并没有人支持你
      *}
      * @apiErrorExample {json} Error-Response:
      *{

+ 0 - 1497
server/app/Http/Controllers/Api/V1/MyController.php___jb_tmp___

xqd
@@ -1,1497 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Models\AccountLog;
-use App\Models\BaseDictionaryOptionModel;
-use App\Models\BaseSettingsModel;
-use App\Models\CommentInfoModel;
-use App\Models\DreamInfoModel;
-use App\Models\InteractionInfo;
-use App\Models\SearchInfoModel;
-use App\Models\Suggest;
-use App\Models\SupportDreamModel;
-use App\Models\SystemInfoModel;
-use App\Models\UserBank;
-use App\Models\UserCareDream;
-use App\Models\UserCareUser;
-use App\Models\UserCashOut;
-use App\Models\UserInfoModel;
-use Illuminate\Http\Request;
-use App\Services\Base\ErrorCode;
-use App\Helper\JpushHelper;
-use Illuminate\Support\Facades\Log;
-
-class MyController extends Controller
-{
-    use JpushHelper;
-    /**
-     * @api {get} /api/my/show 个人首页
-     * @apiDescription 个人首页
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 O*  "status": true,
-    {
-        "status": true,
-        "status_code": 0,
-        "message": "",
-        "data": {
-            "id": 1,
-            "phone": "13880642880",
-            "nickname": "name1",
-            "avatar": "/upload/user/20170629/e77068cc14c82086fb6b16e5bb7c3dd1.jpg",
-            "birthday": "2000-06-21",
-            "sign": 0,
-            "money": 0,
-            "coin": 308,
-            "sex": 1,
-            "signture": "我的个性签名1",
-            "height": 170,
-            "work": "网红",
-            "emotion": 1,
-            "address": "",
-            "city": "上海",
-            "detail_address": "",
-            "status": 1,
-            "wechat": "",
-            "weibo": "",
-            "remember_token": "",
-            "created_at": "2017-06-25 10:27:08",
-            "updated_at": "2017-08-19 13:24:29",
-            "deleted_at": null,
-            "care_number": 0,   关注
-            "fans_number": 0,   粉丝
-            "dreams_number": 9,  梦想
-            "collection_number": 0,  收藏
-            "interaction_number": 0, 发帖
-            "huitie": 1,    回复
-        }
-    }
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     *{
-     *      "status": true,
-     *      "status_code": 0,
-     *      "message": "",
-     *      "data": {
-     *          "user": null
-     *      }
-     *}
-     */
-    public function show()
-    {
-        $user = $this->getUser();
-        /*
-         * 我的关注人数,我的粉丝,收藏
-         * 点赞?徽章?
-         * */
-        $care_num = $user->UserCareUser;
-        $user->care_number = count($care_num);
-        $fens = UserCareUser::where('other_user_id',$user->id)->get();
-        $user->fans_number = count($fens);
-        $dreams = $user->dreams;
-        $user->dreams_number = count($dreams);
-        $collection = $user->collection;
-        $user->collection_number = count($collection);
-        $interaction_infos = $user->allInteraction;
-        $user->interaction_number = count($interaction_infos);
-        $huitie = CommentInfoModel::where('user_id',$user->id)->orWhere('to_user_id',$user->id)->get()->groupBy('interaction_id');
-        $user->huitie = count($huitie);
-        return $this->api($user);
-    }
-
-
-    /**
-     * @api {get} /api/my/edit 修改个人信息
-     * @apiDescription 修改个人信息
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *   "status_code": 0,
-     *   "message": "",
-        "data": {
-            "emotion": [
-                {
-                    "value": "1",
-                    "name": "未婚"
-                },
-                {
-                    "value": "2",
-                    "name": "已婚"
-                },
-                {
-                    "value": "3",
-                    "name": "离异"
-                }
-            ],
-            "sex": [
-                {
-                    "value": "0",
-                    "name": "男"
-                },
-                {
-                    "value": "1",
-                    "name": "女"
-                }
-            ]
-        }
-     * }
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * {
-     *   "status": false,
-     *   "status_code": 1500,
-     *   "message": "会员不存在",
-     *   "data": null
-     *  }
-     */
-    public function  edit()
-    {
-        $sex = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
-             where('dictionary_code','sex')->get();
-        $emotion = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
-             where('dictionary_code','emotion')->get();
-
-        return $this->api(compact('emotion','sex'));
-
-    }
-
-    /**
-     * @api {post} /api/my/update 保存个人信息
-     * @apiDescription   保存个人信息
-     *      @apiParam {string} pic   头像
-     *      @apiParam {int} sex   性别
-     *      @apiParam {string} signture   个性签名
-     *      @apiParam {int} emotion   情感状态
-     *      @apiParam {string} work   职业
-     *      @apiParam {int} height   身高
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *    "status": true,
-     *    "status_code": 0,
-     *   "message": "",
-     *   "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     *{
-     *   "status": false,
-     *   "status_code": 600,
-     *   "message": "保存用户数据失败",
-     *   "data": null
-     * }
-     */
-    public function update(Request $request)
-    {
-        $user = $this->getUser();
-        $data = $request->except('_token');
-        $ok =  $user->update($data);
-        if ($ok == true) {
-            return $this->api('');
-        }else{
-            return $this->error(ErrorCode::SAVE_USER_FAILED);
-        }
-    }
-
-    /**
-     * @api {post} /api/my/recharge 充值
-     * @apiDescription 充值
-     * @apiGroup My
-     *    @apiParam {int} coin       充值金额
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function recharge(Request $request)
-    {
-        $validator = \Validator::make($request->all(),
-            [
-                'coin'  => 'required|integer',
-            ],
-            [
-                'coin.required'  => '请填写金额',
-                'coin.integer'  => '请输入整数',
-
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
-        $user = $this->getUser();
-        $user->coin += $request->coin;
-        $user->save();
-        return $this->api('');
-    }
-
-    /**
-     * @api {get} /api/my/dream_info 梦想消息
-     * @apiDescription 梦想消息
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": [
-     *      {
-     *         ....
-     *      }
-     *   ]
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function dreamInfo()
-    {
-//        梦想消息分为 1支持 2收藏 3互动 4提现 5梦想暂停 6结束
-        $user = $this->getUser();
-        $data1  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->where('attr_id',1)->orderBy('id','desc')->get()->toArray();
-        $new_data1 = [] ;
-        if (count($data1) > 0) {
-            if (count($data1) >= 5) {
-                $data1[0]['message'] = "已经有".count($data1)."个人支持了你的梦想!";
-                $new_data1[] = $data1[0];
-            }else{
-                $new_data1 = $data1;
-            }
-        }
-        $data2  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->where('attr_id',2)->orderBy('id','desc')->get()->toArray();
-        $new_data2 = [] ;
-        if (count($data2) > 0) {
-            if (count($data2) >= 5) {
-                $data2[0]['message'] = "已经有".count($data2)."个人收藏了你的梦想!";
-                $new_data2[] = $data2[0];
-            }else{
-                $new_data2 = $data2;
-            }
-        }
-        $data3  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->where('attr_id',3)->orderBy('id','desc')->get()->toArray();
-        $new_data3 = [] ;
-        if (count($data3) > 0) {
-            if (count($data3) >= 5) {
-                $data3[0]['message'] = "你的互动已经有".count($data3)."个留言啦!快点击看看!";
-                $new_data3[] = $data3[0];
-            }else{
-                $new_data3 = $data3;
-            }
-        }
-        $data456  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)
-            ->where(function ($query) {
-                $query->where('attr_id',4)->orWhere('attr_id',5)->orWhere('attr_id',6);
-            })->orderBy('id','desc')->get()->toArray();
-
-        $data = array_merge($new_data1,$new_data2,$new_data3,$data456);
-        SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->update(['is_read' => 1]);
-        return $this->api($data);
-//        foreach ($data as $item){   //访问接口  标记已读
-//            $item->update(['is_read'=>0]);
-//            $info = InteractionInfo::find($item->interaction_id);
-//            $dream_id =empty($info) ? 0 : $info->dream_id;
-//            $item->dreamid = $dream_id;
-//        }
-    }
-    /**
-     * @api {get} /api/my/sup_info 支持消息
-     * @apiDescription 支持消息
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": [
-     *      {
-     *         ....
-     *      }
-     *   ]
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function supInfo()
-    {
-//        支持消息有 7私信 8@ 9梦想倒计时 10排名 梦想结束
-        $user = $this->getUser();
-        $data8  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',2)->where('attr_id',8)->orderBy('id','desc')->get()->toArray();
-//        计算interaction_id出现的次数
-//        dd(array_column($data8,"interaction_id"));
-        $count = array_count_values(array_filter(array_column($data8,"interaction_id")));
-        $new_data8 = [] ;
-        if (!empty($count)) {
-            foreach ($count as $interaction_id => $value) {
-                    $interaction = InteractionInfo::find($interaction_id);
-                    $dream_id = empty($interaction) ? '0':$interaction->dream_id;
-                if ($value>=5) {
-                    $message =empty($interaction) ? '': $interaction->title."互动上已经提起了你".($value)."次!你还不去瞧一瞧?你也太大牌啦!";
-                }else{
-                    $message =empty($interaction) ? '': $interaction->title."提起了你哦~点击看看!";
-                }
-                if (!empty($message)) {
-                    $new_data8[] = [
-                        'dream_id'=>$dream_id,
-                        'interaction_id'=>$interaction_id,
-                        'message'=>$message,
-                        "attr_id" => 8,
-                        "is_reply" => 0,
-                        "is_max" => 0,
-                        "is_ok" => 0,
-                        "is_end" => 0,
-                        "is_url" => 0,
-                        "type_id" => 2,
-                    ];
-                }
-            }
-        }
-        $data9  =  SystemInfoModel::with('user')->where('to_user_id',$user->id)->where('type_id',2)->where('attr_id','!=',8)->orderBy('id','desc')->get()->toArray();
-        $data = array_merge($new_data8,$data9);
-        SystemInfoModel::where('to_user_id',$user->id)->where('type_id',2)->update(['is_read' => 1]);
-        return $this->api($data);
-    }
-    /**
-     * @api {get} /api/my/system_info 通知消息
-     * @apiDescription 通知消息
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": [
-     *      {
-     *         ....
-     *      }
-     *   ]
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function systemInfo()
-    {
-        $user = $this->getUser();
-        $data  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',0)->orderBy('id','desc')->get()->toArray();
-        SystemInfoModel::where('to_user_id',$user->id)->where('type_id',0)->update(['is_read' => 1]);
-        return $this->api($data);
-    }
-
-    /**
-     * @api {get} /api/my/info 消息中心
-     * @apiDescription 消息中心
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": {
-     *      "dream_info": {
-     *          "number": 3,
-     *      },
-     *      "sup_info": {
-     *          "number": 0,
-     *      },
-     *      "system_info": {
-     *          "number": 3,
-     *      }
-     *  }
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function info()
-    {
-        $user = $this->getUser();
-     /*   $systemInfo1 =  SystemInfoModel::where('user_id',$user->id)->whereNull('to_user_id')->orderBy('id','desc')->get();
-        $systemInfo2 =  SystemInfoModel::where('user_id',$user->id)->where('is_read','0')
-            ->whereNull('to_user_id')->orderBy('id','desc')->get();
-        $letter1 =  SystemInfoModel::where('user_id',$user->id)->whereNotNull('to_user_id')->orderBy('id','desc')->get();
-        $letter2 =  SystemInfoModel::where('user_id',$user->id)->where('is_read','0')
-            ->whereNotNull('to_user_id')->orderBy('id','desc')->get();
-        $comments1 = CommentInfoModel::where('to_user_id',$user->id)->orderBy('id','desc')->get();
-        $comments2 = CommentInfoModel::where('to_user_id',$user->id)->where('is_read','1')->orderBy('id','desc')->get();
-        $arr = [];
-        $arr['systemInfo']['number'] = count($systemInfo1) ;
-        $arr['systemInfo']['is_read'] = count($systemInfo2) ;
-        $arr['letter']['number'] = count($letter1) ;
-        $arr['letter']['is_read'] = count($letter2) ;
-        $arr['reply']['number'] = count($comments1) ;
-        $arr['reply']['is_read'] = count($comments2) ;*/
-//        梦想消息 支持消息 通知消息
-        $user_id = $user->id;
-        $dream_info = SystemInfoModel::where('to_user_id',$user_id)->where('type_id',1)->where('is_read',0)->orderBy('id','desc')->get();
-        $sup_info = SystemInfoModel::where('to_user_id',$user_id)->where('type_id',2)->where('is_read',0)->orderBy('id','desc')->get();
-        $system_info = SystemInfoModel::where('to_user_id',$user_id)->where('type_id',0)->where('is_read',0)->orderBy('id','desc')->get();
-        $arr['dream_info']['number'] = count($dream_info) ;
-        $arr['sup_info']['number'] = count($sup_info) ;
-        $arr['system_info']['number'] = count($system_info) ;
-        return $this->api($arr);
-    }
-
-    /**
-     * @api {get} /api/my/read 设为已读
-     * @apiDescription 设为已读
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * {
-     *   "status": false,
-     *  "status_code": 700,
-     *   "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function read()
-    {
-        $user = $this->getUser();
-        $id = $user->id;
-        $system_infos = SystemInfoModel::where(function ($query) use($id){
-            $query->where('user_id',$id)->where('is_read','0');
-        })->orWhere(function ($query) use($id){
-            $query->where('to_user_id',$id)->where('is_read','0');
-        })->orderBy('id','desc')->get();
-        $comments = CommentInfoModel::where('user_id',$user->id)->where('is_read','0')->orderBy('id','desc')->get();
-        foreach ($system_infos as $system_info){
-            $system_info->update(['is_read'=>1]);
-        }
-        foreach ($comments as $comment){
-            $comment->update(['is_read'=>1]);
-        }
-        if (count($system_infos) > 0 || count($comments) > 0) {
-            return $this->api('');
-        }else{
-            return $this->error(ErrorCode::OPERATION_FAILED);
-        }
-    }
-
-
-
-    /**
-     * @api {get} /api/my/pay/article 支付说明
-     * @apiDescription 支付说明
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *"data": {
-     *   "key": "23453423453",  标题
-     *   "value": "<p><span style=\"color: rgb(255, 0, 0);\">42352345234534是大法官地方<
-     * img src=\"/ueditor/php/upload/image/20170815/1502779635.jpg\" title=\"1502779635.jpg\" alt=\"a1.jpg\"/>234534</span><
-     * br/></p>",    内容
-     *}
-     *  ]
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function payArticle()
-    {
-        $data = BaseSettingsModel::where('category','pay_article')->first();
-        return $this->api($data);
-    }
-
-
-    /**
-     * @api {post} /api/my/cash 提现
-     * @apiDescription 提现
-     * @apiGroup My
-     *    @apiParam {int} data[bank_id]       银行卡号id
-     *    @apiParam {int} data[cash]       提现金额
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": false,
-     *  "status_code": 1413,
-     *  "message": "系统审核中",
-     *  "data": null
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function cash(Request $request)
-    {
-        $data = $request->data;
-        $user = $this->getUser();
-        $validator = \Validator::make($request->all(),
-            [
-                'data.bank_id'  => 'required|integer',
-                'data.cash'  => 'required',
-            ],
-            [
-                'data.bank_id.required'  => '请选择提现账号',
-                'data.bank_id.integer'  => '提现账号不存在',
-                'data.cash.required'  => '请输入金额',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-//        $info = [] ;
-//        $info['from_type'] = '余额';
-//        $info['from_id'] = $user->id;
-//        $info['from_name'] = $user->name;
-//        $info['op'] = '提现';
-//        $info['from_amount'] = $data['coin'];
-//        $info['to_type'] = '现金';
-//        $info['to_id'] = $user->id;
-//        $info['to_name'] = $data['account']; //账号
-//        $info['note'] = $data['type'].$data['name'];
-//        $ok = AccountLog::create($info);
-        $data['user_id'] = $user->id;
-        $data['status'] = 1;
-        $ok = UserCashOut::create($data);
-
-        $message = '你提现的¥'.$data["cash"].'已经到账啦,去实现梦想吧!喵~ ';
-        $info = [
-            'user_id' => $user->id,
-            'message' => $message,
-            'attr_id' => 4,
-            'type_id' => 1,
-        ];
-        SystemInfoModel::create($info);
-
-//            长连接
-        $this->jPush($message,'',$user->id);
-
-        if ($ok) {
-            return $this->api(ErrorCode::verify);
-        }else{
-            return $this->error(ErrorCode::OPERATION_FAILED);
-        }
-    }
-
-//    联系客服
-
-    /**
-     * @api {post} /api/my/suggest 联系客服
-     * @apiDescription 联系客服
-     * @apiGroup My
-     *    @apiParam {string} data[content]       内容
-     *    @apiParam {string} data[email]       邮箱
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function suggest(Request $request)
-    {
-        $data = $request->data;
-        $user = $this->getUser();
-        $validator = \Validator::make($request->all(),
-            [
-                'data.content'  => 'required',
-                'data.email'  => 'required|email',
-            ],
-            [
-                'data.content.required'  => '请输入你遇到的问题',
-                'data.email.required'  => '请输入正确的邮箱地址',
-                'data.email.email'  => '请输入正确的邮箱地址',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $data['user_id'] = $user->id;
-        $ok =Suggest::create($data);
-        if ($ok) {
-            return $this->api('');
-        }else{
-            return $this->error(ErrorCode::OPERATION_FAILED);
-        }
-    }
-
-//    回复我的
-//    public function replyMy()
-//    {
-//
-//        $user = $this->getUser();
-////        梦想
-//        $dreams = $user->UserDream;
-//
-//        $data = $user->allInteraction;
-//        foreach ($data as $item) {
-//            $item->get_money = $item->dream->get_money;
-//            $item->money = $item->dream->money;
-//        }
-//        dd($data) ;
-//        if (count($dreams) == 0)
-//            return $this->error(ErrorCode::DREAM_NOT_EXIST);
-//        $comments_infos = [];
-//        foreach ($dreams as $dream){
-//            $comments_info = $dream->DreamInfo;
-//            if (count($comments_info) > 0) {
-//                foreach ($comments_info as $k => $value) {
-//                    $value->dream_name = $dream->dream;
-//                    $value->dream_about = $dream->about;
-//                    $value->dream_pic = count($dream->dreamImgsFirst) > 0 ? $dream->dreamImgsFirst->pic : '';
-//                    $value->progress = $dream->money == 0 ? 0 :  floor($dream->get_money/$dream->money);
-//                    $value->reviewer = $value->CommentUser->nickname;
-//                    $value->reviewer_pic = $value->CommentUser->pic;
-//                }
-//                $comments_infos[] = $comments_info;
-//            }
-//        }
-//
-//        return $this->api(compact('comments_infos'));
-//    }
-
-    /**
-     * @api {get} /api/my/dream 我的梦想
-     * @apiDescription 我的梦想
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-    {
-        "status": true,
-        "status_code": 0,
-        "message": "",
-        "data": {
-            "current_page": 1,
-            "data": [
-                {
-                    "id": 32,
-                    "user_id": 1,
-                    "name": "name",
-                    "about": "13880642880",
-                    "coin": 100,
-                    "end_time": "0000-00-00 00:00:00",
-                    "get_coin": 2017,
-                    "mark": 100,
-                    "status": 127,
-                    "video": "0",
-                    "score": 0,
-                    "sign": "158730",
-                    "code": "http://www.miao.com/qrcodes/WECHATPAY_201708191324294255.png",
-                    "parameter": 0,
-                    "created_at": "2017-08-19 05:22:12",
-                    "updated_at": "2017-08-19 05:24:30",
-                    "img": {
-                        "title": "",
-                        "pic": "http://q8.9026.com/upload/dream/20170629/79c11614cc8a9d37f747e3974d055331.jpg"
-                    }
-                },
-            ],
-            "from": 1,
-            "last_page": 4,
-            "next_page_url": "http://www.miao.com/api/my/dream?page=2",
-            "path": "http://www.miao.com/api/my/dream",
-            "per_page": 10,
-            "prev_page_url": null,
-            "to": 10,
-            "total": 36
-        }
-    }
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function dream()
-    {
-        $user = $this->getUser();
-        $dreams = DreamInfoModel::where('user_id',$user->id)->orderBy('created_at','desc')->with('img')->paginate();
-        return $this->api($dreams);
-    }
-
-    /**
-     * @api {get} /api/my/collection 我的收藏
-     * @apiDescription 我的收藏
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiParam {string}  [keyword]   关键字可选
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": {
-     *       "data": [
-     *           {                                   梦想详情
-     *               "id": 12,
-     *               "user_id": 2,
-     *              "name": "用户2梦想标题166",
-     *               "about": "用户2梦想介绍666",
-     *               "coin": 2500,
-     *               "time": 21,
-     *               "get_coin": 0,
-     *               "status": 0,
-     *               "video": null,
-     *               "sign": "",
-     *           },
-     *           "img": {
-     *               "title": "",
-     *               "pic": "https://f12f.jpg"      梦想封面图片
-     *            }
-     *       ],
-     *       "users": {
-     *           "2": "https://xxx.jpeg"           ID号和头像
-     *       }
-     *   }
-     *}
-     *          keyword存在
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *   "message": "",
-     *  "data": [
-     *      {
-     *          "id": 2,
-     *          "user_id": 1,
-     *          "dream_id": 12,
-     *          "dream_user_id": 2,
-     *          "interaction_number": 0,
-     *          "created_at": "2017-06-25 13:11:45",
-     *          "updated_at": "2017-06-25 13:11:45",
-     *          "dreams": [                                      梦想
-     *              {
-     *                  "id": 12,
-     *                  "user_id": 2,
-     *                  "name": "用户2梦想标题166",
-     *                  "about": "用户2梦想介绍666",
-     *                  "coin": 2500,
-     *                  "end_time": 72000,
-     *                  "get_coin": 792,
-     *                  "mark": 5484,
-     *                  "status": 0,
-     *                  "video": "e",
-     *                  "score": 158730,
-     *                 "sign": "梦想达人",
-     *                  "created_at": "2017-06-25 13:10:56",
-     *                  "updated_at": "2017-06-28 16:53:39"
-     *                  "img": {                                图片
-     *                      "title": "",
-     *                      "pic": "https://timgsa.baidu.com/timg9&di2f.jpg"
-     *                  },
-     *                  "user": {
-     *
-     *                  }
-     *              }
-     *          ]
-     *      }
-     *  ]
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function collection(Request $request)
-    {
-        $user = $this->getUser();
-        if ($request->keyword) {
-            $keyword ='%'.$request->keyword.'%';
-            $data = UserCareDream::where('user_id',$user->id)->
-            whereHas('dreams',function ($query) use($keyword){
-                $query->where('end_time','>=',time())->where('name','like',$keyword);
-            })->with('dreams')->get();
-            foreach ($data as $item) {
-                foreach ($item->dreams as $dream) {
-                    $dream->img;
-                }
-            }
-            $this->insertSearchTable($user->id,$request->keyword);
-            return $this->api($data);
-        }else{
-            $dreams = $user->collection;
-//            $users = [];
-            foreach ($dreams as $item) {
-              /*  if ($item->pivot->interaction_number > 0) {
-                    $user_info = UserInfoModel::find($item->pivot->dream_user_id);
-                    $avatar = $user_info ?  $user_info->avatar : '';
-                    if (!array_key_exists($item->pivot->dream_user_id,$users)) {
-                        $users[$item->pivot->dream_user_id] = $avatar;
-                    }
-                }*/
-                $item->img;
-                $item->user;
-            }
-            return $this->api(compact('dreams'));
-        }
-    }
-
-    /**
-     * @api {get} /api/my/miao 关于喵喵
-     * @apiDescription 关于喵喵
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": {
-     *       "key": "2511789",                    电话
-     *       "value": "关于喵喵介绍"              关于喵喵
-     *   }
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function aboutMiao()
-    {
-        $data = BaseSettingsModel::where('category','miaomiao')->select('key','value')->first();
-        return $this->api($data);
-    }
-
-
-    /**
-     * @api {get} /api/my/care 我关注的用户
-     * @apiDescription 我关注的用户
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *  "message": "",
-     *   "data":[] or
-     *   "data": [
-     *      {
-     *           "id": 2,
-     *           "phone": "13880642881",
-     *          "nickname": "name2",
-     *          "avatar": "http://www.miao.com/upload/user/20170630/08e235d7211944e9b6482965b4d7c42e.jpg",
-     *          "birthday": "2000-06-21",
-     *          "sign": 0,
-     *          "money": 0,
-     *          "coin": 800,
-     *          "sex": 1,
-     *          "signture": "我的个性签名2",
-     *          "height": 200,
-     *          "work": "兼职",
-     *          "emotion": 2,
-     *          "address": "370105",
-     *          "city": "成都",
-     *          "detail_address": "",
-     *          "status": 1,
-     *          "wechat": "",
-     *          "weibo": "",
-     *          "remember_token": "",
-     *          "created_at": "2017-06-25 10:42:06",
-     *          "updated_at": "2017-06-30 09:15:04",
-     *          "deleted_at": null,
-     *      }
-     *  ]
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function care()
-    {
-        $user = $this->getUser();
-        $users =$user->UserCareUser;
-        return $this->api($users);
-
-    }
-    /**
-     * @api {get} /api/my/careme 关注我的用户
-     * @apiDescription 关注我的用户
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *  "message": "",
-     *   "data":[] or
-     *   "data": [
-     *      {
-     *           "id": 2,
-     *           "phone": "13880642881",
-     *          "nickname": "name2",
-     *          "avatar": "http://www.miao.com/upload/user/20170630/08e235d7211944e9b6482965b4d7c42e.jpg",
-     *          "birthday": "2000-06-21",
-     *          "sign": 0,
-     *          "money": 0,
-     *          "coin": 800,
-     *          "sex": 1,
-     *          "signture": "我的个性签名2",
-     *          "height": 200,
-     *          "work": "兼职",
-     *          "emotion": 2,
-     *          "address": "370105",
-     *          "city": "成都",
-     *          "detail_address": "",
-     *          "status": 1,
-     *          "wechat": "",
-     *          "weibo": "",
-     *          "remember_token": "",
-     *          "created_at": "2017-06-25 10:42:06",
-     *          "updated_at": "2017-06-30 09:15:04",
-     *          "deleted_at": null,
-     *      }
-     *  ]
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function careMe()
-    {
-        $user = $this->getUser();
-        $users =$user->UserCareMe;
-        return $this->api($users);
-
-    }
-
-    public function insertSearchTable($id,$keyword)
-    {
-        $info = SearchInfoModel::where('user_id',$id)->
-        where('search',trim($keyword))->first();
-        if (count($info) == 0) {
-            SearchInfoModel::create(['user_id'=>$id,'search'=>trim($keyword),'times'=>1]);
-        }else{
-            $info->times += 1;
-            $info->save();
-        }
-
-    }
-
-
-    //我的银行账户
-
-
-    /**
-     * @api {get} /api/my/bank/list 我的银行账户
-     * @apiDescription 我的银行账户
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *  "message": "",
-     *   "data":[] or
-     *  "data": [
-     *   {
-     *       "id": 1,
-     *      "user_id": 1,
-     *      "bank_name": "1",
-     *      "bank_number": "1",    /账号
-     *      "bank_phone": "1",
-     *      "bank_user": ""        用户名/
-     *       "type": 微信,            微信(支付宝)二维码
-     *       "url": wwww.ddf,             二维码地址
-     *       "is_img": 1,
-     *   }
-     *]
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function bankList()
-    {
-        $user = $this->getUser();
-        $data =  UserBank::where('user_id',$user->id)->orderBy('id','desc')->get();
-        return $this->api($data);
-    }
-
-    /**
-     * @api {get} /api/my/bank/account 账户余额
-     * @apiDescription 账户余额
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *  "message": "",
-     *   "data":[] or
-     *  "data": {
-     *      "coin": 508,  余额
-     *  }
-     *]
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function account()
-    {
-        $user = $this->getUser();
-        return $this->api($user);
-    }
-
-   // 添加银行卡
-
-    /**
-     * @api {post} /api/my/bank/create 添加银行卡
-     * @apiDescription 添加银行卡
-     * @apiGroup My
-     *    @apiParam {string} data[bank_name]         银行名称
-     *    @apiParam {string} data[bank_number]       银行卡号
-     *    @apiParam {int} data[bank_phone]           银行卡绑定手机号
-     *    @apiParam {string} data[bank_user]         银行卡用户姓名
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function bankCreate(Request $request)
-    {
-        $data = $request->data;
-        $user = $this->getUser();
-        $validator = \Validator::make($request->all(),
-            [
-                'data.bank_name'  => 'required',
-                'data.bank_number'  => 'required',
-                'data.bank_phone'  => 'required',
-                'data.bank_user'  => 'required',
-            ],
-            [
-                'data.bank_name.required'  => '请选择账号类型',
-                'data.bank_number.required'  => '请输入账号',
-                'data.bank_phone.required'  => '请输入账号绑定手机号码',
-                'data.bank_user.required'  => '请输入账号绑定用户姓名',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $data['user_id'] = $user->id;
-        $ok =UserBank::create($data);
-        if ($ok) {
-            return $this->api('');
-        }else{
-            return $this->error(ErrorCode::OPERATION_FAILED);
-        }
-    } /**
-     * @api {post} /api/my/bank/qrcode 添加二维码
-     * @apiDescription 添加二维码
-     * @apiGroup My
-     *    @apiParam {string} data[type]         类型
-     *    @apiParam {string} data[qrcode]       二维码图片
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function bankImgCreate(Request $request)
-    {
-        $data = $request->data;
-        $user = $this->getUser();
-        $validator = \Validator::make($request->all(),
-            [
-                'data.type'  => 'required',
-                'data.qrcode'  => 'required',
-            ],
-            [
-                'data.type.required'  => '请选择账号类型',
-                'data.qrcode.required'  => '请上传二维码图片',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $data['user_id'] = $user->id;
-       /* $data['bank_user'] = '';
-        $data['bank_phone'] = '';
-        $data['bank_number'] = '';
-        $data['bank_name'] = '';*/
-        $info = UserBank::whereNotNull('qrcode')->where('user_id',$user->id)
-            ->where('type',$data['type'])->first();  //定义为二维码
-        if (empty($info)) {
-            $ok =UserBank::create($data);
-        }else{
-            $ok = $info->update($data);
-        }
-        if ($ok) {
-            return $this->api('');
-        }else{
-            return $this->error(ErrorCode::OPERATION_FAILED);
-        }
-    }
-
-    /**
-     * @api {get} /api/my/bank/delete 删除银行卡
-     * @apiDescription 删除银行卡
-     * @apiGroup My
-     *    @apiParam {int} id         银行卡id
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function bankDelete(Request $request)
-    {
-        $id = $request->id;
-        $validator = \Validator::make($request->all(),
-            [
-                'id'  => 'required',
-            ],
-            [
-                'id.required'  => '银行账号不存在',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $ok =UserBank::destroy($id);
-        if ($ok) {
-            return $this->api('');
-        }else{
-            return $this->error(ErrorCode::OPERATION_FAILED);
-        }
-    }
-//    发私信
-    /**
-     * @api {post} /api/my/letter/store 发送私信
-     * @apiDescription 发送私信
-     * @apiGroup My
-     *    @apiParam {string} content         私信内容
-     *    @apiParam {array} [image]         图片
-     *    @apiParam {string} [video]         视频
-     *    @apiParam {int} to_user_id         私信对象
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function letterStore(Request $request)
-    {
-        $validator = \Validator::make($request->all(),
-            [
-                'content'  => 'required',
-                'to_user_id'  => 'required',
-            ],
-            [
-                'content.required'  => '私信内容不存在',
-                'to_user_id.required'  => '私信对象不存在',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $user = $this->getUser();
-        $user_id = $user->id;
-        $info = $request->input('content');
-        $video = $request->input('video');
-        $img = $request->input('image');
-        if (is_array($img)&&!empty($img)) {
-            $image = $img[0];
-        }else{
-            $image = '';
-        }
-        $to_user_id = $request->input('to_user_id');
-//        链接到最近的一个梦想
-        $dream = DreamInfoModel::where('user_id',$user_id)->orderBy('id','desc')->first();
-        $dream_id = empty($dream) ? 0 : $dream->id;
-        $arr = [
-            'user_id'=>$user_id,
-            'info'=>$info,
-            'message'=>$user->nickname.'给你发了个私信哦~点击看看!',
-            'to_user_id'=>$to_user_id,
-            'dream_id'=>$dream_id,
-            'video'=>$video,
-            'image'=>$image,
-            'type_id'=>2,
-            'is_url'=>1,
-            'attr_id'=>7,
-        ];
-
-        $ok =SystemInfoModel::create($arr);
-        if ($ok) {
-            $this->jPush($user->nickname.'给你发了个私信哦~点击看看!','',$to_user_id);
-            return $this->api('');
-        }else{
-            return $this->error(ErrorCode::OPERATION_FAILED);
-        }
-    }
-    /**
-     * @api {get} /api/my/letter/show 查看私信
-     * @apiDescription 查看私信
-     * @apiGroup My
-     *    @apiParam {int} id         私信主键id
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function letterShow(Request $request)
-    {
-        $validator = \Validator::make($request->all(),
-            [
-                'id'  => 'required',
-            ],
-            [
-                'id.required'  => '私信id不存在',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $user = $this->getUser();
-        $user_id = $user->id;
-        $id = $request->input('id');
-
-        $data = SystemInfoModel::find($id);
-      return $this->api($data);
-    }
-
-//    梦想结束时梦想者是否同意见面
-    /**
-     * @api {get} /api/my/sure_meet 梦想者是否同意见面
-     * @apiDescription 梦想结束时梦想者是否同意见面
-     * @apiGroup My
-     *    @apiParam {int} dream_id         梦想id
-     *    @apiParam {int} value         0取消1确定
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": 0  0表示并没有人支持你
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-    public function isOk(Request $request)
-    {
-        $validator = \Validator::make($request->all(),
-            [
-                'value'  => 'required',
-                'dream_id'  => 'required',
-            ],
-            [
-                'value.required'  => '参数错误',
-                'dream_id.required'  => '梦想不存在',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $dream_id = $request->input('dream_id');
-        $value = $request->input('value');
-        $dream = DreamInfoModel::find($dream_id);
-        if (empty($dream)) return $this->error(ErrorCode::DREAM_NOT_EXIST);
-        $support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
-        $top = [] ;
-        foreach ($support_dream as $item) {
-            if (!array_key_exists($item->user_id,$top)) {
-                $top[$item->user_id] = $item->score;
-            }else{
-                $top[$item->user_id] += $item->score;
-            }
-        }
-        arsort($top);
-        $new_arr = array_values($top);
-        if (!empty($top)) {
-            $top_user = array_search($new_arr[0],$top);
-        }else{
-            $top_user = 0;
-        }
-        if ($value==1) {
-//            同意见面
-            $dream->is_ok = 1;
-            $dream->save();
-            $message = "你支持的梦想者已经同意见面啦";
-        }else{
-            $message = "你支持的梦想者拒绝了本次见面,你支持的梦想资金将会退还给您";
-//            退款逻辑
-        }
-        Log::info('is_max:'.$top_user);
-        if (!empty($top_user)) {
-//                给最大支持者发送消息
-            $arr = [
-                'user_id'=>0,
-                'message'=>$message,
-                'to_user_id'=>$top_user,
-                'dream_id'=>$dream_id,
-                'is_end'=>1,
-                'type_id'=>1,
-                'is_max'=>1,
-
-            ];
-            SystemInfoModel::firstOrCreate($arr);
-        }
-
-        return $this->api($top_user);
-    }
-
-    //    梦想结束时梦主是否同意见面
-    /**
-     * @api {get} /api/my/sure_meet2 梦主是否同意见面
-     * @apiDescription 梦想结束时梦主是否同意见面
-     * @apiGroup My
-     *    @apiParam {int} to_user_id         梦想者id(数据中的user_id)
-     *    @apiParam {int} value         0取消1确定
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *  "status": true,
-     *  "status_code": 0,
-     *  "message": "",
-     *  "data": ""
-     *}
-     * @apiErrorExample {json} Error-Response:
-     *{
-     *  "status": false,
-     *  "status_code": 700,
-     *  "message": "操作失败",
-     *  "data": null
-     *}
-     */
-
-    public function isOk2(Request $request)
-    {
-        $user = $this->getUser();
-        $validator = \Validator::make($request->all(),
-            [
-                'value'  => 'required',
-                'to_user_id'  => 'required',
-            ],
-            [
-                'value.required'  => '参数错误',
-                'to_user_id.required'  => '梦想者不存在',
-            ]
-        );
-        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $value = $request->input('value');
-        $to_user_id = $request->input('to_user_id');
-        $to_user_info = UserInfoModel::find($to_user_id);
-        if ($value==1) {
-            $message = '您的梦主同意见面了,赶快准备一下吧';
-//            同意见面会收到一条提示信息
-            if (!empty($to_user_info)) {
-                $arr = [
-                    'user_id'=>0,
-                    'message'=>$to_user_info->nickname.'会第一时间联系你!见面时需要你扫一扫他提供的二维码哦',
-                    'to_user_id'=>$user->id,
-                    'is_end'=>1,
-                    'type_id'=>1,
-                ];
-                SystemInfoModel::firstOrCreate($arr);
-            }
-
-        }else{
-            $message = '您的梦主拒绝了你们的见面,喵~';
-        }
-        $arr = [
-            'user_id'=>0,
-            'message'=>$message,
-            'to_user_id'=>$to_user_id,
-            'is_end'=>1,
-            'type_id'=>1,
-        ];
-        SystemInfoModel::firstOrCreate($arr);
-    }
-
-}

+ 1 - 1
server/app/Widget/Tools/VideoUpload.php

xqd
@@ -31,7 +31,7 @@ class VideoUpload
      *
      */
 
-    public static function mvFile($fileName, $sizex = 150, $sizey = 200,$isImage = false, $dir = 'order')//200 270
+    public static function mvFile($fileName, $sizex = 150, $sizey = 200,$isImage = false, $dir = 'dream/video')//200 270
     {
 
         if (!Request::hasFile($fileName)) return false;

+ 52 - 28
server/resources/views/admin/dream/info/edit.blade.php

xqd xqd xqd
@@ -68,13 +68,40 @@
                 </div>
                 <div class="form-group">
 
-                    <label class="control-label col-sm-3">梦想图片(必填)</label>
+                    <label class="control-label col-sm-3">是否视频</label>
 
                     <div class="col-sm-9">
-                        {!!  widget('Tools.ImgUpload')->multi2('/upload/dream','pic',"pic", isset($data->imgs) ? $data->imgs : "") !!}
+                        @foreach(dict()->get('global','bool') as $key => $val)
+                            <input type="radio" class="is_video" name="type_id" value="{{$key}}" name="" {{ !empty($data) && $data['is_video'] == $key ? 'checked' : '' }}>{{$val}}
+                        @endforeach
+                    </div>
+                </div>
+                                <div  id="is_video" style="display: none">
+                    <div class="form-group">
+                        <label class="control-label col-sm-3" >视频(mp4格式,200MB内)</label>
+                        <input type="file" name="file" >
+                    </div>
+                    <div class="form-group" @if(empty($data))
+                    style="display: none"
+                            @endif>
+                        <label class="control-label col-sm-3" >&nbsp;</label>
+                        <div class="col-sm-9" style="width: 50%;height: 50%">
+                            <video style="width: 300px" src="{{ $data['video'] or ''}}" controls >
+                            </video>
+                        </div>
                     </div>
-
                 </div>
+                                <div id="data_media">
+                                    <div class="form-group">
+
+                                        <label class="control-label col-sm-3">梦想图片(必填)</label>
+
+                                        <div class="col-sm-9">
+                                            {!!  widget('Tools.ImgUpload')->multi2('/upload/dream','pic',"pic", isset($data->imgs) ? $data->imgs : "") !!}
+                                        </div>
+
+                                    </div>
+                                </div>
                 <div class="form-group">
                                     
                  <label class="control-label col-sm-3">所需梦想币</label>
@@ -123,30 +150,6 @@
                     </div>
 
                 </div>
-                <div  id="is_video" style="display: none">
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-3" >视频(mp4格式,200MB内)</label>
-                                        <input type="file" name="file" >
-                                    </div>
-                                    <div class="form-group" @if(is_numeric($data))
-                                    style="display: none"
-                                            @endif>
-                                        <label class="control-label col-sm-3" >&nbsp;</label>
-                                        <div class="col-sm-9" style="width: 50%;height: 50%">
-                                            <video style="width: 300px" src="{{ $data['video'] or ''}}" controls >
-                                            </video>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-3">视频封面图</label>
-                                        <div class="col-sm-9">
-                                            {!! widget('Tools.ImgUpload')->single2('/upload/article/poster',"poster","poster",isset($data['poster']) && $data['is_video'] == 1 ? $data['poster']:'')!!}
-                                            @if(isset($data['poster']))
-                                                <input id="" name="data[poster]" class="form-control" value="{{ $data['poster'] or ''}}" required="" aria-required="true"  placeholder="">
-                                            @endif
-                                        </div>
-                                    </div>
-                        </div>
                 <div class="form-group">
                                     
                  <label class="control-label col-sm-3">排行参数</label>
@@ -215,4 +218,25 @@
             });
         });
     </script>
-@endsection
+    <script>
+        if ($('input:radio[name="type_id"]:checked').val() == 1) {
+            $('#is_video').show();
+            $('#data_media').hide();
+        }else{
+            $('#data_media').show();
+            $('#is_video').hide();
+        }
+        $(function () {
+            $('.is_video').change(function () {
+                if ($(this).val() == 1) {
+                    $('#is_video').show();
+                    $('#data_media').hide();
+                }else{
+                    $('#data_media').show();
+                    $('#is_video').hide();
+                }
+            });
+        });
+
+    </script>
+@endsection