Merge branch 'limengbo'

pages/groupPage/group-details/group-details.js

@@ -75,53 +75,56 @@ Page({
     this.data.selectFlag.forEach( (item ,index) => {
       if(!item) {
         const productId = this.data.bookList[index].id;
+        const title = this.data.bookList[index].title
         this.setData({
           sendGroupFlag: !this.data.sendGroupFlag
         })
-        this.openGroup(productId)
+        wx.navigateTo({
+          url: `/pages/groupPage/grade-details/grade-details?productId=${productId}&title=${title}`
+        })
       }
     })
 
   },
   //开团
-  openGroup: function (productId) {
-    //const productId = this.data.productId;
-    const groupId = this.data.groupId;
-    //开始发起团购
-    httpRequestApi.SendGroupPurchas({
-      productId,
-      groupId
-    }).success((res) => {
-      console.log('发起团购', res);
-      if (res.data.message) {
-        wx.showModal({
-          title: '提示',
-          content: res.data.message,
-          success(res) {
-            if (res.confirm) {
-              console.log('用户点击确定')
-            } else if (res.cancel) {
-              console.log('用户点击取消')
-            }
-          }
-        })
-        return false;
-      }
+  // openGroup: function (productId) {
+  //   //const productId = this.data.productId;
+  //   const groupId = this.data.groupId;
+  //   //开始发起团购
+  //   httpRequestApi.SendGroupPurchas({
+  //     productId,
+  //     groupId
+  //   }).success((res) => {
+  //     console.log('发起团购', res);
+  //     if (res.data.message) {
+  //       wx.showModal({
+  //         title: '提示',
+  //         content: res.data.message,
+  //         success(res) {
+  //           if (res.confirm) {
+  //             console.log('用户点击确定')
+  //           } else if (res.cancel) {
+  //             console.log('用户点击取消')
+  //           }
+  //         }
+  //       })
+  //       return false;
+  //     }
       
-      if (res.data.data.groupPurchaseOrder.groupType === 'BASE') {
-        debugger;
-        //掉起支付
-        this.prePayMap(res.data.data.prePayMap, 'create');
-      }else {
-        wx.navigateTo({
-          url: `/pages/groupPage/make-money/make-money?productId=${productId}&id=${res.data.data.groupPurchaseOrder.id}&groupId=${groupId}`
-        })
-      }
+  //     if (res.data.data.groupPurchaseOrder.groupType === 'BASE') {
+  //       debugger;
+  //       //掉起支付
+  //       this.prePayMap(res.data.data.prePayMap, 'create');
+  //     }else {
+  //       wx.navigateTo({
+  //         url: `/pages/groupPage/make-money/make-money?productId=${productId}&id=${res.data.data.groupPurchaseOrder.id}&groupId=${groupId}`
+  //       })
+  //     }
 
-    }).fail((error) => {
+  //   }).fail((error) => {
 
-    })
-  },
+  //   })
+  // },
   //参团
   jionGroup: function () {
     const orderId = this.data.orderId;
@@ -208,6 +211,9 @@ Page({
         }
       } else if (type === 'create') {
         this.showSuccess(groupOrder.organizer, groupOrder.organizerPrice)
+        this.setData({
+          orderId: groupOrder.id
+        })
       } else {
         for (var i = 0; i < surplusNum; i++) {
           this.data.surplusList.push(1);
@@ -316,20 +322,20 @@ Page({
     })
   },
 
-  //拼团是否成功并弹窗
-  // groupSuccess: function (orderId, detailId) {
-  //   httpRequestApi.groupSuccess(orderId).success(res => {
-  //     console.log('团购是否成功', res.data.data)
-  //     const status = res.data.data.status;
-  //     const uid = res.data.data.uid;
-  //   }).fail(error => {
-  //     console.log('错误', eroor)
-  //   })
-  // },
-
   //再次发起团
   group: function () {
-    this.openGroup();
+    const orderId = this.data.orderId;
+    this.goToDetail(orderId);
+    //拼团是否成功并弹窗
+    // httpRequestApi.groupSuccess(orderId).success(res => {
+    //   console.log('团购是否成功', res.data.data)
+    //   debugger;
+    //   const status = res.data.data.status;
+    //   const uid = res.data.data.uid;
+    // }).fail(error => {
+    //   console.log('错误', eroor)
+    // })
+    //this.openGroup();
   },
 
   /**

pages/groupPage/my-group/my-group.js

@@ -73,7 +73,7 @@ Page({
       res.data.data.list.forEach(element => {
         if(element.groupPurchaseOrder.status == 'SUCCESSED') {
           this.data.closeFlags.push(true);
-          this.data.timeList.push(util.formatDate(element.groupPurchaseOrder.gmtModified, 1))
+          this.data.timeList.push(util.formatDate(element.groupPurchaseOrder.gmtModified, 4))
         }else {
           this.data.closeFlags.push(false);
           if(element.groupPurchaseOrder.closeTime - Date.parse(new Date()) < 0 ) {

pages/groupPage/my-group/my-group.wxml

@@ -21,7 +21,7 @@
                         <text wx:if="{{!(item.groupPurchaseOrder.headcount - item.groupPurchaseOrder.joinCount)}}">{{timeList[index]}}</text>
                     </view>
                     <view class="jion-btn {{item.groupPurchaseOrder.status =='SUCCESSED' ? 'success-bg' : ''}}"  bindtap="collageDetails" data-ind="{{index}}" data-num="{{item.groupPurchaseOrder.status==='SUCCESSED'}}" data-orderId="{{item.groupPurchaseOrder.id}}" data-groupId="{{item.groupPurchaseOrder.groupId}}" data-productId="{{item.groupPurchaseOrder.productId}}" data-uid="{{item.groupPurchaseOrder.organizer}}">
-                        {{item.status =='SUCCESSED' ? '已成功' : '去参团'}}
+                        {{item.groupPurchaseOrder.status =='SUCCESSED' ? '已成功' : '去参团'}}
                     </view>
                 </view>
                 </view>

utils/util.js

@@ -30,6 +30,8 @@ function formatDate(time, flag) {
 		return year + '-' + month + '-' + day
 	}else if(flag == 3){
 		return month + '-' + day + ' ' + hour + ':' + minute;
+	}else if( flag == 4) {
+		return year + '年' + month + '月' + day + '日';
 	}
 }
 function GetQueryString(str,name){