错误代码

components/activity/index.ttml

@@ -53,8 +53,8 @@
         <view class="listInfo">
           <block tt:if="{{item.tags.length > 0}}">
             <view class="red font12"><text>
-                <block tt:for="{{item.tags}}" tt:for-index="idx" tt:for-item="it" tt:key="unique">{{idx > 0 ? ' |
-                  ':''}}{{it.tagValue}}</block>
+                <block tt:for="{{item.tags}}" tt:for-index="idx" tt:for-item="it" tt:key="unique">{{idx > 0 ?
+                  ' | ':''}}{{it.tagValue}}</block>
               </text></view>
           </block>
           <!-- <view class='gray font12'>{{item.sessionsDays || ''}}</view> -->

pages/home/index.ttml

@@ -7,7 +7,7 @@
   <text class="icon icon-toTop"></text>
 </view>
 <!-- 添加筛选 -->
-<view class="screen screenFix" hidden="{{screenHid}}">
+<!-- <view class="screen screenFix" hidden="{{screenHid}}">
   <view class="screen-col {{days == item.id?'screenCurrent':'screenCol'}}" tt:for="{{screen}}" bindtap="chooseScreen"
     data-id="{{item.id}}" tt:key="*this">{{item.txt}}</view>
   <view class="screen-col screenCol line {{defaultHid?'':'default'}}" bindtap="defaultShow">
@@ -16,7 +16,7 @@
     <view class="{{sort == item.id?'defaultCur':''}}" tt:for="{{default}}" bindtap="defaultScreen" data-id="{{item.id}}"
       tt:key="*this">{{item.txt}}</view>
   </view>
-</view>
+</view> -->
 
 <!-- <view class="topCol">
   <navigator url="/pages/city/list" class="city">{{region || '定位中'}}<text tt:if="{{region}}"></text></navigator>

pages/product/activity/index.ttml

@@ -159,238 +159,239 @@
           </view>
         </view>
       </view>
-  </view>
-  </scroll-view>
-  <!-- 累计已售 -->
-  <view tt:if="{{datas.users && datas.users.length>0}}">
-    <view class="census-title"><text tt:if="{{datas.psAttendCount > 0}}">累计已售{{datas.psAttendCount}}\t\t\t\t
-      </text><text tt:if="{{datas.attendCount > 0}}"> 本期已售{{datas.attendCount}}</text></view>
-    <view class="censusList" tt:if="{{datas.users.length>0}}">
-      <view class="list" tt:for="{{datas.users}}" tt:key="userId" tt:if="{{index < 8}}">
-        <image class="joinHeard" src="{{item.avatar}}" mode="aspectFill" data-i="{{index}}" binderror="errorPic" />
+      <!-- </view> -->
+    </scroll-view>
+    <!-- 累计已售 -->
+    <view tt:if="{{datas.users && datas.users.length>0}}">
+      <view class="census-title"><text tt:if="{{datas.psAttendCount > 0}}">累计已售{{datas.psAttendCount}}\t\t\t\t
+        </text><text tt:if="{{datas.attendCount > 0}}"> 本期已售{{datas.attendCount}}</text></view>
+      <view class="censusList" tt:if="{{datas.users.length>0}}">
+        <view class="list" tt:for="{{datas.users}}" tt:key="userId" tt:if="{{index < 8}}">
+          <image class="joinHeard" src="{{item.avatar}}" mode="aspectFill" data-i="{{index}}" binderror="errorPic" />
+        </view>
+        <view class="next" tt:if="{{datas.users.length>=9}}"></view>
       </view>
-      <view class="next" tt:if="{{datas.users.length>=9}}"></view>
-    </view>
 
-  </view>
-</view>
-<view class="comment white-bg borderRadiu" tt:if="{{comments.comments.length>0}}">
-  <navigator class="r-float font12  buttom1" url="/pages/product/comment/index?aid={{datas.aid}}">查看全部 </navigator>
-  <view class="scoreBox">
-    <view class="scoreTit inline-block">整体评分</view>
-    <view class="starBlank inline-block">
-      <view class="scoreBG" style="width:{{score}}%"></view>
     </view>
   </view>
-  <view class="line"></view>
-  <block tt:for="{{comments.comments}}" tt:key="aid">
-    <view class="userInfor">
-      <view class="headerBox">
-        <image class="headerImgB" src="{{item.ownerAvatar}}" />
-        <text>{{item.ownerNick}}</text>
-      </view>
-      <view class="userBox">
-        <text class="gray font12">{{item.weiboTime}}</text>
+  <view class="comment white-bg borderRadiu" tt:if="{{comments.comments.length>0}}">
+    <navigator class="r-float font12  buttom1" url="/pages/product/comment/index?aid={{datas.aid}}">查看全部 </navigator>
+    <view class="scoreBox">
+      <view class="scoreTit inline-block">整体评分</view>
+      <view class="starBlank inline-block">
+        <view class="scoreBG" style="width:{{score}}%"></view>
       </view>
     </view>
-    <view class="listScore">
-      <view class="score" bindtap="showAllComment"><text class="comment_content">{{item.contented}}</text></view>
-      <view class="scoreImg " tt:if="{{item.imageList.length>0}}" bindtap="previewImage" data-index="{{index}}">
-        <image class="appraise" src="{{item.imageList[0]}}?x-oss-process=image/resize,m_mfit,h_300,w_300"
-          mode="aspectFill"></image>
+    <view class="line"></view>
+    <block tt:for="{{comments.comments}}" tt:key="aid">
+      <view class="userInfor">
+        <view class="headerBox">
+          <image class="headerImgB" src="{{item.ownerAvatar}}" />
+          <text>{{item.ownerNick}}</text>
+        </view>
+        <view class="userBox">
+          <text class="gray font12">{{item.weiboTime}}</text>
+        </view>
       </view>
-      <!-- 隐藏宝大大回复 todo： -->
-      <view class="reply" tt:if="{{item.answer&&false}}">
-        <view class="addTitle replyTitle"><text class="icon icon-commentd"></text>宝大大回复：</view>
-        <view class="score">{{item.answer}}</view>
+      <view class="listScore">
+        <view class="score" bindtap="showAllComment"><text class="comment_content">{{item.contented}}</text></view>
+        <view class="scoreImg " tt:if="{{item.imageList.length>0}}" bindtap="previewImage" data-index="{{index}}">
+          <image class="appraise" src="{{item.imageList[0]}}?x-oss-process=image/resize,m_mfit,h_300,w_300"
+            mode="aspectFill"></image>
+        </view>
+        <!-- 隐藏宝大大回复 todo： -->
+        <view class="reply" tt:if="{{item.answer&&false}}">
+          <view class="addTitle replyTitle"><text class="icon icon-commentd"></text>宝大大回复：</view>
+          <view class="score">{{item.answer}}</view>
+        </view>
       </view>
-    </view>
-  </block>
-  <view class="line" tt:if="{{marvellousList.length}}"></view>
-  <!-- 往期精彩 -->
-  <view class="marvellous ft14" tt:if="{{marvellousList.length}}">
-    <view class="marvellous_top" data-psId="{{datas.psId}}" bindtap="goPrevious">
-      <view class="marvellous_top_content">
-        <image class='brilliant'
-          src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038035764008987.png" mode />
-        <view
-          style="letter-spacing: 2px;color: #9d9d9e;margin-left:30rpx;position: relative;top:-10rpx;font-size:26rpx">
-          记录活动过程中的精彩瞬间
+    </block>
+    <view class="line" tt:if="{{marvellousList.length}}"></view>
+    <!-- 往期精彩 -->
+    <view class="marvellous ft14" tt:if="{{marvellousList.length}}">
+      <view class="marvellous_top" data-psId="{{datas.psId}}" bindtap="goPrevious">
+        <view class="marvellous_top_content">
+          <image class='brilliant'
+            src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038035764008987.png" mode />
+          <view
+            style="letter-spacing: 2px;color: #9d9d9e;margin-left:30rpx;position: relative;top:-10rpx;font-size:26rpx">
+            记录活动过程中的精彩瞬间
+          </view>
         </view>
+        <image class="brilliantIcon"
+          src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038240147032026.png" mode />
+        <text class="brillianticon"></text>
       </view>
-      <image class="brilliantIcon"
-        src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038240147032026.png" mode />
-      <text class="brillianticon"></text>
-    </view>
-    <view class="marvellous_bottom">
-      <view class="bottom_li" tt:for="{{marvellousList}}" tt:key="index">
-        <!-- 视频 -->
-        <image mode="aspectFill" class='bottom_li' src='{{item.logo}}' tt:if='{{item.type==2}}'
-          data-vdurl="{{item.content}}" bindtap='previewVideo' data-id='{{index}}'></image>
-        <video bindtap='previewVideo' tt:if="{{item.type==2&&show!=index}}" src="{{item.content}}"></video>
-        <!-- 视频号 -->
-        <image mode="aspectFill" class="channelVideo" data-uname="{{item.title}}" data-vdNum="{{item.content}}"
-          src="{{item.logo}}" bindtap="channelVideo" tt:if="{{item.type==3}}"></image>
-        <!-- 图片 -->
-        <image mode="aspectFill" bindtap="actPreviewImage" data-index="{{index}}" data-imgurl="{{item.logo}}"
-          class="bottom_li" src="{{item.logo}}" tt:if="{{item.type==4}}"></image>
-        <view tt:if="{{item.type==3||item.type==2}}" class="icon icon-video-play iconAdd"></view>
-        <!-- <image tt:if="{{item.type==4}}" class="img" src="https://img.bbztx.com/image_test/upload/202302/imgicon.png" mode="" /> -->
+      <view class="marvellous_bottom">
+        <view class="bottom_li" tt:for="{{marvellousList}}" tt:key="index">
+          <!-- 视频 -->
+          <image mode="aspectFill" class='bottom_li' src='{{item.logo}}' tt:if='{{item.type==2}}'
+            data-vdurl="{{item.content}}" bindtap='previewVideo' data-id='{{index}}'></image>
+          <video bindtap='previewVideo' tt:if="{{item.type==2&&show!=index}}" src="{{item.content}}"></video>
+          <!-- 视频号 -->
+          <image mode="aspectFill" class="channelVideo" data-uname="{{item.title}}" data-vdNum="{{item.content}}"
+            src="{{item.logo}}" bindtap="channelVideo" tt:if="{{item.type==3}}"></image>
+          <!-- 图片 -->
+          <image mode="aspectFill" bindtap="actPreviewImage" data-index="{{index}}" data-imgurl="{{item.logo}}"
+            class="bottom_li" src="{{item.logo}}" tt:if="{{item.type==4}}"></image>
+          <view tt:if="{{item.type==3||item.type==2}}" class="icon icon-video-play iconAdd"></view>
+          <!-- <image tt:if="{{item.type==4}}" class="img" src="https://img.bbztx.com/image_test/upload/202302/imgicon.png" mode="" /> -->
+        </view>
       </view>
     </view>
   </view>
-</view>
 
-<view class="newsDet borderRadiu" style="margin-top: 20rpx;padding-top:20rpx;padding-bottom: 20rpx;">
-  <!-- 儿童年龄要求 -->
-  <view class="newsList" tt:if="{{datas.ages || (datas.adultMinAge && datas.adultMaxAge)}}">
-    <view class="icon-child icon-t red"></view>
-    <view class="newsTitle">年龄：<text>儿童 {{datas.ages}}岁</text>
-      <text style="margin-left: 20rpx;" tt:if="{{datas.adultMinAge && datas.adultMaxAge && datas.sparent==0}}">成人
-        {{datas.adultMinAge+'-'+datas.adultMaxAge}}岁</text>
-      <text style="margin-left: 20rpx;" tt:else>（独立营）</text>
+  <view class="newsDet borderRadiu" style="margin-top: 20rpx;padding-top:20rpx;padding-bottom: 20rpx;">
+    <!-- 儿童年龄要求 -->
+    <view class="newsList" tt:if="{{datas.ages || (datas.adultMinAge && datas.adultMaxAge)}}">
+      <view class="icon-child icon-t red"></view>
+      <view class="newsTitle">年龄：<text>儿童 {{datas.ages}}岁</text>
+        <text style="margin-left: 20rpx;" tt:if="{{datas.adultMinAge && datas.adultMaxAge && datas.sparent==0}}">成人
+          {{datas.adultMinAge+'-'+datas.adultMaxAge}}岁</text>
+        <text style="margin-left: 20rpx;" tt:else>（独立营）</text>
+      </view>
     </view>
-  </view>
-  <!-- 活动标签 -->
-  <view class="newsList" tt:if="{{datas.capacity}}">
-    <view class="icon-character icon-t red"></view>
-    <view class="newsTitle">{{datas.capacity}}</view>
-  </view>
-  <!-- 活动地点 -->
-  <view class="newsList">
-    <view class="icon-gather-area icon red"></view>
-    <view class="address">活动地点：{{datas.districk || '暂无地址'}}</view>
-  </view>
-  <!-- 集合地点 -->
-  <view class="newsList mapTo" bindtap="toMap">
-    <view style="display: flex;align-items: center;">
-      <view class="icon-activity-area icon red"></view>
-      <view class="address">集合地点：{{datas.address || '暂无地址'}}</view>
+    <!-- 活动标签 -->
+    <view class="newsList" tt:if="{{datas.capacity}}">
+      <view class="icon-character icon-t red"></view>
+      <view class="newsTitle">{{datas.capacity}}</view>
     </view>
-    <view style="margin-right: 15rpx;" class="brillianticon"> </view>
-  </view>
-  <!-- 最少成团数 -->
-  <view class="newsList">
-    <image class="minImg" src="https://img.bbztx.com/image_test/upload/thumbs/20221025/logo/1666688920648080728.png"
-      mode="widthFix"></image>
-    <view class="address">每个场次最少成团人数：{{datas.minCloudsNumber || 10}}人</view>
-  </view>
-</view>
-
-<view class="preferential-box borderRadiu"
-  tt:if="{{(datas.gdiscount.items && datas.gdiscount.items.length > 0)||(datas.ldiscount.items && datas.ldiscount.items.length>0 && datas.presellOpen==0)||datas.maxUserCoin>0||(datas.refundRule!=null&&datas.refundRule!='5')}}"
-  style="padding-bottom: 10rpx;padding-top: 10rpx;">
-  <!--  preferential-start -->
-  <view class="preferential growup-line no-preferential"
-    tt:if="{{datas.gdiscount.items && datas.gdiscount.items.length > 0}}">
-    <view class="tag-text">拼团</view>
-    <view class="preferential-text">
-      <view class="red">
-        邀请好友进行拼团，最高可<text>{{datas.gdiscount.type ==
-          0?'省':'送'}}</text>{{datas.gdiscount.items[datas.gdiscount.items.length-1].price}}{{datas.gdiscount.type ==
-        0?'元':''}}
+    <!-- 活动地点 -->
+    <view class="newsList">
+      <view class="icon-gather-area icon red"></view>
+      <view class="address">活动地点：{{datas.districk || '暂无地址'}}</view>
+    </view>
+    <!-- 集合地点 -->
+    <view class="newsList mapTo" bindtap="toMap">
+      <view style="display: flex;align-items: center;">
+        <view class="icon-activity-area icon red"></view>
+        <view class="address">集合地点：{{datas.address || '暂无地址'}}</view>
       </view>
+      <view style="margin-right: 15rpx;" class="brillianticon"> </view>
     </view>
-    <view class="preferential-after" style="margin:0">
-      <button
-        class="button {{ datas.status == 6?'button-warn':((buttonClass != 'disabled' && alternateBol) ? 'button-warn':'disabled')}} button-radius button-mini create_group"
-        data-createGroup="1"
-        bindtap="{{datas.status == 6?'newGroup':((buttonClass != 'disabled' && alternateBol)?'newGroup':'')}}">新开拼团</button>
+    <!-- 最少成团数 -->
+    <view class="newsList">
+      <image class="minImg" src="https://img.bbztx.com/image_test/upload/thumbs/20221025/logo/1666688920648080728.png"
+        mode="widthFix"></image>
+      <view class="address">每个场次最少成团人数：{{datas.minCloudsNumber || 10}}人</view>
     </view>
   </view>
-  <!-- 拼团 -->
-  <view class="preferential no-preferential"
-    tt:if="{{datas.gdiscount.users.length > 0 && datas.gdiscount.users && shareInfo.groupid}}">
-    <view class="preferential-text preferential-text2" style="margin-left:0;">
-      <view class="head">
-        <image src="{{item.avatar}}" tt:for="{{datas.gdiscount.users}}" tt:key="userId" tt:if="{{index<3}}"></image>
-      </view>
-      <!-- 倒计时 -->
-      <view class="time" tt:if="{{datas.gdiscount.times>0 && datas.gdiscount.status == 0}}">
-        <text>剩余：</text>
-        <text class='time-m'>{{remainTime.hour}}</text><text class="i">:</text>
-        <text class='time-m'>{{remainTime.minite}}</text><text class="i">:</text>
-        <text class='time-m'>{{remainTime.second}}</text>
-      </view>
-      <view class="groupText" tt:if="{{datas.gdiscount.status == 0}}">
-        <text tt:if="{{datas.gdiscount.before != 0 & datas.gdiscount.times < 0}}">已成{{datas.gdiscount.before}}人团,</text>
-        差<text class="red">{{datas.gdiscount.total <= 0 ? '0' :(datas.gdiscount.next-datas.gdiscount.total)}}< text>
-            人成<text class="red">{{datas.gdiscount.next}}人团</text>
-        </text>
-      </view>
-      <view class="groupText" tt:if="{{datas.gdiscount.status == 4}}">
-        此团<text class="red">已过期</text>
+
+  <view class="preferential-box borderRadiu"
+    tt:if="{{(datas.gdiscount.items && datas.gdiscount.items.length > 0)||(datas.ldiscount.items && datas.ldiscount.items.length>0 && datas.presellOpen==0)||datas.maxUserCoin>0||(datas.refundRule!=null&&datas.refundRule!='5')}}"
+    style="padding-bottom: 10rpx;padding-top: 10rpx;">
+    <!--  preferential-start -->
+    <view class="preferential growup-line no-preferential"
+      tt:if="{{datas.gdiscount.items && datas.gdiscount.items.length > 0}}">
+      <view class="tag-text">拼团</view>
+      <view class="preferential-text">
+        <view class="red">
+          邀请好友进行拼团，最高可<text>{{datas.gdiscount.type ==
+            0?'省':'送'}}</text>{{datas.gdiscount.items[datas.gdiscount.items.length-1].price}}{{datas.gdiscount.type ==
+          0?'元':''}}
+        </view>
       </view>
-      <view class="groupText" tt:if="{{datas.gdiscount.status == 2}}">
-        此团<text class="red">已满员</text>
+      <view class="preferential-after" style="margin:0">
+        <button
+          class="button {{ datas.status == 6?'button-warn':((buttonClass != 'disabled' && alternateBol) ? 'button-warn':'disabled')}} button-radius button-mini create_group"
+          data-createGroup="1"
+          bindtap="{{datas.status == 6?'newGroup':((buttonClass != 'disabled' && alternateBol)?'newGroup':'')}}">新开拼团</button>
       </view>
     </view>
     <!-- 拼团 -->
-    <view class="preferential-after">
-      <button data-createGroup="0" bindtap="{{(buttonClass1 != 'disabled' && alternateBol) ? 'newGroup':''}}"
-        class="button {{(buttonClass1 != 'disabled' && alternateBol) ? 'button-warn':'disabled'}} button-mini button-radius {{datas.gdiscount.status == 0 ? 'create_group':''}}">{{datas.gdiscount.status
-        == 2 ? '此团已满':(datas.gdiscount.status == 4 ? '此团过期':'一键参团')}}</button>
-    </view>
-  </view>
-  <view class="preferential no-preferential"
-    tt:if="{{(datas.presellOpen == 0 || datas.presellOpen == 2) && (datas.status == 6 || (datas.status == 0 && showPrivilege))}}">
-    <view class="tag-text">特权</view>
-    <view class="preferential-text">
-      <view class="black" tt:if="{{datas.aheadTimeLong && datas.aheadTimeLong>0}}">已兑换特权，可提前<span
-          class="red">{{privilegeTime}}</span>抢购活动
+    <view class="preferential no-preferential"
+      tt:if="{{datas.gdiscount.users.length > 0 && datas.gdiscount.users && shareInfo.groupid}}">
+      <view class="preferential-text preferential-text2" style="margin-left:0;">
+        <view class="head">
+          <image src="{{item.avatar}}" tt:for="{{datas.gdiscount.users}}" tt:key="userId" tt:if="{{index<3}}"></image>
+        </view>
+        <!-- 倒计时 -->
+        <view class="time" tt:if="{{datas.gdiscount.times>0 && datas.gdiscount.status == 0}}">
+          <text>剩余：</text>
+          <text class='time-m'>{{remainTime.hour}}</text><text class="i">:</text>
+          <text class='time-m'>{{remainTime.minite}}</text><text class="i">:</text>
+          <text class='time-m'>{{remainTime.second}}</text>
+        </view>
+        <view class="groupText" tt:if="{{datas.gdiscount.status == 0}}">
+          <text
+            tt:if="{{datas.gdiscount.before != 0 & datas.gdiscount.times < 0}}">已成{{datas.gdiscount.before}}人团,</text>
+          差<text class="red">{{datas.gdiscount.total <= 0 ? '0' :(datas.gdiscount.next-datas.gdiscount.total)}}< text>
+              人成<text class="red">{{datas.gdiscount.next}}人团</text>
+          </text>
+        </view>
+        <view class="groupText" tt:if="{{datas.gdiscount.status == 4}}">
+          此团<text class="red">已过期</text>
+        </view>
+        <view class="groupText" tt:if="{{datas.gdiscount.status == 2}}">
+          此团<text class="red">已满员</text>
+        </view>
       </view>
-      <view class="black" tt:else>最高可兑换<text style="color:#ee3a43">20分钟</text>的提前抢购特权
+      <!-- 拼团 -->
+      <view class="preferential-after">
+        <button data-createGroup="0" bindtap="{{(buttonClass1 != 'disabled' && alternateBol) ? 'newGroup':''}}"
+          class="button {{(buttonClass1 != 'disabled' && alternateBol) ? 'button-warn':'disabled'}} button-mini button-radius {{datas.gdiscount.status == 0 ? 'create_group':''}}">{{datas.gdiscount.status
+          == 2 ? '此团已满':(datas.gdiscount.status == 4 ? '此团过期':'一键参团')}}</button>
       </view>
     </view>
-    <button class="change-privilege" bindtap="openConvertPopup"
-      tt:if="{{!datas.aheadTimeLong && datas.aheadTimeLong<=0}}">立即兑换</button>
-  </view>
-  <block tt:if="{{datas.ldiscount.items && datas.ldiscount.items.length>0 && datas.presellOpen==0}}">
-    <view class="preferential no-preferential">
-      <!-- blue -->
-      <view class="tag-text ">早鸟</view>
+    <view class="preferential no-preferential"
+      tt:if="{{(datas.presellOpen == 0 || datas.presellOpen == 2) && (datas.status == 6 || (datas.status == 0 && showPrivilege))}}">
+      <view class="tag-text">特权</view>
       <view class="preferential-text">
-        <view class="black" tt:for="{{datas.ldiscount.items}}" tt:key="index">{{item.start}}-{{item.end}}购买，单人减<text
-            class="red">{{item.price}}元</text></view>
-        <view class="black" tt:if="{{datas.ldiscount.num>0}}">(每期限前{{datas.ldiscount.num}}个参与者)</view>
+        <view class="black" tt:if="{{datas.aheadTimeLong && datas.aheadTimeLong>0}}">已兑换特权，可提前<span
+            class="red">{{privilegeTime}}</span>抢购活动
+        </view>
+        <view class="black" tt:else>最高可兑换<text style="color:#ee3a43">20分钟</text>的提前抢购特权
+        </view>
       </view>
+      <button class="change-privilege" bindtap="openConvertPopup"
+        tt:if="{{!datas.aheadTimeLong && datas.aheadTimeLong<=0}}">立即兑换</button>
     </view>
-  </block>
+    <block tt:if="{{datas.ldiscount.items && datas.ldiscount.items.length>0 && datas.presellOpen==0}}">
+      <view class="preferential no-preferential">
+        <!-- blue -->
+        <view class="tag-text ">早鸟</view>
+        <view class="preferential-text">
+          <view class="black" tt:for="{{datas.ldiscount.items}}" tt:key="index">{{item.start}}-{{item.end}}购买，单人减<text
+              class="red">{{item.price}}元</text></view>
+          <view class="black" tt:if="{{datas.ldiscount.num>0}}">(每期限前{{datas.ldiscount.num}}个参与者)</view>
+        </view>
+      </view>
+    </block>
 
-  <!-- 宝贝币 -->
-  <view class="preferential no-preferential" tt:if="{{datas.maxUserCoin>0}}">
-    <view class="tag-text ">宝贝币</view>
-    <view class="preferential-text">
-      <view class="black">部分场次可用，最高可抵扣<text class="red">{{datas.maxUserCoin/10}}元</text></view>
+    <!-- 宝贝币 -->
+    <view class="preferential no-preferential" tt:if="{{datas.maxUserCoin>0}}">
+      <view class="tag-text ">宝贝币</view>
+      <view class="preferential-text">
+        <view class="black">部分场次可用，最高可抵扣<text class="red">{{datas.maxUserCoin/10}}元</text></view>
+      </view>
     </view>
-  </view>
-  <!-- 报名无忧 -->
-  <view class="preferential no-preferential" bindtap="changeRefund"
-    tt:if="{{datas.refundRule!=null&&datas.refundRule!=5}}">
-    <view class="tag-text ">报名无忧</view>
-    <view class="preferential-text">
-      <view class="dis">
-        <view class="black" tt:if="{{datas.refundRule=='3'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='1'}}">活动开始前3天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='4'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='2'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='6'}}">活动开始前60天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='7'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='8'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='9'}}">活动开始前20天可<text class="red">全额退款/免费换排期</text></view>
-        <view class="black" tt:if="{{datas.refundRule=='10'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
-        <!-- 国内亲子营退款规则 -->
-        <view class="black" tt:if="{{datas.refundRule=='11'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
-        <!-- 国内行走系列退款规则 -->
-        <view class="black" tt:if="{{datas.refundRule=='12'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
-        <!-- 国际单飞/亲子营退款规则 -->
-        <view class="black" tt:if="{{datas.refundRule=='13'}}">活动开始前30天可<text class="red">全额退款/免费换排期</text></view>
+    <!-- 报名无忧 -->
+    <view class="preferential no-preferential" bindtap="changeRefund"
+      tt:if="{{datas.refundRule!=null&&datas.refundRule!=5}}">
+      <view class="tag-text ">报名无忧</view>
+      <view class="preferential-text">
+        <view class="dis">
+          <view class="black" tt:if="{{datas.refundRule=='3'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='1'}}">活动开始前3天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='4'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='2'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='6'}}">活动开始前60天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='7'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='8'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='9'}}">活动开始前20天可<text class="red">全额退款/免费换排期</text></view>
+          <view class="black" tt:if="{{datas.refundRule=='10'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
+          <!-- 国内亲子营退款规则 -->
+          <view class="black" tt:if="{{datas.refundRule=='11'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
+          <!-- 国内行走系列退款规则 -->
+          <view class="black" tt:if="{{datas.refundRule=='12'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
+          <!-- 国际单飞/亲子营退款规则 -->
+          <view class="black" tt:if="{{datas.refundRule=='13'}}">活动开始前30天可<text class="red">全额退款/免费换排期</text></view>
+        </view>
       </view>
     </view>
   </view>
