提交 261aec4c 编写于 作者: zhangzhiwei's avatar zhangzhiwei

正常环境域名

上级 5a19383d
...@@ -2,11 +2,9 @@ ...@@ -2,11 +2,9 @@
<project version="4"> <project version="4">
<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$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" 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" />
<change beforePath="$PROJECT_DIR$/pages/login/login.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/pay/pay.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pay/pay.json" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -24,7 +22,7 @@ ...@@ -24,7 +22,7 @@
<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="541"> <state relative-caret-position="541">
<caret line="39" column="36" selection-start-line="39" selection-start-column="36" selection-end-line="39" selection-end-column="36" /> <caret line="39" column="29" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="29" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -67,8 +65,8 @@ ...@@ -67,8 +65,8 @@
<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="528"> <state relative-caret-position="312">
<caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" /> <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> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
...@@ -85,8 +83,11 @@ ...@@ -85,8 +83,11 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>globalData</find>
<find>E淘</find> <find>E淘</find>
<find>weixin/QRCode</find>
<find>weixin/wxsession</find>
<find>globalData</find>
<find>getwxsession</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -109,7 +110,7 @@ ...@@ -109,7 +110,7 @@
<component name="NodePackageJsonFileManager"> <component name="NodePackageJsonFileManager">
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-8" /> <option name="x" value="-8" />
<option name="y" value="-8" /> <option name="y" value="-8" />
<option name="width" value="1936" /> <option name="width" value="1936" />
...@@ -132,12 +133,6 @@ ...@@ -132,12 +133,6 @@
<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="logs" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -147,7 +142,7 @@ ...@@ -147,7 +142,7 @@
</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="F:/etao-sjht" />
<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" />
...@@ -174,16 +169,15 @@ ...@@ -174,16 +169,15 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1714790536207</updated> <updated>1714790536207</updated>
<workItem from="1714790537418" duration="2717000" /> <workItem from="1714790537418" duration="8224000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2717000" /> <option name="totallyTimeSpent" value="8224000" />
</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="7" />
<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" />
...@@ -223,19 +217,19 @@ ...@@ -223,19 +217,19 @@
<entry file="file://$PROJECT_DIR$/pages/logs/logs.json"> <entry file="file://$PROJECT_DIR$/pages/logs/logs.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/logs/logs.wxml"> <entry file="file://$PROJECT_DIR$/pages/logs/logs.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.wxss"> <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/logs/logs.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" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.json"> <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" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.js"> <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/index.wxml"> <entry file="file://$PROJECT_DIR$/pages/index.wxml">
...@@ -243,8 +237,8 @@ ...@@ -243,8 +237,8 @@
</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="528"> <state relative-caret-position="312">
<caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" /> <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> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
...@@ -254,7 +248,7 @@ ...@@ -254,7 +248,7 @@
<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="541"> <state relative-caret-position="541">
<caret line="39" column="36" selection-start-line="39" selection-start-column="36" selection-end-line="39" selection-end-column="36" /> <caret line="39" column="29" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="29" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -37,7 +37,7 @@ App({ ...@@ -37,7 +37,7 @@ App({
//正式:https://wxapplets.edstao.com //正式:https://wxapplets.edstao.com
globalData: { globalData: {
userInfo: null, userInfo: null,
defurl:'http://192.168.0.17:3000', defurl:'https://wxapplets-jyx.edstao.com',
userInfo:'' userInfo:''
} }
}) })
\ No newline at end of file
...@@ -27,6 +27,7 @@ Page({ ...@@ -27,6 +27,7 @@ Page({
userInfo = name; userInfo = name;
this.setData({ url: this.data.defurl + '/weixin/QRCode?t='+new Date().getTime()+'&name='+ name + '&code=' + code, userInfo: name }); this.setData({ url: this.data.defurl + '/weixin/QRCode?t='+new Date().getTime()+'&name='+ name + '&code=' + code, userInfo: name });
if (!name) { if (!name) {
// this.setData({url:"https://etaoh5dz-pre.edstao.com"})
this.getwxsession() this.getwxsession()
} }
if(options.brandid){ if(options.brandid){
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册