kulley 7 jaren geleden
bovenliggende
commit
d17daab87d
47 gewijzigde bestanden met toevoegingen van 719 en 1236 verwijderingen
  1. 3 0
      .gitignore
  2. 0 12
      .idea/appointment-mp.iml
  3. 0 4
      .idea/deployment.xml
  4. 0 3
      .idea/dictionaries/kulley.xml
  5. 0 44
      .idea/inspectionProfiles/Project_Default.xml
  6. 0 78
      .idea/markdown-navigator.xml
  7. 0 3
      .idea/markdown-navigator/profiles_settings.xml
  8. 0 6
      .idea/misc.xml
  9. 0 8
      .idea/modules.xml
  10. 0 717
      .idea/workspace.xml
  11. 37 36
      app.json
  12. 58 45
      dist/dialog/dialog.js
  13. 0 11
      package-lock.json
  14. 24 1
      pages/home/contact/contact.js
  15. 6 5
      pages/home/contact/contact.json
  16. 2 2
      pages/home/contact/contact.wxml
  17. 52 8
      pages/home/showMy/showMy.js
  18. 4 3
      pages/home/showMy/showMy.json
  19. 37 38
      pages/home/showMy/showMy.wxml
  20. 21 7
      pages/manage/allOrders/selectedOrders/selectedOrders.js
  21. 1 1
      pages/manage/allOrders/selectedOrders/selectedOrders.wxml
  22. 6 6
      pages/manage/manage.json
  23. 6 3
      pages/manage/release/release.js
  24. 1 1
      pages/manage/release/release.json
  25. 17 17
      pages/manage/release/release.wxml
  26. 27 10
      pages/manage/release/serverAdd/serverAdd.js
  27. 3 3
      pages/manage/release/serverAdd/serverAdd.wxml
  28. 0 23
      pages/manage/release/serviceRelease/serviceRelease.js
  29. 0 4
      pages/manage/release/serviceRelease/serviceRelease.json
  30. 0 2
      pages/manage/release/serviceRelease/serviceRelease.wxml
  31. 0 1
      pages/manage/release/serviceRelease/serviceRelease.wxss
  32. 126 0
      pages/manage/release/serviceShow/serviceRelease/serviceRelease.js
  33. 10 0
      pages/manage/release/serviceShow/serviceRelease/serviceRelease.json
  34. 61 0
      pages/manage/release/serviceShow/serviceRelease/serviceRelease.wxml
  35. 18 0
      pages/manage/release/serviceShow/serviceRelease/serviceRelease.wxss
  36. 48 0
      pages/manage/release/serviceShow/serviceShow.js
  37. 8 0
      pages/manage/release/serviceShow/serviceShow.json
  38. 26 0
      pages/manage/release/serviceShow/serviceShow.wxml
  39. 7 0
      pages/manage/release/serviceShow/serviceShow.wxss
  40. 15 51
      pages/message/message.js
  41. 9 48
      pages/service/service.js
  42. 3 4
      pages/service/service.wxml
  43. 25 0
      pages/vant/vant.js
  44. 6 0
      pages/vant/vant.json
  45. 7 0
      pages/vant/vant.wxml
  46. 1 0
      pages/vant/vant.wxss
  47. 44 31
      utils/util.js

+ 3 - 0
.gitignore

@@ -12,3 +12,6 @@ $RECYCLE.BIN/
 
 # Node.js
 node_modules/
+
+.idea
+package-lock.json

+ 0 - 12
.idea/appointment-mp.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

+ 0 - 4
.idea/deployment.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData" exclude=".svn;.cvs;.idea;.DS_Store;.git;.hg;node_modules" />
-</project>

+ 0 - 3
.idea/dictionaries/kulley.xml

@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="kulley" />
-</component>

+ 0 - 44
.idea/inspectionProfiles/Project_Default.xml

@@ -1,44 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="myValues">
-        <value>
-          <list size="9">
-            <item index="0" class="java.lang.String" itemvalue="wx:if" />
-            <item index="1" class="java.lang.String" itemvalue="bind:tap" />
-            <item index="2" class="java.lang.String" itemvalue="wx:else" />
-            <item index="3" class="java.lang.String" itemvalue="class" />
-            <item index="4" class="java.lang.String" itemvalue="bindtap" />
-            <item index="5" class="java.lang.String" itemvalue="open-type" />
-            <item index="6" class="java.lang.String" itemvalue="bindgetuserinfo" />
-            <item index="7" class="java.lang.String" itemvalue="src" />
-            <item index="8" class="java.lang.String" itemvalue="mode" />
-          </list>
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="myValues">
-        <value>
-          <list size="12">
-            <item index="0" class="java.lang.String" itemvalue="nobr" />
-            <item index="1" class="java.lang.String" itemvalue="noembed" />
-            <item index="2" class="java.lang.String" itemvalue="comment" />
-            <item index="3" class="java.lang.String" itemvalue="noscript" />
-            <item index="4" class="java.lang.String" itemvalue="embed" />
-            <item index="5" class="java.lang.String" itemvalue="script" />
-            <item index="6" class="java.lang.String" itemvalue="view" />
-            <item index="7" class="java.lang.String" itemvalue="button" />
-            <item index="8" class="java.lang.String" itemvalue="block" />
-            <item index="9" class="java.lang.String" itemvalue="text" />
-            <item index="10" class="java.lang.String" itemvalue="van-stepper" />
-            <item index="11" class="java.lang.String" itemvalue="van-cell" />
-          </list>
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

+ 0 - 78
.idea/markdown-navigator.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownProjectSettings" wasCopied="true">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="0" emojiImages="0">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="HTML_DEEP_PARSER" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="ADMONITION_EXT" value="false" />
-        <option name="ATTRIBUTES_EXT" value="false" />
-        <option name="COMMONMARK_LISTS" value="true" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="ENUMERATED_REFERENCES_EXT" value="false" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_LISTS" value="false" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="NO_TEXT_ATTRIBUTES" value="false" />
-        <option name="PARSE_HTML_ANCHOR_ID" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-      <cssUriHistory />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-</project>

+ 0 - 3
.idea/markdown-navigator/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="MarkdownNavigator.ProfileManager">
-  <settings default="" pdf-export="" />
-</component>

+ 0 - 6
.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

+ 0 - 8
.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/appointment-mp.iml" filepath="$PROJECT_DIR$/.idea/appointment-mp.iml" />
-    </modules>
-  </component>
-</project>

+ 0 - 717
.idea/workspace.xml