-</view>
-<!-- 安全保障和物品清单 -->
-<!-- <view class="borderRadiu mTop10 safety" tt:if="{{showGoodsRecom && securityShow!='' }}">
+  <!-- 安全保障和物品清单 -->
+  <!-- <view class="borderRadiu mTop10 safety" tt:if="{{showGoodsRecom && securityShow!='' }}">
   <view class="flex-box" style="padding: 0;">
     <view class="safetyGoods" bindtap="jumpGoodsPage">
       <view class="flex-box" style="padding: 0;width: 100%;z-index: 1; position: relative;">
@@ -419,65 +420,65 @@
     </view>
   </view>
 </view> -->
-<!-- <view tt:else> -->
-<!-- 物品清单 -->
-<!-- <view class="borderRadiu mTop10" tt:if="{{showGoodsRecom}}">
+  <!-- <view tt:else> -->
+  <!-- 物品清单 -->
+  <!-- <view class="borderRadiu mTop10" tt:if="{{showGoodsRecom}}">
     <physicalForCard title="点击查看活动前所需准备的物品" link="{{'/pages/public/showGoodsList/index?aid='+datas.aid}}">
     </physicalForCard>
   </view> -->
-<!-- 安全保障 -->
-<view class="borderRadiu mTop10 safety" style="background-color: #fff;" bindtap="jumpPage">
-  <view class="flex-box">
-    <view style="display: flex;align-items: center; padding: 20rpx 0;">
-      <view class="box-l">
-        <image class="brilliant" src="../images/safety@2x.png" mode
-          style="height: 48rpx;width: 224rpx;margin-right: 10rpx;" />
+  <!-- 安全保障 -->
+  <view class="borderRadiu mTop10 safety" style="background-color: #fff;" bindtap="jumpPage">
+    <view class="flex-box">
+      <view style="display: flex;align-items: center; padding: 20rpx 0;">
+        <view class="box-l">
+          <image class="brilliant" src="../images/safety@2x.png" mode
+            style="height: 48rpx;width: 224rpx;margin-right: 10rpx;" />
+        </view>
+        <view class="box-c">专业资质+安全服务保障</view>
       </view>
