Skip to content

E
etaoshop-dz
提交 264be1d9 编写于 作者: zhangzhiwei's avatar zhangzhiwei
浏览文件
操作

导航

上级 33bca0ee
显示空白字符变更
内嵌 并排
正在显示 包含 84 行增加 和 82 行删除
.idea/workspace.xml
浏览文件 @ 264be1d9
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8836328f-bafb-4666-8053-185078535f28" name="Default" comment=""> <list default="true" id="8836328f-bafb-4666-8053-185078535f28" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pages/map/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/map/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/map/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/map/index.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -21,38 +22,43 @@ ...@@ -21,38 +22,43 @@
<file leaf-file-name="login.wxml" pinned="false" current-in-tab="false"> <file leaf-file-name="login.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/login/login.wxml"> <entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825"> <state relative-caret-position="528">
<caret line="25" column="47" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="47" /> <caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.wxml" pinned="false" current-in-tab="false"> <file leaf-file-name="ETaoLogo.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/map/index.wxml"> <entry file="file://$PROJECT_DIR$/asstes/img/ETaoLogo.png">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="images" />
<state relative-caret-position="33"> </entry>
<caret line="1" column="7" selection-start-line="1" selection-start-column="7" selection-end-line="3" selection-end-column="12" /> </file>
</state> <file leaf-file-name="login.json" pinned="false" current-in-tab="false">
</provider> <entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="wxLogin.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogin.png">
<provider selected="true" editor-type-id="images" />
</entry> </entry>
</file> </file>
<file leaf-file-name="login.js" pinned="false" current-in-tab="false"> <file leaf-file-name="login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/login/login.js"> <entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6567"> <state relative-caret-position="33">
<caret line="199" column="1" lean-forward="true" selection-start-line="199" selection-start-column="1" selection-end-line="205" selection-end-column="4" /> <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <file leaf-file-name="index.wxml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index.js"> <entry file="file://$PROJECT_DIR$/pages/map/index.wxml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1287"> <state relative-caret-position="165">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="39" selection-end-column="4" /> <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#style#0;n#image#0;n#view#0;n#!!top" expanded="true" />
<element signature="e#1842#2231#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -61,17 +67,22 @@ ...@@ -61,17 +67,22 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/map/index.js"> <entry file="file://$PROJECT_DIR$/pages/map/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627"> <state relative-caret-position="759">
<caret line="19" column="11" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="21" selection-end-column="4" /> <caret line="23" column="19" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.json" pinned="false" current-in-tab="false"> <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/map/index.json"> <entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33"> <state relative-caret-position="957">
<caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" /> <caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -79,37 +90,15 @@ ...@@ -79,37 +90,15 @@
<file leaf-file-name="app.js" pinned="false" current-in-tab="false"> <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.js"> <entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-684"> <state relative-caret-position="1386">
<caret line="13" column="63" selection-start-line="13" selection-start-column="63" selection-end-line="13" selection-end-column="63" /> <caret line="42" column="2" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="2" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.wxss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/map/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="logs.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="app.json" pinned="false" current-in-tab="true"> <file leaf-file-name="app.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.json"> <entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="132">
<caret line="4" column="22" lean-forward="true" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
</state>
</provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
...@@ -165,9 +154,9 @@ ...@@ -165,9 +154,9 @@
<option value="$PROJECT_DIR$/pages/index.js" /> <option value="$PROJECT_DIR$/pages/index.js" />
<option value="$PROJECT_DIR$/pages/map/index.json" /> <option value="$PROJECT_DIR$/pages/map/index.json" />
<option value="$PROJECT_DIR$/pages/map/index.wxss" /> <option value="$PROJECT_DIR$/pages/map/index.wxss" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/map/index.wxml" /> <option value="$PROJECT_DIR$/pages/map/index.wxml" />
<option value="$PROJECT_DIR$/pages/map/index.js" /> <option value="$PROJECT_DIR$/pages/map/index.js" />
<option value="$PROJECT_DIR$/app.json" />
</list> </list>
</option> </option>
</component> </component>
...@@ -223,7 +212,7 @@ ...@@ -223,7 +212,7 @@
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="F:/fenxiao_h5" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <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_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="configurable.group.appearance" /> <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
...@@ -277,33 +266,34 @@ ...@@ -277,33 +266,34 @@
<workItem from="1723448622008" duration="28000" /> <workItem from="1723448622008" duration="28000" />
<workItem from="1723449451915" duration="6000" /> <workItem from="1723449451915" duration="6000" />
<workItem from="1723449604775" duration="619000" /> <workItem from="1723449604775" duration="619000" />
<workItem from="1723713889430" duration="332000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62734000" /> <option name="totallyTimeSpent" value="63237000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.18018967" /> <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.1796875" />
<window_info anchor="bottom" id="TODO" order="10" /> <window_info anchor="bottom" id="TODO" order="10" />
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="2" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Run" order="6" />
<window_info anchor="bottom" id="Version Control" order="1" /> <window_info anchor="bottom" id="Version Control" order="1" />
<window_info anchor="bottom" id="Run" order="6" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" /> <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" order="3" /> <window_info anchor="bottom" id="Terminal" order="3" />
<window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
<window_info id="Favorites" order="0" side_tool="true" /> <window_info id="Favorites" order="0" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="9" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Find" order="5" />
<window_info anchor="bottom" id="Message" order="4" /> <window_info anchor="bottom" id="Message" order="4" />
<window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
<window_info anchor="bottom" id="Find" order="5" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -367,6 +357,7 @@ ...@@ -367,6 +357,7 @@
<caret line="15" column="52" lean-forward="true" selection-start-line="15" selection-start-column="52" selection-end-line="15" selection-end-column="76" /> <caret line="15" column="52" lean-forward="true" selection-start-line="15" selection-start-column="52" selection-end-line="15" selection-end-column="76" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" /> <element signature="e#1842#2231#0" />
</folding> </folding>
</state> </state>
...@@ -411,6 +402,7 @@ ...@@ -411,6 +402,7 @@
<caret line="30" column="33" lean-forward="true" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" /> <caret line="30" column="33" lean-forward="true" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" /> <element signature="e#1842#2231#0" />
</folding> </folding>
</state> </state>
...@@ -525,24 +517,25 @@ ...@@ -525,24 +517,25 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.wxml"> <entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825"> <state relative-caret-position="528">
<caret line="25" column="47" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="47" /> <caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.js"> <entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6567"> <state relative-caret-position="33">
<caret line="199" column="1" lean-forward="true" selection-start-line="199" selection-start-column="1" selection-end-line="205" selection-end-column="4" /> <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/index.js"> <entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1287"> <state relative-caret-position="957">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="39" selection-end-column="4" /> <caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" /> <element signature="e#1842#2231#0" />
</folding> </folding>
</state> </state>
...@@ -555,13 +548,6 @@ ...@@ -555,13 +548,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/map/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="7" selection-start-line="1" selection-start-column="7" selection-end-line="3" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/map/index.json"> <entry file="file://$PROJECT_DIR$/pages/map/index.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33"> <state relative-caret-position="33">
...@@ -569,24 +555,30 @@ ...@@ -569,24 +555,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/map/index.js"> <entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627"> <state relative-caret-position="1386">
<caret line="19" column="11" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="21" selection-end-column="4" /> <caret line="42" column="2" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="2" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app.js"> <entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/map/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-684"> <state relative-caret-position="759">
<caret line="13" column="63" selection-start-line="13" selection-start-column="63" selection-end-line="13" selection-end-column="63" /> <caret line="23" column="19" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app.json"> <entry file="file://$PROJECT_DIR$/pages/map/index.wxml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="165">
<caret line="4" column="22" lean-forward="true" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" /> <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#image#0;n#view#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
pages/map/index.js
浏览文件 @ 264be1d9
...@@ -20,4 +20,14 @@ Page({ ...@@ -20,4 +20,14 @@ Page({
// }, // },
}] }]
}, },
toIndex(){
wx.openLocation({
latitude: 30.339744,
longitude: 120.113514,
name: "佐萌科技旗舰店",
address: "杭州市拱墅区祥茂路166号 华滋科欣设计创意园2号楼701室",
scale: 14,
infoUrl: "",
});
},
}) })
\ No newline at end of file
pages/map/index.wxml
浏览文件 @ 264be1d9
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
<map id="myMap" scale="18" longitude="{{longitude}}" latitude="{{latitude}}" markers="{{markers}}" show-location="{{true}}" <map id="myMap" scale="18" longitude="{{longitude}}" latitude="{{latitude}}" markers="{{markers}}" show-location="{{true}}"
> >
</map> </map>
<!--<image bindtap='toIndex' class='wxLogo' style="width: 50rpx;height: 50rpx;border-radius: 10rpx" src='/asstes/img/daohang.jpg'></image>--> <image bindtap='toIndex' class='wxLogo' style="width: 50rpx;height: 50rpx;border-radius: 10rpx" src='/asstes/img/daohang.jpg'></image>
</view> </view>
project.config.json
浏览文件 @ 264be1d9
...@@ -127,5 +127,5 @@ ...@@ -127,5 +127,5 @@
"ignore": [], "ignore": [],
"include": [] "include": []
}, },
"appid": "wxdb3d8f9a94eca8d9" "appid": "wx175347bd3977d6a9"
} }
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或