@@ -1,717 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="d21073ef-a197-4518-8589-ea67fe7efb11" name="Default Changelist" comment="" />
-    <ignored path="$PROJECT_DIR$/.tmp/" />
-    <ignored path="$PROJECT_DIR$/temp/" />
-    <ignored path="$PROJECT_DIR$/tmp/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-600201672">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="2" />
-          <entry key="project.open.time.14" value="1" />
-          <entry key="project.open.time.2" value="1" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.opened" value="3" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="js" value="54" />
-          <entry key="json" value="34" />
-          <entry key="wxml" value="31" />
-          <entry key="wxss" value="25" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="HTML" value="29" />
-          <entry key="JSON" value="34" />
-          <entry key="JavaScript" value="54" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Wxss" value="24" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="js" value="556" />
-          <entry key="json" value="235" />
-          <entry key="wxml" value="466" />
-          <entry key="wxss" value="79" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="HTML" value="466" />
-          <entry key="JSON" value="235" />
-          <entry key="JavaScript" value="556" />
-          <entry key="Wxss" value="79" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/manage/release/release.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="690">
-              <caret line="30" column="6" lean-forward="true" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
-              <folding>
-                <element signature="n#style#0;n#view#0;n#view#0;n#van-cell#0;n#van-cell-group#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.wxss">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="805">
-              <caret line="35" column="24" lean-forward="true" selection-start-line="35" selection-start-column="24" selection-end-line="35" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="138">
-              <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/home/contact/contact.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="5" selection-start-line="5" selection-end-line="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/home/contact/contact.wxss">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="299">
-              <caret line="13" selection-start-line="13" selection-end-line="20" selection-end-column="1" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="299">
-              <caret line="13" column="27" lean-forward="true" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/gql.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="578">
-              <caret line="176" column="25" lean-forward="true" selection-start-line="176" selection-start-column="25" selection-end-line="176" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/utils/util.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/message/message.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="23">
-              <caret line="40" selection-start-line="40" selection-end-line="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/message/message.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="667">
-              <caret line="29" column="18" lean-forward="true" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="18" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/pages/message/message.json" />
-        <option value="$PROJECT_DIR$/pages/index/index.js" />
-        <option value="$PROJECT_DIR$/utils/gql.js" />
-        <option value="$PROJECT_DIR$/pages/index/index.wxml" />
-        <option value="$PROJECT_DIR$/pages/manage/manage.wxss" />
-        <option value="$PROJECT_DIR$/pages/home/home.json" />
-        <option value="$PROJECT_DIR$/pages/server/server.json" />
-        <option value="$PROJECT_DIR$/pages/service/service.json" />
-        <option value="$PROJECT_DIR$/pages/service/service.wxml" />
-        <option value="$PROJECT_DIR$/dist/loading/index.wxss" />
-        <option value="$PROJECT_DIR$/pages/service/service.wxss" />
-        <option value="$PROJECT_DIR$/pages/service/service.js" />
-        <option value="$PROJECT_DIR$/app.js" />
-        <option value="$PROJECT_DIR$/pages/message/message.wxml" />
-        <option value="$PROJECT_DIR$/pages/home/home.wxml" />
-        <option value="$PROJECT_DIR$/pages/home/showMy/showMy.js" />
-        <option value="$PROJECT_DIR$/pages/manage/manage.json" />
-        <option value="$PROJECT_DIR$/pages/manage/manage.wxml" />
-        <option value="$PROJECT_DIR$/pages/message/message.js" />
-        <option value="$PROJECT_DIR$/pages/home/home.js" />
-        <option value="$PROJECT_DIR$/pages/manage/manage.js" />
-        <option value="$PROJECT_DIR$/pages/manage/allOrders/allOrders.json" />
-        <option value="$PROJECT_DIR$/pages/manage/allOrders/allOrders.wxml" />
-        <option value="$PROJECT_DIR$/config/gql.js" />
-        <option value="$PROJECT_DIR$/pages/manage/allOrders/allOrders.js" />
-        <option value="$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.wxml" />
-        <option value="$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.json" />
-        <option value="$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.wxss" />
-        <option value="$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.js" />
-        <option value="$PROJECT_DIR$/pages/server/server.js" />
-        <option value="$PROJECT_DIR$/pages/server/server.wxml" />
-        <option value="$PROJECT_DIR$/pages/manage/release/release.wxss" />
-        <option value="$PROJECT_DIR$/pages/manage/release/release.js" />
-        <option value="$PROJECT_DIR$/pages/manage/release/serviceRelease/serviceRelease.js" />
-        <option value="$PROJECT_DIR$/pages/manage/release/release.json" />
-        <option value="$PROJECT_DIR$/pages/manage/release/release.wxml" />
-        <option value="$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.js" />
-        <option value="$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.wxss" />
-        <option value="$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.json" />
-        <option value="$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.wxml" />
-        <option value="$PROJECT_DIR$/utils/util.js" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsFlowSettings">
-    <service-enabled>true</service-enabled>
-    <exe-path />
-    <annotation-enable>false</annotation-enable>
-    <other-services-enabled>true</other-services-enabled>
-  </component>
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="162" />
-    <option name="y" value="56" />
-    <option name="width" value="2237" />
-    <option name="height" value="1335" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>AngularJS</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="config" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="manage" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="manage" type="462c0819:PsiDirectoryNode" />
-              <item name="release" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="manage" type="462c0819:PsiDirectoryNode" />
-              <item name="release" type="462c0819:PsiDirectoryNode" />
-              <item name="serverAdd" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="message" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="server" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="appointment-mp" type="b2602c69:ProjectViewProjectNode" />
-              <item name="appointment-mp" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.JavaScript" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/config" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="d21073ef-a197-4518-8589-ea67fe7efb11" name="Default Changelist" comment="" />
-      <created>1546420580079</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1546420580079</updated>
-      <workItem from="1546420581702" duration="979000" />
-      <workItem from="1546422382377" duration="6794000" />
-      <workItem from="1546494083975" duration="17681000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25454000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="162" y="56" width="2237" height="1335" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24966079" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/dist/info/index.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/dist/common/component.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/dist/loading/index.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/service/service.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="25" selection-start-line="25" selection-end-line="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="851">
-          <caret line="37" column="1" selection-start-line="37" selection-start-column="1" selection-end-line="37" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="22" column="41" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/service/service.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="127">
-          <caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/home.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/home.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/message/message.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="3" lean-forward="true" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/manage.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/allOrders.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/manage.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/manage.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/allOrders.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="23" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/allOrders.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="644">
-          <caret line="28" column="33" lean-forward="true" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/home.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/allOrders.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="474">
-          <caret line="32" column="42" lean-forward="true" selection-start-line="32" selection-start-column="42" selection-end-line="32" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/showMy/showMy.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="1" selection-start-line="1" selection-end-line="11" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="3" column="33" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/allOrders/selectedOrders/selectedOrders.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="545">
-          <caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/server/server.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="26" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/server/server.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/server/server.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="22" column="2" selection-start-line="22" selection-start-column="2" selection-end-line="22" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/server/server.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="644">
-          <caret line="28" column="1" lean-forward="true" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/showMy/showMy.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="14" column="46" lean-forward="true" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/showMy/showMy.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="3" column="8" lean-forward="true" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/showMy/showMy.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="35" selection-start-line="35" selection-end-line="53" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/manage.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="16" column="3" lean-forward="true" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/release.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="30" column="21" lean-forward="true" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serviceRelease/serviceRelease.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serviceRelease/serviceRelease.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serviceRelease/serviceRelease.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serviceRelease/serviceRelease.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/release.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1053">
-          <caret line="52" column="35" lean-forward="true" selection-start-line="52" selection-start-column="35" selection-end-line="52" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/release.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="1" lean-forward="true" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="22" column="3" selection-start-line="22" selection-start-column="3" selection-end-line="22" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/contact/contact.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" selection-start-line="5" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/home/contact/contact.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" selection-start-line="13" selection-end-line="20" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/message/message.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="40" selection-start-line="40" selection-end-line="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/message/message.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="667">
-          <caret line="29" column="18" lean-forward="true" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/release.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="30" column="6" lean-forward="true" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
-          <folding>
-            <element signature="n#style#0;n#view#0;n#view#0;n#van-cell#0;n#van-cell-group#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="805">
-          <caret line="35" column="24" lean-forward="true" selection-start-line="35" selection-start-column="24" selection-end-line="35" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/manage/release/serverAdd/serverAdd.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="27" lean-forward="true" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/gql.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="578">
-          <caret line="176" column="25" lean-forward="true" selection-start-line="176" selection-start-column="25" selection-end-line="176" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/utils/util.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>

