Skip to content

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

更换logo

上级 283a430b
显示空白字符变更
内嵌 并排
正在显示 包含 197 行增加 和 103 行删除
.idea/workspace.xml
浏览文件 @ 61e7de7a
......@@ -2,6 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<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$/pages/login/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/login/login.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.wxml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -15,12 +17,12 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="login.wxml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="21" column="4" selection-start-line="21" selection-start-column="8" selection-end-line="23" selection-end-column="17" />
<state relative-caret-position="495">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
......@@ -30,36 +32,49 @@
<provider selected="true" editor-type-id="images" />
</entry>
</file>
<file leaf-file-name="index.wxml" pinned="false" current-in-tab="false">
<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>
<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" />
</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="phoneIcon.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/asstes/img/phoneIcon.png">
<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="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>
</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="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>
<caret column="2" lean-forward="true" selection-start-column="2" selection-end-column="2" />
<state relative-caret-position="264">
<caret line="8" column="10" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="10" />
</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" />
</entry>
</file>
<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="1023">
<caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
<state relative-caret-position="957">
<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" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" />
</folding>
</state>
</provider>
......@@ -68,31 +83,12 @@
<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="594">
<caret line="39" column="44" selection-start-line="39" selection-start-column="44" selection-end-line="39" selection-end-column="44" />
</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="510">
<caret line="50" column="40" lean-forward="true" selection-start-line="50" selection-start-column="40" selection-end-line="50" selection-end-column="57" />
<state relative-caret-position="670">
<caret line="42" column="2" lean-forward="true" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="2" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="phoneIcon.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/asstes/img/phoneIcon.png">
<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>
</leaf>
</component>
<component name="FindInProjectRecents">
......@@ -110,8 +106,9 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/index.js" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/login/login.js" />
<option value="$PROJECT_DIR$/pages/login/login.wxml" />
</list>
</option>
......@@ -136,6 +133,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -163,12 +161,11 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="F:/etao-sjht" />
<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_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
......@@ -202,11 +199,17 @@
<option name="presentableId" value="Default" />
<updated>1714790536207</updated>
<workItem from="1714790537418" duration="8224000" />
<workItem from="1715246164938" duration="682000" />
<workItem from="1715332129883" duration="1730000" />
<workItem from="1715406876636" duration="2102000" />
<workItem from="1715584189355" duration="846000" />
<workItem from="1716252238008" duration="1078000" />
<workItem from="1717395807496" duration="183000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16999000" />
<option name="totallyTimeSpent" value="23624000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
......@@ -216,7 +219,6 @@
<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="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Find" order="5" />
<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" />
......@@ -224,22 +226,12 @@
<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="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="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="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 id="Favorites" order="0" side_tool="true" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -249,6 +241,98 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<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" />
</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">
<caret line="21" column="4" lean-forward="true" selection-start-line="21" selection-start-column="4" selection-end-line="23" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="3" selection-start-column="3" selection-end-line="14" selection-end-column="2" />
</state>
</provider>
</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.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/logs/logs.wxss">
<provider selected="true" editor-type-id="text-editor" />
</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$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="10" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<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>
<element signature="n#!!doc" expanded="true" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
......@@ -275,15 +359,6 @@
</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">
......@@ -297,6 +372,8 @@
<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" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" />
</folding>
</state>
</provider>
......@@ -334,19 +411,9 @@
<entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor" />
</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/logs/logs.wxss">
<provider selected="true" editor-type-id="text-editor" />
</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/logs/logs.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
......@@ -356,23 +423,11 @@
</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>
<caret column="3" selection-start-column="3" selection-end-line="14" selection-end-column="2" />
</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" />
</entry>
......@@ -390,37 +445,75 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/ETaoLogo.png">
<provider selected="true" editor-type-id="images" />
<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/login/login.js">
<entry file="file://$PROJECT_DIR$/pages/pay/pay.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3366">
<caret line="103" column="8" selection-start-line="103" selection-start-column="2" selection-end-line="103" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="50" column="40" lean-forward="true" selection-start-line="50" selection-start-column="40" selection-end-line="50" selection-end-column="57" />
<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/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1023">
<caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
<state relative-caret-position="957">
<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" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
<caret line="39" column="44" selection-start-line="39" selection-start-column="44" selection-end-line="39" selection-end-column="44" />
<state relative-caret-position="670">
<caret line="42" column="2" lean-forward="true" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="2" />
</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/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$/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>
<entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="8" column="10" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogin.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">
<state relative-caret-position="396">
<caret line="21" column="4" selection-start-line="21" selection-start-column="8" selection-end-line="23" selection-end-column="17" />
<state relative-caret-position="495">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
......
pages/login/login.js
浏览文件 @ 61e7de7a
......@@ -5,7 +5,8 @@ Page({
defurl:app.globalData.defurl,
userInfo:'',
paramsUrl:'',
openId:''
openId:'',
imgLgo:'https://img.edsmall.com/ETao/ETao/jinyanxia/jinyanxia_pc_h5.jpg?t='+new Date().getTime()
},
onLoad: function (options) {
try{
......
pages/login/login.wxml
浏览文件 @ 61e7de7a
......@@ -13,7 +13,7 @@
</view>
<view wx:if='{{openId&&!showPrivacy}}'>
<view class='ETaoLogoBox'>
<image class='ETaoLogo' mode='widthFix' src='/asstes/img/ETaoLogo.png'></image>
<image class='ETaoLogo' mode='widthFix' src='{{imgLgo}}'></image>
<view class='ETaoName'>商城</view>
</view>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或