-      <view class="box-c">专业资质+安全服务保障</view>
+      <view class="box-r"></view>
     </view>
-    <view class="box-r"></view>
+    <image src="../images/safetyBg.png" class="bgImg" style="z-index: 0;"></image>
   </view>
-  <image src="../images/safetyBg.png" class="bgImg" style="z-index: 0;"></image>
-</view>
-<!-- </view> -->
-<!-- 详情 -->
-<view class="details mTop10 borderRadiu">
-  <view class="product-nav {{Column ? 'product-nav-fiexd':''}}">
-    <view class="nav {{isColumn ? 'topNav':''}}">
-      <view class="nav-col" bindtap="chooseNav" data-id="0">
-        <text class="navCol {{current == 0?'current':''}}">图文详情</text>
-      </view>
-      <view class="nav-col" bindtap="chooseNav" data-id="1">
-        <text class="navCol {{current == 1?'current':''}}">安全行程</text>
-      </view>
-      <view class="nav-col" bindtap="chooseNav" data-id="2">
-        <text class="navCol {{current == 2?'current':''}}">报名须知</text>
+  <!-- </view> -->
+  <!-- 详情 -->
+  <view class="details mTop10 borderRadiu">
+    <view class="product-nav {{Column ? 'product-nav-fiexd':''}}">
+      <view class="nav {{isColumn ? 'topNav':''}}">
+        <view class="nav-col" bindtap="chooseNav" data-id="0">
+          <text class="navCol {{current == 0?'current':''}}">图文详情</text>
+        </view>
+        <view class="nav-col" bindtap="chooseNav" data-id="1">
+          <text class="navCol {{current == 1?'current':''}}">安全行程</text>
+        </view>
+        <view class="nav-col" bindtap="chooseNav" data-id="2">
+          <text class="navCol {{current == 2?'current':''}}">报名须知</text>
+        </view>
       </view>
     </view>