+ 37 - 36
app.json

@@ -1,38 +1,39 @@
 {
-  "pages": [
-    "pages/server/server",
-    "pages/home/home",
-    "pages/manage/manage",
-    "pages/service/service",
-    "pages/message/message"
-  ],
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "WeChat",
-    "navigationBarTextStyle": "black"
-  },
-  "tabBar": {
-    "selectedColor": "#353535",
-    "list": [
-      {
-        "pagePath": "pages/server/server",
-        "text": "预约",
-        "iconPath": "images/timeline.png",
-        "selectedIconPath": "images/timeline_s.png"
-      },
-      {
-        "pagePath": "pages/home/home",
-        "text": "我的",
-        "iconPath": "images/home.png",
-        "selectedIconPath": "images/home_s.png"
-      },
-      {
-        "pagePath": "pages/manage/manage",
-        "text": "管理",
-        "iconPath": "images/settings.png",
-        "selectedIconPath": "images/settings_s.png"
-      }
-    ]
-  }
+    "pages": [
+        "pages/server/server",
+        "pages/home/home",
+        "pages/manage/manage",
+        "pages/service/service",
+        "pages/message/message",
+        "pages/vant/vant"
+    ],
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "WeChat",
+        "navigationBarTextStyle": "black"
+    },
+    "tabBar": {
+        "selectedColor": "#353535",
+        "list": [
+            {
+                "pagePath": "pages/server/server",
+                "text": "预约",
+                "iconPath": "images/timeline.png",
+                "selectedIconPath": "images/timeline_s.png"
+            },
+            {
+                "pagePath": "pages/home/home",
+                "text": "我的",
+                "iconPath": "images/home.png",
+                "selectedIconPath": "images/home_s.png"
+            },
+            {
+                "pagePath": "pages/manage/manage",
+                "text": "管理",
+                "iconPath": "images/settings.png",
+                "selectedIconPath": "images/settings_s.png"
+            }
+        ]
+    }
 }

+ 58 - 45
dist/dialog/dialog.js

@@ -1,75 +1,88 @@
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() {
+    _extends = Object.assign || function (target) {
+        for (var i = 1; i < arguments.length; i++) {
+            var source = arguments[i];
+            for (var key in source) {
+                if (Object.prototype.hasOwnProperty.call(source, key)) {
+                    target[key] = source[key];
+                }
+            }
+        }
+        return target;
+    };
+    return _extends.apply(this, arguments);
+}
 
 var queue = [];
 
 function getContext() {
-  var pages = getCurrentPages();
-  return pages[pages.length - 1];
+    var pages = getCurrentPages();
+    return pages[pages.length - 1];
 }
 
 var Dialog = function Dialog(options) {
-  options = _extends({}, Dialog.currentOptions, options);
-  return new Promise(function (resolve, reject) {
-    var context = options.context || getContext();
-    var dialog = context.selectComponent(options.selector);
-    delete options.selector;
+    options = _extends({}, Dialog.currentOptions, options);
+    return new Promise(function (resolve, reject) {
+        var context = options.context || getContext();
+        var dialog = context.selectComponent(options.selector);
+        delete options.selector;
 
-    if (dialog) {
-      dialog.set(_extends({
-        onCancel: reject,
-        onConfirm: resolve
-      }, options));
-      queue.push(dialog);
-    } else {
-      console.warn('未找到 van-dialog 节点,请确认 selector 及 context 是否正确');
-    }
-  });
+        if (dialog) {
+            dialog.set(_extends({
+                onCancel: reject,
+                onConfirm: resolve
+            }, options));
+            queue.push(dialog);
+        } else {
+            console.warn('未找到 van-dialog 节点,请确认 selector 及 context 是否正确');
+        }
+    });
 };
 
 Dialog.defaultOptions = {
-  show: true,
-  title: '',
-  message: '',
-  zIndex: 100,
-  overlay: true,
-  asyncClose: false,
-  messageAlign: '',
-  transition: 'scale',
-  selector: '#van-dialog',
-  confirmButtonText: '确认',
-  cancelButtonText: '取消',
-  showConfirmButton: true,
-  showCancelButton: false,
-  closeOnClickOverlay: false,
-  confirmButtonOpenType: ''
+    show: true,
+    title: '',
+    message: '',
+    zIndex: 100,
+    overlay: true,
+    asyncClose: false,
+    messageAlign: '',
+    transition: 'scale',
+    selector: '#van-dialog',
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    showConfirmButton: true,
+    showCancelButton: false,
+    closeOnClickOverlay: false,
+    confirmButtonOpenType: ''
 };
 Dialog.alert = Dialog;
 
 Dialog.confirm = function (options) {
-  return Dialog(_extends({
-    showCancelButton: true
-  }, options));
+    return Dialog(_extends({
+        showCancelButton: true
+    }, options));
 };
 
 Dialog.close = function () {
-  queue.forEach(function (dialog) {
-    dialog.close();
-  });
-  queue = [];
+    queue.forEach(function (dialog) {
+        dialog.close();
+    });
+    queue = [];
 };
 
 Dialog.stopLoading = function () {
-  queue.forEach(function (dialog) {
-    dialog.stopLoading();
-  });
+    queue.forEach(function (dialog) {
+        dialog.stopLoading();
+    });
 };
 
 Dialog.setDefaultOptions = function (options) {
-  Object.assign(Dialog.currentOptions, options);
+    Object.assign(Dialog.currentOptions, options);
 };
 
 Dialog.resetDefaultOptions = function () {
-  Dialog.currentOptions = _extends({}, Dialog.defaultOptions);
+    Dialog.currentOptions = _extends({}, Dialog.defaultOptions);
 };
 
 Dialog.resetDefaultOptions();

