YanaDH 7 سال پیش
والد
کامیت
998dc5adf4
2فایلهای تغییر یافته به همراه37 افزوده شده و 71 حذف شده
  1. 35 69
      miaomiao/www/.idea/workspace.xml
  2. 2 2
      miaomiao/www/templates/my/payExplain.html

+ 35 - 69
miaomiao/www/.idea/workspace.xml

xqd xqd xqd xqd xqd
@@ -28,61 +28,28 @@
         <entry file="file://$PROJECT_DIR$/js/config/config.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
+              <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.35749185">
-              <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-3.8125">
-              <caret line="760" column="31" selection-start-line="760" selection-start-column="31" selection-end-line="760" selection-end-column="31" />
+            <state vertical-scroll-proportion="0.10993485">
+              <caret line="5" column="32" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="32" />
               <folding>
-                <marker date="1509691797885" expanded="true" signature="31929:31954" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="32237:32301" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="32353:32369" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="32601:32665" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="32717:32732" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="32932:32963" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="33195:33213" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="33404:33431" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="35345:35363" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="37657:37675" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="37740:37765" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="37984:38003" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="38004:38198" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="38064:38083" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="38064:38110" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="38309:38327" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="39099:39117" placeholder="..." />
-                <marker date="1509691797885" expanded="true" signature="40110:40128" placeholder="..." />
+                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#0;n#div#1;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#div#1;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#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#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-12.75">
-              <caret line="751" column="26" selection-start-line="751" selection-start-column="19" selection-end-line="751" selection-end-column="26" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -117,10 +84,10 @@
         <option value="$PROJECT_DIR$/js/config/config.js" />
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
       </list>
     </option>
   </component>
@@ -610,21 +577,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17142858">
-          <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#1;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#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5985401">
@@ -633,14 +585,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-12.75">
@@ -678,11 +622,33 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35749185">
-          <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" />
+        <state vertical-scroll-proportion="0.21091205">
+          <caret line="89" column="46" selection-start-line="89" selection-start-column="46" selection-end-line="89" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.10993485">
+          <caret line="5" column="32" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="32" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;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#div#1;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#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#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 2 - 2
miaomiao/www/templates/my/payExplain.html

xqd
@@ -4,10 +4,10 @@
             <div ng-if="items.length==0" class="padding">暂无交易记录</div>
             <div ng-repeat="item in items" class="item reply-item" >
                 <div class="item" style="height:90px; border-bottom: 2px solid #EFEFEF">
-                    <div style="float:left;">
+                    <div style="float:left; width: 15%;">
                         <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{item.avatar}}" />
                     </div>
-                    <div style="float:left; width: 83%; margin-left: 10px; height: 60px; overflow: hidden">
+                    <div style="float:left; width: 81%; margin-left: 10px; height: 60px; overflow: hidden">
                         <h2> {{item.from_name}} </h2>
                         <div>
                             <div class="fl">{{item.created_at}}</div>