+    <view class="detail-content" id='content' style="padding-top:20rpx;">
+      <video class="video" id="myVideo-{{index}}" tt:if="{{viode}}" tt:for="{{viode}}" tt:key="index"
+        src="{{item}}"></video>
+      <rich-text nodes="{{datas.content}}"></rich-text>
+    </view>
+    <view class="detail-content" id='safeTrip'>
+      <rich-text nodes="{{datas.safeTrip}}"></rich-text>
+    </view>
+    <view class="detail-content" id='notes'>
+      <rich-text nodes="{{datas.notes}}"></rich-text>
+    </view>
   </view>
-  <view class="detail-content" id='content' style="padding-top:20rpx;">
-    <video class="video" id="myVideo-{{index}}" tt:if="{{viode}}" tt:for="{{viode}}" tt:key="index"
-      src="{{item}}"></video>
-    <rich-text nodes="{{datas.content}}"></rich-text>
-  </view>
-  <view class="detail-content" id='safeTrip'>
-    <rich-text nodes="{{datas.safeTrip}}"></rich-text>
-  </view>
-  <view class="detail-content" id='notes'>
-    <rich-text nodes="{{datas.notes}}"></rich-text>
-  </view>
-</view>
-<!-- 活动推荐 -->
-<recommend aid="{{datas.aid}}" tt:if="{{datas.recommend==1}}" />
-<convertPopup show="{{showConvert}}" aid="{{datas.aid}}" status="{{datas.status}}" presellOpen="{{datas.presellOpen}}"
-  bind:close="closeConvertPopup" bind:showPrompt="showPrompt"></convertPopup>
-<!-- 兑换二次弹窗 -->
-<convertNextPopup show="{{showNextConvert}}" aid="{{datas.aid}}" checkedTime="{{checkedTime}}" city="{{city}}"
-  bind:close="closeNextPopup" bind:changePrivilege="changePrivilege"></convertNextPopup>
-<coinTaskToTime show="{{countDown.show}}" time="{{countDown.time}}" taskId="{{countDown.taskId}}"
-  bind:finishedTime="finishedTime"></coinTaskToTime>
-</view>
-<!-- 底部悬浮关注服务号 -->
-<!-- <bottomSuspension></bottomSuspension> -->
-<!-- 隐私授权弹窗 -->
-<!-- <privacy-popup></privacy-popup> -->
+  <!-- 活动推荐 -->
+  <recommend aid="{{datas.aid}}" tt:if="{{datas.recommend==1}}" />
+  <convertPopup show="{{showConvert}}" aid="{{datas.aid}}" status="{{datas.status}}" presellOpen="{{datas.presellOpen}}"
+    bind:close="closeConvertPopup" bind:showPrompt="showPrompt"></convertPopup>
+  <!-- 兑换二次弹窗 -->
+  <convertNextPopup show="{{showNextConvert}}" aid="{{datas.aid}}" checkedTime="{{checkedTime}}" city="{{city}}"
+    bind:close="closeNextPopup" bind:changePrivilege="changePrivilege"></convertNextPopup>
+  <coinTaskToTime show="{{countDown.show}}" time="{{countDown.time}}" taskId="{{countDown.taskId}}"
+    bind:finishedTime="finishedTime"></coinTaskToTime>
+  <!-- </view> -->
+  <!-- 底部悬浮关注服务号 -->
+  <!-- <bottomSuspension></bottomSuspension> -->
+  <!-- 隐私授权弹窗 -->
+  <!-- <privacy-popup></privacy-popup> -->