+ 0 - 11
package-lock.json

@@ -1,11 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "vant-weapp": {
-      "version": "0.5.0-beta2",
-      "resolved": "http://registry.npm.taobao.org/vant-weapp/download/vant-weapp-0.5.0-beta2.tgz",
-      "integrity": "sha1-c34uP6oYsuQY4bx/vN7B8Pztl2Q="
-    }
-  }
-}

+ 24 - 1
pages/home/contact/contact.js

@@ -1,3 +1,4 @@
+// import Notify from '../../dist/notify/notify';
 const { fetchGraphql } = require('../../../utils/util.js');
 const { userbyid } = require('../../../config/gql.js');
 const app = getApp();
@@ -44,5 +45,27 @@ Component({
               name: e.detail
           })
       },
+      submit: function() {
+          if(this.data.name && this.data.phone) {
+              wx.showToast({
+                  title: '修改成功',
+                  icon: 'success'
+              });
+              console.log('仅做展示,无操作');
+          } else {
+              wx.showToast({
+                  title: '修改成功',
+                  icon: 'success'
+              });
+          }
+
+
+      },
+      reset: function() {
+          this.setData({
+              name: '',
+              phone: ''
+          })
+      }
   }
-})
+});

+ 6 - 5
pages/home/contact/contact.json

@@ -1,10 +1,11 @@
 {
   "component": true,
   "usingComponents": {
-        "van-loading": "../../../dist/loading/index",
-        "van-cell-group": "../../dist/cell-group/index",
-        "van-cell": "../../../dist/cell/index",
-        "van-button": "../../../dist/button/index",
-        "van-field": "../../dist/field/index"
+    "van-loading": "../../../dist/loading/index",
+    "van-cell-group": "../../dist/cell-group/index",
+    "van-cell": "../../../dist/cell/index",
+    "van-button": "../../../dist/button/index",
+    "van-field": "../../dist/field/index",
+    "van-notify": "../../dist/notify/index"
   }
 }

+ 2 - 2
pages/home/contact/contact.wxml

@@ -21,6 +21,6 @@
 </van-cell-group>
 
 <view class='button-group'>
-    <van-button size="small" type="primary" bind:click="formSubmit" class='button'>提交</van-button>
-    <van-button size="small" type="danger" bind:click="formReset">重置</van-button>
+    <van-button size="small" type="primary" bind:click="submit" class='button'>提交</van-button>
+    <van-button size="small" type="danger" bind:click="reset">重置</van-button>
 </view>

+ 52 - 8
pages/home/showMy/showMy.js

@@ -1,4 +1,5 @@
-const {fetchGraphql} = require('../../../utils/util.js');
+// import Dialog from '../../../dist/dialog/dialog';
+const {fetchGraphql, dateTime} = require('../../../utils/util.js');
 const {orderbyprops} = require('../../../config/gql.js');
 const app = getApp();
 
@@ -18,13 +19,19 @@ Component({
                             user_id: app.globalData.userID,
                             orderStatus: newVal
                         },
-                        'orders',
+                        null,
                         'orderbyprops',
-                        this
+                        null
                     )
                         .then(orders => {
+                            orders.forEach(order => {
+                                order.service_id.formatDate = dateTime(Number(order.service_id.startTime), true).date;
+                                order.service_id.formatStartTime = dateTime(Number(order.service_id.startTime), true).time;
+                                order.service_id.formatEndTime = dateTime(Number(order.service_id.startTime) + Number(order.service_id.lastTime), true).time;
+                            });
                             this.setData({
-                                loading: false
+                                loading: false,
+                                orders
                             });
                             console.log(orders)
                         });
@@ -41,13 +48,19 @@ Component({
                     user_id: app.globalData.userID,
                     orderStatus: 'success'
                 },
-                'orders',
+                null,
                 'orderbyprops',
-                this
+                null
             )
                 .then(orders => {
+                    orders.forEach(order => {
+                        order.service_id.formatDate = dateTime(Number(order.service_id.startTime), true).date;
+                        order.service_id.formatStartTime = dateTime(Number(order.service_id.startTime), true).time;
+                        order.service_id.formatEndTime = dateTime(Number(order.service_id.startTime) + Number(order.service_id.lastTime), true).time;
+                    });
                     this.setData({
-                        loading: false
+                        loading: false,
+                        orders
                     })
                 });
         }
@@ -60,11 +73,42 @@ Component({
 
     methods: {
         deleteThis() {
-
+            wx.showToast({
+                title: '已删除',
+                icon: 'success',
+                duration: 2000
+            });
+            console.log('仅做展示,无操作');
         },
 
         cancelThis() {
+            // console.log('函数是进的来的');
+            // Dialog.confirm({
+            //     title: '您确定取消?',
+            //     message: '取消后30分钟内不能再次执行',
+            //
+            // }).then(() => {
+            //     // on confirm
+            // }).catch(() => {
+            //     // on cancel
+            // });
 
+            wx.showModal({
+                title: '确定取消?',
+                content: '取消后30分钟内不能再次预约',
+                success(res) {
+                    if (res.confirm) {
+                        console.log('仅做展示,无操作');
+                        wx.showToast({
+                            title: '已取消',
+                            icon: 'success',
+                            duration: 2000
+                        });
+                    } else if (res.cancel) {
+                        console.log('你取消了')
+                    }
+                }
+            });
         }
     }
 });

+ 4 - 3
pages/home/showMy/showMy.json

@@ -1,8 +1,9 @@
 {
   "component": true,
   "usingComponents": {
-        "van-loading": "../../../dist/loading/index",
-        "van-card": "../../../dist/card/index",
-        "van-button": "../../../dist/button/index"
+    "van-loading": "../../../dist/loading/index",
+    "van-card": "../../../dist/card/index",
+    "van-button": "../../../dist/button/index",
+    "van-dialog": "../../../dist/dialog/index"
   }
 }

+ 37 - 38
pages/home/showMy/showMy.wxml

@@ -1,45 +1,44 @@
-<!--pages/home/showMy/showMy.wxml-->
-
 <view wx:if="{{loading}}" class='loading'>
     <van-loading color="#fff" size="80rpx" custom-class='loading-spin'/>
 </view>
 
-<view wx:if="{{orders !== '' && orders.length === 0}}" class='no-order'>
-    你还没有订单呢
-  </view>
-  <block wx:for="{{orders}}" wx:key="{{order.id}}" wx:for-item="order">
+<view wx:if="{{orders !== '' && orders.length === 0}}" class='no-order'>你还没有订单呢</view>
+
+<!--<van-dialog id="van-dialog" />-->
+
+<block wx:for="{{orders}}" wx:key="{{order.id}}" wx:for-item="order">
     <van-card
