Skip to content

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

朱亮定制

上级 b70f6b46
隐藏空白字符变更
内嵌 并排
正在显示 包含 47 行增加 和 50 行删除
.idea/workspace.xml
浏览文件 @ 6a84f588
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<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$/pages/login/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.js" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -27,11 +25,6 @@ ...@@ -27,11 +25,6 @@
</provider> </provider>
</entry> </entry>
</file> </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" />
</entry>
</file>
<file leaf-file-name="wxLogin.png" pinned="false" current-in-tab="false"> <file leaf-file-name="wxLogin.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogin.png"> <entry file="file://$PROJECT_DIR$/asstes/img/wxLogin.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
...@@ -40,7 +33,7 @@ ...@@ -40,7 +33,7 @@
<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="396"> <state relative-caret-position="1782">
<caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" /> <caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
</state> </state>
</provider> </provider>
...@@ -49,7 +42,7 @@ ...@@ -49,7 +42,7 @@
<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/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="924"> <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" /> <caret line="28" column="24" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
...@@ -68,7 +61,12 @@ ...@@ -68,7 +61,12 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="true"> <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="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="363"> <state relative-caret-position="363">
...@@ -91,11 +89,11 @@ ...@@ -91,11 +89,11 @@
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
</file> </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"> <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="462"> <state relative-caret-position="495">
<caret line="14" column="35" lean-forward="true" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" /> <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> </state>
</provider> </provider>
</entry> </entry>
...@@ -165,6 +163,7 @@ ...@@ -165,6 +163,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -182,22 +181,15 @@ ...@@ -182,22 +181,15 @@
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" /> <item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<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" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</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="$PROJECT_DIR$/../fenxiao_h5-dz" /> <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" />
...@@ -242,12 +234,13 @@ ...@@ -242,12 +234,13 @@
<workItem from="1718933314986" duration="3217000" /> <workItem from="1718933314986" duration="3217000" />
<workItem from="1719372772086" duration="12084000" /> <workItem from="1719372772086" duration="12084000" />
<workItem from="1720163640448" duration="1636000" /> <workItem from="1720163640448" duration="1636000" />
<workItem from="1720409373147" duration="234000" /> <workItem from="1720409373147" duration="2509000" />
<workItem from="1720683275041" duration="5000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="45729000" /> <option name="totallyTimeSpent" value="47998000" />
</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" />
...@@ -256,19 +249,19 @@ ...@@ -256,19 +249,19 @@
<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="Version Control" order="1" />
<window_info anchor="bottom" id="Run" order="6" /> <window_info anchor="bottom" id="Run" order="6" />
<window_info anchor="bottom" id="Version Control" order="1" />
<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 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 id="Favorites" order="0" side_tool="true" />
<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="Message" order="4" />
<window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
<window_info anchor="bottom" id="Find" order="5" /> <window_info anchor="bottom" id="Find" order="5" />
<window_info anchor="bottom" id="Message" order="4" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -448,9 +441,6 @@ ...@@ -448,9 +441,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/pay/pay.wxml"> <entry file="file://$PROJECT_DIR$/pages/pay/pay.wxml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="957"> <state relative-caret-position="957">
...@@ -495,31 +485,31 @@ ...@@ -495,31 +485,31 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/tsconfig.json" /> <entry file="file://$PROJECT_DIR$/tsconfig.json" />
<entry file="file://$PROJECT_DIR$/package.json" /> <entry file="file://$PROJECT_DIR$/package.json" />
<entry file="file://$PROJECT_DIR$/app.json"> <entry file="file://$PROJECT_DIR$/ext.json" />
<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 relative-caret-position="462"> <state>
<caret line="14" column="35" lean-forward="true" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" /> <caret column="2" selection-start-column="2" selection-end-column="2" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/ext.json" /> <entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
<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="33"> <state relative-caret-position="528">
<caret line="1" column="60" selection-start-line="1" selection-start-column="60" selection-end-line="1" selection-end-column="60" /> <caret line="16" column="38" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/index.json"> <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> <state relative-caret-position="1782">
<caret column="2" selection-start-column="2" selection-end-column="2" /> <caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
</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="924"> <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" /> <caret line="28" column="24" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
...@@ -528,19 +518,15 @@ ...@@ -528,19 +518,15 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.wxml"> <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="528"> <state relative-caret-position="33">
<caret line="16" column="38" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="38" /> <caret line="1" column="60" selection-start-line="1" selection-start-column="60" selection-end-line="1" selection-end-column="60" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.js"> <entry file="file://$PROJECT_DIR$/pages/index.wxss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="396">
<caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
</state>
</provider>
</entry> </entry>
<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">
...@@ -549,5 +535,12 @@ ...@@ -549,5 +535,12 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
app.js
浏览文件 @ 6a84f588
...@@ -10,6 +10,8 @@ App({ ...@@ -10,6 +10,8 @@ App({
this.globalData.defurl='https://wxapplets-hdzm.edstao.com' this.globalData.defurl='https://wxapplets-hdzm.edstao.com'
}else if(appId=='wxca8cfe95f6fa0e0b'){ }else if(appId=='wxca8cfe95f6fa0e0b'){
this.globalData.defurl='https://wxapplets-gxds.edstao.com' this.globalData.defurl='https://wxapplets-gxds.edstao.com'
}else if(appId=='wx58e23ba759c957f2'){
this.globalData.defurl='wxapplets-xmy.edstao.com'
} }
// 展示本地存储能力 // 展示本地存储能力
// var logs = wx.getStorageSync('logs') || [] // var logs = wx.getStorageSync('logs') || []
......
pages/login/login.js
浏览文件 @ 6a84f588
...@@ -53,6 +53,8 @@ Page({ ...@@ -53,6 +53,8 @@ Page({
subdomain='wuyoushop0571jg0001' subdomain='wuyoushop0571jg0001'
}else if(appId=='wxca8cfe95f6fa0e0b'){ }else if(appId=='wxca8cfe95f6fa0e0b'){
subdomain='guoxindengshi' subdomain='guoxindengshi'
}else if(appId=='wx58e23ba759c957f2'){
subdomain='xmy888'
} }
wx.request({ wx.request({
url: app.globalData.defurl + '/api/store/info?link='+subdomain, url: app.globalData.defurl + '/api/store/info?link='+subdomain,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或