add

.idea/workspace.xml

@@ -2,20 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/.hbuilderx/launch.json" beforeDir="false" afterPath="$PROJECT_DIR$/.hbuilderx/launch.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Tenantbill/companybill/companybill.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Tenantbill/companybill/companybill.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/index/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/uni.scss" beforeDir="false" afterPath="$PROJECT_DIR$/uni.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/login/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/my/Personalinformation/Personalinformation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Personalinformation/Personalinformation.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/my/my.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/my/xinxi.png" beforeDir="false" afterPath="$PROJECT_DIR$/static/my/xinxi.png" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -28,13 +26,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="239">
-              <caret line="61" column="28" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="28" />
+            <state relative-caret-position="721">
+              <caret line="232" column="10" selection-start-line="232" selection-start-column="10" selection-end-line="232" selection-end-column="10" />
               <folding>
-                <element signature="n#view#2;n#view#0;n#template#0;n#!!top" />
+                <element signature="n#style#0;n#view#1;n#view#0;n#view#0;n#view#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#1;n#view#0;n#view#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#2;n#view#0;n#view#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
@@ -43,34 +49,28 @@
                 <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#view#0;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#view#1;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#2;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#2;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#0;n#view#3;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#view#1;n#view#3;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#t-table#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#t-table#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="e#6982#7036#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="539">
-              <caret line="145" selection-start-line="145" selection-end-line="145" />
-              <folding>
-                <element signature="n#style#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="e#1561#1611#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2160">
-              <caret line="72" column="48" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -82,27 +82,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>zhifuright</find>
-      <find>zhifumk</find>
-      <find>canceltype</find>
-      <find>BaseApi</find>
-      <find>zhifucanvas</find>
-      <find>canys</find>
-      <find>guanbi</find>
-      <find>1000</find>
-      <find>showpayjine</find>
-      <find>getpaisongdata</find>
-      <find>queryOrder</find>
-      <find>Immediatepayment</find>
-      <find>Confirmationpayment</find>
-      <find>typechange</find>
-      <find>confirmtype</find>
-      <find>seedetail</find>
-      <find>Currentamount</find>
-      <find>Workordertodone</find>
-      <find>projectId</find>
-      <find>deviceArr</find>
-      <find>getuserInfo</find>
       <find>getuserInfoname</find>
       <find>pd</find>
       <find>totalnumber</find>
@@ -112,6 +91,27 @@
       <find>dataForm</find>
       <find>设备异常</find>
       <find>Punchindata</find>
+      <find>Personalinformation</find>
+      <find>Informationmodification</find>
+      <find>hideKeyboard</find>
+      <find>submit</find>
+      <find>name</find>
+      <find>sex</find>
+      <find>phone</find>
+      <find>mobile</find>
+      <find>email</find>
+      <find>actions</find>
+      <find>sexSelect</find>
+      <find>department</find>
+      <find>address</find>
+      <find>navigations</find>
+      <find>Homepage_header</find>
+      <find>Homepage_suspension</find>
+      <find>content</find>
+      <find>pending</find>
+      <find>pending1</find>
+      <find>arrears</find>
+      <find>arrears1</find>
     </findStrings>
     <replaceStrings>
       <replace>repairRegioncontactPerson</replace>
@@ -132,8 +132,11 @@
         <option value="$PROJECT_DIR$/pages/index/EquipmentException/EquipmentException.vue" />
         <option value="$PROJECT_DIR$/pages.json" />
         <option value="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" />
-        <option value="$PROJECT_DIR$/pages/index/index.vue" />
         <option value="$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue" />
+        <option value="$PROJECT_DIR$/pages/my/my.vue" />
+        <option value="$PROJECT_DIR$/pages/my/Personalinformation/Personalinformation.vue" />
+        <option value="$PROJECT_DIR$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue" />
+        <option value="$PROJECT_DIR$/pages/index/index.vue" />
       </list>
     </option>
   </component>
@@ -151,6 +154,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -158,11 +162,6 @@
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
-              <item name="http" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
@@ -215,6 +214,21 @@
               <item name="Mydistribution" type="462c0819:PsiDirectoryNode" />
               <item name="distributionedit" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
+              <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="my" type="462c0819:PsiDirectoryNode" />
+              <item name="Personalinformation" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
+              <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="my" type="462c0819:PsiDirectoryNode" />
+              <item name="Personalinformation" type="462c0819:PsiDirectoryNode" />
+              <item name="Informationmodification" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
@@ -224,12 +238,11 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../witcarbon-vue" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
   </component>
@@ -261,12 +274,14 @@
       <workItem from="1681086898029" duration="593000" />
       <workItem from="1681105513481" duration="9579000" />
       <workItem from="1681172833354" duration="23497000" />
-      <workItem from="1681258597059" duration="5548000" />
+      <workItem from="1681258597059" duration="12277000" />
+      <workItem from="1681345236598" duration="1191000" />
+      <workItem from="1681432005487" duration="594000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47663000" />
+    <option name="totallyTimeSpent" value="56177000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
@@ -378,20 +393,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="263" column="47" selection-start-line="263" selection-start-column="47" selection-end-line="263" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2550">
-          <caret line="85" column="30" selection-start-line="85" selection-start-column="12" selection-end-line="85" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="719">
@@ -402,39 +403,92 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
+    <entry file="file://$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="28" />
+        <state relative-caret-position="269">
+          <caret line="82" column="63" lean-forward="true" selection-start-line="81" selection-start-column="12" selection-end-line="82" selection-end-column="63" />
           <folding>
-            <element signature="n#view#2;n#view#0;n#template#0;n#!!top" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#0;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#1;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="e#1561#1611#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="279">
+          <caret line="97" column="98" selection-start-line="97" selection-start-column="22" selection-end-line="97" selection-end-column="98" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2160">
+        <state relative-caret-position="-1770">
           <caret line="72" column="48" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue">
+    <entry file="file://$PROJECT_DIR$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="222" column="10" selection-start-line="222" selection-start-column="10" selection-end-line="222" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/my/Personalinformation/Personalinformation.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="28" column="29" selection-start-line="24" selection-start-column="8" selection-end-line="28" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="212" column="36" selection-start-line="212" selection-start-column="26" selection-end-line="212" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="539">
-          <caret line="145" selection-start-line="145" selection-end-line="145" />
+        <state relative-caret-position="721">
+          <caret line="232" column="10" selection-start-line="232" selection-start-column="10" selection-end-line="232" selection-end-column="10" />
           <folding>
-            <element signature="n#style#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="e#1561#1611#0" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#0;n#view#0;n#view#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#1;n#view#0;n#view#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#2;n#view#0;n#view#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#2;n#view#1;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#0;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#0;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#1;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#1;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#2;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#2;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#0;n#view#3;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#view#1;n#view#3;n#view#1;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#t-table#0;n#view#0;n#view#4;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#t-table#0;n#view#0;n#view#5;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="e#6982#7036#0" expanded="true" />
           </folding>
         </state>
       </provider>

pages.json

@@ -28,7 +28,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "首页",
+				 "enablePullDownRefresh": true
 			}
 		},
 		// {
@@ -266,6 +267,24 @@
             }
 
         }
