python学习
This commit is contained in:
708
.idea/workspace.xml
generated
708
.idea/workspace.xml
generated
@@ -5,8 +5,12 @@
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/mina" beforeDir="false" afterPath="$PROJECT_DIR$/mina" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/mina/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/app.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/mina/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/index/index.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/mina/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/project.config.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/native/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/native/app.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/native/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/config.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/native/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/native/project.config.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/native/utils/auth.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/utils/auth.js" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
@@ -15,7 +19,98 @@
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/index/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2046">
|
||||
<caret line="66" column="17" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/four/four.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="423">
|
||||
<caret line="160" column="25" lean-forward="true" selection-start-line="160" selection-start-column="25" selection-end-line="160" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/mina/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="412">
|
||||
<caret line="56" column="10" lean-forward="true" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/native/utils/auth.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="434">
|
||||
<caret line="37" column="85" selection-start-line="37" selection-start-column="47" selection-end-line="37" selection-end-column="85" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/native/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="403">
|
||||
<caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/native/config.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="155">
|
||||
<caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/native/app.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="594">
|
||||
<caret line="43" column="23" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="350">
|
||||
<caret line="269" column="17" lean-forward="true" selection-start-line="269" selection-start-column="17" selection-end-line="269" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/native/pages/card/main.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2148">
|
||||
<caret line="213" column="6" lean-forward="true" selection-start-line="213" selection-start-column="6" selection-end-line="213" selection-end-column="6" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/native/pages/index/main.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="288">
|
||||
<caret line="39" column="17" selection-start-line="39" selection-start-column="12" selection-end-line="39" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
@@ -26,36 +121,36 @@
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>now-buy</find>
|
||||
<find>footer-box</find>
|
||||
<find>tobuy</find>
|
||||
<find>page-body-form-key</find>
|
||||
<find>page-body-button</find>
|
||||
<find>form-control</find>
|
||||
<find>ibox-content</find>
|
||||
<find>do-login</find>
|
||||
<find>btn-primary</find>
|
||||
<find>m-b</find>
|
||||
<find>login_wrap</find>
|
||||
<find>login_name</find>
|
||||
<find>pull-right</find>
|
||||
<find>checkReg</find>
|
||||
<find>foodIndex</find>
|
||||
<find>Member</find>
|
||||
<find>model_member</find>
|
||||
<find>app</find>
|
||||
<find>login</find>
|
||||
<find>/food/index</find>
|
||||
<find>/member/login</find>
|
||||
<find>mobile</find>
|
||||
<find>走，</find>
|
||||
<find>checkLogin</find>
|
||||
<find>globalData</find>
|
||||
<find>regFlag</find>
|
||||
<find>buildUrl</find>
|
||||
<find>token</find>
|
||||
<find>aicard/user/friend</find>
|
||||
<find>friend</find>
|
||||
<find>idcardCheck</find>
|
||||
<find>detail</find>
|
||||
<find>friend/detail</find>
|
||||
<find>user/friend/detail</find>
|
||||
<find>cardUid</find>
|
||||
<find>setStorageSync</find>
|
||||
<find>API_BASE_URL</find>
|
||||
<find>getCardInfo</find>
|
||||
<find>getCardUid</find>
|
||||
<find>wx.request</find>
|
||||
<find>friendUserDetail</find>
|
||||
<find>user/wxapp/login</find>
|
||||
<find>login_email</find>
|
||||
<find>aicard</find>
|
||||
<find>subDomain</find>
|
||||
<find>appid</find>
|
||||
<find>密钥</find>
|
||||
<find>api</find>
|
||||
<find>key</find>
|
||||
<find>wxlogin/login</find>
|
||||
<find>food/index</find>
|
||||
<find>getRequestHeader</find>
|
||||
<find>info</find>
|
||||
<find>request</find>
|
||||
<find>login</find>
|
||||
<find>bindGetUserInfo</find>
|
||||
<find>wx.getUserInfo</find>
|
||||
<find>login_wx</find>
|
||||
<find>register_complex</find>
|
||||
</findStrings>
|
||||
<replaceStrings>
|
||||
<replace>ops_render</replace>
|
||||
@@ -67,10 +162,6 @@
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/mina/pages/posts/post.wxml" />
|
||||
<option value="$PROJECT_DIR$/mina/pages/posts/post.js" />
|
||||
<option value="$PROJECT_DIR$/web/controllers/food/Food.py" />
|
||||
<option value="$PROJECT_DIR$/web/controllers/furniture/Food.py" />
|
||||
<option value="$PROJECT_DIR$/www.py" />
|
||||
<option value="$PROJECT_DIR$/web/static/js/common.js" />
|
||||
<option value="$PROJECT_DIR$/web/controllers/furniture/Furniture.py" />
|
||||
@@ -118,6 +209,10 @@
|
||||
<option value="$PROJECT_DIR$/mina/pages/food/index.js" />
|
||||
<option value="$PROJECT_DIR$/mina/app.js" />
|
||||
<option value="$PROJECT_DIR$/mina/pages/index/index.js" />
|
||||
<option value="$PROJECT_DIR$/native/app.json" />
|
||||
<option value="$PROJECT_DIR$/native/config.js" />
|
||||
<option value="$PROJECT_DIR$/native/utils/auth.js" />
|
||||
<option value="$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -142,7 +237,6 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -153,31 +247,79 @@
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="jobs" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="jobs" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="tasks" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="jobs" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="tasks" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="queue" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="mina" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="mina" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="mina" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="food" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="mina" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="four" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="mina" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="index" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="native" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="native" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="miniprogram_npm" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="native" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="miniprogram_npm" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="apifm-wxapi" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="native" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="native" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="card" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="native" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="index" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="native" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="utils" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
@@ -187,98 +329,26 @@
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="controllers" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="js" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="js" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="account" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="js" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="finance" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="js" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="food" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="js" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="stat" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="static" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="plugins" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="templates" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="templates" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="account" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="templates" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="common" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="templates" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="food" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="order" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="order" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="templates" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="member" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="controllers" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="api" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/native/utils" />
|
||||
<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="options.lastSelected" value="com.jetbrains.python.configuration.PythonSdkConfigurable" />
|
||||
@@ -288,19 +358,19 @@
|
||||
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\order" />
|
||||
<recent name="D:\order\mina\pages" />
|
||||
<recent name="D:\order\mina\pages\shangpin" />
|
||||
<recent name="D:\order\mina\pages\location" />
|
||||
<recent name="D:\order\mina\images" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="D:\order\mina\images\nav" />
|
||||
<recent name="D:\order\common\libs" />
|
||||
<recent name="D:\order\web" />
|
||||
<recent name="D:\order\web\controllers\user" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\order\native\utils" />
|
||||
<recent name="D:\order" />
|
||||
<recent name="D:\order\mina\pages" />
|
||||
<recent name="D:\order\mina\pages\shangpin" />
|
||||
<recent name="D:\order\mina\pages\location" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
@@ -326,13 +396,6 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1528044544203</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00011" summary="python学习">
|
||||
<created>1564564379831</created>
|
||||
<option name="number" value="00011" />
|
||||
<option name="presentableId" value="LOCAL-00011" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1564564379831</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00012" summary="python学习">
|
||||
<created>1564569007474</created>
|
||||
<option name="number" value="00012" />
|
||||
@@ -669,7 +732,14 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1583221802369</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="60" />
|
||||
<task id="LOCAL-00060" summary="python学习">
|
||||
<created>1605610340669</created>
|
||||
<option name="number" value="00060" />
|
||||
<option name="presentableId" value="LOCAL-00060" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1605610340670</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="61" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
@@ -683,8 +753,9 @@
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1654373" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16491044" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info id="Project Explorer" order="3" />
|
||||
@@ -725,151 +796,6 @@
|
||||
<option name="LAST_COMMIT_MESSAGE" value="python学习" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/common/models/member/Mendianusertwo.py" />
|
||||
<entry file="file://$PROJECT_DIR$/common/libs/food/FoodService.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/local_setting.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/common/models/member/Mendianuserinfo.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="62">
|
||||
<caret line="7" selection-start-line="7" selection-end-line="7" />
|
||||
<folding>
|
||||
<element signature="e#16#72#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/production_setting.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="372">
|
||||
<caret line="12" selection-start-line="12" selection-end-line="12" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/index.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-465" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/static.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/food/Food.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/templates/user/login.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1178">
|
||||
<caret line="38" column="18" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="38" selection-end-column="18" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/templates/common/layout_user.html">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/static/js/user/login.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="558">
|
||||
<caret line="18" column="23" lean-forward="true" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/static/js/user/edit.js">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/index/index.json">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/common/models/member/OauthMemberBind.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="341">
|
||||
<caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/account/Account.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="155">
|
||||
<caret line="12" column="29" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/member/Member.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="558">
|
||||
<caret line="25" column="14" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/docs/mysql.md">
|
||||
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
||||
<state split_layout="SPLIT">
|
||||
<first_editor />
|
||||
<second_editor />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/api/My.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/api/Order.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="124">
|
||||
<caret line="14" column="13" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/templates/index/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="434">
|
||||
<caret line="14" column="26" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/food/index.wxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="341">
|
||||
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/jobs/tasks/queue/index.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1953">
|
||||
<caret line="73" column="39" lean-forward="true" selection-start-line="73" selection-start-column="39" selection-end-line="73" selection-end-column="39" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/index/index.wxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="339">
|
||||
<caret line="13" column="70" selection-start-line="13" selection-start-column="63" selection-end-line="13" selection-end-column="70" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/api/Member.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="279">
|
||||
<caret line="18" column="33" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
|
||||
<folding>
|
||||
<element signature="e#24#65#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/furniture/Furniture.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="811">
|
||||
<caret line="66" selection-start-line="66" selection-end-line="66" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/common/models/member/Member.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="341">
|
||||
@@ -899,34 +825,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/index/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="649">
|
||||
<caret line="90" column="40" lean-forward="true" selection-start-line="90" selection-start-column="40" selection-end-line="90" selection-end-column="40" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1891">
|
||||
<caret line="61" column="20" selection-start-line="61" selection-start-column="4" selection-end-line="61" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/food/info.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="6045">
|
||||
<caret line="195" column="19" selection-start-line="195" selection-start-column="19" selection-end-line="195" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/food/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2139">
|
||||
<caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/templates/food/set.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-2444" />
|
||||
@@ -1015,5 +913,183 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/project.config.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="439">
|
||||
<caret line="38" column="15" lean-forward="true" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/one/one.wxml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/one/one.json">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/app.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="93">
|
||||
<caret line="3" column="22" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="22" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="496">
|
||||
<caret line="16" column="15" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/project.config.json">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/pages/card/main.wxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="246">
|
||||
<caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/pages/card/main.json">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/food/info.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="299">
|
||||
<caret line="55" column="8" selection-start-line="55" selection-start-column="8" selection-end-line="55" selection-end-column="8" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/index/index.json">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/common/libs/pay/WeChatService.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="299">
|
||||
<caret line="39" column="17" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/typings/wx.d.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="950">
|
||||
<caret line="2393" column="62" selection-start-line="2393" selection-start-column="62" selection-end-line="2393" selection-end-column="62" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/jobs/tasks/queue/index.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1767">
|
||||
<caret line="67" lean-forward="true" selection-start-line="67" selection-end-line="67" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/food/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="525">
|
||||
<caret line="68" column="42" selection-start-line="68" selection-start-column="32" selection-end-line="68" selection-end-column="42" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="93">
|
||||
<caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/api/My.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/api/Order.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/static.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/controllers/index.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="608">
|
||||
<caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="403">
|
||||
<caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/four/four.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="423">
|
||||
<caret line="160" column="25" lean-forward="true" selection-start-line="160" selection-start-column="25" selection-end-line="160" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/utils/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="381">
|
||||
<caret line="64" column="53" lean-forward="true" selection-start-line="63" selection-start-column="10" selection-end-line="64" selection-end-column="53" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/app.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="412">
|
||||
<caret line="56" column="10" lean-forward="true" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/pages/index/main.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="288">
|
||||
<caret line="39" column="17" selection-start-line="39" selection-start-column="12" selection-end-line="39" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/app.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="594">
|
||||
<caret line="43" column="23" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/config.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="155">
|
||||
<caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/pages/card/main.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2148">
|
||||
<caret line="213" column="6" lean-forward="true" selection-start-line="213" selection-start-column="6" selection-end-line="213" selection-end-column="6" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/mina/pages/index/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2046">
|
||||
<caret line="66" column="17" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/utils/auth.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="434">
|
||||
<caret line="37" column="85" selection-start-line="37" selection-start-column="47" selection-end-line="37" selection-end-column="85" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="350">
|
||||
<caret line="269" column="17" lean-forward="true" selection-start-line="269" selection-start-column="17" selection-end-line="269" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
||||
2
mina
2
mina
Submodule mina updated: b84bf63d7a...556449ab50
@@ -41,7 +41,7 @@
|
||||
]
|
||||
},
|
||||
"navigateToMiniProgramAppIdList": [
|
||||
"wx56c8f077de74b07c"
|
||||
"wxaae03bb4c7273f06"
|
||||
],
|
||||
"sitemapLocation": "sitemap.json"
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
module.exports = {
|
||||
version: "2.1.0",
|
||||
note: '优化了名片二维码的生成效率，减少图片空间存储',
|
||||
subDomain: "aicard", // 根据教程 https://www.yuque.com/apifm/doc/qr6l4m 查看你自己的 subDomain
|
||||
// subDomain: "aicard", // 根据教程 https://www.yuque.com/apifm/doc/qr6l4m 查看你自己的 subDomain
|
||||
subDomain: "hcms", // 根据教程 https://www.yuque.com/apifm/doc/qr6l4m 查看你自己的 subDomain
|
||||
// subDomain: "", // 根据教程 https://www.yuque.com/apifm/doc/qr6l4m 查看你自己的 subDomain
|
||||
}
|
||||
@@ -94,11 +94,13 @@ module.exports =
|
||||
|
||||
/* eslint-disable */
|
||||
// 小程序开发api接口工具包，https://github.com/gooking/wxapi
|
||||
var API_BASE_URL = 'https://api.it120.cc';
|
||||
//var API_BASE_URL = 'https://api.it120.cc';
|
||||
var API_BASE_URL = 'http://www.ruilaizipj.com';
|
||||
var subDomain = 'tz';
|
||||
|
||||
var request = function request(url, needSubDomain, method, data) {
|
||||
var _url = API_BASE_URL + (needSubDomain ? '/' + subDomain : '') + url;
|
||||
// var _url = API_BASE_URL + (needSubDomain ? '' + subDomain : '') + url;
|
||||
return new Promise(function (resolve, reject) {
|
||||
wx.request({
|
||||
url: _url,
|
||||
@@ -263,40 +265,20 @@ module.exports = {
|
||||
alipay: function alipay(data) {
|
||||
return request('/pay/alipay/semiAutomatic/payurl', true, 'post', data);
|
||||
},
|
||||
login_wx: function login_wx(code) {
|
||||
return request('/user/wxapp/login', true, 'post', {
|
||||
login_wx: function login_wx(code,nickName,avatarUrl,gender,province,city,country) {
|
||||
return request('/wxlogin/login', true, 'post', {
|
||||
code: code,
|
||||
type: 2
|
||||
});
|
||||
},
|
||||
login_username: function login_username(data) {
|
||||
return request('/user/username/login', true, 'post', data);
|
||||
},
|
||||
bindUsername: function bindUsername(token, username) {
|
||||
var pwd = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
||||
|
||||
return request('/user/username/bindUsername', true, 'post', {
|
||||
token: token, username: username, pwd: pwd
|
||||
});
|
||||
},
|
||||
login_mobile: function login_mobile(mobile, pwd) {
|
||||
var deviceId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
||||
var deviceName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
|
||||
|
||||
return request('/user/m/login', true, 'post', {
|
||||
mobile: mobile, pwd: pwd, deviceId: deviceId, deviceName: deviceName
|
||||
});
|
||||
},
|
||||
resetPwdUseMobileCode: function resetPwdUseMobileCode(mobile, pwd, code) {
|
||||
return request('/user/m/reset-pwd', true, 'post', {
|
||||
mobile: mobile, pwd: pwd, code: code
|
||||
});
|
||||
},
|
||||
resetPwdUseEmailCode: function resetPwdUseEmailCode(email, pwd, code) {
|
||||
return request('/user/email/reset-pwd', true, 'post', {
|
||||
email: email, pwd: pwd, code: code
|
||||
nickName: nickName,
|
||||
avatarUrl: avatarUrl,
|
||||
gender: gender,
|
||||
province: province,
|
||||
city: city,
|
||||
country: country,
|
||||
});
|
||||
},
|
||||
// login_wx: function login_wx(data) {
|
||||
// return request('/wxlogin/login', true, 'post', data);
|
||||
// },
|
||||
register_complex: function register_complex(data) {
|
||||
return request('/user/wxapp/register/complex', true, 'post', data);
|
||||
},
|
||||
@@ -480,6 +462,9 @@ module.exports = {
|
||||
friendUserDetail: function friendUserDetail(token, uid) {
|
||||
return request('/user/friend/detail', true, 'get', { token: token, uid: uid });
|
||||
},
|
||||
// friendUserDetail: function friendUserDetail(token, uid) {
|
||||
// return request('/wxlogin/login', true, 'get', { token: token, uid: uid });
|
||||
// },
|
||||
videoDetail: function videoDetail(videoId) {
|
||||
return request('/media/video/detail', true, 'get', {
|
||||
videoId: videoId
|
||||
|
||||
@@ -5,45 +5,56 @@
|
||||
"es6": true,
|
||||
"enhance": true,
|
||||
"postcss": false,
|
||||
"preloadBackgroundData": false,
|
||||
"minified": true,
|
||||
"newFeature": true,
|
||||
"coverView": true,
|
||||
"nodeModules": false,
|
||||
"autoAudits": false,
|
||||
"showShadowRootInWxmlPanel": true,
|
||||
"scopeDataCheck": false,
|
||||
"uglifyFileName": false,
|
||||
"checkInvalidKey": true,
|
||||
"checkSiteMap": true,
|
||||
"uploadWithSourceMap": true,
|
||||
"compileHotReLoad": false,
|
||||
"useMultiFrameRuntime": false,
|
||||
"useApiHook": true,
|
||||
"babelSetting": {
|
||||
"ignore": [],
|
||||
"disablePlugins": [],
|
||||
"outputPath": ""
|
||||
}
|
||||
},
|
||||
"enableEngineNative": false,
|
||||
"bundle": false,
|
||||
"useIsolateContext": true,
|
||||
"useCompilerModule": true,
|
||||
"userConfirmedUseCompilerModuleSwitch": false,
|
||||
"packNpmManually": false,
|
||||
"packNpmRelationList": [],
|
||||
"minifyWXSS": true
|
||||
},
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "2.9.4",
|
||||
"appid": "wx872cc8cc1327641a",
|
||||
"appid": "wxaae03bb4c7273f06",
|
||||
"projectname": "%E5%90%8D%E7%89%87%E5%B0%8F%E7%A8%8B%E5%BA%8F",
|
||||
"scripts": {},
|
||||
"simulatorType": "wechat",
|
||||
"simulatorPluginLibVersion": {},
|
||||
"condition": {
|
||||
"search": {
|
||||
"current": -1,
|
||||
"list": []
|
||||
},
|
||||
"conversation": {
|
||||
"current": -1,
|
||||
"list": []
|
||||
},
|
||||
"plugin": {
|
||||
"current": -1,
|
||||
"list": []
|
||||
},
|
||||
"game": {
|
||||
"current": -1,
|
||||
"list": []
|
||||
},
|
||||
"miniprogram": {
|
||||
"current": 7,
|
||||
"list": [
|
||||
{
|
||||
"id": -1,
|
||||
|
||||
@@ -20,10 +20,22 @@ async function checkHasLogined() {
|
||||
}
|
||||
|
||||
async function login(page){
|
||||
|
||||
const _this = this
|
||||
wx.login({
|
||||
success: function (res) {
|
||||
WXAPI.login_wx(res.code).then(function (res) {
|
||||
// 必须是在用户已经授权的情况下调用
|
||||
let code = res.code; // 微信登录接口返回的 code 参数，下面注册接口需要用到
|
||||
wx.getUserInfo({
|
||||
success: function (res) {
|
||||
var userInfo = res.userInfo
|
||||
var nickName = userInfo.nickName
|
||||
var avatarUrl = userInfo.avatarUrl
|
||||
var gender = userInfo.gender //性别 0：未知、1：男、2：女
|
||||
var province = userInfo.province
|
||||
var city = userInfo.city
|
||||
var country = userInfo.country
|
||||
WXAPI.login_wx(res.code,nickName,avatarUrl,gender,province,city,country).then(function (res) {
|
||||
if (res.code == 10000) {
|
||||
// 去注册
|
||||
//_this.register(page)
|
||||
@@ -46,6 +58,10 @@ async function login(page){
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async function register(page) {
|
||||
|
||||
Reference in New Issue
Block a user