.

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <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$/asstes/img/ETaoLogo.png" beforeDir="false" afterPath="$PROJECT_DIR$/asstes/img/ETaoLogo.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -54,8 +54,8 @@
       <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pages/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="528">
-              <caret line="106" column="5" lean-forward="true" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
+            <state relative-caret-position="490">
+              <caret line="30" column="36" lean-forward="true" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" />
               <folding>
                 <element signature="n#!!doc" expanded="true" />
               </folding>
@@ -63,23 +63,31 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="phoneIcon.png" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/asstes/img/phoneIcon.png">
-          <provider selected="true" editor-type-id="images" />
+      <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="594">
+              <caret line="39" column="43" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="43" />
+            </state>
+          </provider>
         </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" />
+      <file leaf-file-name="login.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/login/login.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="510">
+              <caret line="50" column="40" lean-forward="true" selection-start-line="50" selection-start-column="40" selection-end-line="50" selection-end-column="57" />
+            </state>
+          </provider>
         </entry>
       </file>
-      <file leaf-file-name="wxLogin.png" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/asstes/img/wxLogin.png">
+      <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="wxLogo.png" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/asstes/img/wxLogo.png">
+      <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>
@@ -114,7 +122,7 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="1912" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -142,6 +150,12 @@
               <item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
             </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>
           <select />
         </subPane>
@@ -189,7 +203,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10976000" />
+    <option name="totallyTimeSpent" value="14761000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
@@ -320,20 +334,6 @@
     <entry file="file://$PROJECT_DIR$/pages/login/login.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/login/login.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="37" column="18" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="541">
-          <caret line="39" column="46" lean-forward="true" selection-start-line="39" selection-start-column="46" selection-end-line="39" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/logs/logs.wxss">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -393,10 +393,24 @@
     <entry file="file://$PROJECT_DIR$/pages/login/login.wxml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages/login/login.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="510">
+          <caret line="50" column="40" lean-forward="true" selection-start-line="50" selection-start-column="40" selection-end-line="50" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="594">
+          <caret line="39" column="43" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pages/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="106" column="5" lean-forward="true" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
+        <state relative-caret-position="490">
+          <caret line="30" column="36" lean-forward="true" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
           </folding>

app.js

@@ -37,7 +37,7 @@ App({
   //正式：https://wxapplets.edstao.com  
   globalData: {
     userInfo: null,
-    defurl:'https://wxapplets-jyx.edstao.com',
+    defurl:'https://etaoh5dz-pre.edstao.com',
     userInfo:''
   }
 })
\ No newline at end of file

pages/index.js

@@ -27,8 +27,8 @@ Page({
             userInfo = name;
             this.setData({ url: this.data.defurl + '/weixin/QRCode?t='+new Date().getTime()+'&name='+ name + '&code=' + code, userInfo: name });
             if (!name) {
-              // this.setData({url:"https://etaoh5dz-pre.edstao.com"})
-              this.getwxsession()
+              this.setData({url:"https://etaoh5dz-pre.edstao.com"})
+              // this.getwxsession()
             }
             if(options.brandid){
               let newUrl = '/brand/shop';