+        ,{
+            "path" : "pages/my/Myorder/Myorder",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的订单",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/my/Myorder/Orderdetails/Orderdetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单明细",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/Workorder/Tenantbill/Tenantbill.vue

@@ -193,7 +193,7 @@
 
 		methods: {
 			seedetail(e) {
-				//  console.log('222',e)
+				  console.log('222',e)
 				let faltesdata = {
 					name: e.name,
 					id: e.id,

pages/Workorder/Tenantbill/companybill/companybill.vue

@@ -104,20 +104,91 @@
 			</view>
 		</view>
 
+<view class="dibu" v-show="dibucaidan">
+	<view class="yucun">
+		<u-button type="success" text="预存" @click="prestore('预存')"></u-button>
+	</view>
+	<view class="yucun">
+		<u-button type="primary" text="补助" @click="prestore('补助')"></u-button>
+	</view>
+	<!-- <view class="yucun">
+		<u-button type="error" text="退费" @click="prestore('退费')"></u-button>
+	</view> -->
+</view>
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'>
-		</u-picker>
+		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'>	</u-picker>
+			
+			
+			<u-popup :show="showpayjine" @close="closepay1" @open="openpay1" mode="bottom" :round="10" :closeable=true :closeOnClickOverlay=true>
+			    <view class="paytall1">
+			        <!-- <text>请选择支付方式</text> -->
+			        <view class="hejitop">
+			            {{prestorename}}
+			        </view>
+			        <view class="zhifufs">
+			            <u--form
+			                    labelWidth="100"
+			                    labelPosition="left"
+			                    :model="model1"
+			                    :rules="rules"
+			                    ref="uForm"
+			            >
+			                <u-form-item
+			                        label="金额"
+			                        prop="userInfo.amount"
+			                        borderBottom
+			                        ref="item1"
+			                >
+			                    <u--input
+			                            v-model="model1.userInfo.amount"
+			                            border="none"
+			                    ></u--input>
+			                </u-form-item>
+			
+			            </u--form>
+			        </view>
+			        <view style="margin: 0 30rpx;">
+			            <u-button type="primary" text="确定" @click="Confirmationpaymentjine"></u-button>
+			        </view>
+			    </view>
+			</u-popup>
+		
+	<view class="canys" v-if="zhifucanvas">
+	    <h4>请用微信扫码二维码</h4>
+	    <canvas  class="zhifucanvas" canvas-id='canvas'></canvas>
+	   <view class="guanbi">
+	       <u-button type="primary" :plain="true" text="关闭" @click="guanbi"></u-button>
+	   </view>
+	</view>
+	
+	<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>
 
 <script>
-	// import {
-	// 	isEmpty,
-	// 	getDictDataList
-	// } from "@/utils/index";
+	var QRCode = require('@/utils/qrcode.js');
+	const BaseApi = require("@/http/baseApi.js");
+	
 	export default {
 		data() {
 			return {
+				  zhifucanvas: false,
+				dibucaidan:true,
+				prestorename:'',
+				model1: {
+				    userInfo: {
+				        amount: '',
+				    },
+				},
+				rules: {
+				    'userInfo.amount': {
+				        type: 'string',
+				        required: true,
+				        message: '请填写预存金额',
+				        trigger: ['blur', 'change']
+				    },
+				},
+				  showpayjine: false,
 				totalnumber:0,
 				jfnodata:false,
 				showtype: false,
@@ -155,12 +226,14 @@
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
-		onLoad: function(options) { //option为object类型，会序列化上个页面传递的参数
+		onLoad: function(options) {
+			
+			//option为object类型，会序列化上个页面传递的参数
 			//	console.log(options); //打印出上个页面传递的参数。
 			this.fatherparameter = JSON.parse(decodeURIComponent(options.para));
 			
 			let getDictDataList=uni.getStorageSync('getDictDataList');
-  console.log('111111111111111111',getDictDataList)
+ // console.log('111111111111111111',getDictDataList)
 
 			for(let i=0;i<getDictDataList.length;i++){
 				if(getDictDataList[i].dictType=='PayType'){
@@ -174,8 +247,6 @@
 			}
 
 
-
-			
 			this.dataForm.tenantId = this.fatherparameter.id;
 			this.dataForm.costCycle = this.fatherparameter.cycle;
 			this.dataForm.page = 1;
@@ -204,26 +275,158 @@
 
 		methods: {
 			
-			    // getPayTypeList() {
-				// 	this.columnstype=[getDictDataList("PayType")]
-			    // },
+			prestore(e){
+				//  console.log('111111111111111111',e)
+				this.showpayjine=true;
+				this.dibucaidan=false;
+				this.prestorename=e;
+			},
+			Confirmationpaymentjine() {
+			 
+			    this.$refs.uForm.validate().then(res => {
+			      //  uni.$u.toast('校验通过')
+			      //  console.log('111111111111111111', this.model1.userInfo.amount)
+			        this.showpayjine=false;
+			        this.Predepositshow=false;
+					this.dibucaidan=true;
+			  if(this.prestorename=='预存'){
+				  this.prestoredata(this.model1.userInfo.amount)
+			  }else if(this.prestorename=='补助'){
+				   this.subsidydata(this.model1.userInfo.amount)
+			  }else if(this.prestorename=='退费'){
+				   this.refunddata(this.model1.userInfo.amount)
+			  }  
+			      //   let postdata = {
+			      //       totalFee: '0.01',
+			      //       tenantId: Math.floor(this.dataForm.tenantId),
+			      //       tradeType: 'NATIVE',
+			      //       billIds: ''
+			      //   }   				  
+			    }).catch(errors => {
+			        uni.$u.toast('校验失败')
+			    })
+			},
+			//预存
+			prestoredata(e){
+				   this.zhifucanvas=true;
+				//  console.log('11',e)
+				//this.fatherparameter.id
+				let postdata = {
+				    totalFee: e,
+				    tenantId: Math.floor(this.fatherparameter.id),
+				    tradeType: 'NATIVE',
+				    billIds: ''
+				}
+				uni.request({
+				    url: BaseApi.BaseApi + '/pay/createOrder',
+				    method: "POST",
+				    data: postdata,
+				    header: {
+				        'content-type': 'application/x-www-form-urlencoded',
+				        "token": uni.getStorageSync('tokendata'),
+				    },
+				    success: (res) => {
+				        //	window.open(res.codeUrl, '_blank);
+				        let qrcode = new QRCode('canvas', {
+				            text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
+				            width: 213,
+				            height: 213,
+				            colorDark: "black",
+				            colorLight: "white",
+				            correctLevel: QRCode.CorrectLevel.H,
+				        });
+				     //   10秒之后调取查询订单
+				        let that = this;
+				        setTimeout(function () {
+							  that.zhifucanvas = false;
+							that.zddata={};
+							that.dataForm.page = 1;
+				            that.getalldata();
+							
+							this.jfpost.page = 1;
+							this.indexList=[];
+							 this.getjfdata();
+				        }, 15000);
+				
+				    }
+				});
+				
+			},
+			//补助
+			subsidydata(e){
+				  console.log('22',e)
+				//this.zhifucanvas=true;
+				//  console.log('11',e)
+				//this.fatherparameter.id
+				let postdata = {
+				    totalFee: e,
+				    tenantId: Math.floor(this.fatherparameter.id),
+				    tradeType: 'NATIVE',
+				    billIds: ''
+				}
+				uni.request({
+				    url: BaseApi.BaseApi + '/pay/createOrder',
+				    method: "POST",
+				    data: postdata,
+				    header: {
+				        'content-type': 'application/x-www-form-urlencoded',
+				        "token": uni.getStorageSync('tokendata'),
+				    },
+				    success: (res) => {
+				   
+				     	this.$refs.uNotify.success('补助成功')														    		
+				    }
+				});
+				
+				
+			},
+			//退费
+			refunddata(e){
+				  console.log('33',e)
+				  let postdata = {
+				      amount: e,
+				      id:Math.floor(this.fatherparameter.id),
+				      orderId: 0,
+				      refundReason: ''
+				  }
+				  
+				this.$api.post('/refundinfo',postdata)
+				.then(res=>{
+				if(res.data.code==0){
+					this.$refs.uNotify.success('退费成功')										
+				}else{
+					this.$refs.uNotify.error(res.data.msg)										
+				}
+				
+				})
+					
+			},
 			
-			// getPayStatusList() {
-			// 	this.payStatusList = getDictDataList("PayStatus");
-			// //	console.log('0000', this.payStatusList)
-			// },
+			closepay1() {
+			    this.showpayjine = false
+			    // console.log('close');
+				this.dibucaidan=true;
+			},
+			openpay1() {
+			    console.log('open');
+			},
 			goback() {
 				uni.navigateBack({
 					delta: 1
 				});
 			},
-			
+			guanbi(){
+			    this.zhifucanvas=false;
+			    this.Predepositshow=true;
+			    this.getalldata();
+			    this.getjfdata();
+			},
 			
 			canceltype() {
 				this.showtype = false;
 			},
 			confirmtype(e) {
-				console.log('111111111111111111', e.value[0])
+				//console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				this.expensedata = e.value[0].dictLabel;
 					if( e.value[0].dictLabel=='全部'){
@@ -244,6 +447,7 @@
 				this.current = index;
 				if (index == 0) {
 					this.cdshow = true;
+				
 					this.dataForm.page = 1;
 					this.getalldata();
 				} else {
@@ -289,6 +493,7 @@
 				this.dataForm.costCycle = e.target.value;
 				this.jfpost.costCycle = e.target.value;
 				
+				this.zddata={};
 				this.dataForm.page = 1;
 				this.getalldata();
 			},
@@ -299,16 +504,18 @@
 					//	this.indexList = [];
 					//	this.indexList = res.data.data;
 					//	console.log('222222', this.indexList)
+						this.zddata={};
 					if(res.data.data.length==0){
 						//  console.log('111111111111111111',)
-						this.zddata={};
+					//	this.zddata={};
 						  this.nodata=true;
 					}else{
+						 this.nodata=false; 
 						this.zddata.amount=res.data.data[0].amount;
 						this.zddata.glf=res.data.data[0].billLists[0].amount;
 						this.zddata.ktf=res.data.data[0].billLists[1].amount;
 						this.zddata.dtf=res.data.data[0].billLists[2].amount;
-						 this.nodata=false;
+						
 					}	
 					})
 			},
@@ -318,6 +525,23 @@
 </script>
 
 <style lang="scss">
+	
+	.dibu{
+		position: fixed;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		width: 750rpx;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		background-color: #fff;
+	}
+	.yucun{
+		width: 200rpx;
+
+	}
 	.nodata{
 		text-align: center;
 		padding-top: 400rpx;
@@ -447,4 +671,361 @@
 		text-align: center;
 		font-weight: bold;
 	}
+	
+	    .Predeposit {
+	        position: fixed;
+	        bottom: 0;
+	        left: 0;
+	        right: 0;
+	        width: 750rpx;
+	    }
+	
+	    .nodata {
+	        text-align: center;
+	        padding-top: 400rpx;
+	    }
+	
+	    .zhifucanvas {
+	        width: 400rpx;
+	        height: 400rpx;
+	       margin: 0 auto;
+	    }
+	.canys{
+	    width: 500rpx;
+	    height: 600rpx;
+	    position: fixed;
+	    top: 30%;
+	    left: 140rpx;
+	    background: #e6e6e6;
+	    h4{
+	        width: 500rpx;
+	        text-align: center;
+	        height: 80rpx;
+	        line-height: 80rpx;
+	    }
+	}
+	.guanbi{
+	    margin-top: 50rpx;
+	}
+	
+	    .zhifufs {
+	        padding: 30rpx;
+	
+	        ::v-deep .u-radio-label--right {
+	            margin-top: 30rpx;
+	        }
+	
+	        ::v-deep .u-radio__icon-wrap {
+	            width: 40rpx !important;
+	            height: 40rpx !important;
+	        }
+	
+	        ::v-deep .u-radio__text {
+	            font-size: 32rpx !important;
+	        }
+	    }
+	
+	    .hejitop {
+	        width: 750rpx;
+	        text-align: center;
+	        font-weight: bold;
+	        font-size: 40rpx;
+	        margin-bottom: 30rpx;
+	    }
+	
+	    .paytall {
+	        width: 750rpx;
+	        height: 400rpx;
+	        background-color: #fff;
+	    }
+	
+	    .paytall1 {
+	        width: 750rpx;
+	        height: 330rpx;
+	        background-color: #fff;
+	    }
+	
+	    .heji span {
+	        color: #ED3A25;
+	    }
+	
+	    .likezhifu {
+	        margin-left: 20rpx;
+	        margin-right: 30rpx;
+	    }
+	
+	    .zhifu {
+	        position: fixed;
+	        right: 0 ;
+	        bottom: 0 ;
+	        left: 0 ;
+	        height: 140rpx;
+	        background-color: #fff;
+	        display: flex;
+	        align-items: center;
+	        justify-content: space-between;
+	    }
+	
+	    .zhifuleft {
+	        margin-left: 30rpx;
+	    }
+	
+	    .zhifuright {
+	        display: flex;
+	        align-items: center;
+	        justify-content: flex-end;
+	    }
+	
+	    .outstanding1 {
+	        background-color: #09C700;
+	        width: 100rpx;
+	        height: 40rpx;
+	        text-align: center;
+	        line-height: 40rpx;
+	        color: #fff;
+	        font-size: 14 rpx;
+	        position: absolute;
+	        top: 0px;
+	        right: 0px;
+	        border-top-right-radius: 10rpx;
+	        border-bottom-left-radius: 10rpx;
+	    }
+	
+	    .outstanding2 {
+	        background-color: #ED3A25;
+	        width: 100rpx;
+	        height: 40rpx;
+	        text-align: center;
+	        line-height: 40rpx;
+	        color: #fff;
+	        font-size: 14rpx;
+	        position: absolute;
+	        top: 0px;
+	        right: 0px;
+	        border-top-right-radius: 10rpx;
+	        border-bottom-left-radius: 10rpx;
+	    }
+	
+	    .outstanding3 {
+	        background-color: #e6e6e6;
+	        width: 100rpx;
+	        height: 40rpx;
+	        text-align: center;
+	        line-height: 40rpx;
+	        color: #fff;
+	        font-size: 14 rpx;
+	        position: absolute;
+	        top: 0px;
+	        right: 0px;
+	        border-top-right-radius: 10rpx;
+	        border-bottom-left-radius: 10rpx;
+	    }
+	
+	    .userInfotenantName {
+	        text-align: center;
+	        margin-bottom: 10rpx;
+	        font-size: 34rpx;
+	    }
+	
+	    .topbilledit {
+	        display: flex;
+	        justify-content: space-around;
+	        align-items: center;
+	    }
+	
+	    .changetime1 {
+	        padding-right: 10rpx;
+	    }
+	
+	    .paisong {
+	        display: flex;
+	        flex-direction: column;
+	        justify-content: center;
+	        height: 220rpx;
+	        background-color: #fff;
+	        margin: 30rpx;
+	        border-radius: 9rpx;
+	        position: relative;
+	
+	        h3 {
+	            height: 70rpx;
+	            line-height: 70rpx;
+	            padding-left: 30rpx;
+	        }
+	    }
+	
+	    .paisong2 {
+	        display: flex;
+	        flex-direction: column;
+	        justify-content: center;
+	        height: 330rpx;
+	        background-color: #fff;
+	        margin: 30rpx;
+	        border-radius: 9rpx;
+	        position: relative;
+	
+	        h3 {
+	            height: 70rpx;
+	            line-height: 70rpx;
+	            padding-left: 30rpx;
+	        }
+	    }
+	
+	    .companylist {
+	        margin: 20rpx 30rpx;
+	        background: #fff;
+	        height: 280rpx;
+	        border-radius: 10px;
+	        position: relative;
+	
+	        h3 {
+	            height: 70rpx;
+	            line-height: 70rpx;
+	            padding-left: 30rpx;
+	        }
+	    }
+	
+	    .settled1 {
+	        background-color: #09C700;
+	        width: 100rpx;
+	        height: 40rpx;
+	        text-align: center;
+	        line-height: 40rpx;
+	        color: #fff;
+	        font-size: 14rpx;
+	        position: absolute;
+	        top: 0px;
+	        right: 0px;
+	        border-top-right-radius: 10rpx;
+	        border-bottom-left-radius: 10rpx;
+	    }
+	
+	    .settled2 {
+	        background-color: #30D3A2;
+	        width: 100rpx;
+	        height: 40rpx;
+	        text-align: center;
+	        line-height: 40rpx;
+	        color: #fff;
+	        font-size: 14 rpx;
+	        position: absolute;
+	        top: 0px;
+	        right: 0px;
+	        border-top-right-radius: 10rpx;
+	        border-bottom-left-radius: 10rpx;
+	    }
+	
+	    .settled3 {
+	        background-color: #30D3A2;
+	        width: 100rpx;
+	        height: 40rpx;
+	        text-align: center;
+	        line-height: 40rpx;
+	        color: #fff;
+	        font-size: 14rpx;
+	        position: absolute;
+	        top: 0px;
+	        right: 0px;
+	        border-top-right-radius: 10rpx;
+	        border-bottom-left-radius: 10rpx;
+	    }
+	
+	
+	    .Currentamount {
+	        padding-left: 30rpx;
+	        height: 50rpx;
+	        line-height: 50rpx;
+	        color: #BCB3A7;
+	
+	        span {
+	            color: #FA5555;
+	            padding-left: 9rpx;
+	        }
+	    }
+	
+	    .Currentamount1 {
+	        padding-left: 30rpx;
+	        height: 45rpx;
+	        line-height: 45rpx;
+	        color: #BCB3A7;
+	
+	        span {
+	            color: #FA5555;
+	            padding-left: 9rpx;
+	        }
+	    }
+	
+	    .records1 {
+	        background-color: #FA5555;
+	        width: 100rpx;
+	        height: 40rpx;
+	        text-align: center;
+	        line-height: 40rpx;
+	        color: #fff;
+	        font-size: 14rpx;
+	        position: absolute;
+	        top: 0px;
+	        right: 0px;
+	        border-top-right-radius: 10rpx;
+	        border-bottom-left-radius: 10rpx;
+	    }
+	
+	    .records {
+	        display: flex;
+	        flex-direction: column;
+	        // justify-content: center;
+	        position: relative;
+	        width: 690rpx;
+	        height: 210rpx;
+	        background: #fff;
+	        margin: 0 auto;
+	        border-radius: 9rpx;
+	    }
+	
+	    .onerecord {
+	        width: 750rpx;
+	        height: 90rpx;
+	        line-height: 90rpx;
+	        padding-left: 30rpx;
+	        color: #999;
+	
+	        span {
+	            color: red;
+	        }
+	    }
+	
+	    .topbilledit {
+	        display: flex;
+	        justify-content: center;
+	        align-items: center;
+	        background: #fff;
+	        height: 60rpx;
+	    }
+	
+	    .changetime2 {
+	        padding-left: 10rpx;
+	    }
+	
+	    .subsection {
+	        padding: 30rpx;
+	        background: #fff;
+	    }
+	
+	    .topname {
+	        height: 44px;
+	        width: 750rpx;
+	        display: flex;
+	        align-items: center;
+	    }
+	
+	    .topname1 {
+	        width: 50rpx;
+	        padding-left: 10rpx;
+	    }
+	
+	    .topname2 {
+	        width: 700rpx;
+	        text-align: center;
+	        font-weight: bold;
+	    }
 </style>

pages/index/BillPending/BillPending.vue

@@ -775,7 +775,7 @@
 
     .paytall1 {
         width: 750rpx;
-        height: 290rpx;
+        height: 330rpx;
         background-color: #fff;
     }
 

pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -194,12 +194,14 @@
 				this.showtype = false;
 				if (e.value[0].dictValue == 'all') {
 					this.mytype = e.value[0].dictLabel;
+					this.indexList=[];
 					this.dataForm.type = '';
 					this.dataForm.page = 1;
 					this.getalldata();
 				} else {
 					this.mytype = e.value[0].dictLabel;
 					this.dataForm.type = e.value[0].dictValue;
+					this.indexList=[];
 					this.dataForm.page = 1;
 					this.getalldata();
 				}
@@ -230,6 +232,7 @@
 							}
 							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
+							this.indexList=[];
 							this.dataForm.page = 1;
 							this.getalldata();
 						} else {
@@ -261,6 +264,8 @@
 				this.dataForm.buildingId = e.value[0].orgId;
 				this.dataForm.storeyId = e.value[1].orgId;
 				this.showfloor = false;
+				this.indexList=[];
+					this.dataForm.page = 1;
 				this.getalldata();
 			},
 			cancelfloor() {

pages/index/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="content">
-		<view class="Homepage_header">
+		<view class="Homepage_header"
+			v-if="$has('app:InspectionRecord')&&$has('app:OnlineReport')&&$has('app:WithholdingRecord')">
 			<view class="Homepage_suspension">
 				<view class="Suspension">
 					<view class="online" @click="Onlinewarranty" v-if="$has('app:InspectionRecord')">
@@ -31,9 +32,9 @@
 		<!-- <view class="kongbai">
 
 		</view> -->
-		<view class="pending" >
-			<view class="pending_middle" >
-				<view class="all"  >
+		<view class="pending1">
+			<view class="pending_middle">
+				<view class="all">
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">实时巡检</span>
 					</view>
@@ -45,23 +46,25 @@
 
 					</view>
 				</view>
-				<view class="wait" >
-					<view  >
+				<view class="wait">
+					<view>
 						<view style="font-size: 26rpx;color: #697081;">今日待巡检</view>
-						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{inspectionInfoList.todayTotalNum}}</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
+							{{inspectionInfoList.todayTotalNum}}</view>
 					</view>
-					<view  >
+					<view>
 						<view style="font-size: 26rpx;color: #697081;">今日已巡检</view>
-						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{inspectionInfoList.todayNum}}</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
+							{{inspectionInfoList.todayNum}}</view>
 					</view>
 
 				</view>
 			</view>
 		</view>
 
-		<view class="pending"  v-if="$has('app:Tobeassigned')&&$has('app:Toberepaired')&&$has('app:hasrepaired')">
-			<view class="pending_middle" >
-				<view class="all"   v-if="$has('app:WorkorderTobeDone')">
+		<view class="pending" v-if="$has('app:Tobeassigned')&&$has('app:Toberepaired')&&$has('app:hasrepaired')">
+			<view class="pending_middle">
+				<view class="all" v-if="$has('app:WorkorderTobeDone')">
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">工单待办</span>
 					</view>
@@ -73,18 +76,21 @@
 
 					</view>
 				</view>
-				<view class="wait" >
-					<view  v-if="$has('app:Tobeassigned')">
+				<view class="wait">
+					<view v-if="$has('app:Tobeassigned')">
 						<view style="font-size: 26rpx;color: #697081;">待指派</view>
-						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{workList[1]}}</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
+							{{workList[1]}}</view>
 					</view>
-					<view  v-if="$has('app:Toberepaired')">
+					<view v-if="$has('app:Toberepaired')">
 						<view style="font-size: 26rpx;color: #697081;">待维修</view>
-						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{workList[2]}}</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
+							{{workList[2]}}</view>
 					</view>
-					<view  v-if="$has('app:hasrepaired')">
+					<view v-if="$has('app:hasrepaired')">
 						<view style="font-size: 26rpx;color: #697081;">已维修</view>
-						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{workList[3]}}</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
+							{{workList[3]}}</view>
 					</view>
 				</view>
 			</view>
@@ -97,7 +103,7 @@
 						<span style="font-size: 30rpx;font-weight: bold;">设备异常</span>
 					</view>
 					<view class="processing">
-						<view class="immediately"  @click="EquipmentException">
+						<view class="immediately" @click="EquipmentException">
 							<span style="font-size: 25rpx; color: #5c8fff; ">立即查看</span>
 							<u-icon name="arrow-right" color="#5c8fff" size="16rpx"></u-icon>
 						</view>
@@ -106,20 +112,24 @@
 				</view>
 				<view class="wait">
 					<view>
-						<view  style="font-size: 26rpx;color: #697081;">异常总数</view>
-						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.AirConditioner}}</view>
+						<view style="font-size: 26rpx;color: #697081;">异常总数</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
+							{{deviceArr.AirConditioner}}</view>
 					</view>
 					<view>
-						<view  style="font-size: 26rpx;color: #697081;">空调异常</view>
-						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.Ammeter}}</view>
+						<view style="font-size: 26rpx;color: #697081;">空调异常</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
+							{{deviceArr.Ammeter}}</view>
 					</view>
 					<view>
