Merge branch 'oil' of 39.97.239.116:gyfl/minixyz into oil

pages/components/shareDialog/shareDialog.js

@@ -11,7 +11,7 @@ Component({
       type:Boolean,
       value:false,
       observer:function(newVal,oldVal){
-        console.log(this.properties);
+        console.log(newVal);
         const _self = this;
         const parmas = this.properties;
         if(newVal == true) {

pages/myhome/myhome.js

@@ -165,6 +165,6 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-    return app.cardShareInfo();
+    // return app.cardShareInfo();
   }
 })

pages/phoneCharges/phoneCharges.js

@@ -230,6 +230,9 @@ Page({
 
   },
     onShareAppMessage: function () {
+      this.setData({
+        onShowShareDialog:true
+      });
     return app.cardShareInfo();
   }
 })

pages/postage/postage.js

@@ -244,11 +244,22 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    this.setData({
-      showShareDialog:false,
-      shareGoodsId:0,
-      showtermsOfServiceDialog:false
-    })
+    if(this.data.onShowShareDialog) {
+      this.setData({
+        showShareDialog:true,
+        // shareGoodsId:0,
+        showtermsOfServiceDialog:false,
+        onShowShareDialog:false
+      })
+    }
+    else {
+      this.setData({
+        onShowShareDialog:false,
+        showShareDialog:false,
+        shareGoodsId:0,
+        showtermsOfServiceDialog:false
+      })
+    }
   },
   onShareInfo: function () {
     console.log('onShareInfo')
@@ -280,6 +291,9 @@ Page({
 
   },
   onShareAppMessage: function () {
+    this.setData({
+      onShowShareDialog:true
+    });
     return app.cardShareInfo();
   }
 })