pages/product/component/inviteEnrollPopup.ttml

@@ -10,7 +10,7 @@
     <view class="invite-group" tt:if="{{shareInfo.groupid}}">
       <view class="groupText" tt:if="{{datas.status == 0}}">
         <text tt:if="{{datas.before != 0 && datas.times < 0}}">已成{{datas.before}}人团,</text>
-        差<text class="red">{{datas.total <= 0 ? '0':(datas.next-datas.total)}}< text>人成<text class="red">{{datas.next}}人团</text>
+        差<text class="red">{{datas.total <= 0 ? '0':(datas.next-datas.total)}}<text>人成<text class="red">{{datas.next}}人团</text>
      </text></view>
       <view class="groupText" tt:if="{{datas.status == 4}}">
         此团<text class="red">已过期</text>

pages/sharingHome/index.ttml

@@ -1,7 +1,8 @@
 <sjs src='../../pages/wxs/util.sjs' module='filter' />
 <popup show="{{showPopup}}" opacity='6'>
   <view class="pop_content">
-    <view style="color:gray;line-height: 1.5;">你已被停用<text>{{organStatus?'机构':'分享家'}}</text>身份，无法再通过分享来获得佣金。可联系对应工作人员重新启用（注：未到账佣金不受影响，验票后到账）
+    <view style="color:gray;line-height: 1.5;">
+      你已被停用<text>{{organStatus?'机构':'分享家'}}</text>身份，无法再通过分享来获得佣金。可联系对应工作人员重新启用（注：未到账佣金不受影响，验票后到账）
     </view>
     <view class="btns" bindtap="closePopup">确定</view>
   </view>
