1

app.js

@@ -119,13 +119,12 @@ App({
     let data={};
     var promise = new Promise((resolve, reject) => {
       wx.showLoading({
-        title: '加载中',
+        title: '加载中...',
       });
       let timestamp = (new Date()).valueOf()
       let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
       wx.request({
-        // url: 'https://reborn.oytour.com/api/common/post'+ url, //线上
-        url: 'http://efficient.oytour.com/'+ url, //线上
+        url: 'https://efficient.oytour.com/'+ url, //线上
         // url: 'http://47.96.12.235:9001/' + url,       //测试 
         // url: 'http://192.168.2.215:9000/'+ url,
 

pages/activity/activity.js

@@ -15,7 +15,7 @@ Page({
     let userInfo = wx.getStorageSync('admin')
     console.log(userInfo)
     this.setData({
-      url: "http://activity.oytour.com/html/task/home.html?customerId=" + userInfo.id + "&accountId=" + userInfo.customerAccountId + "&token=" + userInfo.token + "&secretKey=" + userInfo.secretKey 
+      url: "https://activity.oytour.com/html/task/home.html?customerId=" + userInfo.id + "&accountId=" + userInfo.customerAccountId + "&token=" + userInfo.token + "&secretKey=" + userInfo.secretKey 
     })
     console.log(this.data.url)
   },

pages/member/invesDetails/invesDetails.js

@@ -14,7 +14,7 @@ Page({
   onLoad: function (options) {
     console.log(options)
     this.setData({
-      url: "http://activity.oytour.com/html/invesDetails.html" + '?ID=' + options.ID + '&name=' + encodeURI(options.name) + '&MobilePhone=' + options.MobilePhone
+      url: "https://activity.oytour.com/html/invesDetails.html" + '?ID=' + options.ID + '&name=' + encodeURI(options.name) + '&MobilePhone=' + options.MobilePhone
     })
     console.log(this.data.url)
   },

pages/member/member.js

@@ -55,16 +55,21 @@ Page({
    */
   onLoad: function (options) {
     let userInfo = wx.getStorageSync('admin');
-    if (wx.getStorageSync('admin')) {
+    if (userInfo) {
       this.setData({
         isLogin: true,
-      })
-    }
-    this.setData({
-      userInfo: userInfo
+        userInfo: userInfo,
+        photo: app.state.admin.photo === null ? '' : app.state.admin.photo,
+        isMember: app.state.admin.isMember,
+        account: app.state.admin.account,
+        address: app.state.admin.address,
+        businessCardPhotos: app.state.admin.businessCardPhotos === null ? [] : app.state.admin.businessCardPhotos,
+        housePhotos: app.state.admin.housePhotos === null ? [] : app.state.admin.housePhotos,
+        images: app.state.admin.images === null ? [] : app.state.admin.images
       })
       this.getInfo()
       this.getUserMemberExp()
+    }
   },
 
   /**
@@ -81,16 +86,21 @@ Page({
    */
   onShow: function () {
     let userInfo = wx.getStorageSync('admin');
-    if (wx.getStorageSync('admin')) {
+    if (userInfo) {
       this.setData({
         isLogin: true,
-      })
-    }
-    this.setData({
-      userInfo: userInfo
+        userInfo: userInfo,
+        photo: app.state.admin.photo === null ? '' : app.state.admin.photo,
+        isMember: app.state.admin.isMember,
+        account: app.state.admin.account,
+        address: app.state.admin.address,
+        businessCardPhotos: app.state.admin.businessCardPhotos === null ? [] : app.state.admin.businessCardPhotos,
+        housePhotos: app.state.admin.housePhotos === null ? [] : app.state.admin.housePhotos,
+        images: app.state.admin.images === null ? [] : app.state.admin.images
       })
       this.getInfo()
       this.getUserMemberExp()
+    }
   },
 
   /**