Skip to content

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

动态

上级 9bf5a4a6
隐藏空白字符变更
内嵌 并排
正在显示 包含 149 行增加 和 91 行删除
.idea/workspace.xml
浏览文件 @ ca3923cf
......@@ -2,7 +2,10 @@
<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$/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" />
<change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -19,37 +22,17 @@
<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="400">
<state relative-caret-position="330">
<caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ETaoLogo.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/asstes/img/ETaoLogo.png">
<provider selected="true" editor-type-id="images" />
</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" />
</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>
<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" />
......@@ -58,8 +41,8 @@
<file leaf-file-name="login.js" pinned="false" current-in-tab="true">
<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="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<state relative-caret-position="490">
<caret line="62" column="17" lean-forward="true" selection-start-line="62" selection-start-column="17" selection-end-line="62" selection-end-column="17" />
</state>
</provider>
</entry>
......@@ -67,28 +50,67 @@
<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="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" />
<state relative-caret-position="429">
<caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#1220#1808#0" />
<element signature="e#1842#2231#0" />
</folding>
</state>
</provider>
</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="33">
<caret line="1" column="60" lean-forward="true" selection-start-line="1" selection-start-column="60" selection-end-line="1" selection-end-column="60" />
</state>
</provider>
</entry>
</file>
<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="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 relative-caret-position="99">
<caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="10" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.json" pinned="false" current-in-tab="false">
<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>
</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" />
</entry>
</file>
<file leaf-file-name="app.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="14" column="35" lean-forward="true" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="tsconfig.json" />
<option value="package_json" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>E淘</find>
......@@ -99,6 +121,9 @@
<find>getOpenId</find>
<find>getInfo</find>
<find>imgLgo</find>
<find>wxFastLoginFail</find>
<find>onShow</find>
<find>extEnable</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -107,9 +132,12 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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$/app.js" />
<option value="$PROJECT_DIR$/pages/login/login.wxml" />
<option value="$PROJECT_DIR$/pages/login/login.js" />
</list>
</option>
......@@ -166,7 +194,7 @@
</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="G:/EDS/elifewechat" />
<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" />
......@@ -205,12 +233,16 @@
<workItem from="1715406876636" duration="2102000" />
<workItem from="1715584189355" duration="846000" />
<workItem from="1716252238008" duration="1078000" />
<workItem from="1717395807496" duration="1141000" />
<workItem from="1717395807496" duration="1747000" />
<workItem from="1718593200342" duration="671000" />
<workItem from="1718604548432" duration="2688000" />
<workItem from="1718933314986" duration="3217000" />
<workItem from="1719372772086" duration="11481000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="24582000" />
<option name="totallyTimeSpent" value="43245000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
......@@ -220,19 +252,19 @@
<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="Version Control" order="1" />
<window_info anchor="bottom" id="Find" order="5" />
<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 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 id="Favorites" order="0" side_tool="true" />
<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="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="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="Cvs" order="8" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -242,15 +274,6 @@
<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>
......@@ -328,7 +351,6 @@
<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>
......@@ -373,7 +395,6 @@
<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>
......@@ -403,12 +424,6 @@
</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" />
</entry>
......@@ -432,20 +447,6 @@
<entry file="file://$PROJECT_DIR$/pages/index.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$/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/pay/pay.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="957">
......@@ -467,25 +468,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor">
<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="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>
......@@ -504,17 +486,76 @@
<entry file="file://$PROJECT_DIR$/asstes/img/wxLogin.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/app.wxss">
<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="400">
<state relative-caret-position="330">
<caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tsconfig.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="22" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="14" column="35" lean-forward="true" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ext.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="2" column="33" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="60" lean-forward="true" selection-start-line="1" selection-start-column="60" selection-end-line="1" selection-end-column="60" />
</state>
</provider>
</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.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
<folding>
<element signature="n#!!doc" expanded="true" />
<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="99">
<caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="10" selection-end-column="5" />
</state>
</provider>
</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="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<state relative-caret-position="490">
<caret line="62" column="17" lean-forward="true" selection-start-line="62" selection-start-column="17" selection-end-line="62" selection-end-column="17" />
</state>
</provider>
</entry>
......
app.js
浏览文件 @ ca3923cf
//app.js
App({
onLaunch: function () {
let appId = wx.getAccountInfoSync().miniProgram.appId
if(appId=='wxdb3d8f9a94eca8d9'){
this.globalData.defurl='https://wxapplets-jyx.edstao.com'
}else if(appId=='wx175347bd3977d6a9'){
this.globalData.defurl='https://wxapplets-fl.edstao.com'
}else if(appId=='wx7dca103eaf35d1f7'){
this.globalData.defurl='https://wxapplets-hdzm.edstao.com'
}
// 展示本地存储能力
// var logs = wx.getStorageSync('logs') || []
// logs.unshift(Date.now())
......
pages/login/login.js
浏览文件 @ ca3923cf
......@@ -43,8 +43,17 @@ Page({
},
getInfo(){
let that = this
let subdomain=''
let appId = wx.getAccountInfoSync().miniProgram.appId
if(appId=='wxdb3d8f9a94eca8d9'){
subdomain='jinyanxia'
}else if(appId=='wx175347bd3977d6a9'){
subdomain='21'
}else if(appId=='wx7dca103eaf35d1f7'){
subdomain='wuyoushop0571jg0001'
}
wx.request({
url: app.globalData.defurl + '/api/store/info?link=jinyanxia',
url: app.globalData.defurl + '/api/store/info?link='+subdomain,
success: function (res) {
that.setData({
headImg:res.data.data.headImg,
......
project.config.json
浏览文件 @ ca3923cf
......@@ -127,5 +127,5 @@
"ignore": [],
"include": []
},
"appid": "wxdb3d8f9a94eca8d9"
"appid": "wx175347bd3977d6a9"
}
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或