@@ -11,11 +12,14 @@
     <view class="userInfo">
       <image src='{{info.avatar}}' mode="aspectFill" lazy-load="true"></image>
       <view class="userName">{{info.nickname}}</view>
-      <view class="level {{info.roleTypeDisable==1 ?'stop_user':(info.sharerInfo.levelMax==1?'ordinary':(info.sharerInfo.levelMax==2?'copper':(info.sharerInfo.levelMax==3?'silver':(info.sharerInfo.levelMax==4?'gold':(info.sharerInfo.levelMax==5?'super':'')))))}}" tt:if="{{info.roleType=='sharer'}}">
+      <view
+        class="level {{info.roleTypeDisable==1 ?'stop_user':(info.sharerInfo.levelMax==1?'ordinary':(info.sharerInfo.levelMax==2?'copper':(info.sharerInfo.levelMax==3?'silver':(info.sharerInfo.levelMax==4?'gold':(info.sharerInfo.levelMax==5?'super':'')))))}}"
+        tt:if="{{info.roleType=='sharer'}}">
         <text class="icon icon-sharer-level"></text>
         <text>{{info.sharerInfo.levelMax==1?'普通':(info.sharerInfo.levelMax==2?'铜牌':(info.sharerInfo.levelMax==3?'银牌':(info.sharerInfo.levelMax==4?'金牌':(info.sharerInfo.levelMax==5?'超级':''))))}}</text>
       </view>
