Skip to content

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

更换logo

上级 261aec4c
隐藏空白字符变更
内嵌 并排
正在显示 包含 207 行增加 和 56 行删除
.idea/workspace.xml
浏览文件 @ 553289ef
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<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.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/asstes/img/ETaoLogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/asstes/img/ETaoLogo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pages/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index.js" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -18,55 +18,44 @@ ...@@ -18,55 +18,44 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="app.js" pinned="false" current-in-tab="true"> <file leaf-file-name="login.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.js"> <entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="39" column="29" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="util.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor" />
</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" />
</entry>
</file>
<file leaf-file-name="login.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
</file> </file>
<file leaf-file-name="logs.js" pinned="false" current-in-tab="false"> <file leaf-file-name="ETaoLogo.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.js"> <entry file="file://$PROJECT_DIR$/asstes/img/ETaoLogo.png">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
</file> </file>
<file leaf-file-name="logs.json" pinned="false" current-in-tab="false"> <file leaf-file-name="index.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.json"> <entry file="file://$PROJECT_DIR$/pages/index.wxml">
<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="61" lean-forward="true" selection-end-line="4" selection-end-column="140" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="logs.wxml" pinned="false" current-in-tab="false"> <file leaf-file-name="index.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml"> <entry file="file://$PROJECT_DIR$/pages/index.json">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state>
<caret column="2" lean-forward="true" selection-start-column="2" selection-end-column="2" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="logs.wxss" pinned="false" current-in-tab="false"> <file leaf-file-name="index.wxss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxss"> <entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
</file> </file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<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="312"> <state relative-caret-position="528">
<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="106" column="5" lean-forward="true" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
...@@ -74,9 +63,24 @@ ...@@ -74,9 +63,24 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.wxml" pinned="false" current-in-tab="false"> <file leaf-file-name="phoneIcon.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index.wxml"> <entry file="file://$PROJECT_DIR$/asstes/img/phoneIcon.png">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="images" />
</entry>
</file>
<file leaf-file-name="phoneLogin.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/asstes/img/phoneLogin.png">
<provider selected="true" editor-type-id="images" />
</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>
</file>
<file leaf-file-name="wxLogo.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogo.png">
<provider selected="true" editor-type-id="images" />
</entry> </entry>
</file> </file>
</leaf> </leaf>
...@@ -96,8 +100,8 @@ ...@@ -96,8 +100,8 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/pages/index.js" />
<option value="$PROJECT_DIR$/app.js" /> <option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -111,7 +115,7 @@ ...@@ -111,7 +115,7 @@
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectFrameBounds" extendedState="7"> <component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-8" /> <option name="x" value="1912" />
<option name="y" value="-8" /> <option name="y" value="-8" />
<option name="width" value="1936" /> <option name="width" value="1936" />
<option name="height" value="1056" /> <option name="height" value="1056" />
...@@ -128,6 +132,11 @@ ...@@ -128,6 +132,11 @@
<item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" /> <item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" />
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" /> <item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" />
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
<item name="asstes" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" /> <item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" />
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" /> <item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
...@@ -147,6 +156,12 @@ ...@@ -147,6 +156,12 @@
<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" />
</component> </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" />
</key>
</component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
<list> <list>
...@@ -174,10 +189,11 @@ ...@@ -174,10 +189,11 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="8224000" /> <option name="totallyTimeSpent" value="10976000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
<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.18018967" />
<window_info anchor="bottom" id="TODO" order="10" /> <window_info anchor="bottom" id="TODO" order="10" />
...@@ -191,11 +207,22 @@ ...@@ -191,11 +207,22 @@
<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="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="Docker" order="0" show_stripe_button="false" />
<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="bottom" id="Cvs" order="8" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.18018967" />
<window_info id="Structure" order="2" side_tool="true" 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="TODO" order="10" />
<window_info anchor="bottom" id="Run" order="6" />
<window_info anchor="bottom" id="Find" order="5" />
<window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
<window_info anchor="bottom" id="Terminal" order="3" />
<window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="1" />
<window_info anchor="bottom" id="Message" order="4" /> <window_info anchor="bottom" id="Message" order="4" />
<window_info id="Favorites" order="0" side_tool="true" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -211,46 +238,170 @@ ...@@ -211,46 +238,170 @@
<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" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/utils/util.js"> <entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.json"> <entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81">
<caret line="37" column="18" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="39" column="46" lean-forward="true" selection-start-line="39" selection-start-column="46" selection-end-line="39" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/pay/pay.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1485">
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</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$/pages/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<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>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxss">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="2" column="1" lean-forward="true" selection-end-line="2" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.js"> <entry file="file://$PROJECT_DIR$/pages/logs/logs.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="13" column="3" lean-forward="true" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="801">
<caret line="473" selection-start-line="473" selection-end-line="473" />
</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" />
</entry>
<entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.json"> <entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</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">
<state relative-caret-position="81">
<caret line="37" column="18" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="39" column="46" lean-forward="true" selection-start-line="39" selection-start-column="46" selection-end-line="39" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxss">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml"> <entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml">
<provider selected="true" editor-type-id="text-editor" /> <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>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxss"> <entry file="file://$PROJECT_DIR$/pages/logs/logs.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="2" column="1" lean-forward="true" selection-end-line="2" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="13" column="3" lean-forward="true" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogo.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogin.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/phoneLogin.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/phoneIcon.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/index.json">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="2" lean-forward="true" selection-start-column="2" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxml"> <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.wxml">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</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="312"> <state relative-caret-position="528">
<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="106" column="5" lean-forward="true" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="39" column="29" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="29" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
asstes/img/ETaoLogo.png
查看替换文件 @ 261aec4c 浏览文件 @ 553289ef
asstes/img/ETaoLogo.png

7.9 KB | W: | H:

asstes/img/ETaoLogo.png

12.3 KB | W: | H:

asstes/img/ETaoLogo.png
asstes/img/ETaoLogo.png
asstes/img/ETaoLogo.png
asstes/img/ETaoLogo.png
  • 2-up
  • Swipe
  • Onion skin
pages/index.js
浏览文件 @ 553289ef
...@@ -97,7 +97,7 @@ Page({ ...@@ -97,7 +97,7 @@ Page({
let newUrl = options.webViewUrl.replace(data.defurl, ''); let newUrl = options.webViewUrl.replace(data.defurl, '');
let title = data.proName ? data.proName : '商城'; let title = data.proName ? data.proName : '商城';
let time =new Date().getTime() let time =new Date().getTime()
let imageUrl = data.imgUrl ? data.imgUrl : 'http://app.edsmall.com/ETaoShopMiniApp/images/share.jpg?t='+time let imageUrl = data.imgUrl ? data.imgUrl : 'https://img.edsmall.com/ROOT/ETao/fenxiao/h5/share-bg.png?t='+time
const weburl = encodeURIComponent(data.defurl + '/weixin/QRCode&&from=wx&url=' + newUrl + '&name=' + data.userInfo); const weburl = encodeURIComponent(data.defurl + '/weixin/QRCode&&from=wx&url=' + newUrl + '&name=' + data.userInfo);
return { return {
title: title, title: title,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或