Browse Source

'注掉团购'

Rorschach 5 years ago
parent
commit
f3d38218e0
3 changed files with 16 additions and 26 deletions
  1. 2 2
      component/my/my.wxml
  2. 10 20
      pages/groupPage/grade-details/grade-details.wxml
  3. 4 4
      pages/index/index.js

+ 2 - 2
component/my/my.wxml

@@ -66,10 +66,10 @@
           <image src="../../static/image/collect.png" />
           <view class="btn-title">我的收藏</view>
         </view>
-        <view class="btn" bindtap='toMyCollage' data-title='{{ myData.collage }}'>
+        <!-- <view class="btn" bindtap='toMyCollage' data-title='{{ myData.collage }}'>
           <image src="../../static/image/firends.png" />
           <view class="btn-title">我的{{myData.isIOS? '助力' : '拼团'}}</view>
-        </view>
+        </view> -->
         <view class="btn">
           <image src="../../static/image/message.png" bindtap="goToMessage" />
           <view class="btn-title">消息/客服</view>

+ 10 - 20
pages/groupPage/grade-details/grade-details.wxml

@@ -34,10 +34,9 @@
         </view>
     </scroll-view>
     <!-- 安卓界面 -->
-    <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{!isIOS ? haveJoinNormal ? false : haveCreatedHelp  ? false : haveJoinHelp ? true : true : false}}">
+    <!-- <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{!isIOS ? haveJoinNormal ? false : haveCreatedHelp  ? false : haveJoinHelp ? true : true : false}}">
     <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
         <image class="bg1" src="../../../static/groupImg/baise.png"></image>
-        <!-- <image class="bg2" src="../../../static/groupImg/baise.png"></image> -->
         <block wx:for="{{payList}}" wx:key="{{index}}">
             <form class="Price" bindsubmit="pay" report-submit="{{formIsANAsshole}}" data-id="{{item.id}}" wx:if="{{item.headcount === 5 ? false : true }}">
                 <text class="formFit two-line-1">{{item.price / 100}}元</text>
@@ -46,51 +45,42 @@
                 <button class="formBtn" form-type="submit"></button>
             </form>
         </block>
-    </view>
+    </view> -->
     <!-- ios界面 -->
-    <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{isIOS ? haveCreatedHelp ? false : haveJoinNormal ? false : true :false }}">
+    <!-- <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{isIOS ? haveCreatedHelp ? false : haveJoinNormal ? false : true :false }}">
     <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
-        <!-- <image class="bg1" src="../../../static/groupImg/baise.png" style="left: 50%"></image> -->
         <block wx:for="{{payList}}" wx:key="{{index}}" wx:if="{{!imSuper}}">
             <form class="Price" bindsubmit="pay" report-submit="{{formIsANAsshole}}" data-id="{{item.id}}" wx:if="{{index != 0 && index != 2 }}">
-                <!-- <text class="formFit">{{item.price / 100}}元/{{item.headcount - 1}}人帮忙</text> -->
-                <!-- <text class="formFit">两个小伙伴助力</text> -->
                 <text class="formFit one-line-text">邀请好友助力获得本课使用权</text>
                 <button class="formBtn" form-type="submit"></button>
             </form>
-        </block>
+        </block> -->
         <!-- ios 七天权限的界面-->
-        <block wx:for="{{payList}}" wx:key="{{index}}"  wx:if="{{imSuper && haveJoinHelp}}">
+        <!-- <block wx:for="{{payList}}" wx:key="{{index}}"  wx:if="{{imSuper && haveJoinHelp}}">
             <form class="Price" bindsubmit="pay" report-submit="{{formIsANAsshole}}" data-id="{{item.id}}" wx:if="{{item.headcount == 1 || item.headcount == 5 ? false : true }}">
                  <text class="formFit two-line-2">试用期还有{{tasteDay}}天</text>
                 <text class="formFit two-line-1">邀请好友助力获得本课使用权</text>
                 <button class="formBtn" form-type="submit"></button>
             </form>
-        </block>
+        </block> -->
         <!-- ios 三年权限的界面 支持继续开团 -->
-        <block wx:for="{{payList}}" wx:key="{{index}}" wx:if="{{imSuper && !haveJoinHelp}}">
+        <!-- <block wx:for="{{payList}}" wx:key="{{index}}" wx:if="{{imSuper && !haveJoinHelp}}">
             <form class="Price" bindsubmit="pay" report-submit="{{formIsANAsshole}}" data-id="{{item.id}}" wx:if="{{index != 0 && index != 2 }}">
-                <!-- <text class="formFit">{{item.price / 100}}元/{{item.headcount - 1}}人帮忙</text> -->
-                <!-- <text class="formFit">两个小伙伴助力</text> -->
                 <text class="formFit one-line-text">好东西要分享给好朋友</text>
                 <button class="formBtn" form-type="submit"></button>
             </form>
         </block>
-    </view>
+    </view> -->
     <!-- 已有权限的界面 安卓 -->
-    <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{!isIOS ? haveJoinNormal ? true : haveCreatedHelp ? true : false : false}}">
+    <!-- <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{!isIOS ? haveJoinNormal ? true : haveCreatedHelp ? true : false : false}}">
         <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
-        <!-- <image class="bg1" style="left: 50%" src="../../../static/groupImg/baise.png"></image> -->
         <block wx:for="{{payList}}" wx:key="{{index}}">
             <form class="Price" bindsubmit="pay" report-submit="{{formIsANAsshole}}" data-id="{{item.id}}" wx:if="{{index != 0 && index != 2 }}">
                 <view>继续开团赚取奖学金吧</view>
-                <!-- <view class="formFit"> -->
-                <!-- <text class="formFit">{{item.headcount}}人团</text> -->
-                <!-- </view> -->
                 <button class="formBtn" form-type="submit"></button>
             </form>
         </block>
-    </view>
+    </view> -->
     <!-- 已有权限的界面 并且是ios-->
     <!-- <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{isIOS ? haveCreatedHelp ? false : haveJoinHelp ? true : false : false  }}">
         <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />

+ 4 - 4
pages/index/index.js

@@ -38,10 +38,10 @@ Page({
         name: '发现',
         templates: 'hot',
       },
-      {
-        name: '热团',
-        templates: 'group',
-      },
+      // {
+      //   name: '热团',
+      //   templates: 'group',
+      // },
       // {
       //   name: '动态',
       //   templates: 'follow',