-      <view tt:if="{{info.roleType=='organ'}}" class="level  {{info.roleTypeDisable==1?'stop_user':'organTip'}}">机构</view>
+      <view tt:if="{{info.roleType=='organ'}}" class="level  {{info.roleTypeDisable==1?'stop_user':'organTip'}}">机构
+      </view>
       <view class="sharer-status font10" bindtap="showInstract" tt:if="{{info.roleTypeDisable==1 }}">已停用</view>
     </view>
     <view class="rule_ins" data-type="0" bindtap="jumptoIns">
@@ -47,14 +51,16 @@
           </view>
           <view class="col-8 link line" data-url="/pages/sharingHome/wallet" bindtap='navigatorURl'>
             <view style="flex: 1;">
-              <view class="font12">￥<text class="font18 red">{{coin.coinReflect>0?coin.coinReflect:'0.00' }}</text></view>
+              <view class="font12">￥<text class="font18 red">{{coin.coinReflect>0?coin.coinReflect:'0.00' }}</text>
+              </view>
               <view class='label'>
                 <text class="font12">已提现</text>
               </view>
             </view>
           </view>
           <view class="col-8 link" data-url="/pages/sharingHome/wallet" bindtap='navigatorURl'>
-            <view class="font12">￥<text class="font18 red">{{coin.coinUsageAmount>0?coin.coinUsageAmount:'0.00'}}</text></view>
+            <view class="font12">￥<text class="font18 red">{{coin.coinUsageAmount>0?coin.coinUsageAmount:'0.00'}}</text>
+            </view>
             <view class='label'>
               <text class="font12">已使用</text>
             </view>