-						<view  style="font-size: 26rpx;color: #697081;">水表异常</view>
-						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.WaterMeter}}</view>
+						<view style="font-size: 26rpx;color: #697081;">水表异常</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
+							{{deviceArr.WaterMeter}}</view>
 					</view>
 					<view>
-						<view  style="font-size: 26rpx;color: #697081;">电表异常</view>
-						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.Relay}}</view>
+						<view style="font-size: 26rpx;color: #697081;">电表异常</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
+							{{deviceArr.Relay}}</view>
 					</view>
 				</view>
 			</view>
@@ -127,7 +137,7 @@
 		<!-- 管理员界面 -->
 		<view class="arrears" v-if="$has('app:ArrearstobeCollected')">
 			<view class="pending_middle">
-				<view class="all"  v-if="$has('app:ImmediateCollection')">
+				<view class="all" v-if="$has('app:ImmediateCollection')">
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">欠费待收</span>
 					</view>
@@ -154,10 +164,10 @@
 				</t-table>
 			</view>
 		</view>
-	<!-- 	租户界面 -->
-		<view class="arrears" v-if="$has('app:BillPending')">
+		<!-- 	租户界面 -->
+		<view class="arrears1" v-if="$has('app:BillPending')">
 			<view class="pending_middle">
-				<view class="all"  v-if="$has('app:ImmediatePayment')">
+				<view class="all" v-if="$has('app:ImmediatePayment')">
 					<view class="work">
 						<span style="font-size: 30rpx;font-weight: bold;">账单待缴</span>
 					</view>
