beibo 6 months ago
parent
commit
69ba9c0bfb

+ 5 - 5
app.json

@@ -13,14 +13,15 @@
13 13
         "components/scroll-view/childsCard",
14 14
         "components/cashCoupon/index",
15 15
         "components/poster/poster",
16
-        "pages/qualifications/qualifications"
16
+        "pages/qualifications/qualifications",
17
+        "ext://microapp-trade-plugin/rate-submit",
18
+        "ext://microapp-trade-plugin/rate-detail"
17 19
     ],
18 20
     "requiredPrivateInfos": [
19 21
         "chooseAddress",
20 22
         "getLocation"
21 23
     ],
22
-    "subpackages": [
23
-        {
24
+    "subpackages": [{
24 25
             "root": "pages/account",
25 26
             "pages": [
26 27
                 "cards/index",
@@ -199,8 +200,7 @@
199 200
         "color": "#595757",
200 201
         "selectedColor": "#ee3a43",
201 202
         "backgroundColor": "#ffffff",
202
-        "list": [
203
-            {
203
+        "list": [{
204 204
                 "pagePath": "pages/home/index",
205 205
                 "iconPath": "images/home.png",
206 206
                 "selectedIconPath": "images/home_selected.png",

+ 1 - 1
components/activity/index.js

@@ -12,7 +12,7 @@ Component({
12 12
     data: {
13 13
       type: Object,
14 14
       observer: function (newVal, oldVal) {
15
-        console.log(newVal);
15
+        console.log(newVal,'newVal');
16 16
         this.setData({ activeData: newVal });
17 17
       }
18 18
     },

+ 59 - 47
components/activity/index.ttml

@@ -1,59 +1,71 @@
1 1
 <sjs src='../../pages/wxs/util.sjs' module='filter' />
2 2
 <view class="list septal-bottom-line borderRadiu" tt:for="{{activeData}}" tt:key="unique">
3
-    <view bindtap="goDetails" data-aid="{{item.aid}}" data-title="{{item.title}}">
4
-      <view >
5
-        <view class="listBan">
6
-          <image src="{{filter.formatImg(imgPath, item.logo)}}" mode="aspectFill" lazy-load="true" binderror="binderror" data-aid="{{item.aid}}" data-index="{{index}}"></image>
7
-          <view class="label" tt:if="{{history}}">
8
-            <text class="labelText gray"><text class="icon icon-finish"></text> 往期活动</text>
9
-          </view>
10
-          <view class='label' tt:else>
11
-            <text class="labelText statusDisabled" tt:if="{{item.status == 1}}"><text class="icon icon-finish"></text> 已结束</text>
12
-            <text class="labelText statusAll" tt:elif="{{item.status == 2}}"><text class="icon icon-full"></text> 已满额</text>
13
-            <view tt:elif="{{item.status == 0}}">
14
-              <text class="labelText discountLG" tt:if="{{(item.discount == '早鸟+拼团折扣' || item.discount == '拼团+早鸟折扣') && item.presellOpen == 0}}">拼团+早鸟折扣</text>
15
-              <text class='labelText discountG' tt:elif="{{item.discount == '拼团折扣' && item.presellOpen == 0}}">拼团折扣</text>
16
-              <text class='labelText discountL' tt:elif="{{item.discount == '早鸟折扣' && item.presellOpen == 0}}">早鸟折扣</text>
17
-              <text class='labelText discountG' tt:elif="{{item.presellOpen == 1}}"><text class="icon icon-pressel"></text> 预售中</text>
18
-            </view>
19
-            <text class='labelText statusSoon' tt:elif="{{(item.status == 3 && item.presellOpen == 0) || item.presellOpen == 2}}"><text class="icon icon-soon"></text> 即将开始</text>
20
-          </view>
21
-          <view class="listPos">
22
-            <view class="left">
23
-              <block tt:if="{{item.sparent!=2}}">
24
-                <text class="icon {{item.sparent==0?'icon-guarder':'icon-me'}}"></text>{{item.sparent==0?'亲子':'独立'}}营
25
-              </block>
26
-              <text class="icon icon-time" style="margin-left:20rpx;"></text>{{item.days}}天<text class="icon icon-children" style="margin-left:20rpx;"></text>{{item.ages?item.ages+'岁':'所有'}}
27
-            </view>
28
-            <view class="right">
29
-              <text class="saleCount" tt:if="{{item.saleCount > 10}}">{{item.saleCount}}人参加</text>
30
-            </view>
3
+  <view bindtap="goDetails" data-aid="{{item.aid}}" data-title="{{item.title}}">
4
+    <view>
5
+      <view class="listBan">
6
+        <image src="{{item.logo}}" mode="aspectFill" lazy-load="true" binderror="binderror" data-aid="{{item.aid}}"
7
+          data-index="{{index}}"></image>
8
+        <view class="label" tt:if="{{history}}">
9
+          <text class="labelText gray"><text class="icon icon-finish"></text> 往期活动</text>
10
+        </view>
11
+        <view class='label' tt:else>
12
+          <text class="labelText statusDisabled" tt:if="{{item.status == 1}}"><text class="icon icon-finish"></text>
13
+            已结束</text>
14
+          <text class="labelText statusAll" tt:elif="{{item.status == 2}}"><text class="icon icon-full"></text>
15
+            已满额</text>
16
+          <view tt:elif="{{item.status == 0}}">
17
+            <text class="labelText discountLG"
18
+              tt:if="{{(item.discount == '早鸟+拼团折扣' || item.discount == '拼团+早鸟折扣') && item.presellOpen == 0}}">拼团+早鸟折扣</text>
19
+            <text class='labelText discountG' tt:elif="{{item.discount == '拼团折扣' && item.presellOpen == 0}}">拼团折扣</text>
20
+            <text class='labelText discountL' tt:elif="{{item.discount == '早鸟折扣' && item.presellOpen == 0}}">早鸟折扣</text>
21
+            <text class='labelText discountG' tt:elif="{{item.presellOpen == 1}}"><text
22
+                class="icon icon-pressel"></text> 预售中</text>
31 23
           </view>
24
+          <text class='labelText statusSoon'
25
+            tt:elif="{{(item.status == 3 && item.presellOpen == 0) || item.presellOpen == 2}}"><text
26
+              class="icon icon-soon"></text> 即将开始</text>
32 27
         </view>
33
-      </view>
34
-      <view class="card-bottom">
35
-        <view class="card-bottom-info">
36
-          <view class="titleT">{{item.title}}</view>
37
-          <view class="act-sign font12">
38
-            <text tt:if="{{item.presellOpen == 1}}">预付折扣</text>
39
-            <block tt:if="{{item.discount}}">
40
-              <text tt:for="{{item.discount}}" tt:for-item="el" tt:key="unique" tt:if="{{(el != '早鸟' && el != '早鸟折扣' && item.presellOpen != 0)|| item.presellOpen == 0}}">{{el}}</text>
28
+        <view class="listPos">
29
+          <view class="left">
30
+            <block tt:if="{{item.sparent!=2}}">
31
+              <text class="icon {{item.sparent==0?'icon-guarder':'icon-me'}}"></text>{{item.sparent==0?'亲子':'独立'}}营
41 32
             </block>
42
-            <text tt:if="{{item.maxUserCoin&&item.maxUserCoin>0}}">宝贝币最高可抵{{item.maxUserCoin/10}}元</text>
33
+            <text class="icon icon-time" style="margin-left:20rpx;"></text>{{item.days}}天<text
34
+              class="icon icon-children" style="margin-left:20rpx;"></text>{{item.ages?item.ages+'岁':'所有'}}
43 35
           </view>
44
-          <view class="listInfo">
45
-            <block tt:if="{{item.tags.length > 0}}">
46
-              <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></text></view>
47
-            </block>
48
-            <!-- <view class='gray font12'>{{item.sessionsDays || ''}}</view> -->
36
+          <view class="right">
37
+            <text class="saleCount" tt:if="{{item.saleCount > 10}}">{{item.saleCount}}人参加</text>
49 38
           </view>
50 39
         </view>
51
-        <view class="listTitle">
52
-          <view class="listPrice">
53
-            <view class="{{item.originalPrice?'actualPrice':'noOriginPrice'}}">¥{{item.price}}</view>
54
-            <view class="s" tt:if="{{item.originalPrice}}">¥{{item.originalPrice}}</view>
55
-          </view>
40
+      </view>
41
+    </view>
42
+    <view class="card-bottom">
43
+      <view class="card-bottom-info">
44
+        <view class="titleT">{{item.title}}</view>
45
+        <view class="act-sign font12">
46
+          <text tt:if="{{item.presellOpen == 1}}">预付折扣</text>
47
+          <block tt:if="{{item.discount}}">
48
+            <text tt:for="{{item.discount}}" tt:for-item="el" tt:key="unique"
49
+              tt:if="{{(el != '早鸟' && el != '早鸟折扣' && item.presellOpen != 0)|| item.presellOpen == 0}}">{{el}}</text>
50
+          </block>
51
+          <text tt:if="{{item.maxUserCoin&&item.maxUserCoin>0}}">宝贝币最高可抵{{item.maxUserCoin/10}}元</text>
52
+        </view>
53
+        <view class="listInfo">
54
+          <block tt:if="{{item.tags.length > 0}}">
55
+            <view class="red font12"><text>
56
+                <block tt:for="{{item.tags}}" tt:for-index="idx" tt:for-item="it" tt:key="unique">{{idx > 0 ? ' |
57
+                  ':''}}{{it.tagValue}}</block>
58
+              </text></view>
59
+          </block>
60
+          <!-- <view class='gray font12'>{{item.sessionsDays || ''}}</view> -->
61
+        </view>
62
+      </view>
63
+      <view class="listTitle">
64
+        <view class="listPrice">
65
+          <view class="{{item.originalPrice?'actualPrice':'noOriginPrice'}}">¥{{item.price}}</view>
66
+          <view class="s" tt:if="{{item.originalPrice}}">¥{{item.originalPrice}}</view>
56 67
         </view>
57 68
       </view>
58 69
     </view>
70
+  </view>
59 71
 </view>

+ 118 - 143
components/activity/sku.js

@@ -15,6 +15,13 @@ Component({
15 15
         if (this.data.show) {
16 16
           this.getCalendarInfo();
17 17
         }
18
+        this.data.cityList.map((item, index) => {
19
+          if (item.aid == this.data.aid) {
20
+            this.setData({
21
+              checkCity: index
22
+            });
23
+          }
24
+        })
18 25
       }
19 26
     },
20 27
     military: { //是否为军事营 1-是 0-否
@@ -166,7 +173,15 @@ Component({
166 173
           maxUserCoin: newVal
167 174
         });
168 175
       }
169
-    }
176
+    },
177
+    cityList: {
178
+      type: Array,
179
+      observer: function (newVal) {
180
+        this.setData({
181
+          cityList: newVal
182
+        });
183
+      }
184
+    },
170 185
   },
171 186
   data: {
172 187
     checkeduseCoin: false,
@@ -221,27 +236,17 @@ Component({
221 236
     checkSession: -1,
222 237
     checkMeals: -1,
223 238
     // 城市列表
224
-    cityList: [{
225
-      city: '杭州'
226
-    }, {
227
-      city: '杭州'
228
-    }, {
229
-      city: '杭州'
230
-    }, {
231
-      city: '杭州'
232
-    }, {
233
-      city: '杭州'
234
-    }, {
235
-      city: '杭州'
236
-    }, ],
239
+    cityList: [],
237 240
     checkCity: -1,
238
-    checkScheduling: 0,
239
-    phoneNum: '',
241
+    checkScheduling: 1,
242
+    // todo:
243
+    phoneNum: '17695730341',
240 244
     // 分享者信息
241 245
     shareInfo: {},
242 246
     userInfo: app.globalData.userInfo || '', //用户信息
243 247
   },
244 248
   methods: {
249
+
245 250
     showFund() {
246 251
       this.triggerEvent("showFund");
247 252
     },
@@ -414,7 +419,7 @@ Component({
414 419
       })
415 420
     },
416 421
     // 手机号
417
-    phoneNum(e) {
422
+    bindKeyInput(e) {
418 423
       this.setData({
419 424
         phoneNum: e.detail.value
420 425
       });
@@ -553,14 +558,19 @@ Component({
553 558
     sumbit(e) {
554 559
       let type = (this.data.saleType && this.data.presellOpen == 0) ? 1 : 0,
555 560
         initialSku = this.data.initialSku;
556
-      if (this.data.checkSession == -1) {
561
+      if (this.data.checkScheduling != 1 && this.data.checkSession == -1) {
557 562
         util.showTips('请选择场次');
558 563
         return false;
559 564
       }
560
-      if (this.data.checkMeals == -1) {
565
+      if (this.data.checkScheduling != 1 && this.data.checkMeals == -1) {
561 566
         util.showTips('请选择' + this.data.military == 1 ? "排" : "套餐");
562 567
         return false;
563 568
       }
569
+      // 手机号
570
+      if (!this.data.phoneNum) {
571
+        util.showTips("请填写手机号");
572
+        return false;
573
+      }
564 574
       tt.reportAnalytics('active_enroll', {
565 575
         aid: this.data.aid,
566 576
         title: this.data.title
@@ -569,133 +579,96 @@ Component({
569 579
     },
570 580
 
571 581
     toBuy(type) {
572
-      tt.canIUse('createOrder')
573
-      // tt.createOrder({
574
-      //   goodsList: [{
575
-      //     quantity: 1, // 购买数量 必填
576
-      //     price: 102, // 商品价格 必填
577
-
578
-      //     goodsName: "【西安】农耕特辑之插秧大作战(劳动教育课)", // 商品名称 必填
579
-      //     goodsPhoto: "https://img.bbztx.com/leaderArticleRecruit/test/20231011093442/BjJhNMYbjB.jpg", // 商品图片链接 必填
580
-      //     goodsId: "7300755297319110690", // 商品ID 必填
581
-      //     goodsType: 1, // 商品类型 必填
582
-
583
-      //     goodsLabels: ["不可退"], // 商品标签 非必填
584
-      //     dateRule: "", // 使用规则 非必填
585
-      //   }, ],
586
-      //   payment: {
587
-      //     totalAmount: 1, // 订单总价 必填
588
-      //   },
589
-      //   contactInfo: {
590
-      //     phoneNumber: "12345678901", // 手机号 非必传
591
-      //     contactName: "test name", // 姓名 非必传
592
-      //   },
593
-      //   note: "for future", // 备注 非必传
594
-      //   storeInfo: {
595
-      //     storeName: "test store", // 商店名称 非必传
596
-      //     storeIcon: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic.ibaotu.com%2Fgif%2F19%2F48%2F47%2F76Z888piCd6W.gif%21fwpaa50%2Ffw%2F700&refer=http%3A%2F%2Fpic.ibaotu.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1644654365&t=5fc9b5fdad0a16264a9a9c09c14b3af9", // 商店头像 非必填
597
-      //   },
598
-      //   callbackData: {
599
-      //     test: 999999
600
-      //   }, // 透传数据,开发者自定义字段 非必传
601
-      //   tradeOption: {
602
-      //     life_trade_flag: 1 // 0:非融合链路(默认值)  1:走融合链路(标准融合/完全融合)
603
-      //   }, // 透传数据,开发者自定义字段 非必传
604
-
605
-      //   success: (res) => {
606
-      //     const {
607
-      //       orderId,
608
-      //       outOrderNo
609
-      //     } = res;
610
-      //     console.log("success res", res);
611
-      //     console.log("orderId", orderId, "outOrderNo", outOrderNo);
612
-      //     this.setData({
613
-      //       orderId,
614
-      //       outOrderNo
615
-      //     });
616
-      //   },
617
-      //   fail: (res) => {
618
-      //     const {
619
-      //       orderId,
620
-      //       outOrderNo,
621
-      //       errNo,
622
-      //       errMsg,
623
-      //       errLogId
624
-      //     } = res;
625
-      //     if (errLogId) {
626
-      //       console.log("预下单失败", errNo, errMsg, errLogId);
627
-      //     }
628
-      //     if (orderId || outOrderNo) {
629
-      //       console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
630
-      //     }
631
-      //     console.log(errNo, errMsg);
632
-      //   },
633
-      // });
634
-
635
-
636
-      tt.createOrder({
637
-        skuList: [{
638
-          skuId: "7300755297319110690", // sku 商品Id 必传
639
-          skuType: 1, // sku 商品类型 必传
640
-          quantity: 1, // 数量 必传
641
-          price: 102, // 价格 非商品库 sku 商品必传
642
-          goodsInfo: {
643
-            goodsName: "【西安】农耕特辑之插秧大作战(劳动教育课)", // 商品名称 必填
644
-            goodsPhoto: "https://img.bbztx.com/leaderArticleRecruit/test/20231011093442/BjJhNMYbjB.jpg", // 商品图片链接 必填
645
-            goodsId: "7300755297319110690", // 商品ID 必填
646
-            goodsType: 1, // 商品类型 必填
647
-            goodsLabels: ["不可退"], // 商品标签 非必填
648
-            dateRule: "", // 使用规则 非必填
649
-          },
650
-        }],
651
-        payment: {
652
-          totalAmount: 100, // 订单总价 必填
653
-        },
654
-        contactInfo: {
655
-          phoneNumber: "17695730341", // 手机号 非必传
656
-          contactName: "test name", // 姓名 非必传
657
-        },
658
-        note: "for future", // 备注 非必传
582
+      let data = {},
583
+        meals = ''
584
+      console.log(meals, 7878)
585
+      data.aid = this.data.aid
586
+      data.contactPhone = '17695730341'
587
+      data.meals = meals || ''
588
+      data.btype = 0
589
+      let that = this
590
+      util.ajax({
591
+        func: "tiktok/order/create",
592
+        data: data,
593
+        method: "POST",
594
+      }, function (data) {
595
+        if (data.code == 0) {
596
+          console.debug(6767676767)
597
+          // 预下单
598
+          tt.createOrder({
599
+            skuList: [{
600
+              skuId: "7300755297319110690", // sku 商品Id 必传
601
+              skuType: 1, // sku 商品类型 必传
602
+              quantity: 1, // 数量 必传
603
+              price: 102, // 价格 非商品库 sku 商品必传
604
+              goodsInfo: {
605
+                goodsName: "【西安】农耕特辑之插秧大作战(劳动教育课)", // 商品名称 必填
606
+                goodsPhoto: "https://img.bbztx.com/leaderArticleRecruit/test/20231011093442/BjJhNMYbjB.jpg", // 商品图片链接 必填
607
+                goodsId: "7300755297319110690", // 商品ID 必填
608
+                goodsType: 1, // 商品类型 必填
609
+                goodsLabels: ["不可退"], // 商品标签 非必填
610
+                dateRule: "", // 使用规则 非必填
611
+              },
612
+            }],
613
+            payment: {
614
+              totalAmount: 100, // 订单总价 必填
615
+            },
616
+            contactInfo: {
617
+              phoneNumber: "17695730341", // 手机号 非必传
618
+              contactName: "test name", // 姓名 非必传
619
+            },
620
+            note: "for future", // 备注 非必传
659 621
 
660
-        storeInfo: {
661
-          storeName: "test store", // 商店名称 非必传
662
-          storeIcon: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic.ibaotu.com%2Fgif%2F19%2F48%2F47%2F76Z888piCd6W.gif%21fwpaa50%2Ffw%2F700&refer=http%3A%2F%2Fpic.ibaotu.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1644654365&t=5fc9b5fdad0a16264a9a9c09c14b3af9", // 商店头像 非必填
663
-        },
664
-        callbackData: {
665
-          test: 999999
666
-        }, // 透传数据,开发者自定义字段 非必传
667
-        tradeOption: {
668
-          life_trade_flag: 0 // 0:非融合链路(默认值)  1:走融合链路(标准融合/完全融合)
669
-        }, // 透传数据,开发者自定义字段 非必传
622
+            storeInfo: {
623
+              storeName: "test store", // 商店名称 非必传
624
+              storeIcon: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic.ibaotu.com%2Fgif%2F19%2F48%2F47%2F76Z888piCd6W.gif%21fwpaa50%2Ffw%2F700&refer=http%3A%2F%2Fpic.ibaotu.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1644654365&t=5fc9b5fdad0a16264a9a9c09c14b3af9", // 商店头像 非必填
625
+            },
626
+            callbackData: {
627
+              test: 999999,
628
+              rid: app.globalData.userInfo ? app.globalData.userInfo.rid : '',
629
+              tkaid: "",
630
+              aid: "c3b0af496747fd8aea4a1329",
631
+              meals: "20231011124|1",
632
+              createGroup: "1",
633
+              btype: 0,
634
+              city: "杭州",
635
+              platform: 5
636
+            }, // 透传数据,开发者自定义字段 非必传
637
+            tradeOption: {
638
+              life_trade_flag: 0 // 0:非融合链路(默认值)  1:走融合链路(标准融合/完全融合)
639
+            }, // 透传数据,开发者自定义字段 非必传
670 640
 
671
-        success: (res) => {
672
-          const {
673
-            orderId,
674
-            outOrderNo
675
-          } = res;
676
-          console.log("success res", res);
677
-          console.log("orderId", orderId, "outOrderNo", outOrderNo);
678
-          this.setData({
679
-            orderId,
680
-            outOrderNo
641
+            success: (res) => {
642
+              const {
643
+                orderId,
644
+                outOrderNo
645
+              } = res;
646
+              console.log("success res", res);
647
+              console.log("orderId", orderId, "outOrderNo", outOrderNo);
648
+              this.setData({
649
+                orderId,
650
+                outOrderNo
651
+              });
652
+            },
653
+            fail: (res) => {
654
+              const {
655
+                orderId,
656
+                outOrderNo,
657
+                errNo,
658
+                errMsg,
659
+                errLogId
660
+              } = res;
661
+              if (errLogId) {
662
+                console.log(res, "预下单失败", errNo, errMsg, errLogId);
663
+              }
664
+              if (orderId || outOrderNo) {
665
+                console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
666
+              }
667
+              console.log(errNo, errMsg);
668
+            },
681 669
           });
682
-        },
683
-        fail: (res) => {
684
-          const {
685
-            orderId,
686
-            outOrderNo,
687
-            errNo,
688
-            errMsg,
689
-            errLogId
690
-          } = res;
691
-          if (errLogId) {
692
-            console.log(res,"预下单失败", errNo, errMsg, errLogId);
693
-          }
694
-          if (orderId || outOrderNo) {
695
-            console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
696
-          }
697
-          console.log(errNo, errMsg);
698
-        },
670
+        } else
671
+          util.showTips(data.reason);
699 672
       });
700 673
 
701 674
 
@@ -704,6 +677,8 @@ Component({
704 677
 
705 678
 
706 679
 
680
+
681
+
707 682
       // tt.pay({
708 683
       //   orderInfo: {
709 684
       //     order_id: "6819903302604491021",

+ 3 - 3
components/activity/sku.ttml

@@ -60,7 +60,7 @@
60 60
         <!-- todo: -->
61 61
         <view style="flex: 0 0 20%;" tt:for="{{cityList}}" tt:key="id">
62 62
           <view class="cityItem {{checkCity==index?'sku-row__item--active':''}}" data-i="{{index}}"
63
-            bindtap="selectCity">杭州
63
+            bindtap="selectCity">{{item.city}}
64 64
           </view>
65 65
         </view>
66 66
       </view>
@@ -155,8 +155,8 @@
155 155
         <view class="modal-title">联系方式</view>
156 156
         <view class="modal-label" style="display: flex;justify-content: space-between;">
157 157
           <view>联系手机号</view>
158
-          <view> <input class="line-details phoneNum" value="{{phoneNum}}" name="phoneNum" style="text-align:right;"
159
-              placeholder="请输入手机号码" bindblur="phoneNum" bindconfirm="phoneNum" type="number" /></view>
158
+          <view> <input class="line-details phoneNum" bindinput="bindKeyInput" value="{{phoneNum}}" name="phoneNum" style="text-align:right;"
159
+              placeholder="请输入手机号码" type="number" /></view>
160 160
         </view>
161 161
       </view>
162 162
     </view>

+ 5 - 3
pages/home/index.js

@@ -208,7 +208,7 @@ Page({
208 208
     util.ajax({
209 209
       func: "tiktok/activity/recome_list",
210 210
       data: {
211
-        "pageIndex": pageIndex,
211
+        "pageIndex": pageIndex - 1,
212 212
         "pageSize": 10,
213 213
       },
214 214
       method: "POST",
@@ -216,7 +216,8 @@ Page({
216 216
     }, function (res) {
217 217
       console.log(res);
218 218
       if (res.code == 0) {
219
-        res.data.list.map((el) => {
219
+        res.data.map((el) => {
220
+          el.aid = el.tkaid
220 221
           if (!util.isEmpty(el.discount)) {
221 222
             let arr = [];
222 223
             if (el.discount.indexOf('+') == -1) {
@@ -227,7 +228,7 @@ Page({
227 228
             el.discount = arr;
228 229
           }
229 230
         });
230
-        let datas = res.data.list,
231
+        let datas = res.data,
231 232
           activeData = that.data.activeData,
232 233
           bottom = false,
233 234
           imgPath = that.data.imgPath;
@@ -322,6 +323,7 @@ Page({
322 323
     //     title: data.title
323 324
     //   });
324 325
     // }
326
+    console.info(info.aid, 89898989)
325 327
     //类目类型 0-单个活动 1-活动集 2-精彩回顾 3-活动体系 4-活动日历 5-活动视频 6-炫酷装备 7-单个链接 8-大转盘 9-成长课
326 328
     let canJump = true;
327 329
     switch (info.categoryType) {

+ 11 - 0
pages/order/detail/index.js

@@ -40,6 +40,17 @@ Page({
40 40
     lineType: '1',
41 41
     imType: 'order',
42 42
   },
43
+  handleInit(event) {
44
+    const {
45
+      status
46
+    } = event.detail;
47
+  },
48
+  handleSuccess(event) {
49
+    const {
50
+      result
51
+    } = event.detail;
52
+    // 团购订单不支持查看评价,此时可决定按钮是否展示
53
+  },
43 54
   imCallback(e) {
44 55
     console.log("跳转IM客服成功", e.detail);
45 56
     this.setData({

+ 8 - 4
pages/order/detail/index.ttml

@@ -73,14 +73,18 @@
73 73
     <button class="button button-warn share-group"
74 74
       tt:elif="{{info.waitComment == 1&&info.orderStatus!=3&&info.orderStatus!=4&&(query.otype==0||query.otype==3)}}"
75 75
       bindtap="actEvaluate">{{info.atype==1?'商品':'活动'}}评价</button>
76
+      <!-- todo: -->
77
+    <rate-button order-id="xxx" bind:init="handleInit" bind:success="handleSuccess"
78
+      class="button button-warn share-group" style="width: 310rpx;" />
79
+
76 80
     <!-- 追加评价 -->
77
-    <button class="button button-warn share-group"
81
+    <!-- <button class="button button-warn share-group"
78 82
       tt:elif="{{info.comment&&info.comment.additional == 0&&(query.otype==0||query.otype==3)}}"
79
-      bindtap="editEvaluate">追加评价</button>
83
+      bindtap="editEvaluate">追加评价</button> -->
80 84
     <!-- 修改追评 -->
81
-    <button class="button button-warn share-group"
85
+    <!-- <button class="button button-warn share-group"
82 86
       tt:elif="{{info.comment.additional == 1 && info.comment.additionalComment.modified == 0&&(query.otype==0||query.otype==3)}}"
83
-      bindtap="editEvaluate">修改追评</button>
87
+      bindtap="editEvaluate">修改追评</button> -->
84 88
     <!-- 支付尾款 -->
85 89
     <button type="warn" tt:elif="{{info.atype == 0 && info.orderStatus ==4 && info.needPayBalance==1}}"
86 90
       class="button button-warn share-group" data-aid="{{info.aid}}" data-orderid="{{query.orderid}}"

+ 2 - 2
pages/order/editOrderDetail/index.js

@@ -574,10 +574,10 @@ Page({
574 574
   getActiviteInfo(aid) {
575 575
     let that = this;
576 576
     util.ajax({
577
-      func: "v2/article/detail",
577
+      func: "tiktok/activity/detail",
578 578
       load: false,
579 579
       data: {
580
-        "aid": aid
580
+        "tkaid": aid
581 581
       }
582 582
     }, function (res) {
583 583
       if (res.code == 0) {

+ 35 - 29
pages/product/activity/index.js

@@ -558,14 +558,14 @@ Page({
558 558
           // 记录浏览
559 559
           that.pageCount();
560 560
           // 获取物品推荐
561
-          that.getGoodsRecommend();
561
+          // that.getGoodsRecommend();
562 562
         } else {
563 563
           // getLocation.then(function (value) {
564 564
           that.getData();
565 565
           // 记录浏览
566 566
           that.pageCount();
567 567
           // 获取物品推荐
568
-          that.getGoodsRecommend();
568
+          // that.getGoodsRecommend();
569 569
           // });
570 570
         }
571 571
       }
@@ -704,15 +704,16 @@ Page({
704 704
     let that = this,
705 705
       userInfo = app.globalData.userInfo;
706 706
     util.ajax({
707
-      func: "v2/article/detail",
707
+      func: "tiktok/activity/detail",
708 708
       data: {
709
-        "aid": that.data.aid,
709
+        "tkaid": that.data.aid,
710 710
         "groupid": that.data.groupid != 'null' ? that.data.groupid : '',
711 711
         'orderid': that.data.orderid || ''
712 712
       },
713 713
       load: false
714 714
     }, function (res) {
715 715
       if (res.code == 0) {
716
+        console.log(6666)
716 717
         let datas = res.data;
717 718
         that.data.paramsDetail = res.data.psId;
718 719
         datas.isTuan = datas.discountStatus;
@@ -720,10 +721,10 @@ Page({
720 721
           securityShow: datas.articleType ? datas.articleType : '',
721 722
           copyCanbuy: datas.canbuy,
722 723
           privilegeTime: datas.aheadTimeLong ? that.timeToDate(datas.aheadTimeLong) : 0,
723
-          'shareInfo.groupid': !util.isEmpty(datas.gdiscount.groupid) ? datas.gdiscount.groupid : '',
724
+          // 'shareInfo.groupid': !util.isEmpty(datas.gdiscount.groupid) ? datas.gdiscount.groupid : '',
724 725
           marvellousList: datas.productSystemHistoryList
725 726
         });
726
-        console.log(that.data.marvellousList);
727
+        console.log(that.data.marvellousList, 9999999);
727 728
         that.setData({
728 729
           baseStatus: datas.status,
729 730
           buttonText: util.decode(datas.status, 0, !util.isObjEmpty(res.data.gdiscount) ? !util.isEmpty(that.data.groupid) ? '立即购买' : "单独报名" : userInfo && userInfo.membered == 1 ? "会员报名" : "立即报名", 1, "已结束", 2, "已满额", 3, "已下架", 4, "待审核", 6, "未开始", "")
@@ -734,13 +735,13 @@ Page({
734 735
         if (datas.presellOpen != 0) {
735 736
           datas.canbuy = 1;
736 737
           buttonClass = datas.presellOpen == 1 ? 'button-warn' : 'disabled';
737
-          buttonClass1 = datas.gdiscount.items && datas.gdiscount.status == 0 && datas.presellOpen == 1 ? 'button-warn' : 'disabled';
738
+          buttonClass1 = datas.gdiscount && datas.gdiscount.items && datas.gdiscount.status == 0 && datas.presellOpen == 1 ? 'button-warn' : 'disabled';
738 739
         } else {
739
-          buttonClass = datas.status == 0 ? datas.gdiscount.items || datas.gdiscount.status == 0 ? 'button-warn' : 'button-warn' : 'disabled';
740
+          buttonClass = datas.status == 0 ? datas.gdiscount && datas.gdiscount.items || datas.gdiscount.status == 0 ? 'button-warn' : 'button-warn' : 'disabled';
740 741
 
741
-          buttonClass1 = datas.status == 0 ? datas.gdiscount.items && datas.gdiscount.status == 0 ? 'button-warn' : 'disabled' : 'disabled';
742
+          buttonClass1 = datas.status == 0 ? datas.gdiscount && datas.gdiscount.items && datas.gdiscount.status == 0 ? 'button-warn' : 'disabled' : 'disabled';
742 743
 
743
-          buttonPTClass = datas.status == 0 && datas.canbuy == 0 ? datas.gdiscount.items || datas.gdiscount.status == 0 ? 'button-danger' : 'button-danger' : 'disabled';
744
+          buttonPTClass = datas.status == 0 && datas.canbuy == 0 ? datas.gdiscount && datas.gdiscount.items || datas.gdiscount.status == 0 ? 'button-danger' : 'button-danger' : 'disabled';
744 745
         }
745 746
 
746 747
         if (!util.isObjEmpty(datas.users)) {
@@ -759,7 +760,7 @@ Page({
759 760
         } else {
760 761
           datas.tags1 = datas.tags;
761 762
         }
762
-        console.log(datas.tags1, datas.tags2);
763
+        console.log(datas.tags1, datas.tags2, 78787878);
763 764
         that.setData({
764 765
           city: res.data.city,
765 766
           datas,
@@ -768,7 +769,7 @@ Page({
768 769
           buttonPTClass,
769 770
           title: datas.title,
770 771
           currentPages: getCurrentPages().length,
771
-          groupid: datas.gdiscount.groupid ? datas.gdiscount.groupid : that.data.groupid,
772
+          // groupid: datas.gdiscount.groupid ? datas.gdiscount.groupid : that.data.groupid,
772 773
           growupInfo: {
773 774
             otype: datas.gdiscount ? datas.gdiscount.otype : 0,
774 775
             price: datas.gdiscount ? datas.gdiscount.maxGPrice : 0.00,
@@ -776,7 +777,7 @@ Page({
776 777
             createGroup: 0 //1--新开拼团 0--一键参团
777 778
           },
778 779
           integralConfig: {
779
-            discount: datas.discount,
780
+            // discount: datas.discount,
780 781
             aid: datas.aid
781 782
           },
782 783
           showPrivilege: datas.presellOpen == 2 || datas.presellOpen == 0 && datas.status == 6 ? true : false
@@ -793,6 +794,8 @@ Page({
793 794
         // if ((datas.qptype == 1 && (datas.saleTimeLong >0 || datas.endSaleTimeLong >0)) || (datas.presellOpen != 0 && (datas.presellStartTimeLong >0 || datas.presellEndTimeLong >0))) {
794 795
         //   that.updateTime();
795 796
         // }
797
+        console.log(8888)
798
+
796 799
         if (datas.presellOpen == 0) {
797 800
           that.getBalance();
798 801
         }
@@ -800,10 +803,9 @@ Page({
800 803
         that.getSkuInfo();
801 804
         that.getFeedbook();
802 805
         that.getContent();
803
-        // that.pageCount();
804 806
         that.stat();
805
-        // that.getGoodsRecommend();
806 807
         that.countDownTask();
808
+        console.log(676767676)
807 809
       } else {
808 810
         util.showTips(res.reason);
809 811
       }
@@ -1261,20 +1263,24 @@ Page({
1261 1263
       this.data.show = this.defaultShow();
1262 1264
       this.data.show.growup = false;
1263 1265
       this.data.show.integral = false;
1264
-      if (this.data.datas.canbuy == 0 && this.data.datas.status == 0) {
1265
-        this.data.show.sku = true;
1266
-        let data = JSON.stringify(e.currentTarget.dataset) != "{}" ? e.currentTarget.dataset : e.detail;
1267
-        this.data.growupInfo.createGroup = data.alone ? data.alone : this.data.growupInfo.createGroup != undefined ? this.data.growupInfo.createGroup : 0;
1268
-        let isBuy = this.data.growupInfo.createGroup == 0 ? false : true;
1269
-        this.setData({
1270
-          url: '/page/registration.html',
1271
-          show: this.data.show,
1272
-          isBuy,
1273
-          growupInfo: this.data.growupInfo,
1274
-          skuIndex: data.alone != 1 && data.item ? data.item.sid : -1,
1275
-          mealsIndex: data.alone != 1 && data.item ? data.item.pid : -1
1276
-        });
1277
-      }
1266
+      // if (this.data.datas.canbuy == 0 && this.data.datas.status == 0) {
1267
+      this.data.show.sku = true;
1268
+      let data = JSON.stringify(e.currentTarget.dataset) != "{}" ? e.currentTarget.dataset : e.detail;
1269
+      this.data.growupInfo.createGroup = data.alone ? data.alone : this.data.growupInfo.createGroup != undefined ? this.data.growupInfo.createGroup : 0;
1270
+      let isBuy = this.data.growupInfo.createGroup == 0 ? false : true;
1271
+      console.log(787878787, data)
1272
+
1273
+      this.setData({
1274
+        url: '/page/registration.html',
1275
+        show: this.data.show,
1276
+        isBuy,
1277
+        growupInfo: this.data.growupInfo,
1278
+        cityList: this.data.datas.cityVOList,
1279
+        cityAid: data.item ? data.item.aid : '',
1280
+        // skuIndex: data.alone != 1 && data.item ? data.item.sid : -1,
1281
+        // mealsIndex: data.alone != 1 && data.item ? data.item.pid : -1
1282
+      });
1283
+      // }
1278 1284
     }
1279 1285
   },
1280 1286
   // 新开拼团/一键参团弹窗确认购买

File diff suppressed because it is too large
+ 26 - 1
pages/product/activity/index.json


+ 291 - 293
pages/product/activity/index.ttml

@@ -7,7 +7,7 @@
7 7
 <refund bindclose="closeRefund" type="{{type}}" show="{{refundShow}}"></refund>
8 8
 <!-- 点击报名的弹框 -->
9 9
 <sku presellOpen='{{datas.presellOpen}}' ageLimit="{{datas.ages}}" military="{{datas.military}}" show="{{show.sku}}"
10
-  aid="{{aid}}" s1="{{skuIndex || -1}}" s2="{{mealsIndex || -1}}" shareInfo="{{shareInfo}}"
10
+  aid="{{cityAid}}" cityList="{{cityList}}" s1="{{skuIndex || -1}}" s2="{{mealsIndex || -1}}" shareInfo="{{shareInfo}}"
11 11
   createGroup="{{datas.discountStatus == 1? 1 : growupInfo.createGroup}}" atype="{{datas.atype}}"
12 12
   groupid="{{isBuy ? '': groupid}}" shareId="{{shareId}}" qtype="{{datas.qtype}}"
13 13
   street="{{datas.street ? datas.street : '0'}}" recommender="{{datas.recommender}}"
@@ -53,35 +53,43 @@
53 53
     <!-- 底部按钮组 -->
54 54
     <view class="button-growup">
55 55
       <!-- 预售/开售提醒 -->
56
-      <view tt:if="{{datas.status == 1 || datas.status == 2 || datas.status == 6 }}"
56
+      <!-- <view tt:if="{{datas.status == 1 || datas.status == 2 || datas.status == 6 }}"
57 57
         class="button-growup set-remind {{ datas.status == 6?'button-blue':''}}" bindtap='setRemind'
58 58
         style="margin-left: 10px;">
59 59
         <text>{{datas.presellOpen==0?'开售提醒':'预售提醒'}}</text>
60 60
         <text>{{buttonText}}</text>
61
-      </view>
62
-      <view tt:else class="button-growup set-remind {{buttonClass}}" style="margin-left: 10px;">
61
+      </view> -->
62
+      <view tt:else class="button-growup set-remind button-warn" style="margin-left: 10px;">
63 63
         <!-- 立即报名 -->
64
-        <view class="button {{buttonClass}}" bindtap="{{buttonClass == 'disabled'?'':'goPay'}}" data-alone="1"
65
-          tt:if="{{datas.presellOpen == 0 && (datas.status==0 || datas.status==3)}}">{{buttonText}}</view>
64
+        <!-- <view class="button {{buttonClass}}" bindtap="{{buttonClass == 'disabled'?'':'goPay'}}" data-alone="1"
65
+        tt:if="{{datas.presellOpen == 0 && (datas.status==0 || datas.status==3)}}">{{buttonText}}</view> -->
66
+        <view class="button button-warn" bindtap="goPay" data-alone="1">
67
+          立即报名</view>
66 68
         <!-- 立即预定 -->
67
-        <view style="font-size: 28rpx; line-height: 1;" class="button {{buttonClass}}"
69
+        <!-- <view style="font-size: 28rpx; line-height: 1;" class="button {{buttonClass}}"
68 70
           bindtap="{{buttonClass == 'disabled'?'':'goPay'}}" data-alone="1"
69 71
           tt:if="{{(datas.presellOpen == 1 || datas.presellOpen == 2) && datas.status==0}}">
70 72
           <view class="font14"><text>付¥</text>{{datas.presellPrice}}<text>抵¥</text>{{datas.presellDiscount}}</view>
71 73
           立即预订
72
-        </view>
74
+        </view> -->
73 75
       </view>
74 76
     </view>
75 77
   </view>
76 78
 </view>
77 79
 <view class="content">
78
-  <downTimer aid="{{aid}}" source="1" />
80
+  <!-- todo -->
81
+  <!-- <downTimer aid="{{aid}}" source="1" /> -->
79 82
   <view class="top">
80 83
     <swiper indicator-dots="true" class="swiper">
81
-      <block tt:for="{{datas.pics}}" tt:key="index">
84
+      <!-- <block tt:for="{{datas.pics}}" tt:key="index">
82 85
         <swiper-item>
83 86
           <image src="{{imgUrl}}{{item}}" class="slide-image" width="355" height="150" />
84 87
         </swiper-item>
88
+      </block> -->
89
+      <block>
90
+        <swiper-item>
91
+          <image src="{{datas.logo}}" class="slide-image" width="355" height="150" />
92
+        </swiper-item>
85 93
       </block>
86 94
       <!-- <view class="act-tip" wx:if="{{userInfo.roleType=='sharer'&& userInfo.shareStatus==1&&datas.shareCommission>0}}">邀约好友报名 最高可赚{{datas.shareCommission}}元</view> -->
87 95
     </swiper>
@@ -122,7 +130,7 @@
122 130
         </view>
123 131
       </block>
124 132
       <!-- 活动预定 -->
125
-      <view tt:if="{{datas.presellOpen != 0}}">
133
+      <!-- <view tt:if="{{datas.presellOpen != 0}}">
126 134
         <block>
127 135
           <view class="qptype-box white">
128 136
             <view class="qptype-info">
@@ -161,9 +169,10 @@
161 169
             尾款支付时间:<text>{{datas.presellPayStartTime}}</text>~<text>{{datas.presellPayEndTime}}</text>
162 170
           </view>
163 171
         </view>
164
-      </view>
172
+      </view> -->
165 173
       <!-- 普通活动 -->
166
-      <view class="product-box borderRadiu" tt:if="{{datas.qptype == 0 && datas.presellOpen == 0}}">
174
+      <!-- <view class="product-box borderRadiu" tt:if="{{datas.qptype == 0 && datas.presellOpen == 0}}"> -->
175
+      <view class="product-box borderRadiu">
167 176
         <view class="colBox">
168 177
           <view class="priceRemark">{{datas.priceRemark || '活动费'}}</view>
169 178
           <text class="col red font23" style="font-weight: 600;"><text
@@ -194,8 +203,7 @@
194 203
   </view>
195 204
 
196 205
 
197
-  <view class="newsDet borderRadiu" style="padding: 20rpx 0 20rpx 20rpx;"
198
-    tt:if="{{sku.sessions.length > 0 && (datas.status == 0 || datas.status == 6 || datas.status == 2) && updateTime.isPayInfo}}">
206
+  <view class="newsDet borderRadiu" style="padding: 20rpx 0 20rpx 20rpx;">
199 207
     <!-- 场次选择 -->
200 208
     <scroll-view scroll-x="true" class="sku borderRadiu" scroll-with-animation="true">
201 209
       <!-- <view class="sku-boxs">
@@ -218,340 +226,330 @@
218 226
         </view>
219 227
       </view> -->
220 228
       <view class="sku-boxs">
221
-        <view
222
-          class="sku-box {{datas.status == 6?'':(item.status != 0 ? (datas.presellOpen!=1 && item.status == 1 && item.actnum<=0 ? (item.waitActNum>0?'':'item-disabled'):'item-disabled'):'')}}"
223
-          tt:for="{{sku.sessions}}" tt:key="sid" data-index="{{index}}"
224
-          bindtap="{{datas.status == 6?'setRemind':((item.status == 0 || (datas.presellOpen!=1&&item.status == 1 && item.actnum<=0 && item.waitActNum>0)) ? 'goPay':'')}}"
225
-          data-item="{{item}}" data-alone="0"
226
-          tt:if="{{datas.status != 6 || (datas.status == 6 && item.status != 2 && (item.actnum>0 || item.waitActNum>0))}}">
227
-          杭州
229
+        <view class="sku-box " tt:for="{{datas.cityVOList}}" tt:key="city" data-index="{{index}}" bindtap="goPay"
230
+          data-item="{{item}}" data-alone="0">{{item.city}}
228 231
           <view style="margin-top: 10rpx;">
229
-            <text
230
-              class="font10 {{datas.status == 6?'blue':(item.status == 0 && item.actnum > (item.beignNum*item.proportion) ? 'green':(item.status == 0 && item.actnum > 0 && item.actnum <= (item.beignNum*item.proportion) ?'redStatus':(datas.presellOpen!=1&&item.status == 1 && item.actnum <= 0 && item.waitActNum>0?'orange':'')))}}">{{datas.status
231
-              == 6?'即将开售':(item.status == 1 ? (item.actnum<=0 && item.waitActNum>0 &&
232
-                datas.presellOpen!=1?'售罄候补':'已满额'):(item.status == 2 ?'已结束':(item.actnum >
233
-                (item.beignNum*item.proportion) ? '火热报名中':(item.actnum > 0 && item.actnum <=
234
-                  (item.beignNum*item.proportion) ? '少量名额' :''))))}} </text>
232
+            <text class="font12 {{stockNum>0?'orange':''}}">{{stockNum>0?'开售中':'已满额'}} </text>
235 233
           </view>
236 234
         </view>
237 235
       </view>
238
-    </scroll-view>
239
-    <!-- 累计已售 -->
240
-    <view tt:if="{{datas.users && datas.users.length>0}}">
241
-      <view class="census-title"><text tt:if="{{datas.psAttendCount > 0}}">累计已售{{datas.psAttendCount}}\t\t\t\t
242
-        </text><text tt:if="{{datas.attendCount > 0}}"> 本期已售{{datas.attendCount}}</text></view>
243
-      <view class="censusList" tt:if="{{datas.users.length>0}}">
244
-        <view class="list" tt:for="{{datas.users}}" tt:key="userId" tt:if="{{index < 8}}">
245
-          <image class="joinHeard" src="{{item.avatar}}" mode="aspectFill" data-i="{{index}}" binderror="errorPic" />
246
-        </view>
247
-        <view class="next" tt:if="{{datas.users.length>=9}}"></view>
236
+  </view>
237
+  </scroll-view>
238
+  <!-- 累计已售 -->
239
+  <view tt:if="{{datas.users && datas.users.length>0}}">
240
+    <view class="census-title"><text tt:if="{{datas.psAttendCount > 0}}">累计已售{{datas.psAttendCount}}\t\t\t\t
241
+      </text><text tt:if="{{datas.attendCount > 0}}"> 本期已售{{datas.attendCount}}</text></view>
242
+    <view class="censusList" tt:if="{{datas.users.length>0}}">
243
+      <view class="list" tt:for="{{datas.users}}" tt:key="userId" tt:if="{{index < 8}}">
244
+        <image class="joinHeard" src="{{item.avatar}}" mode="aspectFill" data-i="{{index}}" binderror="errorPic" />
248 245
       </view>
246
+      <view class="next" tt:if="{{datas.users.length>=9}}"></view>
247
+    </view>
249 248
 
249
+  </view>
250
+</view>
251
+<view class="comment white-bg borderRadiu" tt:if="{{comments.comments.length>0}}">
252
+  <navigator class="r-float font12  buttom1" url="/pages/product/comment/index?aid={{datas.aid}}">查看全部 </navigator>
253
+  <view class="scoreBox">
254
+    <view class="scoreTit inline-block">整体评分</view>
255
+    <view class="starBlank inline-block">
256
+      <view class="scoreBG" style="width:{{score}}%"></view>
250 257
     </view>
251 258
   </view>
252
-  <view class="comment white-bg borderRadiu" tt:if="{{comments.comments.length>0}}">
253
-    <navigator class="r-float font12  buttom1" url="/pages/product/comment/index?aid={{datas.aid}}">查看全部 </navigator>
254
-    <view class="scoreBox">
255
-      <view class="scoreTit inline-block">整体评分</view>
256
-      <view class="starBlank inline-block">
257
-        <view class="scoreBG" style="width:{{score}}%"></view>
259
+  <view class="line"></view>
260
+  <block tt:for="{{comments.comments}}" tt:key="aid">
261
+    <view class="userInfor">
262
+      <view class="headerBox">
263
+        <image class="headerImgB" src="{{item.ownerAvatar}}" />
264
+        <text>{{item.ownerNick}}</text>
265
+      </view>
266
+      <view class="userBox">
267
+        <text class="gray font12">{{item.weiboTime}}</text>
258 268
       </view>
259 269
     </view>
260
-    <view class="line"></view>
261
-    <block tt:for="{{comments.comments}}" tt:key="aid">
262
-      <view class="userInfor">
263
-        <view class="headerBox">
264
-          <image class="headerImgB" src="{{item.ownerAvatar}}" />
265
-          <text>{{item.ownerNick}}</text>
266
-        </view>
267
-        <view class="userBox">
268
-          <text class="gray font12">{{item.weiboTime}}</text>
269
-        </view>
270
+    <view class="listScore">
271
+      <view class="score" bindtap="showAllComment"><text class="comment_content">{{item.contented}}</text></view>
272
+      <view class="scoreImg " tt:if="{{item.imageList.length>0}}" bindtap="previewImage" data-index="{{index}}">
273
+        <image class="appraise" src="{{item.imageList[0]}}?x-oss-process=image/resize,m_mfit,h_300,w_300"
274
+          mode="aspectFill"></image>
270 275
       </view>
271
-      <view class="listScore">
272
-        <view class="score" bindtap="showAllComment"><text class="comment_content">{{item.contented}}</text></view>
273
-        <view class="scoreImg " tt:if="{{item.imageList.length>0}}" bindtap="previewImage" data-index="{{index}}">
274
-          <image class="appraise" src="{{item.imageList[0]}}?x-oss-process=image/resize,m_mfit,h_300,w_300"
275
-            mode="aspectFill"></image>
276
-        </view>
277
-        <!-- 隐藏宝大大回复 todo: -->
278
-        <view class="reply" tt:if="{{item.answer&&false}}">
279
-          <view class="addTitle replyTitle"><text class="icon icon-commentd"></text>宝大大回复:</view>
280
-          <view class="score">{{item.answer}}</view>
281
-        </view>
276
+      <!-- 隐藏宝大大回复 todo: -->
277
+      <view class="reply" tt:if="{{item.answer&&false}}">
278
+        <view class="addTitle replyTitle"><text class="icon icon-commentd"></text>宝大大回复:</view>
279
+        <view class="score">{{item.answer}}</view>
282 280
       </view>
283
-    </block>
284
-    <view class="line" tt:if="{{marvellousList.length}}"></view>
285
-    <!-- 往期精彩 -->
286
-    <view class="marvellous ft14" tt:if="{{marvellousList.length}}">
287
-      <view class="marvellous_top" data-psId="{{datas.psId}}" bindtap="goPrevious">
288
-        <view class="marvellous_top_content">
289
-          <image class='brilliant'
290
-            src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038035764008987.png" mode />
291
-          <view
292
-            style="letter-spacing: 2px;color: #9d9d9e;margin-left:30rpx;position: relative;top:-10rpx;font-size:26rpx">
293
-            记录活动过程中的精彩瞬间
294
-          </view>
281
+    </view>
282
+  </block>
283
+  <view class="line" tt:if="{{marvellousList.length}}"></view>
284
+  <!-- 往期精彩 -->
285
+  <view class="marvellous ft14" tt:if="{{marvellousList.length}}">
286
+    <view class="marvellous_top" data-psId="{{datas.psId}}" bindtap="goPrevious">
287
+      <view class="marvellous_top_content">
288
+        <image class='brilliant'
289
+          src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038035764008987.png" mode />
290
+        <view
291
+          style="letter-spacing: 2px;color: #9d9d9e;margin-left:30rpx;position: relative;top:-10rpx;font-size:26rpx">
292
+          记录活动过程中的精彩瞬间
295 293
         </view>
296
-        <image class="brilliantIcon"
297
-          src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038240147032026.png" mode />
298
-        <text class="brillianticon"></text>
299 294
       </view>
300
-      <view class="marvellous_bottom">
301
-        <view class="bottom_li" tt:for="{{marvellousList}}" tt:key="index">
302
-          <!-- 视频 -->
303
-          <image mode="aspectFill" class='bottom_li' src='{{item.logo}}' tt:if='{{item.type==2}}'
304
-            data-vdurl="{{item.content}}" bindtap='previewVideo' data-id='{{index}}'></image>
305
-          <video bindtap='previewVideo' tt:if="{{item.type==2&&show!=index}}" src="{{item.content}}"></video>
306
-          <!-- 视频号 -->
307
-          <image mode="aspectFill" class="channelVideo" data-uname="{{item.title}}" data-vdNum="{{item.content}}"
308
-            src="{{item.logo}}" bindtap="channelVideo" tt:if="{{item.type==3}}"></image>
309
-          <!-- 图片 -->
310
-          <image mode="aspectFill" bindtap="actPreviewImage" data-index="{{index}}" data-imgurl="{{item.logo}}"
311
-            class="bottom_li" src="{{item.logo}}" tt:if="{{item.type==4}}"></image>
312
-          <view tt:if="{{item.type==3||item.type==2}}" class="icon icon-video-play iconAdd"></view>
313
-          <!-- <image wx:if="{{item.type==4}}" class="img" src="https://img.bbztx.com/image_test/upload/202302/imgicon.png" mode="" /> -->
314
-        </view>
295
+      <image class="brilliantIcon"
296
+        src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677038240147032026.png" mode />
297
+      <text class="brillianticon"></text>
298
+    </view>
299
+    <view class="marvellous_bottom">
300
+      <view class="bottom_li" tt:for="{{marvellousList}}" tt:key="index">
301
+        <!-- 视频 -->
302
+        <image mode="aspectFill" class='bottom_li' src='{{item.logo}}' tt:if='{{item.type==2}}'
303
+          data-vdurl="{{item.content}}" bindtap='previewVideo' data-id='{{index}}'></image>
304
+        <video bindtap='previewVideo' tt:if="{{item.type==2&&show!=index}}" src="{{item.content}}"></video>
305
+        <!-- 视频号 -->
306
+        <image mode="aspectFill" class="channelVideo" data-uname="{{item.title}}" data-vdNum="{{item.content}}"
307
+          src="{{item.logo}}" bindtap="channelVideo" tt:if="{{item.type==3}}"></image>
308
+        <!-- 图片 -->
309
+        <image mode="aspectFill" bindtap="actPreviewImage" data-index="{{index}}" data-imgurl="{{item.logo}}"
310
+          class="bottom_li" src="{{item.logo}}" tt:if="{{item.type==4}}"></image>
311
+        <view tt:if="{{item.type==3||item.type==2}}" class="icon icon-video-play iconAdd"></view>
312
+        <!-- <image wx:if="{{item.type==4}}" class="img" src="https://img.bbztx.com/image_test/upload/202302/imgicon.png" mode="" /> -->
315 313
       </view>
316 314
     </view>
317 315
   </view>
316
+</view>
318 317
 
319
-  <view class="newsDet borderRadiu" style="margin-top: 20rpx;padding-top:20rpx;padding-bottom: 20rpx;">
320
-    <!-- 儿童年龄要求 -->
321
-    <view class="newsList" tt:if="{{datas.ages || (datas.adultMinAge && datas.adultMaxAge)}}">
322
-      <view class="icon-child icon-t red"></view>
323
-      <view class="newsTitle">年龄:<text>儿童 {{datas.ages}}岁</text>
324
-        <text style="margin-left: 20rpx;" tt:if="{{datas.adultMinAge && datas.adultMaxAge && datas.sparent==0}}">成人
325
-          {{datas.adultMinAge+'-'+datas.adultMaxAge}}岁</text>
326
-        <text style="margin-left: 20rpx;" tt:else>(独立营)</text>
327
-      </view>
328
-    </view>
329
-    <!-- 活动标签 -->
330
-    <view class="newsList" tt:if="{{datas.capacity}}">
331
-      <view class="icon-character icon-t red"></view>
332
-      <view class="newsTitle">{{datas.capacity}}</view>
318
+<view class="newsDet borderRadiu" style="margin-top: 20rpx;padding-top:20rpx;padding-bottom: 20rpx;">
319
+  <!-- 儿童年龄要求 -->
320
+  <view class="newsList" tt:if="{{datas.ages || (datas.adultMinAge && datas.adultMaxAge)}}">
321
+    <view class="icon-child icon-t red"></view>
322
+    <view class="newsTitle">年龄:<text>儿童 {{datas.ages}}岁</text>
323
+      <text style="margin-left: 20rpx;" tt:if="{{datas.adultMinAge && datas.adultMaxAge && datas.sparent==0}}">成人
324
+        {{datas.adultMinAge+'-'+datas.adultMaxAge}}岁</text>
325
+      <text style="margin-left: 20rpx;" tt:else>(独立营)</text>
333 326
     </view>
334
-    <!-- 活动地点 -->
335
-    <view class="newsList">
336
-      <view class="icon-gather-area icon red"></view>
337
-      <view class="address">活动地点:{{datas.districk || '暂无地址'}}</view>
327
+  </view>
328
+  <!-- 活动标签 -->
329
+  <view class="newsList" tt:if="{{datas.capacity}}">
330
+    <view class="icon-character icon-t red"></view>
331
+    <view class="newsTitle">{{datas.capacity}}</view>
332
+  </view>
333
+  <!-- 活动地点 -->
334
+  <view class="newsList">
335
+    <view class="icon-gather-area icon red"></view>
336
+    <view class="address">活动地点:{{datas.districk || '暂无地址'}}</view>
337
+  </view>
338
+  <!-- 集合地点 -->
339
+  <view class="newsList mapTo" bindtap="toMap">
340
+    <view style="display: flex;align-items: center;">
341
+      <view class="icon-activity-area icon red"></view>
342
+      <view class="address">集合地点:{{datas.address || '暂无地址'}}</view>
338 343
     </view>
339
-    <!-- 集合地点 -->
340
-    <view class="newsList mapTo" bindtap="toMap">
341
-      <view style="display: flex;align-items: center;">
342
-        <view class="icon-activity-area icon red"></view>
343
-        <view class="address">集合地点:{{datas.address || '暂无地址'}}</view>
344
+    <view style="margin-right: 15rpx;" class="brillianticon"> </view>
345
+  </view>
346
+  <!-- 最少成团数 -->
347
+  <view class="newsList">
348
+    <image class="minImg" src="https://img.bbztx.com/image_test/upload/thumbs/20221025/logo/1666688920648080728.png"
349
+      mode="widthFix"></image>
350
+    <view class="address">每个场次最少成团人数:{{datas.minCloudsNumber || 10}}人</view>
351
+  </view>
352
+</view>
353
+
354
+<view class="preferential-box borderRadiu"
355
+  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')}}"
356
+  style="padding-bottom: 10rpx;padding-top: 10rpx;">
357
+  <!--  preferential-start -->
358
+  <view class="preferential growup-line no-preferential"
359
+    tt:if="{{datas.gdiscount.items && datas.gdiscount.items.length > 0}}">
360
+    <view class="tag-text">拼团</view>
361
+    <view class="preferential-text">
362
+      <view class="red">
363
+        邀请好友进行拼团,最高可<text>{{datas.gdiscount.type ==
364
+          0?'省':'送'}}</text>{{datas.gdiscount.items[datas.gdiscount.items.length-1].price}}{{datas.gdiscount.type ==
365
+        0?'元':''}}
344 366
       </view>
345
-      <view style="margin-right: 15rpx;" class="brillianticon"> </view>
346 367
     </view>
347
-    <!-- 最少成团数 -->
348
-    <view class="newsList">
349
-      <image class="minImg" src="https://img.bbztx.com/image_test/upload/thumbs/20221025/logo/1666688920648080728.png"
350
-        mode="widthFix"></image>
351
-      <view class="address">每个场次最少成团人数:{{datas.minCloudsNumber || 10}}人</view>
368
+    <view class="preferential-after" style="margin:0">
369
+      <button
370
+        class="button {{ datas.status == 6?'button-warn':((buttonClass != 'disabled' && alternateBol) ? 'button-warn':'disabled')}} button-radius button-mini create_group"
371
+        data-createGroup="1"
372
+        bindtap="{{datas.status == 6?'newGroup':((buttonClass != 'disabled' && alternateBol)?'newGroup':'')}}">新开拼团</button>
352 373
     </view>
353 374
   </view>
354
-
355
-  <view class="preferential-box borderRadiu"
356
-    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')}}"
357
-    style="padding-bottom: 10rpx;padding-top: 10rpx;">
358
-    <!--  preferential-start -->
359
-    <view class="preferential growup-line no-preferential"
360
-      tt:if="{{datas.gdiscount.items && datas.gdiscount.items.length > 0}}">
361
-      <view class="tag-text">拼团</view>
362
-      <view class="preferential-text">
363
-        <view class="red">
364
-          邀请好友进行拼团,最高可<text>{{datas.gdiscount.type ==
365
-            0?'省':'送'}}</text>{{datas.gdiscount.items[datas.gdiscount.items.length-1].price}}{{datas.gdiscount.type ==
366
-          0?'元':''}}
367
-        </view>
375
+  <!-- 拼团 -->
376
+  <view class="preferential no-preferential"
377
+    tt:if="{{datas.gdiscount.users.length > 0 && datas.gdiscount.users && shareInfo.groupid}}">
378
+    <view class="preferential-text preferential-text2" style="margin-left:0;">
379
+      <view class="head">
380
+        <image src="{{item.avatar}}" tt:for="{{datas.gdiscount.users}}" tt:key="userId" tt:if="{{index<3}}"></image>
368 381
       </view>
369
-      <view class="preferential-after" style="margin:0">
370
-        <button
371
-          class="button {{ datas.status == 6?'button-warn':((buttonClass != 'disabled' && alternateBol) ? 'button-warn':'disabled')}} button-radius button-mini create_group"
372
-          data-createGroup="1"
373
-          bindtap="{{datas.status == 6?'newGroup':((buttonClass != 'disabled' && alternateBol)?'newGroup':'')}}">新开拼团</button>
382
+      <!-- 倒计时 -->
383
+      <view class="time" tt:if="{{datas.gdiscount.times>0 && datas.gdiscount.status == 0}}">
384
+        <text>剩余:</text>
385
+        <text class='time-m'>{{remainTime.hour}}</text><text class="i">:</text>
386
+        <text class='time-m'>{{remainTime.minite}}</text><text class="i">:</text>
387
+        <text class='time-m'>{{remainTime.second}}</text>
374 388
       </view>
375
-    </view>
376
-    <!-- 拼团 -->
377
-    <view class="preferential no-preferential"
378
-      tt:if="{{datas.gdiscount.users.length > 0 && datas.gdiscount.users && shareInfo.groupid}}">
379
-      <view class="preferential-text preferential-text2" style="margin-left:0;">
380
-        <view class="head">
381
-          <image src="{{item.avatar}}" tt:for="{{datas.gdiscount.users}}" tt:key="userId" tt:if="{{index<3}}"></image>
382
-        </view>
383
-        <!-- 倒计时 -->
384
-        <view class="time" tt:if="{{datas.gdiscount.times>0 && datas.gdiscount.status == 0}}">
385
-          <text>剩余:</text>
386
-          <text class='time-m'>{{remainTime.hour}}</text><text class="i">:</text>
387
-          <text class='time-m'>{{remainTime.minite}}</text><text class="i">:</text>
388
-          <text class='time-m'>{{remainTime.second}}</text>
389
-        </view>
390
-        <view class="groupText" tt:if="{{datas.gdiscount.status == 0}}">
391
-          <text
392
-            tt:if="{{datas.gdiscount.before != 0 & datas.gdiscount.times < 0}}">已成{{datas.gdiscount.before}}人团,</text>
393
-          差<text class="red">{{datas.gdiscount.total <= 0 ? '0' :(datas.gdiscount.next-datas.gdiscount.total)}}< text>
394
-              人成<text class="red">{{datas.gdiscount.next}}人团</text>
395
-          </text>
396
-        </view>
397
-        <view class="groupText" tt:if="{{datas.gdiscount.status == 4}}">
398
-          此团<text class="red">已过期</text>
399
-        </view>
400
-        <view class="groupText" tt:if="{{datas.gdiscount.status == 2}}">
401
-          此团<text class="red">已满员</text>
402
-        </view>
389
+      <view class="groupText" tt:if="{{datas.gdiscount.status == 0}}">
390
+        <text tt:if="{{datas.gdiscount.before != 0 & datas.gdiscount.times < 0}}">已成{{datas.gdiscount.before}}人团,</text>
391
+        差<text class="red">{{datas.gdiscount.total <= 0 ? '0' :(datas.gdiscount.next-datas.gdiscount.total)}}< text>
392
+            人成<text class="red">{{datas.gdiscount.next}}人团</text>
393
+        </text>
403 394
       </view>
404
-      <!-- 拼团 -->
405
-      <view class="preferential-after">
406
-        <button data-createGroup="0" bindtap="{{(buttonClass1 != 'disabled' && alternateBol) ? 'newGroup':''}}"
407
-          class="button {{(buttonClass1 != 'disabled' && alternateBol) ? 'button-warn':'disabled'}} button-mini button-radius {{datas.gdiscount.status == 0 ? 'create_group':''}}">{{datas.gdiscount.status
408
-          == 2 ? '此团已满':(datas.gdiscount.status == 4 ? '此团过期':'一键参团')}}</button>
395
+      <view class="groupText" tt:if="{{datas.gdiscount.status == 4}}">
396
+        此团<text class="red">已过期</text>
409 397
       </view>
410
-    </view>
411
-    <view class="preferential no-preferential"
412
-      tt:if="{{(datas.presellOpen == 0 || datas.presellOpen == 2) && (datas.status == 6 || (datas.status == 0 && showPrivilege))}}">
413
-      <view class="tag-text">特权</view>
414
-      <view class="preferential-text">
415
-        <view class="black" tt:if="{{datas.aheadTimeLong && datas.aheadTimeLong>0}}">已兑换特权,可提前<span
416
-            class="red">{{privilegeTime}}</span>抢购活动
417
-        </view>
418
-        <view class="black" tt:else>最高可兑换<text style="color:#ee3a43">20分钟</text>的提前抢购特权
419
-        </view>
398
+      <view class="groupText" tt:if="{{datas.gdiscount.status == 2}}">
399
+        此团<text class="red">已满员</text>
420 400
       </view>
421
-      <button class="change-privilege" bindtap="openConvertPopup"
422
-        tt:if="{{!datas.aheadTimeLong && datas.aheadTimeLong<=0}}">立即兑换</button>
423 401
     </view>
424
-    <block tt:if="{{datas.ldiscount.items && datas.ldiscount.items.length>0 && datas.presellOpen==0}}">
425
-      <view class="preferential no-preferential">
426
-        <!-- blue -->
427
-        <view class="tag-text ">早鸟</view>
428
-        <view class="preferential-text">
429
-          <view class="black" tt:for="{{datas.ldiscount.items}}" tt:key="index">{{item.start}}-{{item.end}}购买,单人减<text
430
-              class="red">{{item.price}}元</text></view>
431
-          <view class="black" tt:if="{{datas.ldiscount.num>0}}">(每期限前{{datas.ldiscount.num}}个参与者)</view>
432
-        </view>
402
+    <!-- 拼团 -->
403
+    <view class="preferential-after">
404
+      <button data-createGroup="0" bindtap="{{(buttonClass1 != 'disabled' && alternateBol) ? 'newGroup':''}}"
405
+        class="button {{(buttonClass1 != 'disabled' && alternateBol) ? 'button-warn':'disabled'}} button-mini button-radius {{datas.gdiscount.status == 0 ? 'create_group':''}}">{{datas.gdiscount.status
406
+        == 2 ? '此团已满':(datas.gdiscount.status == 4 ? '此团过期':'一键参团')}}</button>
407
+    </view>
408
+  </view>
409
+  <view class="preferential no-preferential"
410
+    tt:if="{{(datas.presellOpen == 0 || datas.presellOpen == 2) && (datas.status == 6 || (datas.status == 0 && showPrivilege))}}">
411
+    <view class="tag-text">特权</view>
412
+    <view class="preferential-text">
413
+      <view class="black" tt:if="{{datas.aheadTimeLong && datas.aheadTimeLong>0}}">已兑换特权,可提前<span
414
+          class="red">{{privilegeTime}}</span>抢购活动
433 415
       </view>
434
-    </block>
435
-    <!-- 宝贝币 -->
436
-    <view class="preferential no-preferential" tt:if="{{datas.maxUserCoin>0}}">
437
-      <view class="tag-text ">宝贝币</view>
438
-      <view class="preferential-text">
439
-        <view class="black">部分场次可用,最高可抵扣<text class="red">{{datas.maxUserCoin/10}}元</text></view>
416
+      <view class="black" tt:else>最高可兑换<text style="color:#ee3a43">20分钟</text>的提前抢购特权
440 417
       </view>
441 418
     </view>
442
-    <!-- 报名无忧 -->
443
-    <view class="preferential no-preferential" bindtap="changeRefund"
444
-      tt:if="{{datas.refundRule!=null&&datas.refundRule!=5}}">
445
-      <view class="tag-text ">报名无忧</view>
419
+    <button class="change-privilege" bindtap="openConvertPopup"
420
+      tt:if="{{!datas.aheadTimeLong && datas.aheadTimeLong<=0}}">立即兑换</button>
421
+  </view>
422
+  <block tt:if="{{datas.ldiscount.items && datas.ldiscount.items.length>0 && datas.presellOpen==0}}">
423
+    <view class="preferential no-preferential">
424
+      <!-- blue -->
425
+      <view class="tag-text ">早鸟</view>
446 426
       <view class="preferential-text">
447
-        <view class="dis">
448
-          <view class="black" tt:if="{{datas.refundRule=='3'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
449
-          <view class="black" tt:if="{{datas.refundRule=='1'}}">活动开始前3天可<text class="red">全额退款/免费换排期</text></view>
450
-          <view class="black" tt:if="{{datas.refundRule=='4'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
451
-          <view class="black" tt:if="{{datas.refundRule=='2'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
452
-          <view class="black" tt:if="{{datas.refundRule=='6'}}">活动开始前60天可<text class="red">全额退款/免费换排期</text></view>
453
-          <view class="black" tt:if="{{datas.refundRule=='7'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
454
-          <view class="black" tt:if="{{datas.refundRule=='8'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
455
-          <view class="black" tt:if="{{datas.refundRule=='9'}}">活动开始前20天可<text class="red">全额退款/免费换排期</text></view>
456
-          <view class="black" tt:if="{{datas.refundRule=='10'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
457
-          <!-- 国内亲子营退款规则 -->
458
-          <view class="black" tt:if="{{datas.refundRule=='11'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
459
-          <!-- 国内行走系列退款规则 -->
460
-          <view class="black" tt:if="{{datas.refundRule=='12'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
461
-          <!-- 国际单飞/亲子营退款规则 -->
462
-          <view class="black" tt:if="{{datas.refundRule=='13'}}">活动开始前30天可<text class="red">全额退款/免费换排期</text></view>
463
-        </view>
427
+        <view class="black" tt:for="{{datas.ldiscount.items}}" tt:key="index">{{item.start}}-{{item.end}}购买,单人减<text
428
+            class="red">{{item.price}}元</text></view>
429
+        <view class="black" tt:if="{{datas.ldiscount.num>0}}">(每期限前{{datas.ldiscount.num}}个参与者)</view>
464 430
       </view>
465 431
     </view>
432
+  </block>
433
+  <!-- 宝贝币 -->
434
+  <view class="preferential no-preferential" tt:if="{{datas.maxUserCoin>0}}">
435
+    <view class="tag-text ">宝贝币</view>
436
+    <view class="preferential-text">
437
+      <view class="black">部分场次可用,最高可抵扣<text class="red">{{datas.maxUserCoin/10}}元</text></view>
438
+    </view>
466 439
   </view>
467
-  <!-- 安全保障和物品清单 -->
468
-  <view class="borderRadiu mTop10 safety" tt:if="{{showGoodsRecom && securityShow!='' }}">
469
-    <view class="flex-box" style="padding: 0;">
470
-      <view class="safetyGoods" bindtap="jumpGoodsPage">
471
-        <view class="flex-box" style="padding: 0;width: 100%;z-index: 1; position: relative;">
472
-          <view style="display: flex;align-items: center; padding: 20rpx 0;">
473
-            <view class="box-l">
474
-              <image class="brilliant"
475
-                src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677039704908027896.png" mode
476
-                style="height: 43rpx;width: 212rpx;margin-right: 10rpx;" />
477
-            </view>
478
-          </view>
479
-          <view class="box-r"></view>
480
-        </view>
481
-        <image src="../images/goodBgS.png" class="bgImg" style="left: 0;top: 0rpx;height: 100%;z-index: 0;"></image>
440
+  <!-- 报名无忧 -->
441
+  <view class="preferential no-preferential" bindtap="changeRefund"
442
+    tt:if="{{datas.refundRule!=null&&datas.refundRule!=5}}">
443
+    <view class="tag-text ">报名无忧</view>
444
+    <view class="preferential-text">
445
+      <view class="dis">
446
+        <view class="black" tt:if="{{datas.refundRule=='3'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
447
+        <view class="black" tt:if="{{datas.refundRule=='1'}}">活动开始前3天可<text class="red">全额退款/免费换排期</text></view>
448
+        <view class="black" tt:if="{{datas.refundRule=='4'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
449
+        <view class="black" tt:if="{{datas.refundRule=='2'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
450
+        <view class="black" tt:if="{{datas.refundRule=='6'}}">活动开始前60天可<text class="red">全额退款/免费换排期</text></view>
451
+        <view class="black" tt:if="{{datas.refundRule=='7'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
452
+        <view class="black" tt:if="{{datas.refundRule=='8'}}">活动开始前7天可<text class="red">全额退款/免费换排期</text></view>
453
+        <view class="black" tt:if="{{datas.refundRule=='9'}}">活动开始前20天可<text class="red">全额退款/免费换排期</text></view>
454
+        <view class="black" tt:if="{{datas.refundRule=='10'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
455
+        <!-- 国内亲子营退款规则 -->
456
+        <view class="black" tt:if="{{datas.refundRule=='11'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
457
+        <!-- 国内行走系列退款规则 -->
458
+        <view class="black" tt:if="{{datas.refundRule=='12'}}">活动开始前15天可<text class="red">全额退款/免费换排期</text></view>
459
+        <!-- 国际单飞/亲子营退款规则 -->
460
+        <view class="black" tt:if="{{datas.refundRule=='13'}}">活动开始前30天可<text class="red">全额退款/免费换排期</text></view>
482 461
       </view>
483
-      <view class="safetyGoods" bindtap="jumpPage">
484
-        <view class="flex-box" style="padding: 0;width: 100%;z-index: 1; position: relative;">
485
-          <view style="display: flex;align-items: center; padding: 20rpx 0;">
486
-            <view class="box-l">
487
-              <image class="brilliant" src="../images/safety@2x.png" mode
488
-                style="height: 50rpx;width: 224rpx;margin-right: 10rpx;" />
489
-            </view>
462
+    </view>
463
+  </view>
464
+</view>
465
+<!-- 安全保障和物品清单 -->
466
+<view class="borderRadiu mTop10 safety" tt:if="{{showGoodsRecom && securityShow!='' }}">
467
+  <view class="flex-box" style="padding: 0;">
468
+    <view class="safetyGoods" bindtap="jumpGoodsPage">
469
+      <view class="flex-box" style="padding: 0;width: 100%;z-index: 1; position: relative;">
470
+        <view style="display: flex;align-items: center; padding: 20rpx 0;">
471
+          <view class="box-l">
472
+            <image class="brilliant"
473
+              src="https://img.bbztx.com/image_test/upload/thumbs/20230222/logo/1677039704908027896.png" mode
474
+              style="height: 43rpx;width: 212rpx;margin-right: 10rpx;" />
490 475
           </view>
491
-          <view class="box-r"></view>
492 476
         </view>
493
-        <image src="../images/safetyBgS.png" class="bgImg" style="left: 0;top: 0rpx;height: 100%;z-index: 0;"></image>
477
+        <view class="box-r"></view>
494 478
       </view>
479
+      <image src="../images/goodBgS.png" class="bgImg" style="left: 0;top: 0rpx;height: 100%;z-index: 0;"></image>
495 480
     </view>
496
-  </view>
497
-  <view tt:else>
498
-    <!-- 物品清单 -->
499
-    <view class="borderRadiu mTop10" tt:if="{{showGoodsRecom}}">
500
-      <physicalForCard title="点击查看活动前所需准备的物品" link="{{'/pages/public/showGoodsList/index?aid='+datas.aid}}">
501
-      </physicalForCard>
502
-    </view>
503
-    <!-- 安全保障 -->
504
-    <view class="borderRadiu mTop10 safety" style="background-color: #fff;" tt:if="{{securityShow!=''}}"
505
-      bindtap="jumpPage">
506
-      <view class="flex-box">
481
+    <view class="safetyGoods" bindtap="jumpPage">
482
+      <view class="flex-box" style="padding: 0;width: 100%;z-index: 1; position: relative;">
507 483
         <view style="display: flex;align-items: center; padding: 20rpx 0;">
508 484
           <view class="box-l">
509 485
             <image class="brilliant" src="../images/safety@2x.png" mode
510
-              style="height: 48rpx;width: 224rpx;margin-right: 10rpx;" />
486
+              style="height: 50rpx;width: 224rpx;margin-right: 10rpx;" />
511 487
           </view>
512
-          <view class="box-c">专业资质+安全服务保障</view>
513 488
         </view>
514 489
         <view class="box-r"></view>
515 490
       </view>
516
-      <image src="../images/safetyBg.png" class="bgImg" style="z-index: 0;"></image>
491
+      <image src="../images/safetyBgS.png" class="bgImg" style="left: 0;top: 0rpx;height: 100%;z-index: 0;"></image>
517 492
     </view>
518 493
   </view>
519
-  <!-- 详情 -->
520
-  <view class="details mTop10 borderRadiu">
521
-    <view class="product-nav {{Column ? 'product-nav-fiexd':''}}">
522
-      <view class="nav {{isColumn ? 'topNav':''}}">
523
-        <view class="nav-col" bindtap="chooseNav" data-id="0">
524
-          <text class="navCol {{current == 0?'current':''}}">图文详情</text>
525
-        </view>
526
-        <view class="nav-col" bindtap="chooseNav" data-id="1">
527
-          <text class="navCol {{current == 1?'current':''}}">安全行程</text>
528
-        </view>
529
-        <view class="nav-col" bindtap="chooseNav" data-id="2">
530
-          <text class="navCol {{current == 2?'current':''}}">报名须知</text>
494
+</view>
495
+<view tt:else>
496
+  <!-- 物品清单 -->
497
+  <view class="borderRadiu mTop10" tt:if="{{showGoodsRecom}}">
498
+    <physicalForCard title="点击查看活动前所需准备的物品" link="{{'/pages/public/showGoodsList/index?aid='+datas.aid}}">
499
+    </physicalForCard>
500
+  </view>
501
+  <!-- 安全保障 -->
502
+  <view class="borderRadiu mTop10 safety" style="background-color: #fff;" tt:if="{{securityShow!=''}}"
503
+    bindtap="jumpPage">
504
+    <view class="flex-box">
505
+      <view style="display: flex;align-items: center; padding: 20rpx 0;">
506
+        <view class="box-l">
507
+          <image class="brilliant" src="../images/safety@2x.png" mode
508
+            style="height: 48rpx;width: 224rpx;margin-right: 10rpx;" />
531 509
         </view>
510
+        <view class="box-c">专业资质+安全服务保障</view>
532 511
       </view>
512
+      <view class="box-r"></view>
533 513
     </view>
534
-    <view class="detail-content" id='content' style="padding-top:20rpx;">
535
-      <video class="video" id="myVideo-{{index}}" tt:if="{{viode}}" tt:for="{{viode}}" tt:key="index"
536
-        src="{{item}}"></video>
537
-      <rich-text nodes="{{datas.content}}"></rich-text>
538
-    </view>
539
-    <view class="detail-content" id='safeTrip'>
540
-      <rich-text nodes="{{datas.safeTrip}}"></rich-text>
541
-    </view>
542
-    <view class="detail-content" id='notes'>
543
-      <rich-text nodes="{{datas.notes}}"></rich-text>
514
+    <image src="../images/safetyBg.png" class="bgImg" style="z-index: 0;"></image>
515
+  </view>
516
+</view>
517
+<!-- 详情 -->
518
+<view class="details mTop10 borderRadiu">
519
+  <view class="product-nav {{Column ? 'product-nav-fiexd':''}}">
520
+    <view class="nav {{isColumn ? 'topNav':''}}">
521
+      <view class="nav-col" bindtap="chooseNav" data-id="0">
522
+        <text class="navCol {{current == 0?'current':''}}">图文详情</text>
523
+      </view>
524
+      <view class="nav-col" bindtap="chooseNav" data-id="1">
525
+        <text class="navCol {{current == 1?'current':''}}">安全行程</text>
526
+      </view>
527
+      <view class="nav-col" bindtap="chooseNav" data-id="2">
528
+        <text class="navCol {{current == 2?'current':''}}">报名须知</text>
529
+      </view>
544 530
     </view>
545 531
   </view>
546
-  <!-- 活动推荐 -->
547
-  <recommend aid="{{datas.aid}}" tt:if="{{datas.recommend==1}}" />
548
-  <convertPopup show="{{showConvert}}" aid="{{datas.aid}}" status="{{datas.status}}" presellOpen="{{datas.presellOpen}}"
549
-    bind:close="closeConvertPopup" bind:showPrompt="showPrompt"></convertPopup>
550
-  <!-- 兑换二次弹窗 -->
551
-  <convertNextPopup show="{{showNextConvert}}" aid="{{datas.aid}}" checkedTime="{{checkedTime}}" city="{{city}}"
552
-    bind:close="closeNextPopup" bind:changePrivilege="changePrivilege"></convertNextPopup>
553
-  <coinTaskToTime show="{{countDown.show}}" time="{{countDown.time}}" taskId="{{countDown.taskId}}"
554
-    bind:finishedTime="finishedTime"></coinTaskToTime>
532
+  <view class="detail-content" id='content' style="padding-top:20rpx;">
533
+    <video class="video" id="myVideo-{{index}}" tt:if="{{viode}}" tt:for="{{viode}}" tt:key="index"
534
+      src="{{item}}"></video>
535
+    <rich-text nodes="{{datas.content}}"></rich-text>
536
+  </view>
537
+  <view class="detail-content" id='safeTrip'>
538
+    <rich-text nodes="{{datas.safeTrip}}"></rich-text>
539
+  </view>
540
+  <view class="detail-content" id='notes'>
541
+    <rich-text nodes="{{datas.notes}}"></rich-text>
542
+  </view>
543
+</view>
544
+<!-- 活动推荐 -->
545
+<recommend aid="{{datas.aid}}" tt:if="{{datas.recommend==1}}" />
546
+<convertPopup show="{{showConvert}}" aid="{{datas.aid}}" status="{{datas.status}}" presellOpen="{{datas.presellOpen}}"
547
+  bind:close="closeConvertPopup" bind:showPrompt="showPrompt"></convertPopup>
548
+<!-- 兑换二次弹窗 -->
549
+<convertNextPopup show="{{showNextConvert}}" aid="{{datas.aid}}" checkedTime="{{checkedTime}}" city="{{city}}"
550
+  bind:close="closeNextPopup" bind:changePrivilege="changePrivilege"></convertNextPopup>
551
+<coinTaskToTime show="{{countDown.show}}" time="{{countDown.time}}" taskId="{{countDown.taskId}}"
552
+  bind:finishedTime="finishedTime"></coinTaskToTime>
555 553
 </view>
556 554
 <!-- 底部悬浮关注服务号 -->
557 555
 <!-- <bottomSuspension></bottomSuspension> -->

+ 3 - 3
pages/product/activity/index.ttss

@@ -135,7 +135,7 @@ page {
135 135
 }
136 136
 
137 137
 .content {
138
-  padding-bottom: 160rpx;
138
+  /* padding-bottom: 160rpx; */
139 139
 }
140 140
 
141 141
 .census {
@@ -1083,7 +1083,7 @@ scroll-view ::-webkit-scrollbar {
1083 1083
 .sku-box {
1084 1084
   border-radius: 16rpx;
1085 1085
   color: #717071;
1086
-  font-size: 24rpx;
1086
+  font-size: 32rpx;
1087 1087
   padding: 20rpx;
1088 1088
   text-align: center;
1089 1089
   display: inline-block;
@@ -1139,7 +1139,7 @@ scroll-view ::-webkit-scrollbar {
1139 1139
 
1140 1140
 .orange {
1141 1141
   color: #ff7e8d;
1142
-  border: 1rpx solid #ff7e8d;
1142
+  /* border: 1rpx solid #ff7e8d; */
1143 1143
   padding: 0 10rpx;
1144 1144
   border-radius: 20rpx;
1145 1145
 }

+ 4 - 2
pages/product/goods/detail.js

@@ -15,6 +15,8 @@ Page({
15 15
     nodes: '',
16 16
     datas: {},
17 17
     comments: {},
18
+
19
+    
18 20
     bottom: false,
19 21
     imgPath: util.config.imgPath,
20 22
     aid: '',
@@ -131,9 +133,9 @@ Page({
131 133
   getData() {
132 134
     let that = this;
133 135
     util.ajax({
134
-      func: "v2/article/detail",
136
+      func: "tiktok/activity/detail",
135 137
       data: {
136
-        "aid": that.data.aid
138
+        "tkaid": that.data.aid
137 139
       }
138 140
     }, function (res) {
139 141
       if (res.code == 0) {

+ 1 - 0
pages/wxs/util.sjs

@@ -1,5 +1,6 @@
1 1
 module.exports = {
2 2
   formatImg: function (img, pic) {
3
+    console.log(pic,675678678)
3 4
     console.log(pic.indexOf("noimg.png") == -1 ? img + pic : pic);
4 5
     return pic.indexOf("noimg.png") == -1 ? img + pic : pic;
5 6
   },

+ 53 - 52
utils/config.js

@@ -1,5 +1,5 @@
1 1
 const accountInfo = tt.getEnvInfoSync();
2
-console.log(accountInfo,7878)
2
+console.log(accountInfo, 7878)
3 3
 const env = accountInfo.microapp.envType;
4 4
 const URLMap = {
5 5
   development: 'https://api-qa.bbztx.com/', //开发版
@@ -149,56 +149,57 @@ module.exports = {
149 149
     camp: 9.5
150 150
   }],
151 151
   coin_level: [{
152
-    level: 1,
153
-    levelName: '普通',
154
-    next_level: '白银',
155
-    min_num: 0,
156
-    max_num: 500,
157
-    bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478678081324.png'
158
-  },
159
-  {
160
-    level: 2,
161
-    levelName: '白银',
162
-    next_level: '黄金',
163
-    min_num: 500,
164
-    max_num: 3000,
165
-    bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478675014263.png',
166
-    time: 5
167
-  },
168
-  {
169
-    level: 3,
170
-    levelName: '黄金',
171
-    next_level: '一钻',
172
-    min_num: 3000,
173
-    max_num: 8000,
174
-    bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478672013220.png',
175
-    time: 10
176
-  },
177
-  {
178
-    level: 4,
179
-    levelName: '一钻',
180
-    next_level: '二钻',
181
-    min_num: 8000,
182
-    max_num: 15000,
183
-    bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478666081396.png',
184
-    time: 15
185
-  },
186
-  {
187
-    level: 5,
188
-    levelName: '二钻',
189
-    next_level: '三钻',
190
-    min_num: 15000,
191
-    max_num: 30000,
192
-    bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478660056372.png',
193
-    time: 20
194
-  },
195
-  {
196
-    level: 6,
197
-    levelName: '三钻',
198
-    next_level: '',
199
-    min_num: 30000,
200
-    max_num: 1000000,
201
-    bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478669045931.png'
202
-  }]
152
+      level: 1,
153
+      levelName: '普通',
154
+      next_level: '白银',
155
+      min_num: 0,
156
+      max_num: 500,
157
+      bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478678081324.png'
158
+    },
159
+    {
160
+      level: 2,
161
+      levelName: '白银',
162
+      next_level: '黄金',
163
+      min_num: 500,
164
+      max_num: 3000,
165
+      bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478675014263.png',
166
+      time: 5
167
+    },
168
+    {
169
+      level: 3,
170
+      levelName: '黄金',
171
+      next_level: '一钻',
172
+      min_num: 3000,
173
+      max_num: 8000,
174
+      bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478672013220.png',
175
+      time: 10
176
+    },
177
+    {
178
+      level: 4,
179
+      levelName: '一钻',
180
+      next_level: '二钻',
181
+      min_num: 8000,
182
+      max_num: 15000,
183
+      bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478666081396.png',
184
+      time: 15
185
+    },
186
+    {
187
+      level: 5,
188
+      levelName: '二钻',
189
+      next_level: '三钻',
190
+      min_num: 15000,
191
+      max_num: 30000,
192
+      bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478660056372.png',
193
+      time: 20
194
+    },
195
+    {
196
+      level: 6,
197
+      levelName: '三钻',
198
+      next_level: '',
199
+      min_num: 30000,
200
+      max_num: 1000000,
201
+      bg_url: 'https://img.bbztx.com/image_test/upload/thumbs/20220426/logo/1650966478669045931.png'
202
+    }
203
+  ]
203 204
 
204 205
 };