@@ -64,15 +70,18 @@
     </view>
   </view>
   <view class="share-num color_gray">
-    <view class="share-num-item" data-url="/pages/sharingHome/inviteUser?type=0&roleType={{info.roleType}}" bindtap='navigatorURl'>
+    <view class="share-num-item" data-url="/pages/sharingHome/inviteUser?type=0&roleType={{info.roleType}}"
+      bindtap='navigatorURl'>
       <view class="person font12"><text class="red">{{invitee.directMemberNum || 0}}</text>人</view>
       <view class="font12">一级会员</view>
     </view>
-    <view class="share-num-item" data-url="/pages/sharingHome/inviteUser?type=1&roleType={{info.roleType}}" bindtap='navigatorURl'>
+    <view class="share-num-item" data-url="/pages/sharingHome/inviteUser?type=1&roleType={{info.roleType}}"
+      bindtap='navigatorURl'>
       <view class="person font12"><text class="red">{{invitee.directSharerNum || 0}}</text>人</view>
       <view class="font12">{{info.roleType == 'sharer' ? '下级分享家':'下级机构'}}</view>
     </view>
-    <view class="share-num-item" data-url="/pages/sharingHome/inviteUser?type=2&roleType={{info.roleType}}" bindtap='navigatorURl'>
+    <view class="share-num-item" data-url="/pages/sharingHome/inviteUser?type=2&roleType={{info.roleType}}"
+      bindtap='navigatorURl'>
       <view class="person font12"><text class="red">{{invitee.indirectMemberNum || 0}}</text>人</view>
       <view class="font12">间接会员</view>
     </view>
@@ -80,8 +89,9 @@
   <view class="modular modular-pad" tt:if="{{info.roleType=='sharer'}}">
     <view class="modal-title title-link ">
       <view class="share_title">
-        <text>分享家等级</text>  
-        <text class="upgrade_ins red" data-type="1" bindtap="jumptoIns">晋级说明 <text class="icon icon-arrow font12"></text></text>
+        <text>分享家等级</text>
+        <text class="upgrade_ins red" data-type="1" bindtap="jumptoIns">晋级说明 <text
+            class="icon icon-arrow font12"></text></text>
       </view>
     </view>
     <view class="modal-label share_level">
@@ -93,17 +103,22 @@
           <view class="power_title">可享权益：</view>
           <view class="power_item">1）邀请下级购买3天及以上活动的返佣比例提升：
             <text>
-              <text class="red">{{sharerLevelInfo.scaleCurrent+'%'+(info.sharerInfo.levelMax<5?('→'+sharerLevelInfo.scaleNext+'%'):'')}}< text><text class="icon icon-promote"></text>
-            </5?('→'+sharerLevelInfo.scaleNext+'%'):'')}}<></text>
-          </text></view>
+              <text class="red">{{sharerLevelInfo.scaleCurrent+'%'+(
+                info.sharerInfo.levelMax<5?('→'+sharerLevelInfo.scaleNext+'%'):'')}}</text><text
+                    class="icon icon-promote"></text>
+              </text>
+          </view>
           <view class="power_item">2）获得<text class="red">{{sharerLevelInfo.price}}枚宝贝币</text>，可用来兑换抢购特权或购买抵现</view>
-          <view class="power_item">3）获得<text class="red">升级福利</text>（{{filter.getSharerPower(info.sharerInfo.levelMax)}}）</view>
+          <view class="power_item">3）获得<text
+              class="red">升级福利</text>（{{filter.getSharerPower(info.sharerInfo.levelMax)}}）</view>
         </view>
       </view>
       <block tt:if="{{info.sharerInfo.levelMax<5}}">
         <view class="method method_1">
           <view class="method_title">途径1</view>
-          <view class="method_ins">邀请{{sharerLevelInfo.levelPlan1}}名新用户报名2天内活动（{{sharerLevelInfo.level_exp1+'/'+sharerLevelInfo.levelPlan1}}）</view>
+          <view class="method_ins">
+            邀请{{sharerLevelInfo.levelPlan1}}名新用户报名2天内活动（{{sharerLevelInfo.level_exp1+'/'+sharerLevelInfo.levelPlan1}}）
+          </view>
           <view class="step_line">
             <view class="line"></view>
             <view class="cercle_box" style="{{'left:'+sharerLevelInfo.percent1}}">
@@ -113,7 +128,9 @@
         </view>
         <view class="method method_2">
           <view class="method_title">途径2</view>
-          <view class="method_ins">邀请{{sharerLevelInfo.levelPlan2}}名用户报名3天及以上活动（{{sharerLevelInfo.level_exp2+'/'+sharerLevelInfo.levelPlan2}}）</view>
+          <view class="method_ins">
+            邀请{{sharerLevelInfo.levelPlan2}}名用户报名3天及以上活动（{{sharerLevelInfo.level_exp2+'/'+sharerLevelInfo.levelPlan2}}）
+          </view>
           <view class="step_line">
             <view class="line"></view>
             <view class="cercle_box" style="{{'left:'+sharerLevelInfo.percent2}}">
@@ -127,7 +144,8 @@
   </view>
   <view class="modular modular-pad">
     <view class="modal-label">
-      <physicalForCard title="分销产品" icon="'icon-sale-product'" link="/pages/sharingHome/shareActivity"></physicalForCard>
+      <physicalForCard title="分销产品" icon="'icon-sale-product'" link="/pages/sharingHome/shareActivity">
+      </physicalForCard>
     </view>
   </view>
   <view class="modular modular-pad" tt:if="{{info.roleType=='sharer'}}">

utils/util.js

@@ -1,4 +1,5 @@
-const Promise = require('./es6-promise.js');
+// 会报错
+// const Promise = require('./es6-promise.js');
 // 保留两位小数
 var filters = {
   toFix: function (value) {