From e18f741ea2c78ca1c0f289653f990896e03c5616 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 11 Oct 2021 15:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/agent/ability/index.js    |  7 +++++--
 pages/agent/ability/index.json  |  1 +
 pages/agent/ability/index.wxml  | 16 +++++++++++++++-
 pages/agent/factory/index.js    |  3 +++
 pages/agent/factory/index.wxml  |  3 +++
 pages/agent/fragment/index.js   |  4 ++--
 pages/article/detail/index.js   |  3 +++
 pages/article/detail/index.wxml |  3 +++
 pages/ztbvip/index.js           | 25 +++++++++++++++++++++++--
 pages/ztbvip/index.json         |  3 ++-
 pages/ztbvip/index.wxml         | 15 ++++++++++++++-
 11 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/pages/agent/ability/index.js b/pages/agent/ability/index.js
index b084101..33375be 100644
--- a/pages/agent/ability/index.js
+++ b/pages/agent/ability/index.js
@@ -10,7 +10,7 @@ Page({
   data: {
     height: app.globalData.fragmentHeight,
     kg: app.globalData.kg,
-    hasActivity: false,
+    activity: 0,
     loading: true,
     requesting: false,
     finished: false,
@@ -30,12 +30,15 @@ Page({
     this.fetchPapersList()
     hasActivity().then(result => {
       wx.hideLoading()
-      this.setData({ height: app.globalData.fragmentHeight, hasActivity: result.data })
+      this.setData({ height: app.globalData.fragmentHeight, activity: result.data ? 2 : 1 })
     }).catch(err => {
       wx.hideLoading()
       this.setData({ height: app.globalData.fragmentHeight })
     })
   },
+  onClose: function(){
+    wx.navigateBack()
+  },
   // 下拉刷新...
   onRefreshList: function () {
     if (this.data.requesting) {
diff --git a/pages/agent/ability/index.json b/pages/agent/ability/index.json
index 5958f8b..da5cf24 100644
--- a/pages/agent/ability/index.json
+++ b/pages/agent/ability/index.json
@@ -7,6 +7,7 @@
     "refresh-view": "/components/refresher/index",
     "wux-image": "/components/image/index",
     "wux-divider": "/components/divider/index",
+    "wux-popup": "/components/popup/index",
     "ability-item": "/pages/agent/ability-item/index"
   }
 }
\ No newline at end of file
diff --git a/pages/agent/ability/index.wxml b/pages/agent/ability/index.wxml
index 2b1a1e9..d130108 100644
--- a/pages/agent/ability/index.wxml
+++ b/pages/agent/ability/index.wxml
@@ -26,4 +26,18 @@
 			</wux-divider>
 		</view>
 	</view>
-</refresh-view>
\ No newline at end of file
+</refresh-view>
+
+<wux-popup wux-class="wux-landscape" wux-content-class="wux-landscape__popup" wux-body-class="wux-landscape__popup-body"
+  hasHeader="{{ false }}" hasFooter="{{ false }}" visible="{{ activity == 2 }}" mask="{{ true }}">
+  <view class="wux-close" bindtap="onClose">
+    <text class="cuIcon-roundclose text-white" style="font-size:64rpx"></text>
+  </view>
+  <view class="wux-landscape__inner">
+    <wux-image width="{{654}}" height="{{680}}" nuit="{{'rpx'}}" bind:click="onClose" src="/assets/popup/no-zige.png" mode="aspectFit">
+      <view class="flex flex-center" slot="loading" style="height:654rpx;width:680rpx">
+        <text class="icon--refresher"></text>
+      </view>
+    </wux-image>
+  </view>
+</wux-popup>
\ No newline at end of file
diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js
index a0b6422..1383778 100644
--- a/pages/agent/factory/index.js
+++ b/pages/agent/factory/index.js
@@ -85,6 +85,9 @@ Page({
   stopTouchMove: function (e) {
     return false
   },
+  onClose: function(){
+    wx.navigateBack()
+  },
   onImageClick: function(){
     wx.navigateTo({ url: '/pages/ztbvip/index' })
   },
diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml
index f55bb8d..bc30ee5 100644
--- a/pages/agent/factory/index.wxml
+++ b/pages/agent/factory/index.wxml
@@ -179,6 +179,9 @@
 
 <wux-popup wux-class="wux-landscape" wux-content-class="wux-landscape__popup" wux-body-class="wux-landscape__popup-body"
   hasHeader="{{ false }}" hasFooter="{{ false }}" visible="{{ visible }}" mask="{{ true }}">
+	<view class="wux-close" bindtap="onClose" wx:if="{{visible}}">
+    <text class="cuIcon-roundclose text-white" style="font-size:64rpx"></text>
+  </view>
   <view class="wux-landscape__inner">
     <wux-image width="{{604}}" height="{{806}}" nuit="{{'rpx'}}" src="/assets/popup/need-member.png" bind:click="onImageClick">
     </wux-image>
diff --git a/pages/agent/fragment/index.js b/pages/agent/fragment/index.js
index 13a5c0c..8072be5 100644
--- a/pages/agent/fragment/index.js
+++ b/pages/agent/fragment/index.js
@@ -38,7 +38,7 @@ Component({
     },
     triggered: false,
     firstShow: false,
-    activity: 0
+    hasActivity: false
   },
   lifetimes: {
     // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
@@ -57,7 +57,7 @@ Component({
       if(!this.data.firstShow){
         if(app.globalData.userInfo){
           hasActivity().then(result => {
-            this.setData({ activity: result.data ? 2 : 1 })
+            this.setData({ hasActivity: result.data })
           })
         }
         this.fetchPapersList()
diff --git a/pages/article/detail/index.js b/pages/article/detail/index.js
index 3099c1e..0a03124 100644
--- a/pages/article/detail/index.js
+++ b/pages/article/detail/index.js
@@ -58,6 +58,9 @@ Page({
       })
     }
   },
+  onClose: function(){
+    wx.navigateBack()
+  },
   onImageClick: function(){
     wx.navigateTo({ url: '/pages/ztbvip/index' })
   },
diff --git a/pages/article/detail/index.wxml b/pages/article/detail/index.wxml
index 96ffebc..a0a4e89 100644
--- a/pages/article/detail/index.wxml
+++ b/pages/article/detail/index.wxml
@@ -168,6 +168,9 @@
 
 <wux-popup wux-class="wux-landscape" wux-content-class="wux-landscape__popup" wux-body-class="wux-landscape__popup-body"
   hasHeader="{{ false }}" hasFooter="{{ false }}" visible="{{ visible }}" mask="{{ true }}">
+	<view class="wux-close" bindtap="onClose" wx:if="{{visible}}">
+    <text class="cuIcon-roundclose text-white" style="font-size:64rpx"></text>
+  </view>
   <view class="wux-landscape__inner">
     <wux-image width="{{604}}" height="{{806}}" nuit="{{'rpx'}}" src="/assets/popup/need-member.png" bind:click="onImageClick">
       <view class="flex flex-center" slot="loading" style="height:654rpx;width:680rpx">
diff --git a/pages/ztbvip/index.js b/pages/ztbvip/index.js
index 0aff08e..1a9166b 100644
--- a/pages/ztbvip/index.js
+++ b/pages/ztbvip/index.js
@@ -1,6 +1,7 @@
 import { getMemberExpenseList, getMemberInfo, buyMemberInfo } from "../../api/ztb"
 const util = require('../../utils/util')
 const event = require('../../utils/event.js')
+const tdsdk = require('../../libs/tdweapp.js')
 const app = getApp()
 
 Page({
@@ -14,7 +15,8 @@ Page({
     iconList: [],
     safeBottom: app.globalData.safeBottom,
     divIndex:null,
-    vipInfo: null
+    vipInfo: null,
+    visible: false
   },
   /**
    * 生命周期函数--监听页面加载
@@ -24,9 +26,11 @@ Page({
     getMemberExpenseList().then(res => {
       this.setData({ iconList: res.data, divIndex:res.data[0].id })
     }).catch(err => { })
+    event.on('EventMessage', this, this.onEvent)
     this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog')
   }, 
   onShow: function () {
+    tdsdk.Page.onShow()
     if(!app.globalData.userInfo){
       return
     }
@@ -47,6 +51,17 @@ Page({
       wx.hideLoading()
     })
   },
+  onEvent: function (message) {
+    if(message.what == 200){
+      this.setData({ visible: true })
+    }
+  },
+  onClose: function(){
+    this.setData({ visible: false })
+  },
+  onImageClick: function(){
+    wx.navigateBack()
+  },
   toAuthor: function(){
     if(this.data.userInfo && !this.data.userInfo.isAuth){
       util.navigateTo('/pages/home/idcard/index')
@@ -84,10 +99,16 @@ Page({
       } else {
         app.globalData.userInfo.isVIP = 1
         event.emit('EventMessage', { what: 200, desc: 'Vip' })
-        util.showBackToast('会员购买成功')
       }
     }).catch((e) => {
       wx.hideLoading()
     })
+  },
+  onHide: function(){
+    tdsdk.Page.onHide()
+  },
+  onUnload: function(){
+    tdsdk.Page.onUnload()
+    event.remove('EventMessage', this)
   }
 })
\ No newline at end of file
diff --git a/pages/ztbvip/index.json b/pages/ztbvip/index.json
index fd228ab..4e7c842 100644
--- a/pages/ztbvip/index.json
+++ b/pages/ztbvip/index.json
@@ -5,6 +5,7 @@
     "wux-image": "/components/image/index",
     "wux-dialog": "/components/dialog/index",
     "wux-grids": "/components/grids/index",
-    "wux-grid": "/components/grid/index"
+    "wux-grid": "/components/grid/index",
+    "wux-popup": "/components/popup/index"
   }
 }
\ No newline at end of file
diff --git a/pages/ztbvip/index.wxml b/pages/ztbvip/index.wxml
index fe86132..d812cfe 100644
--- a/pages/ztbvip/index.wxml
+++ b/pages/ztbvip/index.wxml
@@ -92,4 +92,17 @@
 	<button class="cu-btn bg-red round page-btn" bindtap="openVip">{{vipInfo.isVIP==1?'立即续费':'开通会员'}}</button>
 </view>
 
-<wux-dialog id="wux-dialog" />
\ No newline at end of file
+<wux-dialog id="wux-dialog" />
+<wux-popup wux-class="wux-landscape" wux-content-class="wux-landscape__popup" wux-body-class="wux-landscape__popup-body"
+  hasHeader="{{ false }}" hasFooter="{{ false }}" visible="{{ visible }}" mask="{{ true }}" bind:close="onClose">
+  <view class="wux-close" bindtap="onClose">
+    <text class="cuIcon-roundclose text-white" style="font-size:64rpx"></text>
+  </view>
+  <view class="wux-landscape__inner">
+    <wux-image width="{{654}}" height="{{680}}" nuit="{{'rpx'}}" bind:click="onImageClick" src="/assets/popup/payment-success.png" mode="aspectFit">
+      <view class="flex flex-center" slot="loading" style="height:654rpx;width:680rpx">
+        <text class="icon--refresher"></text>
+      </view>
+    </wux-image>
+  </view>
+</wux-popup>
\ No newline at end of file