Skip to content

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

地图

上级 348efc02
隐藏空白字符变更
内嵌 并排
正在显示 包含 185 行增加 和 96 行删除
.idea/workspace.xml
浏览文件 @ 33bca0ee
......@@ -2,7 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8836328f-bafb-4666-8053-185078535f28" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" 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$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -20,22 +21,26 @@
<file leaf-file-name="login.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="16" column="38" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="38" />
<state relative-caret-position="825">
<caret line="25" column="47" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="47" />
</state>
</provider>
</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" />
<file leaf-file-name="index.wxml" pinned="false" current-in-tab="false">
<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>
</file>
<file leaf-file-name="login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
<state relative-caret-position="6567">
<caret line="199" column="1" lean-forward="true" selection-start-line="199" selection-start-column="1" selection-end-line="205" selection-end-column="4" />
</state>
</provider>
</entry>
......@@ -43,8 +48,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="891">
<caret line="28" column="24" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
<state relative-caret-position="1287">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="39" selection-end-column="4" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#1842#2231#0" />
......@@ -53,48 +58,56 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index.wxml">
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/map/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="60" selection-start-line="1" selection-start-column="60" selection-end-line="1" selection-end-column="60" />
<state relative-caret-position="627">
<caret line="19" column="11" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="21" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.wxss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor" />
<file leaf-file-name="index.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/map/index.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="true">
<file leaf-file-name="app.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<state relative-caret-position="-684">
<caret line="13" column="63" selection-start-line="13" selection-start-column="63" selection-end-line="13" selection-end-column="63" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index.json">
<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>
<caret column="2" selection-start-column="2" selection-end-column="2" />
<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="app.wxss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.wxss">
<provider selected="true" editor-type-id="text-editor" />
<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>
</provider>
</entry>
</file>
<file leaf-file-name="app.json" pinned="false" current-in-tab="false">
<file leaf-file-name="app.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="15" column="1" lean-forward="true" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
<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>
......@@ -126,6 +139,15 @@
<find>proName</find>
<find>imgUrl</find>
<find>storeName</find>
<find>app.locationTa</find>
<find>app.selfPoint</find>
<find>onShareAppMessage</find>
<find>coordtransform</find>
<find>ETaoLogo</find>
<find>headImg</find>
<find>toIndex</find>
<find>location</find>
<find>markers</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -137,10 +159,15 @@
<option value="$PROJECT_DIR$/pages/login/login.wxml" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/ext.json" />
<option value="$PROJECT_DIR$/pages/index.wxml" />
<option value="$PROJECT_DIR$/pages/index.js" />
<option value="$PROJECT_DIR$/pages/login/login.js" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/index.wxml" />
<option value="$PROJECT_DIR$/pages/index.js" />
<option value="$PROJECT_DIR$/pages/map/index.json" />
<option value="$PROJECT_DIR$/pages/map/index.wxss" />
<option value="$PROJECT_DIR$/pages/map/index.wxml" />
<option value="$PROJECT_DIR$/pages/map/index.js" />
<option value="$PROJECT_DIR$/app.json" />
</list>
</option>
</component>
......@@ -185,7 +212,7 @@
<item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" />
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="login" type="462c0819:PsiDirectoryNode" />
<item name="map" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -196,15 +223,15 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="F:/fenxiao_h5" />
<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="settings.editor.selected.configurable" value="configurable.group.appearance" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="F:\app-dz\etaoshop-dz\pages\images" />
<recent name="F:\app-dz\etaoshop-dz\asstes\img" />
<recent name="F:\app-dz\etaoshop-dz\pages\images" />
</key>
</component>
<component name="RunDashboard">
......@@ -243,12 +270,18 @@
<workItem from="1720163640448" duration="1636000" />
<workItem from="1720409373147" duration="2509000" />
<workItem from="1720683275041" duration="5000" />
<workItem from="1720863768996" duration="1397000" />
<workItem from="1720863768996" duration="2478000" />
<workItem from="1723282377051" duration="11117000" />
<workItem from="1723446877197" duration="6000" />
<workItem from="1723447562924" duration="482000" />
<workItem from="1723448622008" duration="28000" />
<workItem from="1723449451915" duration="6000" />
<workItem from="1723449604775" duration="619000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="49395000" />
<option name="totallyTimeSpent" value="62734000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
......@@ -280,29 +313,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="4" column="61" lean-forward="true" selection-end-line="4" selection-end-column="140" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/ETaoLogo.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5544">
<caret line="168" column="9" selection-start-line="168" selection-start-column="2" selection-end-line="168" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
......@@ -450,13 +460,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/pay/pay.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="957">
<caret line="29" column="41" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/pay/pay.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3366">
......@@ -464,13 +467,6 @@
</state>
</provider>
</entry>
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogo.png">
<provider selected="true" editor-type-id="images" />
</entry>
......@@ -480,9 +476,6 @@
<entry file="file://$PROJECT_DIR$/asstes/img/phoneIcon.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/ETaoLogo.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
......@@ -502,17 +495,52 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="4" column="58" selection-start-line="4" selection-start-column="58" selection-end-line="4" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/public.js" />
<entry file="file://$PROJECT_DIR$/asstes/img/ETaoLogo.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/pay/pay.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="957">
<caret line="29" column="41" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="41" />
</state>
</provider>
</entry>
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="16" column="38" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="38" />
<state relative-caret-position="825">
<caret line="25" column="47" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6567">
<caret line="199" column="1" lean-forward="true" selection-start-line="199" selection-start-column="1" selection-end-line="205" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="891">
<caret line="28" column="24" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
<state relative-caret-position="1287">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="39" selection-end-column="4" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#1842#2231#0" />
......@@ -520,34 +548,45 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxml">
<entry file="file://$PROJECT_DIR$/pages/map/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="60" selection-start-line="1" selection-start-column="60" selection-end-line="1" selection-end-column="60" />
<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>
<entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor" />
<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$/app.json">
<entry file="file://$PROJECT_DIR$/pages/map/index.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="15" column="1" lean-forward="true" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
<state relative-caret-position="33">
<caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.js">
<entry file="file://$PROJECT_DIR$/pages/map/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="55" column="39" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="39" />
<state relative-caret-position="627">
<caret line="19" column="11" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="21" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<state relative-caret-position="-684">
<caret line="13" column="63" selection-start-line="13" selection-start-column="63" selection-end-line="13" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<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>
......
app.json
浏览文件 @ 33bca0ee
......@@ -3,7 +3,8 @@
"pages/index",
"pages/pay/pay",
"pages/logs/logs",
"pages/login/login"
"pages/login/login",
"pages/map/index"
],
"__usePrivacyCheck__":true,
"window": {
......
pages/map/index.js 0 → 100644
浏览文件 @ 33bca0ee
Page({
data: {
longitude: 120.113514,
latitude: 30.339744,
markers: [{
id: 1,
longitude: 120.113514,
latitude: 30.339744,
// label:{
// padding:'3px',
// borderRadius:3,
// borderWidth:1,
// bgColor:'#fff',
// content:'佐萌科技',
// color:'#333333',
// fontSize:16,
// title:'佐萌科技',
// textAlign:'right',
// anchorY:6
// },
}]
},
})
\ No newline at end of file
pages/map/index.json 0 → 100644
浏览文件 @ 33bca0ee
{
"navigationBarTitleText": "店铺信息"
}
\ No newline at end of file
pages/map/index.wxml 0 → 100644
浏览文件 @ 33bca0ee
<view class="homepage">
<map id="myMap" scale="18" longitude="{{longitude}}" latitude="{{latitude}}" markers="{{markers}}" show-location="{{true}}"
>
</map>
<!--<image bindtap='toIndex' class='wxLogo' style="width: 50rpx;height: 50rpx;border-radius: 10rpx" src='/asstes/img/daohang.jpg'></image>-->
</view>
pages/map/index.wxss 0 → 100644
浏览文件 @ 33bca0ee
map{width: 100vw; height: 350px;top: 0}
.wxLogo{
position: absolute;
top: 20rpx;
right: 40rpx;
z-index: 9999;
}
.vip_crad_wrap{
position: fixed;
left: 3vw;
bottom: 40rpx;
background: #fff;
width: 94vw;
height: auto;
}
\ No newline at end of file
project.config.json
浏览文件 @ 33bca0ee
......@@ -127,5 +127,5 @@
"ignore": [],
"include": []
},
"appid": "wx175347bd3977d6a9"
"appid": "wxdb3d8f9a94eca8d9"
}
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或