@@ -207,8 +217,8 @@
 				tabbardata: 0,
 				workList: {}, //工单代办
 				deviceArr: {}, //设备异常数据
-getuserInfo:{},
-				inspectionInfoList:{},
+				getuserInfo: {},
+				inspectionInfoList: {},
 			}
 		},
 		onLoad() {
@@ -216,14 +226,21 @@ getuserInfo:{},
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
 
 		},
+		onPullDownRefresh() {
+			console.log('我下拉刷新页面了！！！！！！！！！！！！！！！', )
+			this.getalldata();
+
+		},
+
 		methods: {
 			getalldata() {
 				this.$api.get('/home/homedata', {})
 					.then(res => {
+						uni.stopPullDownRefresh() //刷新数据之后停止刷新效果
 						//console.log('111111111111111111', res.data.data)
 						this.workList = res.data.data.workOrder;
 						this.deviceArr = res.data.data.equip.maps;
-this.inspectionInfoList=res.data.data.inspectionInfo;
+						this.inspectionInfoList = res.data.data.inspectionInfo;
 
 						this.tableList = res.data.data.billPaymentList.map(item => {
 							let json = {};
@@ -239,17 +256,17 @@ this.inspectionInfoList=res.data.data.inspectionInfo;
 							json.tenant = item.arrearageNum;
 							json.arrears = item.arrearageAmount;
 
-								json.currentAmount = item.currentAmount;
-								json.cumulativeAmount = item.cumulativeAmount;
+							json.currentAmount = item.currentAmount;
+							json.cumulativeAmount = item.cumulativeAmount;
 							return json
 						})
 					})
 			},
-			BillPending(){
-				 // console.log('111111111111111111',this.getuserInfo)
-				  uni.navigateTo({
-				          url: '/pages/index/BillPending/BillPending?info=' + encodeURIComponent(JSON.stringify(this.getuserInfo))
-				      });
+			BillPending() {
+				// console.log('111111111111111111',this.getuserInfo)
+				uni.navigateTo({
+					url: '/pages/index/BillPending/BillPending?info=' + encodeURIComponent(JSON.stringify(this.getuserInfo))
+				});
 			},
 			Immediatecollection() {
 				uni.navigateTo({
@@ -261,7 +278,7 @@ this.inspectionInfoList=res.data.data.inspectionInfo;
 					url: '/pages/index/Workordertodone/Workordertodone'
 				})
 			},
-			EquipmentException(){
+			EquipmentException() {
 				uni.navigateTo({
 					url: '/pages/index/EquipmentException/EquipmentException'
 				})
@@ -271,7 +288,7 @@ this.inspectionInfoList=res.data.data.inspectionInfo;
 					url: '/pages/index/Onlinewarranty/Onlinewarranty'
 				})
 			},
-			Immediateinspection(){
+			Immediateinspection() {
 				uni.navigateTo({
 					url: '/pages/index/Immediateinspection/Immediateinspection'
 				})
@@ -319,10 +336,12 @@ this.inspectionInfoList=res.data.data.inspectionInfo;
 		justify-content: center;
 
 	}
-.kongbai{
-			height: 100rpx;
-			width: 750rpx;
-		}
+
+	.kongbai {
+		height: 100rpx;
+		width: 750rpx;
+	}
+
 	.Homepage_suspension {
 		width: 690rpx;
 		height: 200rpx;
@@ -343,15 +362,25 @@ this.inspectionInfoList=res.data.data.inspectionInfo;
 		justify-content: space-around;
 	}
 
+	.pending1 {
+		width: 750rpx;
+		height: 220rpx;
+		// background-color: #ccc;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		margin-top: 120rpx;
+	}
+
 	.pending {
 		width: 750rpx;
-		height: 350rpx;
+		height: 260rpx;
 		// background-color: #ccc;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		position: relative;
-		top: 50rpx;
 	}
 
 	.pending_middle {
@@ -411,6 +440,19 @@ this.inspectionInfoList=res.data.data.inspectionInfo;
 		top: 50rpx;
 	}
 
+	.arrears1 {
+		// width: 750rpx;
+		// height: 350rpx;
+		display: flex;
+		flex: 1;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		top: 80rpx;
+		margin-bottom: 30rpx;
+	}
+
+
 	.type {
 		display: flex;
 		align-items: center;

pages/login/login.vue

@@ -52,8 +52,8 @@
 		data() {
 			return {
 				isShowPassword: false,
-				account: '',
-				password: '',
+				account: 'admin',
+				password: 'cx868688',
 				captcha: '',
 				uuid: '',
 				captchaPath: '',

pages/my/Myorder/Myorder.vue

@@ -0,0 +1,316 @@
+<template>
+	<view class="billall">
+
+		<view class="topbill">
+
+			<view class="topbilledit" @click="typechange">
+				<view class="changetime1">
+					{{mytype}}
+				</view>
+				<view class="changetime2">
+					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+				</view>
+			</view>
+		</view>
+
+		<view class="u-listdata">
+
+			<view style="padding:10rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+				<u-list-item v-for="(item, index) in indexList" :key="index">
+
+					<view class="companylist" @click="seedetail(item)">
+						<view class="outstanding" v-if='item.status==0'>
+							待支付
+						</view>
+						<view class="settled" v-if='item.status==1'>
+							已支付
+						</view>
+						<view class="guanbi" v-if="item.status=='-1'">
+							已关闭
+						</view>
+
+						<view class="Currentamount" style="margin-top: 20rpx;">
+							支付金额: <span>￥{{item.payAmount}}</span>
+						</view>
+						<view class="Currentamount">
+							支付时间: {{item.payAt}}
+						</view>
+						<view class="Currentamount">
+							下单时间: {{item.createDate}}
+						</view>
+						<!-- <view class="Currentamount">
+							交易类型: {{item.tradeType}}
+						</view> -->
+						<view class="Currentamount">
+							交易类型: 微信支付
+						</view>
+					</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
+
+
+
+
+		<u-picker :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
+		</u-picker>
+
+
+
+
+
+	</view>
+</template>
+
+<script>
+	//import { isEmpty, getDictDataList } from "@/utils/index";
+	export default {
+		components: {
+
+		},
+		data() {
+
+			return {
+				totalnumber: 0,
+				setyesno: true,
+				indexList: [],
+				dataList: [],
+				dataForm: {
+					order: "",
+					orderField: "",
+					status: "",
+					page: 1,
+					limit: 10,
+				},
+				pd: true,
+				showtype: false,
+				showdct: false,
+				mytitle: '',
+				alldata: [],
+				showfloor: false,
+				loading: false,
+				columns: [],
+				columnData: [],
+				myday: '',
+				mytype: '全部',
+				showPicker: false,
+				//myday: currentDate,
+				columnstype: [
+					[{
+							label: '全部',
+							id: ''
+
+						}, {
+							label: '已关闭',
+							id: '-1'
+						},
+						{
+							label: '待支付',
+							id: '0'
+						},
+						{
+							label: '已支付',
+							id: '1'
+						},
+					]
+				],
+
+
+
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+		onLoad() {
+
+			this.getalldata();
+			//	this.loadmore();
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {
+			// 微信小程序需要用此写法
+
+		},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+			seedetail(e) {
+				uni.navigateTo({
+					url: `/pages/my/Myorder/Orderdetails/Orderdetails?companyOrgId=${e.id}`
+				});
+			},
+
+			scrolltolower() {
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
+
+			getalldata() {
+				this.$api.get('/order/page', this.dataForm)
+					.then(res => {
+						console.log('111111111111111111', res.data.data)
+
+						this.totalnumber = res.data.data.total;
+						if (res.data.data.list.length != 0) {
+							this.indexList.push(...res.data.data.list);
+							this.dataForm.page = this.dataForm.page + 1;
+							this.pd = true;
+						} else {
+							uni.showToast({
+								title: '暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd = false;
+						}
+					})
+			},
+
+			canceltype() {
+				this.showtype = false;
+			},
+			confirmtype(e) {
+				console.log('111111111111111111', e.value[0])
+				this.showtype = false;
+				this.mytype = e.value[0].label;
+				this.dataForm.status = e.value[0].id;
+				this.indexList = [];
+				this.dataForm.page = 1;
+				this.getalldata();
+			},
+			typechange() {
+				this.showtype = true;
+			},
+
+
+
+
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.Currentamount {
+		padding-left: 30rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		color: #BCB3A7;
+
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+
+	.Callfee {
+		width: 100rpx;
+		height: 45rpx;
+		text-align: center;
+		line-height: 45rpx;
+		color: #5C8FFF;
+		border: 1px solid #5C8FFF;
+		font-size: 22rpx;
+		position: absolute;
+		bottom: 10rpx;
+		right: 10px;
+		font-weight: bold;
+	}
+
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		height: 230rpx;
+		border-radius: 10px;
+		position: relative;
+
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.settled {
+		background-color: #09C700;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+	.outstanding {
+		background-color: #30D3A2;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+	.guanbi {
+		background-color: red;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+
+	.billall {}
+
+	.topbill {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100rpx;
+		background-color: #e6e6e6;
+	}
+
+	.topbilledit {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+
+	.changetime1 {
+		padding-right: 10rpx;
+	}
+</style>

pages/my/Myorder/Orderdetails/Orderdetails.vue

@@ -0,0 +1,448 @@
+<template>
+	<view class="billall">
+
+		<view class="u-listdata">
+
+			<view class="Orderstatus">
+				<view class="Orderstatus1">
+					订单状态：{{alldata.status}}
+				</view>
+				<view class="Orderstatus1">
+					支付金额：{{alldata.payAmount}}
+				</view>
+				<view class="Orderstatus1">
+					支付时间：{{alldata.payAt}}
+				</view>
+
+
+			</view>
+
+			<u-list :pagingEnabled='true'>
+				<u-list-item v-for="(item, index) in indexList" :key="index">
+
+					<view class="companylist">
+						<view class="outstanding" v-if='item.status==2'>
+							未支付
+						</view>
+						<view class="settled" v-if='item.status==1'>
+							已支付
+						</view>
+						<view class="guanbi" v-if="item.status=='3'">
+							支付失败
+						</view>
+
+						<view class="Currentamount" style="margin-top: 20rpx;">
+							金额: <span>￥{{item.amount}}</span>
+						</view>
+						<view class="Currentamount">
+							账单类型: {{item.billType}}
+						</view>
+						<view class="Currentamount">
+							计费周期: {{item.costCycle}}
+						</view>
+						<view class="Currentamount">
+							创建时间: {{item.createDate}}
+						</view>
+						
+
+					</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
+
+		<view class="dibu" v-show="dibucaidan">
+			<!-- <view class="yucun">
+		<u-button type="success" text="预存" @click="prestore('预存')"></u-button>
+	</view>
+	<view class="yucun">
+		<u-button type="primary" text="补助" @click="prestore('补助')"></u-button>
+	</view> -->
+			<view class="yucun">
+				<u-button type="error" text="退费" @click="prestore('退费')"></u-button>
+			</view>
+		</view>
+
+		<!-- 	<u-modal :show="showtype" @cancel='showtype=false' @confirm="confirmtf" :showCancelButton=true title="提示"
+			content='请确定是否退费？'></u-modal> -->
+		<u-popup :show="showpayjine" @close="closepay1" @open="openpay1" mode="bottom" :round="10" :closeable='true' :closeOnClickOverlay='false'>
+			<view class="paytall1">
+				<!-- <text>请选择支付方式</text> -->
+				<view class="hejitop">
+					退费
+				</view>
+				<view class="zhifufs">
+			 	<u--form labelWidth="130" labelPosition="left" :model="model1"  ref="uForm">
+						<u-form-item label="退费金额:" prop="userInfo.amount" borderBottom ref="item1">
+							<u--input v-model="model1.userInfo.amount" border="none"></u--input>
+						</u-form-item>
+						<u-form-item label="退费原因:" prop="userInfo.refundReason" borderBottom ref="item1">
+							<u--input v-model="model1.userInfo.refundReason" border="none"></u--input>
+						</u-form-item>
+					</u--form>
+				</view>
+				<view class="dcc">
+					<view class="">
+						<u-button type="primary" :plain="true" text="取消" @click="closepay1"></u-button>
+					</view>
+					<view class="">
+						<u-button type="primary" text="确定" @click="confirmtf"></u-button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+
+
+
+		<u-notify ref="uNotify" message=""></u-notify>
+	</view>
+</template>
+
+<script>
+	//import { isEmpty, getDictDataList } from "@/utils/index";
+	export default {
+		components: {
+
+		},
+		
+		data() {
+
+			return {
+				zhifucanvas: false,
+				dibucaidan: true,
+				prestorename: '',
+				totalnumber: 0,
+				setyesno: true,
+				indexList: [],
+				dataList: [],
+				showtype: false,
+				showdct: false,
+				myid: '',
+				alldata: {},
+				showfloor: false,
+				loading: false,
+				columns: [],
+				columnData: [],
+				myday: '',
+				mytype: '全部',
+				showPicker: false,
+				//myday: currentDate,
+				showpayjine: false,
+				model1: {
+					userInfo: {
+						amount: '',
+						refundReason:'',
+					},
+				},
+				billstype:[],
+				// rules: {
+				// 	'userInfo.amount': {
+				// 		type: 'string',
+				// 		required: true,
+				// 		message: '请填写退费金额',
+				// 		trigger: [ '']
+				// 	},
+				// 	'userInfo.refundReason': {
+				// 		type: 'string',
+				// 		required: true,
+				// 		message: '请填写退费原因',
+				// 		trigger: ['blur', 'change']
+				// 	},
+				// },
+
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+		onLoad(options) {
+		//	console.log(options.companyOrgId);
+			this.myid = options.companyOrgId;
+			this.getalldata(this.myid)
+			
+			let getDictDataList = uni.getStorageSync('getDictDataList');
+		//	console.log('111111111111111111', getDictDataList)
+			for (let i = 0; i < getDictDataList.length; i++) {
+			    if (getDictDataList[i].dictType == 'PayType') {
+			        this.billstype = getDictDataList[i].dataList
+			    }  
+			}
+			
+			
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {
+			// 微信小程序需要用此写法
+
+		},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+			prestore() {
+				this.showpayjine = true;
+			},
+
+			confirmtf() {
+				 
+				if(this.model1.userInfo.amount==''){
+					this.$refs.uNotify.error('退款金额不能为空')	
+				}else if(this.model1.userInfo.refundReason==''){
+					this.$refs.uNotify.error('退款原因不能为空')	
+				}else{
+					 if(this.model1.userInfo.amount>this.alldata.payAmount){
+					 	this.$refs.uNotify.error('您输入的退款金额不能大于支付金额')	
+					 }else{
+					 	
+					 	let postdata = {
+					 		amount: this.model1.userInfo.amount,
+					 		id: '',
+					 		orderId:this.alldata.id,
+					 		refundReason: this.model1.userInfo.refundReason
+					 	}
+					 	
+					 	this.$api.post('/refundinfo', postdata)
+					 		.then(res => {
+					 			if (res.data.code == 0) {
+					 				this.$refs.uNotify.success('退费成功')
+					 			} else {
+					 				this.$refs.uNotify.error(res.data.msg)
+					 			}
+					 	 this.showpayjine = false;
+					 		})
+					 }	
+				}																			
+			},
+
+
+			getalldata(e) {
+this.indexList=[];
+				this.$api.get('/order/' + e, {})
+					.then(res => {
+					//	console.log('111111111111111111', res.data.data)
+						if (res.data.data.status == '-1') {
+							res.data.data.status = '已关闭'
+						} else if (res.data.data.status == '0') {
+							res.data.data.status = '待支付'
+						} else if (res.data.data.status == '1') {
+							res.data.data.status = '已支付'
+						}
+
+						this.alldata = res.data.data;
+						
+						this.model1.userInfo.amount=this.alldata.payAmount;
+						//this.$refs.uForm.validateField('userInfo.amount')
+						//this.indexList = res.data.data.billLists;
+						
+						if(res.data.data.billLists.length==0){
+							this.indexList=[];
+						}else{
+							function transform(a, b) {
+							    loop: for (let i = 0; i < a.length; i++) {
+							        for (let j = 0; j < b.length; j++) {
+							            if (a[i].billType == b[j].dictValue) {
+							                a[i].billType = b[j].dictLabel;
+							                continue loop;
+							            }
+							        }
+							        a[i].billType =  a[i].billType;
+							    }
+							    return a;
+							}							
+							this.indexList=transform(res.data.data.billLists, this.billstype)											
+						}
+						//  console.log('111111111111111111',this.indexList)																			
+					})
+			},
+
+			closepay1() {
+				 this.showpayjine = false;
+			},
+			openpay1() {
+				console.log('open');
+			},
+
+
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.Currentamount {
+		padding-left: 30rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		color: #BCB3A7;
+
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+
+	.hejitop {
+		width: 750rpx;
+		text-align: center;
+		font-weight: bold;
+		font-size: 40rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.zhifufs {
+		width: 750rpx;
+		height: 250rpx;
+	}
+
+	.paytall1 {
+		width: 750rpx;
+		height: 450rpx;
+		background-color: #fff;
+	}
+
+	.dcc {
+		margin: 0 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+
+		view {
+			width: 200rpx;
+		}
+	}
+
+	.tuifeiyy {
+		height: 400rpx;
+		background-color: #fff;
+		width: 750rpx;
+	}
+
+	.Orderstatus {
+		padding: 30rpx;
+	}
+
+	.Orderstatus1 {
+		height: 50rpx;
+		line-height: 50rpx;
+	}
+
+	.Callfee {
+		width: 100rpx;
+		height: 45rpx;
+		text-align: center;
+		line-height: 45rpx;
+		color: #5C8FFF;
+		border: 1px solid #5C8FFF;
+		font-size: 22rpx;
+		position: absolute;
+		bottom: 10rpx;
+		right: 10px;
+		font-weight: bold;
+	}
+
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		height: 230rpx;
+		border-radius: 10px;
+		position: relative;
+
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.settled {
+		background-color: #09C700;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+	.outstanding {
+		background-color: #30D3A2;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+	.guanbi {
+		background-color: red;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+
+	.dibu {
+		position: fixed;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		width: 750rpx;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		background-color: #fff;
+	}
+
+	.yucun {
+		width: 200rpx;
+
+	}
+
+	.billall {}
+
+	.topbill {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100rpx;
+		background-color: #e6e6e6;
+	}
+
+	.topbilledit {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+
+	.changetime1 {
+		padding-right: 10rpx;
+	}
+</style>

pages/my/Personalinformation/Informationmodification/Informationmodification.vue

@@ -9,32 +9,32 @@
 						:rules="rules"
 						ref="form1">
 					<u-form-item
-					labelWidth="120"				
+					labelWidth="120"
 							label="用户名:"
-							prop="userInfo.name"
+							prop="userInfo.realName"
 							borderBottom
 							ref="item1"				>
 						<u--input
-								v-model="model1.userInfo.name"
+								v-model="model1.userInfo.realName"
 								clearable
 								border="none"
 						></u--input>
 					</u-form-item>
 					<u-form-item
-					labelWidth="120"				
+					labelWidth="120"
 							label="手机:"
-							prop="userInfo.phone"
+							prop="userInfo.mobile"
 							borderBottom
 							ref="item1"
 					>
 						<u--input
-								v-model="model1.userInfo.phone"
+								v-model="model1.userInfo.mobile"
 								clearable
 								border="none"
 						></u--input>
 					</u-form-item>
 					<u-form-item
-					labelWidth="120"				
+					labelWidth="120"
 							label="邮箱:"
 							prop="userInfo.email"
 							borderBottom
@@ -45,17 +45,17 @@
 								clearable
 								border="none"
 						></u--input>
-					</u-form-item>										
+					</u-form-item>
 					<u-form-item
 							label="性别:"
-								labelWidth="120"		
-							prop="userInfo.sex"
+								labelWidth="120"
+							prop="userInfo.gender"
 							borderBottom
-							@click="showSex = true; hideKeyboard()"
+							@click="showSex = true"
 							ref="item1"
 					>
 						<u--input
-								v-model="model1.userInfo.sex"
+								v-model="model1.userInfo.gender"
 								disabled
 								disabledColor="#ffffff"
 								placeholder="请选择性别"
@@ -66,60 +66,60 @@
 								name="arrow-right"
 						></u-icon>
 					</u-form-item>
+					<!--<u-form-item-->
+					<!--labelWidth="120"-->
+							<!--label="地址:"-->
+							<!--prop="userInfo.address"-->
+							<!--borderBottom-->
+							<!--ref="item1"				>-->
+						<!--<u&#45;&#45;input-->
+								<!--v-model="model1.userInfo.address"-->
+								<!--clearable-->
+								<!--border="none"-->
+						<!--&gt;</u&#45;&#45;input>-->
+					<!--</u-form-item>-->
 					<u-form-item
-					labelWidth="120"				
-							label="地址:"
-							prop="userInfo.address"
-							borderBottom
-							ref="item1"				>
-						<u--input
-								v-model="model1.userInfo.address"
-								clearable
-								border="none"
-						></u--input>
-					</u-form-item>
-					<u-form-item
-					labelWidth="120"				
+					labelWidth="120"
 							label="部门:"
-							prop="userInfo.department"
+							prop="userInfo.deptName"
 							borderBottom
 							ref="item1"				>
 						<u--input
-								v-model="model1.userInfo.department"
+								v-model="model1.userInfo.deptName"
 								clearable
 								border="none"
 						></u--input>
 					</u-form-item>
-					<u-form-item
-					labelWidth="120"				
-							label="职位:"
-							prop="userInfo.position"
-							borderBottom
-							ref="item1"				>
-						<u--input
-								v-model="model1.userInfo.position"
-								clearable
-								border="none"
-						></u--input>
-					</u-form-item>
-					
+					<!--<u-form-item-->
+					<!--labelWidth="120"-->
+							<!--label="职位:"-->
+							<!--prop="userInfo.position"-->
+							<!--borderBottom-->
+							<!--ref="item1"				>-->
+						<!--<u&#45;&#45;input-->
+								<!--v-model="model1.userInfo.position"-->
+								<!--clearable-->
+								<!--border="none"-->
+						<!--&gt;</u&#45;&#45;input>-->
+					<!--</u-form-item>-->
+
 				</u--form>
-				
-				
-				
-				<u-action-sheet
-						:show="showSex"
-						:actions="actions"
-						title="请选择性别"
-						@close="showSex = false"
-						@select="sexSelect"
-				>
-				</u-action-sheet>
-				
+				<!--<u-action-sheet-->
+						<!--:show="showSex"-->
+						<!--:actions="actions"-->
+						<!--title="请选择性别"-->
+						<!--@close="showSex = false"-->
+						<!--@select="sexSelect"-->
+				<!--&gt;-->
+				<!--</u-action-sheet>-->
+
 				<view class="submitdata">
 					<u-button  type="primary" @click="submit">提交</u-button>
 				</view>
-			</view>	
+			</view>
+		<u-notify ref="uNotify" message="" ></u-notify>
+
+		<u-picker :show="showSex" @cancel="showSex = false"  @confirm="sexSelect" :columns="actions" keyName="name"></u-picker>
 	</view>
 </template>
 
@@ -127,29 +127,33 @@
 	export default {
 		data() {
 			return {
-				
+				getuserInfo:{},
 				showSex: false,
 				model1: {
 					userInfo: {
-						name: '李伟',
-						sex: '男',
-						phone:'18326607835',
-						email:'328319643@qq.com',
-						address:'安徽省合肥市',
-						department:'合肥传秀科技技术部',
-						position:'前端工程师'
+						realName: '',
+						gender: '',
+						mobile:'',
+						email:'',
+					//	address:'安徽省合肥市',
+						deptName:'',
+					//	position:'前端工程师'
 					},
 				},
 				actions: [
-					{
-					name: '男',
-					},
-					{
-						name: '女',
-					},
-					{
-						name: '保密',
-					},
+					[
+						{
+							id:0,
+							name: '男',
+						},
+						{
+							id:1,
+							name: '女',
+						},
+						{id:2,
+							name: '保密',
+						},
+					]
 				],
 				rules: {
 					'userInfo.name': {
@@ -160,7 +164,7 @@
 					},
 				'userInfo.email': [
 							{
-								required: true, 
+								required: true,
 								message: '请输入邮箱号',
 								trigger: ['change','blur'],
 							},
@@ -176,9 +180,9 @@
 								trigger: ['change','blur'],
 							}
 						],
-						'userInfo.phone': [
+						'userInfo.mobile': [
 									{
-										required: true, 
+										required: true,
 										message: '请输入邮箱',
 										trigger: ['change','blur'],
 									},
@@ -194,9 +198,9 @@
 										trigger: ['change','blur'],
 									}
 								],
-						
-						
-					'userInfo.sex': {
+
+
+					'userInfo.gender': {
 						type: 'string',
 						max: 2,
 						required: true,
@@ -204,22 +208,59 @@
 						trigger: ['blur', 'change']
 					},
 				},
-				
+
 			};
 		},
+		onLoad(options){
+		let userInfo= uni.getStorageSync('getuserInfo');
+			if(userInfo.gender==0){
+				userInfo.gender='男'
+			}else if(userInfo.gender==1){
+				userInfo.gender='女'
+			}else if(userInfo.gender==2){
+				userInfo.gender='保密'
+			}
+		//	console.log('111111111111111111',userInfo)
+			this.model1.userInfo=userInfo;
+			//this.getuserInfo
+
+		},
 		methods: {
+
 			sexSelect(e) {
-				this.model1.userInfo.sex = e.name
-				this.$refs.form1.validateField('userInfo.sex')
+				//console.log('111111111111111111',e)
+				this.model1.userInfo.gender = e.value[0].name;
+				this.$refs.form1.validateField('userInfo.gender')
+				this.showSex=false;
 			},
 			submit() {
 						this.$refs.form1.validate().then(res => {
-							uni.$u.toast('校验通过')
+
+							if(this.model1.userInfo.gender=='男'){
+								this.model1.userInfo.gender=0
+							}else if(this.model1.userInfo.gender=='女'){
+								this.model1.userInfo.gender=1
+							}else if(this.model1.userInfo.gender=='保密'){
+								this.model1.userInfo.gender=2
+							}
+							this.$api.put('/user/',this.model1.userInfo)
+									.then(res=>{
+										console.log('111111111111111111',res)
+										if(res.data.code==0){
+											uni.navigateBack({
+												delta: 1
+											});
+										}else{
+											this.$refs.uNotify.error(res.data.msg)
+										}
+									})
+
+
 						}).catch(errors => {
 							uni.$u.toast('校验失败')
 						})
 					},
-			
+
 		},
 		onReady() {
 			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
@@ -231,7 +272,7 @@
 <style lang="scss">
 .Personalinformationedit{
 	padding: 30rpx;
-	
+
 }
 .submitdata{
 	margin-top: 40rpx;

pages/my/Personalinformation/Personalinformation.vue

@@ -5,46 +5,46 @@
 			<u-cell
 			    size="large"
 			    title="用户名"
-			    value="李伟"
+			    :value="getuserInfo.realName"
 			></u-cell>
 			<u-cell
 			    size="large"
 			    title="手机"
-			    value="18326607835"
+				:value="getuserInfo.mobile"
 			></u-cell>
 			<u-cell
 			    size="large"
 			    title="邮箱"
-			    value="328319643@qq.com"
+				:value="getuserInfo.email"
 			></u-cell>
 			<u-cell
 			    size="large"
 			    title="性别"
-			    value="男"
-			></u-cell>
-			<u-cell
-			    size="large"
-			    title="地址"
-			    value="安徽省合肥市"
+				:value="getuserInfo.gender==0?'男':'女'"
 			></u-cell>
+			<!--<u-cell-->
+			    <!--size="large"-->
+			    <!--title="地址"-->
+			    <!--value="安徽省合肥市"-->
+			<!--&gt;</u-cell>-->
 			<u-cell
 			    size="large"
 			    title="部门"
 			    value="合肥传秀科技技术部"
 			></u-cell>
-			<u-cell
-			    size="large"
-			    title="职位"
-			    value="前端工程师"
-			></u-cell>
-			
+			<!--<u-cell-->
+			    <!--size="large"-->
+			    <!--title="职位"-->
+			    <!--value="前端工程师"-->
+			<!--&gt;</u-cell>-->
+
 		<u-cell
 		    size="large"
 		    title="个人信息"
 		    value="修改"
 		    isLink
 			@click="editdata"
-		></u-cell>	
+		></u-cell>
 		</u-cell-group>
 	</view>
 		</view>
@@ -54,20 +54,34 @@
 	export default {
 		data() {
 			return {
-				
-			};				
+				getuserInfo:{},
+
+			};
+		},
+		onLoad() {
+			this.getuserInfo = uni.getStorageSync('getuserInfo');
+		//	console.log('111111111111111111', this.getuserInfo)
+		//	this.getappuserdata();
 		},
 		methods: {
+			// getappuserdata(){
+			// 	this.$api.get('/user/'+this.getuserInfo.id,{})
+			// 			.then(res=>{
+			// 				console.log('111111111111111111',res)
+			//
+			// 			})
+			// },
+
 			editdata(){
 				uni.navigateTo({
-					url: 'Informationmodification/Informationmodification'
-				})	
+					url: '/pages/my/Personalinformation/Informationmodification/Informationmodification'
+				})
 			},
-			
-				
+
+
 				}
-		
-		
+
+
 	}
 </script>
 

pages/my/my.vue

@@ -4,12 +4,12 @@
 			<view class="touxiang">
 				<u-upload :fileList="fileList" @afterRead="afterRead" name="6" :multiple='false' :maxCount="1"
 					imageMode="true" width="150" height="150">
-					<image :src="src" mode="widthFix" shape="circle" 
+					<image :src="src" mode="widthFix" shape="circle"
 					style="width: 150rpx;height: 150rpx;"></image>
 				</u-upload>
 			</view>
 			<view class="Username">
-				<view class="Username1">李伟 <span>您好</span>   </view>
+				<view class="Username1">{{getuserInfo.realName}} <span>您好</span>   </view>
 				<view class="Username2">
 					<view class="">
 						您上次登录时间：
@@ -19,7 +19,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="changemm">
 				<view class="message">
 					<view class="wdmessage">已读信息:</view>
@@ -48,7 +48,7 @@
 					<text class="grid-text" style="padding-top: 8px;">{{listItem.title}}</text>
 				</u-grid-item>
 			</u-grid> -->
-			<view class="information">
+			<view class="information" @click="navigations1">
 				<view class="icon1">
 					<u-icon name="account" size="55" color="#30D3A2" class=""></u-icon>
 				</view>
@@ -56,21 +56,21 @@
 					个人信息
 				</view>
 			</view>
-			<view class="distribute">
+			<view class="distribute"  @click="navigations2">
 				<view class="icon2">
 					<u-icon name="list" size="55" color="#09C700"></u-icon>
 				</view>
 				<view  style="padding-top: 8px;">
-					我的派发
+					我的订单
 				</view>
 			</view>
-			<view class="task">
+			<view class="task"  @click="navigations3">
 				<view class="icon3">
 					<u-icon name="order" size="55" color="#FF9C27"></u-icon>
 				</view>
 				<view  style="padding-top: 8px;">我的任务</view>
 			</view>
-			<view class="opinions">
+			<view class="opinions"  @click="navigations4">
 				<view class="icon4">
 					<u-icon name="more-circle" size="55" color="#F7B717"></u-icon>
 				</view>
@@ -80,7 +80,7 @@
 		<!-- 导航栏结束 -->
 		<view class="middleimgs">
 			<!-- <img src="@/static/my/xinxi.png" alt=""> -->
-			<u--image  mode="widthFix"  :src="srcxinxi" width="750rpx" height="200rpx"></u--image>
+			<u--image  mode="widthFix"  :src="srcxinxi" width="750rpx" height="300rpx"></u--image>
 		</view>
 		<!-- 中间图片结束 -->
 		<view class="appcell">
@@ -113,37 +113,19 @@
 				showtc: false,
 				src: require('@/static/my/tx.png'),
 				srcxinxi: require('@/static/my/xinxi.png'),
-				
+
 				information1: 34,
 				information2: 100,
-				list: [{
-						name: 'account',
-						title: '个人信息',
-						color: "#30D3A2"
-					},
-					{
-						name: 'list',
-						title: '我的派发',
-						color: "#09C700"
-					},
-					{
-						name: 'order',
-						title: '我的任务',
-						color: "#FF9C27"
-					},
-					{
-						name: 'more-circle',
-						title: '意见建议',
-						color: "#F7B717"
-					},
-
-				],
-
+				getuserInfo:{},
+			
 
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
-		onLoad() {},
+		onLoad() {
+			this.getuserInfo = uni.getStorageSync('getuserInfo');
+			//console.log('111111111111111111', this.getuserInfo)
+		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {},
 
@@ -199,33 +181,35 @@
 					});
 				})
 			},
-			navigations(e) {
-				if (e == 0) {
-					uni.navigateTo({
-						url: 'Personalinformation/Personalinformation'
-					})
-				} else if (e == 1) {
-					uni.navigateTo({
-						url: 'Mydistribution/Mydistribution'
-					})
-				} else if (e == 2) {
-					uni.navigateTo({
-						url: 'Mytask/Mytask'
-					})
-				} else if (e == 3) {
-					uni.navigateTo({
-						url: 'Commentssuggestions/Commentssuggestions'
-					})
-				}
-
+			navigations1(){
+				uni.navigateTo({
+					url: '/pages/my/Personalinformation/Personalinformation'
+				})
+			},
+			navigations2(){
+				// uni.navigateTo({
+				// 	url: '/pages/my/Mydistribution/Mydistribution'
+				// })
+				uni.navigateTo({
+					url: '/pages/my/Myorder/Myorder'
+				})			
+			},
+			navigations3(){
+				uni.navigateTo({
+					url: '/pages/my/Mytask/Mytask'
+				})
+			},
+			navigations4(){
+				uni.navigateTo({
+					url: '/pages/my/Commentssuggestions/Commentssuggestions'
+				})
 			},
-			
 			changepass(){
 				uni.navigateTo({
-					url: 'Changepassword/Changepassword'
+					url: '/pages/my/Changepassword/Changepassword'
 				})
 			},
-			
+
 			tuichu() {
 				this.showtc = true;
 			},
@@ -234,11 +218,11 @@
 				switch (uni.getSystemInfoSync().platform) {
 					case 'android':
 						plus.runtime.quit();
-												
+
 						break;
 					case 'ios':
 						plus.ios.import('UIApplication').sharedApplication().performSelector('exit');
-						
+
 						break;
 				}
 			},
@@ -283,7 +267,7 @@
 	}
 	.middleimgs {
 		width: 750rpx;
-		height: 200rpx;
+		height: 300rpx;
 	}
 
 	.mainview {
@@ -326,7 +310,7 @@
 		display: flex;
 	justify-content:center;
 		flex-direction: column;
-		
+
 	}
 .Username1{
 	line-height: 100rpx;