Rorschach 5 лет назад
Родитель
Сommit
f9b872cf54
3 измененных файлов с 28 добавлено и 23 удалено
  1. 1 1
      component/share/share.wxml
  2. 25 13
      pages/groupPage/group-details/group-details.js
  3. 2 9
      project.config.json

+ 1 - 1
component/share/share.wxml

@@ -8,7 +8,7 @@
             </button>
             <view class="share-circle" catchtap="poster">
                <image  src="../../static/groupImg/circle.png"></image>
-               <text>朋友圈</text>
+               <text>生成海报</text>
             </view>           
        </view>
    </view>

+ 25 - 13
pages/groupPage/group-details/group-details.js

@@ -133,6 +133,13 @@ Page({
     //   this.showAlert();
     //   return;
     // }
+    console.log(this.data.haveTapJoin)
+    if (this.data.haveTapJoin) {
+      return false
+    }
+    this.setData({
+      haveTapJoin: true
+    })
     const orderId = this.data.orderId;
     const formId = e.detail.formId
     console.log(e)
@@ -162,17 +169,20 @@ Page({
           case 801:
             this.setData({
               isModalShow: true,
-              modalType: 'text'
+              modalType: 'text',
+              haveTapJoin: false
             })
             break;
           case 802:
             this.setData({
               // damnDialogLine1:'您已拥有本课程使用权',
               // damnDialogLine2:'快去朗读吧',
-              damnDialogShow: true
+              damnDialogShow: true,
+              haveTapJoin: false
             })
             break;
           case 806:
+          console.log(this.data.haveTapJoin)
             wx.pageScrollTo({
               scrollTop: 0,
               duration: 17
@@ -180,7 +190,8 @@ Page({
             this.setData({
               // isModalShow: true,
               // modalType: 'text'
-              alertFlag: true
+              alertFlag: true,
+              haveTapJoin: false
             })
             // wx.navigateTo({
             //   url:'/pages/groupPage/my-group/my-group'
@@ -196,6 +207,9 @@ Page({
                 } else if (res.cancel) {
                   console.log('用户点击取消')
                 }
+                this.setData({
+                  haveTapJoin: false
+                })
               }
             })
             break;
@@ -221,12 +235,7 @@ Page({
   //支付
   prePayMap: function (prePayMap, type) {
     console.log(prePayMap)
-    if (this.data.haveTapMoney) {
-      return false
-    }
-    this.setData({
-      haveTapMoney: true
-    })
+
     // const that = this;
     this.setData({
       joinGroupType: type
@@ -242,7 +251,7 @@ Page({
         console.log('支付成功')
         this.setData({
           isModalShow: true,
-          haveTapMoney: false
+          haveTapJoin: false
         })
         // const type1 = type;
         // wx.showModal({
@@ -268,7 +277,7 @@ Page({
       'fail': res => {
         console.log('支付失败', res)
         this.setData({
-          haveTapMoney: false
+          haveTapJoin: false
         })
       }
     })
@@ -283,6 +292,9 @@ Page({
       const joinUser = res.data.data.joinUserList;
       const groupId = res.data.data.groupPurchaseOrder.id;
       const myUid = wx.getStorageSync('uid');
+      this.setData({
+        haveTapJoin: false
+      })
       if (myUid === res.data.data.organizer.uid) {
         wx.redirectTo({
           url: `../collage-details/collage-details?orderId=${groupId}&goBackHome=${this.data.goBackHome}`
@@ -357,8 +369,8 @@ Page({
         dataLoading: false,
         groupOSType: groupOrder.os,
         isLoading: false
-      },()=>{
-        if(groupOrder.os === 'ANDROID' && app.globalData.isIOS){
+      }, () => {
+        if (groupOrder.os === 'ANDROID' && app.globalData.isIOS) {
           wx.redirectTo({
             url: `/pages/groupPage/grade-details/grade-details?productId=${res.data.data.groupPurchaseOrder.productId}&goBackHome=1`
           })

+ 2 - 9
project.config.json

@@ -36,7 +36,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": 1,
 			"list": [
 				{
 					"id": -1,
@@ -48,14 +48,7 @@
 					"id": 1,
 					"name": "分享团",
 					"pathName": "pages/groupPage/group-details/group-details",
-					"query": "share=true&shareId=1545234853489961",
-					"scene": "1012"
-				},
-				{
-					"id": -1,
-					"name": "分享团111",
-					"pathName": "pages/groupPage/my-group/my-group",
-					"query": "share=true",
+					"query": "share=true&shareId=1544872514724307",
 					"scene": "1012"
 				}
 			]