YanaDH před 7 roky
rodič
revize
2f3f032569
2 změnil soubory, kde provedl 105 přidání a 106 odebrání
  1. 103 104
      miaomiao/.idea/workspace.xml
  2. 2 2
      miaomiao/www/js/controllers/home.js

+ 103 - 104
miaomiao/.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -37,23 +37,24 @@
         <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" />
+              <caret line="755" column="63" selection-start-line="755" selection-start-column="63" selection-end-line="755" 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="..." />
+                <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+                <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
               </folding>
             </state>
           </provider>
@@ -62,8 +63,8 @@
       <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.35429937">
-              <caret line="380" column="38" selection-start-line="380" selection-start-column="38" selection-end-line="380" selection-end-column="38" />
+            <state vertical-scroll-proportion="0.6441083">
+              <caret line="399" column="17" selection-start-line="399" selection-start-column="17" selection-end-line="399" selection-end-column="17" />
               <folding />
             </state>
           </provider>
@@ -254,7 +255,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/www/js/controllers/my.js</url>
-          <line>686</line>
+          <line>627</line>
         </line-breakpoint>
       </breakpoints>
       <option name="time" value="1" />
@@ -288,21 +289,22 @@
         <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="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -320,21 +322,22 @@
         <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="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -352,21 +355,22 @@
         <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="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -384,21 +388,22 @@
         <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="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -461,13 +466,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/payDetail.html">
-      <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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.18550955">
@@ -558,31 +556,32 @@
     <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" />
+          <caret line="755" column="63" selection-start-line="755" selection-start-column="63" selection-end-line="755" 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="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" 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.35429937">
-          <caret line="380" column="38" selection-start-line="380" selection-start-column="38" selection-end-line="380" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.6441083">
+          <caret line="399" column="17" selection-start-line="399" selection-start-column="17" selection-end-line="399" selection-end-column="17" />
           <folding />
         </state>
       </provider>

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

xqd xqd
@@ -384,7 +384,7 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '\n' + $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,
@@ -402,7 +402,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,