-      num="{{order.customerNumber}}"
-      price="{{order.service_id.price}}"
-      desc="{{order.service_id.startTime}} - {{order.service_id.lastTime}}"
-      title="{{order.service_id.description}}"
-      custom-class="card"
-      title-class="title"
-      desc-class="description"
-      num-class="count"
-      price-class="price"
+            num="{{order.customerNumber}}"
+            price="{{order.service_id.price}}"
+            desc="{{order.service_id.formatDate}} : {{order.service_id.formatStartTime}} - {{order.service_id.formatEndTime}}"
+            title="{{order.service_id.description}}"
+            custom-class="card"
+            title-class="title"
+            desc-class="description"
+            num-class="count"
+            price-class="price"
     >
-      <view slot="footer">
-        <van-button
-            wx:if="{{kind==='success'}}" 
-            id="{{order.id}}" 
-            data-count="{{order.repertory_id.count}}" 
-            data-repertoryid="{{order.repertory_id.id}}" 
-            bind:tap="cancelThis"
-            size="small"
-            type='danger'
-        >
-          取消
-        </van-button>
-        <van-button
-            wx:else
-            id="{{order.id}}" 
-            data-count="{{order.repertory_id.count}}"  
-            bind:tap="deleteThis"
-            size="small"
-        >
-          删除
-        </van-button>
-      </view>
+        <view slot="footer">
+            <van-button
+                    wx:if="{{kind==='success'}}"
+                    id="{{order.id}}"
+                    data-count="{{order.repertory_id.count}}"
+                    data-repertoryid="{{order.repertory_id.id}}"
+                    bind:click="cancelThis"
+                    size="small"
+                    type='danger'
+            >
+                取消
+            </van-button>
+            <van-button
+                    wx:else
+                    id="{{order.id}}"
+                    data-count="{{order.repertory_id.count}}"
+                    bind:click="deleteThis"
+                    size="small"
+            >
+                删除
+            </van-button>
+        </view>
     </van-card>
-  </block>
+</block>

+ 21 - 7
pages/manage/allOrders/selectedOrders/selectedOrders.js

