From 158f9ed8a56ef83cfc7ec888e8ac19881ca9e45b Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Tue, 9 Apr 2024 17:53:57 +0800
Subject: [PATCH] oa单弹窗提醒抽奖

---
 packageE/pages/user/monthgiftbag/payment/payment.js   | 16 +++++++++++++++-
 packageE/pages/user/monthgiftbag/payment/payment.json |  4 +++-
 packageE/pages/user/monthgiftbag/payment/payment.wxml |  6 +++++-
 packageG/pages/payment/pay_success/pay_success.js     |  8 ++++++--
 packageG/pages/payment/pay_success/pay_success.json   |  5 ++++-
 packageG/pages/payment/pay_success/pay_success.wxml   |  6 +++++-
 pages/giftpack/payment/payment.js                     | 12 ++++++++++++
 pages/giftpack/payment/payment.json                   |  4 +++-
 pages/giftpack/payment/payment.wxml                   |  6 +++++-
 9 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/packageE/pages/user/monthgiftbag/payment/payment.js b/packageE/pages/user/monthgiftbag/payment/payment.js
index 63341a7..b989ccb 100644
--- a/packageE/pages/user/monthgiftbag/payment/payment.js
+++ b/packageE/pages/user/monthgiftbag/payment/payment.js
@@ -21,8 +21,22 @@ Page({
     });
     var money = parseFloat(options.money).toFixed(2), order_sn = options.order_sn;
     this.setData({allmoney:money,order_sn:order_sn})
+    // if (money*1 > 0) {
+    //   var encourage = this.selectComponent("#encourage"); //组件的id
+    //   if (encourage){
+    //     encourage.get_encourage();
+    //   }
+    // }
+  },
+  onReady(){
+    // console.error(6666);
+    if (this.data.allmoney*1 > 0) {
+      var encourage = this.selectComponent("#encourage"); //组件的id
+      if (encourage){
+        encourage.get_encourage();
+      }
+    }
   },
-
   goto: function () {
     var url = '/pages/index/index/index';
     getApp().goto(url)
diff --git a/packageE/pages/user/monthgiftbag/payment/payment.json b/packageE/pages/user/monthgiftbag/payment/payment.json
index 1111654..b8252b8 100644
--- a/packageE/pages/user/monthgiftbag/payment/payment.json
+++ b/packageE/pages/user/monthgiftbag/payment/payment.json
@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "支付成功",
-  "usingComponents": {}
+  "usingComponents": {
+    "show_encourage": "/components/show_encourage/show_encourage"
+  }
 }
\ No newline at end of file
diff --git a/packageE/pages/user/monthgiftbag/payment/payment.wxml b/packageE/pages/user/monthgiftbag/payment/payment.wxml
index 6ef67f8..3cd7e02 100644
--- a/packageE/pages/user/monthgiftbag/payment/payment.wxml
+++ b/packageE/pages/user/monthgiftbag/payment/payment.wxml
@@ -53,4 +53,8 @@
       </view>
     </view>
   </view>
-</view>
\ No newline at end of file
+</view>
+
+
+<!-- 满足抽奖提醒 --> 
+<show_encourage id="encourage"></show_encourage>
\ No newline at end of file
diff --git a/packageG/pages/payment/pay_success/pay_success.js b/packageG/pages/payment/pay_success/pay_success.js
index 2dfcc15..db8eabb 100644
--- a/packageG/pages/payment/pay_success/pay_success.js
+++ b/packageG/pages/payment/pay_success/pay_success.js
@@ -133,9 +133,13 @@ Page({
 			};
       
 			
-			
   },
-
+  onReady(){
+    var encourage = this.selectComponent("#encourage"); //组件的id
+    if (encourage){
+      encourage.get_encourage();
+    }
+  },
   goto: function() {
      var  url= '/pages/index/index/index';
      getApp().goto(url)
diff --git a/packageG/pages/payment/pay_success/pay_success.json b/packageG/pages/payment/pay_success/pay_success.json
index 3d262cb..b8252b8 100644
--- a/packageG/pages/payment/pay_success/pay_success.json
+++ b/packageG/pages/payment/pay_success/pay_success.json
@@ -1,3 +1,6 @@
 {
-  "navigationBarTitleText": "支付成功"
+  "navigationBarTitleText": "支付成功",
+  "usingComponents": {
+    "show_encourage": "/components/show_encourage/show_encourage"
+  }
 }
\ No newline at end of file
diff --git a/packageG/pages/payment/pay_success/pay_success.wxml b/packageG/pages/payment/pay_success/pay_success.wxml
index 671c153..dca1c85 100644
--- a/packageG/pages/payment/pay_success/pay_success.wxml
+++ b/packageG/pages/payment/pay_success/pay_success.wxml
@@ -148,4 +148,8 @@
 
 <view class="shequn" style="margin-top:20rpx；"  bindtap="gotoshequn" wx:if="{{banner}}" data-url="{{banner[0].ad_weapplink}}">
    <image src="{{banner[0].ad_code}}" mode="widthFix" style="width: 100%;border-radius: 15rpx;" />
-</view>
\ No newline at end of file
+</view>
+
+
+<!-- 满足抽奖提醒 --> 
+<show_encourage id="encourage"></show_encourage>
\ No newline at end of file
diff --git a/pages/giftpack/payment/payment.js b/pages/giftpack/payment/payment.js
index 6356cee..908a6ed 100644
--- a/pages/giftpack/payment/payment.js
+++ b/pages/giftpack/payment/payment.js
@@ -21,6 +21,18 @@ Page({
     });
     var money = parseFloat(options.money), order_sn = options.order_sn;
     this.setData({allmoney:money,order_sn:order_sn})
+
+
+
+  },
+  onReady(){
+    // console.error(6666);
+    if (this.data.allmoney*1 > 0) {
+      var encourage = this.selectComponent("#encourage"); //组件的id
+      if (encourage){
+        encourage.get_encourage();
+      }
+    }
   },
 
   goto: function () {
diff --git a/pages/giftpack/payment/payment.json b/pages/giftpack/payment/payment.json
index 1111654..b8252b8 100644
--- a/pages/giftpack/payment/payment.json
+++ b/pages/giftpack/payment/payment.json
@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "支付成功",
-  "usingComponents": {}
+  "usingComponents": {
+    "show_encourage": "/components/show_encourage/show_encourage"
+  }
 }
\ No newline at end of file
diff --git a/pages/giftpack/payment/payment.wxml b/pages/giftpack/payment/payment.wxml
index 8a23c10..abf8841 100644
--- a/pages/giftpack/payment/payment.wxml
+++ b/pages/giftpack/payment/payment.wxml
@@ -54,4 +54,8 @@
       </view>
     </view>
   </view>
-</view>
\ No newline at end of file
+</view>
+
+
+<!-- 满足抽奖提醒 --> 
+<show_encourage id="encourage"></show_encourage>
\ No newline at end of file
--
libgit2 0.21.4