This commit is contained in:
chenhui0212
2019-02-28 20:16:26 +08:00
parent 6b58cd43b4
commit 6972b6e6fd
7 changed files with 387 additions and 276 deletions

611
.idea/workspace.xml generated
View File

@@ -2,42 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c4b5bd0d-fb3c-48cd-90a1-e84add737e52" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/components/filter-bar/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/filter-bar/index.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/pages/home/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/espier-taro-fenxiao.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/config/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/api/item.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/item.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/api/req.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/req.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/address/picker.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/address/picker.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/goods-buy-panel/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/goods-buy-panel/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/goods-item/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/goods-item/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/goods-item/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/goods-item/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/loading/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/loading/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/price/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/price/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/price/price.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/price/price.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/timer/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/timer/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/search/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/search/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/search/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/search/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/category/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/category/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/category/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/category/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/item/comps/item.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/item/comps/item.scss" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/item/detail.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/item/detail.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/item/list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/item/list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/item/list.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/item/list.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/trade/comps/item.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/comps/item.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/trade/comps/order-item.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/comps/order-item.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/trade/comps/order-item.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/comps/order-item.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/trade/list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/trade/list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/style/_mixins.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/style/_mixins.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/index.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/dist/" />
<ignored path="$PROJECT_DIR$/.tmp/" />
@@ -52,51 +23,19 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/note/index.js">
<entry file="file://$PROJECT_DIR$/src/pages/category/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="35" column="1" selection-start-line="35" selection-start-column="1" selection-end-line="35" selection-end-column="1" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/note/index.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="610">
<caret line="105" column="36" selection-start-line="105" selection-start-column="22" selection-end-line="105" selection-end-column="36" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
<state relative-caret-position="-14">
<caret line="25" column="16" lean-forward="true" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
<entry file="file://$PROJECT_DIR$/src/components/search/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="92" column="49" lean-forward="true" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
<folding>
<element signature="e#1#47#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/category/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-357">
<caret line="32" column="6" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="6" />
<state relative-caret-position="189">
<caret line="69" column="6" lean-forward="true" selection-start-line="69" selection-start-column="6" selection-end-line="69" selection-end-column="6" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
@@ -105,19 +44,67 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.scss">
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
<state relative-caret-position="574">
<caret line="101" column="22" lean-forward="true" selection-start-line="101" selection-start-column="22" selection-end-line="101" selection-end-column="22" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.scss">
<entry file="file://$PROJECT_DIR$/src/components/search/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<caret line="114" column="3" selection-start-line="114" selection-start-column="3" selection-end-line="114" selection-end-column="3" />
<state relative-caret-position="310">
<caret line="31" column="22" lean-forward="true" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
<folding>
<element signature="e#1074#1080#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/style/taro-ui-mod.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/category/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="28" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="92" column="49" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
<folding>
<element signature="e#1#47#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -126,8 +113,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>AddressPicker</find>
<find>page-view</find>
<find>lockScreen</find>
<find>SearchPanel</find>
<find>changeSelection</find>
@@ -156,23 +141,24 @@
<find>#4C8B03</find>
<find>AAAAAA</find>
<find>fetch</find>
<find>styleNames</find>
<find>classNames</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/src/pages/category/index.js" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/components/search/index.js" root0="SKIP_INSPECTION" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/components/search/search.js" />
<option value="$PROJECT_DIR$/src/components/search/search.scss" />
<option value="$PROJECT_DIR$/src/pages/category/index.scss" />
<option value="$PROJECT_DIR$/src/pages/category/index.js" />
<option value="$PROJECT_DIR$/src/components/search/index.scss" />
<option value="$PROJECT_DIR$/src/style/taro-ui-mod.scss" />
<option value="$PROJECT_DIR$/src/style/variables.scss" />
<option value="$PROJECT_DIR$/src/components/search/index.js" />
<option value="$PROJECT_DIR$/src/components/index.js" />
<option value="$PROJECT_DIR$/src/components/address/edit.js" />
<option value="$PROJECT_DIR$/src/api/index.js" />
<option value="$PROJECT_DIR$/src/api/user.js" />
@@ -188,26 +174,135 @@
<option value="$PROJECT_DIR$/src/pages/member/recharge.scss" />
<option value="$PROJECT_DIR$/src/app.js" />
<option value="$PROJECT_DIR$/src/pages/member/recharge.js" />
<option value="$PROJECT_DIR$/src/pages/index/index.js" />
<option value="$PROJECT_DIR$/src/pages/member/integral.scss" />
<option value="$PROJECT_DIR$/src/pages/member/integral.js" />
<option value="$PROJECT_DIR$/src/pages/index/index.js" />
<option value="$PROJECT_DIR$/src/components/index.js" />
<option value="$PROJECT_DIR$/src/pages/category/index.scss" />
<option value="$PROJECT_DIR$/src/pages/category/index.js" />
<option value="$PROJECT_DIR$/src/components/search/index.scss" />
<option value="$PROJECT_DIR$/src/components/search/index.js" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="280" />
<option name="y" value="118" />
<option name="x" value="508" />
<option name="y" value="113" />
<option name="width" value="1400" />
<option name="height" value="937" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<navigator currentView="Scope" currentSubView="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope" proportions="" version="1">
<showMembers ProjectPane="false" />
<showExcludedFiles Scope="true" ProjectPane="true" />
<sortByType ProjectPane="false" />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scope">
<subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
<expand>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="components" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="components" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="cell" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="components" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="goods-item" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="components" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="note" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="components" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="search" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="pages" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="pages" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="auth" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="pages" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="category" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="pages" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="index" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="pages" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="item" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="pages" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="member" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="style" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="espier-taro-fenxiao" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="utils" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="ProjectPane" />
</panes>
</component>
@@ -221,6 +316,7 @@
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="preferences.editor" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -246,21 +342,22 @@
<updated>1551168703692</updated>
<workItem from="1551168706548" duration="6029000" />
<workItem from="1551178435380" duration="33108000" />
<workItem from="1551332673381" duration="15434000" />
<workItem from="1551332673381" duration="16864000" />
<workItem from="1551353985403" duration="2107000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="54571000" />
<option name="totallyTimeSpent" value="58108000" />
</component>
<component name="ToolWindowManager">
<frame x="280" y="118" width="1400" height="937" extended-state="0" />
<frame x="508" y="113" width="1400" height="937" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49940827" visible="true" weight="0.13560551" />
<window_info id="Structure" order="1" sideWeight="0.5005917" side_tool="true" weight="0.13560551" />
<window_info id="npm" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Structure" order="0" sideWeight="0.5005917" side_tool="true" weight="0.13560551" />
<window_info id="npm" order="1" side_tool="true" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info active="true" content_ui="combo" x="886" y="155" width="187" height="845" id="Project" order="3" sideWeight="0.49940827" visible="true" weight="0.13560551" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
@@ -281,96 +378,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/api/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" selection-start-line="8" selection-end-line="8" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/cart/checkout.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="232" column="22" selection-start-line="232" selection-start-column="9" selection-end-line="232" selection-end-column="22" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/api/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="24" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/components/timer/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="58" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/toast/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="583">
<caret line="65" column="16" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="16" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/trade/detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="33" column="2" lean-forward="true" selection-start-line="33" selection-start-column="2" selection-end-line="44" selection-end-column="3" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/api/member.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/components/timer/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="31" lean-forward="true" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/reg.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="9" selection-end-line="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/forgotpwd.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@@ -395,16 +402,6 @@
<entry file="file://$PROJECT_DIR$/src/components/icon-menu/index.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/style/icon.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="27" column="14" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="14" />
<folding>
<element signature="e#73#4803#1" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/forgotpwd.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
@@ -434,13 +431,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/category/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="32" column="16" lean-forward="true" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/address/picker.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3075">
@@ -530,16 +520,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="33" column="28" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="28" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/member/recharge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-188">
@@ -550,16 +530,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/imgs/trade/ico_wait_buyer_confirm_goods.png">
<provider selected="true" editor-type-id="images" />
</entry>
@@ -594,29 +564,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/note/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="35" column="1" selection-start-line="35" selection-start-column="1" selection-end-line="35" selection-end-column="1" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/note/index.scss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="610">
<caret line="105" column="36" selection-start-line="105" selection-start-column="22" selection-end-line="105" selection-end-column="36" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
@@ -624,25 +571,187 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/category/index.js">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-357">
<caret line="32" column="6" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="6" />
<state relative-caret-position="90">
<caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/note/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="1" lean-forward="true" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="36" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="36" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="17" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/log.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/dom.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/note/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="38" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="38" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="28" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/item/detail.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/item/detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389">
<caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/goods-item/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-57">
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/item/list.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="655">
<caret line="132" column="22" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="22" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/cell/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="24" column="125" lean-forward="true" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="125" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/category/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-14">
<caret line="25" column="16" lean-forward="true" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/member/integral.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="92" column="49" lean-forward="true" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
<state relative-caret-position="233">
<caret line="92" column="49" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
<folding>
<element signature="e#1#47#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/icon.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="623">
<caret line="51" column="16" lean-forward="true" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/auth/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="574">
<caret line="101" column="22" lean-forward="true" selection-start-line="101" selection-start-column="22" selection-end-line="101" selection-end-column="22" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/category/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/taro-ui-mod.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/search/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="31" column="22" lean-forward="true" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
<folding>
<element signature="e#1074#1080#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/search/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="69" column="6" lean-forward="true" selection-start-line="69" selection-start-column="6" selection-end-line="69" selection-end-column="6" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

