Merge branch 'master' of http://192.168.18.147:9000/liugang/channel_business

pages/msgModule/index.js

@@ -21,12 +21,13 @@ Page({
       * 生命周期函数--监听页面加载
       */
     onLoad() {
+        
+    },
+    onShow() {
         if (!app.globalData.customerId) {
             app.goLogin();
             return
         }
-    },
-    onShow() {
         const businessCommunicationCustomer = wx.getStorageSync('businessCommunicationCustomer') || null;
         if (businessCommunicationCustomer) {
             this.setData({

pages/releaseModule/index.js

@@ -28,10 +28,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad() {
-        if (!app.globalData.customerId) {
-            app.goLogin();
-            return
-        }
+       
         const eventChannel = this.getOpenerEventChannel()
         if (eventChannel.on) {
             // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
@@ -47,6 +44,12 @@ Page({
         }
         this.getTags();
     },
+    onShow(){
+        if (!app.globalData.customerId) {
+            app.goLogin();
+            return
+        }
+    },
     // 输入框输入
     textareaInput(e) {
         let value = e.detail.value;