@@ -1,4 +1,4 @@
-const {fetchGraphql} = require('../../../../utils/util.js');
+const {fetchGraphql, dateTime} = require('../../../../utils/util.js');
 const {adminorderbyprops} = require('../../../../config/gql.js');
 
 Component({
@@ -16,13 +16,20 @@ Component({
                     if (newVal === 'all') varObj = {};
                     fetchGraphql(adminorderbyprops,
                         varObj,
-                        'orders',
+                        null,
                         'adminorderbyprops',
-                        this
+                        null
                     )
                         .then(orders => {
+                            orders.forEach(order => {
+                                order.service_id.formatDate = dateTime(Number(order.service_id.startTime), true).date;
+                                order.service_id.formatStartTime = dateTime(Number(order.service_id.startTime), true).time;
+                                order.service_id.formatEndTime = dateTime(Number(order.service_id.startTime) + Number(order.service_id.lastTime), true).time;
+                            });
+
                             this.setData({
-                                loading: false
+                                loading: false,
+                                orders
                             });
                         });
                 }
@@ -37,13 +44,20 @@ Component({
                 {
                     orderStatus: 'success'
                 },
-                'orders',
+                null,
                 'adminorderbyprops',
-                this
+                null
             )
                 .then(orders => {
+                    orders.forEach(order => {
+                        order.service_id.formatDate = dateTime(Number(order.service_id.startTime), true).date;
+                        order.service_id.formatStartTime = dateTime(Number(order.service_id.startTime), true).time;
+                        order.service_id.formatEndTime = dateTime(Number(order.service_id.startTime) + Number(order.service_id.lastTime), true).time;
+                    });
+
                     this.setData({
-                        loading: false
+                        loading: false,
+                        orders
                     });
                 });
         }

+ 1 - 1
pages/manage/allOrders/selectedOrders/selectedOrders.wxml

@@ -11,7 +11,7 @@
         <van-card
                 num="{{order.customerNumber}}"
                 price="{{order.service_id.price}}"
-                desc="{{order.service_id.startTime}} - {{order.service_id.lastTime}}"
+                desc="{{order.service_id.formatDate}} : {{order.service_id.formatStartTime}} - {{order.service_id.formatEndTime}}"
                 title="{{order.service_id.description}}"
                 custom-class="card"
                 title-class="title"

+ 6 - 6
pages/manage/manage.json

@@ -1,11 +1,11 @@
 {
   "usingComponents": {
-    "van-notice-bar": "../../dist/notice-bar/index",
-    "van-picker": "../../dist/picker/index",
-    "van-popup": "../../dist/popup/index",
-    "van-cell": "../../dist/cell/index",
-    "van-tab": "../../dist/tab/index",
-    "van-tabs": "../../dist/tabs/index",
+    "van-notice-bar": "../../../dist/notice-bar/index",
+    "van-picker": "../../../dist/picker/index",
+    "van-popup": "../../../dist/popup/index",
+    "van-cell": "../../../dist/cell/index",
+    "van-tab": "../../../dist/tab/index",
+    "van-tabs": "../../../dist/tabs/index",
     "AllOrders": "./allOrders/allOrders",
     "Release": "./release/release"
   }

+ 6 - 3
pages/manage/release/release.js

@@ -12,7 +12,7 @@ Component({
      */
     data: {
         servers: '',
-        server: '',
+        serverID: '',
     },
 
     /**
@@ -50,13 +50,16 @@ Component({
 
         selectServer(e) {
             this.setData({
-                server: e.target.id
+                serverID: e.target.id
+            });
+            wx.showLoading({
+                title: '获取服务中',
             })
         },
 
         addServer() {
             this.setData({
-                server: 'add'
+                serverID: 'add'
             })
         }
     },

+ 1 - 1
pages/manage/release/release.json

@@ -4,7 +4,7 @@
         "van-notice-bar": "../../../dist/notice-bar/index",
         "van-cell": "../../../dist/cell/index",
         "van-cell-group": "../../../dist/cell-group/index",
-        "ServiceRelease": "./serviceRelease/serviceRelease",
+        "ServiceShow": "./serviceShow/serviceShow",
         "ServerAdd": "./serverAdd/serverAdd"
     }
 }

+ 17 - 17
pages/manage/release/release.wxml

@@ -1,35 +1,35 @@
 <van-notice-bar
-    mode="closeable"
-    text="只有管理员的微信才能看到此界面,此处作为样例全部展示"
+        mode="closeable"
+        text="只有管理员的微信才能看到此界面,此处作为样例全部展示"
 />
 
 <view wx:if="{{loading}}" class='loading'>
     <van-loading color="#fff" size="80rpx" custom-class='loading-spin'/>
 </view>
 
-<view wx:if="{{servers!=='' && servers.length === 0}}">没有技师为您工作</view>
+<view wx:if="{{servers!=='' && servers.length === 0}}">没有服务</view>
 
-<van-cell-group wx:if="{{servers!=='' && servers.length !== 0}}">
-    <view class='cell-title'>你的技师</view>
+<van-cell-group wx:if="{{servers !== '' && servers.length !== 0}}">
+    <view class='cell-title'>服务</view>
     <van-cell
-        wx:for="{{servers}}"
-        wx:for-item="server"
-        wx:key="{{server.id}}"
-        title="{{server.name}}"
-        bind:click="selectServer"
-        is-link
-        id="{{server.id}}"
+            wx:for="{{servers}}"
+            wx:for-item="server"
+            wx:key="{{server.id}}"
+            title="{{server.name}}"
+            bind:click="selectServer"
+            is-link
+            id="{{server.id}}"
     >
         <view slot="icon">
             <view class="avatar" style='background-image: url({{server.img}})'/>
         </view>
     </van-cell>
     <van-cell
-        title="添加一位技师"
-        is-link
-        bind:click="addServer"
+            title="添加"
+            is-link
+            bind:click="addServer"
     />
 </van-cell-group>
 
-<ServiceRelease id="{{server}}" wx:if="{{server !== '' && server !== 'add'}}"/>
-<ServerAdd wx:if="{{server === 'add'}}"/>
+<ServiceShow serverID="{{serverID}}" wx:if="{{serverID !== '' && serverID !== 'add'}}"/>
+<ServerAdd wx:if="{{serverID === 'add'}}"/>

+ 27 - 10
pages/manage/release/serverAdd/serverAdd.js

@@ -1,23 +1,40 @@
 // pages/manage/release/serverAdd/serverAdd.js
 Component({
-    /**
-     * 组件的属性列表
-     */
     properties: {
 
     },
 
-    /**
-     * 组件的初始数据
-     */
     data: {
-
+        name: '',
+        remark: ''
     },
 
-    /**
-     * 组件的方法列表
-     */
     methods: {
+        nameInput(e) {
+            this.setData({
+                name: e.detail
+            })
+        },
+
+        remarkInput(e) {
+            this.setData({
+                remark: e.detail
+            })
+        },
+
+        submit() {
+            wx.showToast({
+                title: '添加成功',
+                icon: 'success'
+            });
+            console.log('仅做展示,无操作');
+        },
 
+        reset() {
+            this.setData({
+                name: '',
+                remark: ''
+            })
+        }
     }
 });

+ 3 - 3
pages/manage/release/serverAdd/serverAdd.wxml

@@ -1,5 +1,5 @@
 
-<view class='cell-title'>技师的服务</view>
+<view class='cell-title'>添加新的技师</view>
 <van-cell-group>
     <van-field
             value="{{ name }}"
@@ -20,6 +20,6 @@
 </van-cell-group>
 
 <view class='button-group'>
-    <van-button size="small" type="primary" bind:click="formSubmit" class='button'>提交</van-button>
-    <van-button size="small" type="danger" bind:click="formReset">重置</van-button>
+    <van-button size="small" type="primary" bind:click="submit" class='button'>提交</van-button>
+    <van-button size="small" type="danger" bind:click="reset">重置</van-button>
 </view>

+ 0 - 23
pages/manage/release/serviceRelease/serviceRelease.js

@@ -1,23 +0,0 @@
-// pages/manage/release/serviceRelease/serviceRelease.js
-Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-
-    }
-});

+ 0 - 4
pages/manage/release/serviceRelease/serviceRelease.json

@@ -1,4 +0,0 @@
-{
-    "component": true,
-    "usingComponents": {}
-}

+ 0 - 2
pages/manage/release/serviceRelease/serviceRelease.wxml

@@ -1,2 +0,0 @@
-<!--pages/manage/release/serviceRelease/serviceRelease.wxml-->
-<text>pages/manage/release/serviceRelease/serviceRelease.wxml</text>

+ 0 - 1
pages/manage/release/serviceRelease/serviceRelease.wxss

@@ -1 +0,0 @@
-/* pages/manage/release/serviceRelease/serviceRelease.wxss */

+ 126 - 0
pages/manage/release/serviceShow/serviceRelease/serviceRelease.js

@@ -0,0 +1,126 @@
+import {dateTime} from '../../../../../utils/util';
+
+Component({
+    properties: {
+        service: {
+            type: Object,
+            observer(newVal) {
+                this.setData({
+                    service: newVal
+                });
+                let service = newVal;
+                console.log(newVal);
+                service.id === 'add' ?
+                    this.setData({
+                        price: 0,
+                        description: '',
+                        repertory: 0,
+                        date: dateTime(Date.now(), true).date,
+                        startTime: dateTime(Date.now(), true).time,
+                        endTime: dateTime(Date.now(), true).time
+                    })
+                    :
+                    this.setData({
+                        date: dateTime(Number(service.startTime), true).date,
+                        startTime: dateTime(Number(service.startTime), true).time,
+                        endTime: dateTime(Number(service.startTime) + Number(service.lastTime), true).time,
+                        price: service.price,
+                        description: service.description,
+                        repertory: service.repertory_id.count
+                    })
+            }
+        }
+    },
+
+    data: {
+        service: '',
+        price: 0,
+        description: '',
+        repertory: 0,
+        date: '2019-01-01',
+        startTime: '00:00',
+        endTime: '00:01'
+    },
+
+    lifetimes: {
+        attached() {
+            let service = this.data.service;
+            service.id === 'add' ?
+                this.setData({
+                    date: dateTime(Date.now(), true).date,
+                    startTime: dateTime(Date.now(), true).time,
+                    endTime: dateTime(Date.now(), true).time
+                })
+                :
+                this.setData({
+                    date: dateTime(Number(service.startTime), true).date,
+                    startTime: dateTime(Number(service.startTime), true).time,
+                    endTime: dateTime(Number(service.startTime) + Number(service.lastTime), true).time,
+                    price: service.price,
+                    description: service.description,
+                    repertory: service.repertory_id.count
+                })
+        }
+    },
+
+    methods: {
+        priceInput(e) {
+            this.setData({
+                price: e.detail
+            })
+        },
+
+        descriptionInput(e) {
+            this.setData({
+                description: e.detail
+            })
+        },
+
+        repertorySlide(e) {
+            this.setData({
+                repertory: e.detail
+            })
+        },
+
+        dateChange(e) {
+            this.setData({
+                date: e.detail.value
+            })
+        },
+
+        startTimeChange(e) {
+            this.setData({
+                startTime: e.detail.value
+            })
+        },
+
+        endTimeChange(e) {
+            this.setData({
+                endTime: e.detail.value
+            })
+        },
+
+        reset() {
+            this.setData({
+                price: 0,
+                description: '',
+                repertory: 0,
+                date: dateTime(Date.now(), true).date,
+                startTime: dateTime(Date.now(), true).time,
+                endTime: dateTime(Date.now(), true).time
+            })
+        },
+
+        submit() {
+            let startTime = dateTime({date: this.data.date, time: this.data.startTime}, false);
+            let endTime = dateTime({date: this.data.date, time: this.data.endTime}, false);
+            let lastTime = endTime - startTime;
+            wx.showToast({
+                title: this.data.service.id==='add'?'已添加': '已修改',
+                icon: 'success',
+                duration: 2000
+            });
+            console.log('仅做展示,无操作');
+        },
+    }
+});

+ 10 - 0
pages/manage/release/serviceShow/serviceRelease/serviceRelease.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-stepper": "../../../../../../dist/stepper/index",
+    "van-field": "../../../../../../dist/field/index",
+    "van-cell-group": "../../../../../../dist/cell-group/index",
+    "van-cell": "../../../../../../dist/cell/index",
+    "van-button": "../../../../../../dist/button/index"
+  }
+}