View File

@@ -9,7 +9,7 @@ export { default as AddressPicker } from './address/picker'
export { default as TabBar } from './tab-bar'
export { default as FilterBar } from './filter-bar'
export { default as SearchPanel } from './search'
export { default as SearchBar } from './search'
export { default as Timer } from './timer'
export { default as SpCheckbox } from './checkbox'

View File

@@ -1,13 +1,13 @@
import Taro, { Component } from '@tarojs/taro'
import {View, Form, Text} from '@tarojs/components'
import { AtSearchBar} from 'taro-ui'
import { AtSearchBar } from 'taro-ui'
import { classNames } from '@/utils'
import api from '@/api'
import './index.scss'
export default class SearchPanel extends Component {
export default class SearchBar extends Component {
static defaultProps = {
isOpend: false,
}
@@ -77,11 +77,18 @@ export default class SearchPanel extends Component {
})
}
handleClickTag = () => {
console.log("tag")
}
render () {
const { isFixed } = this.props
// s
console.log(isFixed, 82)
const { showSearchDailog, historyList } = this.state
return (
<View className={classNames('search-input', showSearchDailog ? 'search-input__focus' : null)}>
<View className={classNames('search-input', showSearchDailog ? 'search-input__focus' : null, isFixed ? 'search-input-fixed' : null)}>
<Form onSubmit={this.handleConfirm.bind(this)}>
<AtSearchBar
className='search-input__bar'
@@ -96,11 +103,11 @@ export default class SearchPanel extends Component {
<View className={classNames(showSearchDailog ? 'search-input__history' : 'search-input__history-none')}>
<View className='search-input__history-title'>
<Text>最近搜索</Text>
<Text onClick={this.handleClickDelete.bind(this)}>删除</Text>
<Text className='sp-icon sp-icon-shanchu icon-del' onClick={this.handleClickDelete.bind(this)}></Text>
</View>
<View className='search-input__history-list'>
{
historyList.map((item, index) => <View className='search-input__history-list__btn' key={index}>{item}</View> )
historyList.map((item, index) => <View className='search-input__history-list__btn' key={index} onClick={this.handleClickTag}>{item}</View> )
}
</View>
</View>

View File

@@ -1,9 +1,6 @@
@import "../../style/imports";
.search-input {
position: fixed;
top: 0;
left: 0;
width: 750px;
height: 84px;
text-align: center;
@@ -22,8 +19,10 @@
color: #666666;
display: flex;
justify-content:space-between;
//text-align: left;
padding: 34px 40px;
.icon-del {
font-size: 40px;
}
}
&-list {
font-size: 26px;
@@ -44,6 +43,13 @@
display: none;
}
}
.search-input-fixed {
position: fixed;
top: 0;
left: 0;
}
.search-input__focus{
height: 100vh;
z-index: 99;

View File

@@ -1,7 +1,7 @@
import Taro, { Component } from '@tarojs/taro'
import {View, Text, ScrollView, Image} from '@tarojs/components'
import { AtSearchBar, AtButton } from 'taro-ui'
import { Loading, SearchPanel } from '@/components'
import { Loading, SearchBar } from '@/components'
import { classNames } from '@/utils'
import { lockScreen } from '@/utils/dom'
import api from '@/api'
@@ -51,8 +51,8 @@ export default class CartIndex extends Component {
return (
<View className='page-category-index'>
<SearchPanel
mode='category'
<SearchBar
isFixed
/>
<View className='category-list'>
<ScrollView

View File

@@ -1,17 +1,6 @@
@import "../../style/imports";
.page-category-index {
height: 100%;
//.category-list__search {
// position: fixed;
// top: 0;
// left: 0;
// height: 84px;
// width: 750px;
// text-align: center;
// border-bottom: 1px solid #DDDDDD;
// box-shadow: 0px -1px 0px 0px rgba(221, 221, 221, 1);
// box-sizing: border-box;
//}
.category-list {
box-sizing: border-box;
padding-top: 84px;

View File

@@ -10,7 +10,7 @@ export default class Index extends Component {
componentWillMount () {
if (process.env.NODE_ENV === 'development') {
Taro.redirectTo({
url: '/pages/item/list?cateId=20'
url: '/pages/category/index'
})
}
}