+ 61 - 0
pages/manage/release/serviceShow/serviceRelease/serviceRelease.wxml

@@ -0,0 +1,61 @@
+<van-cell-group>
+    <view class='cell-title'>请输入服务项信息</view>
+    <van-field
+            value="{{ description }}"
+            label="服务类型"
+            placeholder="请输入服务类型"
+            bind:change="descriptionInput"
+    />
+
+    <van-field
+            value="{{ price }}"
+            label="价格"
+            placeholder="请输入价格"
+            border="{{ false }}"
+            bind:change="priceInput"
+    />
+
+    <van-cell title="库存">
+        <van-stepper name="repertory" value="{{repertory}}" bindchange="repertorySlide"></van-stepper>
+    </van-cell>
+
+    <van-cell title="选择日期">
+        <picker
+                mode="date"
+                value="{{date}}"
+                start="2018-01-01"
+                end="2021-12-31"
+                bindchange="dateChange"
+        >
+            <view class="picker">{{date}}</view>
+        </picker>
+    </van-cell>
+
+    <van-cell title="选择开始时间">
+        <picker
+                mode="time"
+                value="{{startTime}}"
+                start="00:00"
+                end="23:59"
+                bindchange="startTimeChange"
+        >
+            <view class="picker">{{startTime}}</view>
+        </picker>
+    </van-cell>
+    <van-cell title="选择结束时间">
+        <picker
+                mode="time"
+                value="{{endTime}}"
+                start="00:00"
+                end="23:59"
+                bindchange="endTimeChange"
+        >
+            <view class="picker">{{endTime}}</view>
+        </picker>
+    </van-cell>
+</van-cell-group>
+
+<view class='button-group'>
+    <van-button size="small" type="primary" bind:click="submit" class='button'>提交</van-button>
+    <van-button size="small" type="danger" bind:click="reset">重置</van-button>
+</view>

+ 18 - 0
pages/manage/release/serviceShow/serviceRelease/serviceRelease.wxss

@@ -0,0 +1,18 @@
+
+.cell-title {
+    color: #969799;
+    font-weight: 400;
+    font-size: 35rpx;
+    padding: 40rpx 20rpx 20rpx;
+}
+
+.button-group {
+    float: right;
+    margin-right: 20rpx;
+    margin-top: 20rpx;
+    margin-bottom: 20rpx;
+}
+.button {
+    margin-right: 10rpx;
+}
+

+ 48 - 0
pages/manage/release/serviceShow/serviceShow.js

@@ -0,0 +1,48 @@
+const {fetchGraphql} = require('../../../../utils/util.js');
+const {servicebyprops} = require('../../../../config/gql.js');
+
+Component({
+    properties: {
+        serverID: {
+            type: String,
+            observer(newVal, oldVal, changedPath) {
+                this.setData({
+                    services: '',
+                    service: ''
+                });
+                if (newVal !== '') {
+                    fetchGraphql(servicebyprops,
+                        {server_id: newVal},
+                        'services',
+                        'servicebyprops',
+                        this
+                    )
+                    .then(services => {
+                        console.log(services);
+                        wx.hideLoading()
+                    });
+                }
+            }
+        }
+    },
+
+    data: {
+        services: '',
+        service: ''
+    },
+
+    methods: {
+        selectService(e) {
+            let index = e.target.dataset.index;
+            if(index === 'add') {
+                this.setData({
+                    service: {id: 'add', server_id: {id: this.properties.serverID}}
+                })
+            } else {
+                this.setData({
+                    service: this.data.services[index]
+                })
+            }
+        }
+    }
+});

+ 8 - 0
pages/manage/release/serviceShow/serviceShow.json

@@ -0,0 +1,8 @@
+{
+    "component": true,
+    "usingComponents": {
+        "van-cell": "../../../../dist/cell/index",
+        "van-cell-group": "../../../../dist/cell-group/index",
+        "ServiceRelease": "./serviceRelease/serviceRelease"
+    }
+}

+ 26 - 0
pages/manage/release/serviceShow/serviceShow.wxml

@@ -0,0 +1,26 @@
+<view wx:if="{{loading}}" class='loading'>
+    <van-loading color="#fff" size="80rpx" custom-class='loading-spin'/>
+</view>
+
+<van-cell-group wx:if="{{services!==''}}">
+    <view class='cell-title'>TA的服务项</view>
+    <van-cell
+            wx:for="{{services}}"
+            wx:for-item="service"
+            wx:key="{{service.id}}"
+            title="{{service.description}}"
+            is-link
+            data-index="{{index}}"
+            bind:click="selectService"
+    />
+    <van-cell
+            title="{{services.length !== 0? '添加': '没有服务项,点我添加'}}"
+            is-link
+            data-index="add"
+            bind:click="selectService"
+    />
+</van-cell-group>
+
+<ServiceRelease wx:if="{{service !== ''}}" service="{{service}}"/>
+
+

+ 7 - 0
pages/manage/release/serviceShow/serviceShow.wxss

@@ -0,0 +1,7 @@
+
+.cell-title {
+    color: #969799;
+    font-weight: 400;
+    font-size: 35rpx;
+    padding: 40rpx 20rpx 20rpx;
+}

+ 15 - 51
pages/message/message.js

@@ -44,9 +44,17 @@ Page({
             varObj
         ).then(data => {
             console.log(data);
-            wx.reLaunch({
-                url: '../server/server'
-            })
+            wx.showToast({
+                title: '预约成功',
+                icon: 'success',
+                duration: 1500,
+                success: function() {
+                    wx.reLaunch({
+                        url: '../server/server'
+                    })
+                }
+            });
+
         });
     },
 
@@ -76,9 +84,7 @@ Page({
             })
         }
     },
-    /**
-     * 生命周期函数--监听页面加载
-     */
+
     onLoad: function (options) {
         fetchGraphql(userbyid, {id: app.globalData.userID}, 'user', 'userbyid', this).then(user => {
             this.setData({
@@ -96,70 +102,28 @@ Page({
             phone: e.detail
         })
     },
+
     nameInput: function (e) {
         this.setData({
             name: e.detail
         })
     },
+
     remarkInput: function (e) {
         this.setData({
             remark: e.detail
         })
     },
+
     peopleSlide: function (e) {
         this.setData({
             people: e.detail
         })
     },
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
     onReady: function () {
         wx.setNavigationBarTitle({
             title: '填写订单信息'
         })
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
     }
 });

+ 9 - 48
pages/service/service.js

@@ -1,12 +1,12 @@
 // pages/service/service.js
-const {fetchGraphql} = require('../../utils/util.js');
+const {fetchGraphql, dateTime} = require('../../utils/util.js');
 const {servicebyprops} = require('../../config/gql.js');
 
 Page({
     data: {
         serverID: '',
         loading: true,
-        service: ''
+        services: ''
     },
 
     chooseThis(e) {
@@ -14,70 +14,31 @@ Page({
             url: `../message/message?id=${e.target.id}&count=${e.target.dataset.count}&repertoryID=${e.target.dataset.repertoryid}`,
         })
     },
-    /**
-     * 生命周期函数--监听页面加载
-     */
 
     onLoad: function (options) {
         this.setData({
             serverID: options.id
         });
-        fetchGraphql(servicebyprops, {server_id: this.data.serverID}, 'service', 'servicebyprops', this).then(service => {
+        fetchGraphql(servicebyprops, {server_id: this.data.serverID}, null, 'servicebyprops', null).then(services => {
+            services.forEach(service => {
+                service.formatDate = dateTime(Number(service.startTime), true).date;
+                service.formatStartTime = dateTime(Number(service.startTime), true).time;
+                service.formatEndTime = dateTime(Number(service.startTime) + Number(service.lastTime), true).time;
+            });
             this.setData({
                 loading: false,
-                service
+                services
             });
         });
     },
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
     onReady: function () {
         wx.setNavigationBarTitle({
             title: '选择TA的服务'
         })
     },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
     onPullDownRefresh: function () {
 
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
     }
 });

+ 3 - 4
pages/service/service.wxml

@@ -1,16 +1,15 @@
-<!--pages/service/service.wxml-->
 <view>
   <view wx:if="{{loading}}" class='loading'>
     <van-loading color="#fff" size="80rpx" custom-class='loading-spin'/>
   </view>
-  <view wx:if="{{service !== '' && service.length === 0}}" class='rest'>
+  <view wx:if="{{services !== '' && services.length === 0}}" class='rest'>
     今日休息...
   </view>
-  <block wx:for="{{service}}" wx:key="{{service.id}}" wx:for-item="service">
+  <block wx:for="{{services}}" wx:key="{{service.id}}" wx:for-item="service">
     <van-card
       num="{{service.repertory_id.count}}"
       price="{{service.price}}"
-      desc="{{service.startTime}} - {{service.lastTime}}"
+      desc="{{service.formatDate}} : {{service.formatStartTime}} - {{service.formatEndTime}}"
       title="{{service.description}}"
       custom-class="card"
       title-class="title"

+ 25 - 0
pages/vant/vant.js

@@ -0,0 +1,25 @@
+// pages/vant/vant.js
+import Dialog from '../../dist/dialog/dialog';
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    cancelThis() {
+        console.log('函数是进的来的');
+        Dialog.confirm({
+            title: '您确定取消?',
+            message: '取消后30分钟内不能再次执行',
+
+        }).then(() => {
+            // on confirm
+        }).catch(() => {
+            // on cancel
+        });
+    }
+});

+ 6 - 0
pages/vant/vant.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-button": "../../dist/button/index",
+    "van-dialog": "../../dist/dialog/index"
+  }
+}

+ 7 - 0
pages/vant/vant.wxml

@@ -0,0 +1,7 @@
+<!--pages/vant/vant.wxml-->
+<text>pages/vant/vant.wxml</text>
+<van-button bind:click="cancelThis">
+    取消
+</van-button>
+
+<van-dialog id="van-dialog" />

+ 1 - 0
pages/vant/vant.wxss

@@ -0,0 +1 @@
+/* pages/vant/vant.wxss */

+ 44 - 31
utils/util.js

@@ -1,44 +1,57 @@
 const idGen = (kind) => {
-  return kind + '_' + Date.now() + '_' + Math.random().toString().slice(-8);
+    return kind + '_' + Date.now() + '_' + Math.random().toString().slice(-8);
 };
 
-// const graphqlURL = 'http://service-a7y7bobr-1251945881.ap-shanghai.apigateway.myqcloud.com/test/graphql';
 const graphqlURL = 'https://order.szu.im/graphql';
+// const graphqlURL = 'http://orderfcdb.ioobot.cn/graphql';
 
 const fetchGraphql = (query, variables, dataName, dataBack, that) => {
-  // 如果给了 databack,则返回对应的数据,没有则返回全部
-  // 如果给了 dataName,则 setData
-  return new Promise((resolve, reject) => {
-    let _this = that;
-    wx.request({
-      url: graphqlURL,
-      method: 'POST',
-      data: JSON.stringify({
-        query,
-        variables
-      }),
+    // 如果给了 databack,则返回对应的数据,没有则返回全部
+    // 如果给了 dataName,则 setData
+    return new Promise((resolve, reject) => {
+        let _this = that;
+        wx.request({
+            url: graphqlURL,
+            method: 'POST',
+            data: JSON.stringify({
+                query,
+                variables
+            }),
 
-      success: function (res) {
-        let data;
-        if(dataBack) {
-          data = res.data.data[dataBack];
-        } else {
-          data = res.data.data;
-        }
+            success: function (res) {
+                let data;
+                if (dataBack) {
+                    data = res.data.data[dataBack];
+                } else {
+                    data = res.data.data;
+                }
 
-        if (dataName) {
-          _this.setData({
-            [dataName]: data
-          })
-        }
-      
-        resolve(data);
-      }
+                if (dataName) {
+                    _this.setData({
+                        [dataName]: data
+                    })
+                }
+
+                resolve(data);
+            }
+        })
     })
-  })
+};
+
+const dateTime = (data, format) => {
+    if (format) {
+        let date = new Date(data);
+        return {
+            date: date.getFullYear() + '-' + (date.getMonth() < 10 ? '0' + (date.getMonth()+1) : (date.getMonth()+1)) + '-' + (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()),
+            time: (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) +':'+ (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes())
+        }
+    } else {
+        return new Date((data.date + ' ' + data.time + ':00').replace(/-/g, '/')).getTime();
+    }
 };
 
 module.exports = {
-  idGen: idGen,
-  fetchGraphql: fetchGraphql
+    idGen: idGen,
+    fetchGraphql: fetchGraphql,
+    dateTime: dateTime
 };