车唛提交

@@ -31,12 +31,11 @@ Page({
 
   async getDeatils() {
     let that = this
-    wx.showLoading({
-      mask: true
-    })
+    // wx.showLoading({
+    //   mask: true
+    // })
     if (that.data.type == 1) {
       if (that.data.tap == '') {
-
         try {
           const {
             data: {
@@ -48,18 +47,17 @@ Page({
               id: that.data.id
             }
           })
+          console.log(data);
           that.setData({
             details: data,
             content: that.text(data.content)
           })
           WxParse.wxParse('content', 'html', that.data.content, that, 5);
           wx.hideLoading()
-          console.log(data);
+
         } catch (err) {
-          that.setData({
-            msg: err.msg
-          })
-          that.popMaskTest()
+          console.log(err);
+          a.popTest(err.msg)
         }
       } else {
         try {
@@ -82,10 +80,8 @@ Page({
           WxParse.wxParse('content', 'html', that.data.content, that, 5);
           console.log(data, "type");
         } catch (err) {
-          that.setData({
-            msg: err.msg
-          })
-          that.popMaskTest()
+          console.log(err);
+          a.popTest(err.msg)
         }
       }
 

@@ -3,57 +3,64 @@ page {
 }
 
 .container {
-  padding: 32rpx;
+  padding: 32rpx 0;
   box-sizing: border-box;
 
-  .activityDetails {
+  .waidel {
     width: 100%;
-    display: flex;
-    flex-direction: column;
-    background-color: #fff;
-    padding: 20rpx 32rpx;
+    padding: 0 32rpx;
     box-sizing: border-box;
     border-radius: 8rpx;
 
-    .details_title {
-      width: 100%;
-      font-size: 36rpx;
-      font-family: PingFang SC;
-      line-height: 44rpx;
-      color: rgba(6, 18, 30, 1);
-      opacity: 1;
-    }
 
-    .activity_icon {
+    .activityDetails {
       width: 100%;
       display: flex;
-      align-items: center;
-      padding: 10rpx 0;
+      flex-direction: column;
+      background-color: #fff;
+      padding: 20rpx 28rpx;
       box-sizing: border-box;
 
-      image {
-        width: 34rpx;
-        height: 34rpx;
-
-      }
-
-      .activity_icon_name {
-        margin-left: 10rpx;
-        height: 34rpx;
-        font-size: 24rpx;
+      .details_title {
+        width: 100%;
+        font-size: 36rpx;
         font-family: PingFang SC;
-        font-weight: 400;
-        line-height: 34rpx;
-        color: rgba(140, 145, 152, 1);
+        line-height: 44rpx;
+        color: rgba(6, 18, 30, 1);
         opacity: 1;
       }
+
+      .activity_icon {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        padding: 10rpx 0;
+        box-sizing: border-box;
+
+        image {
+          width: 34rpx;
+          height: 34rpx;
+
+        }
+
+        .activity_icon_name {
+          margin-left: 10rpx;
+          height: 34rpx;
+          font-size: 24rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          line-height: 34rpx;
+          color: rgba(140, 145, 152, 1);
+          opacity: 1;
+        }
+      }
     }
   }
 
   .activityDetails_txt {
     margin-top: 20rpx;
     width: 100%;
-    padding: 20rpx 32rpx;
+    padding: 20rpx 0rpx;
     box-sizing: border-box;
     background-color: #fff;
     border-radius: 8rpx;

 <view class="container">
-  <view class="activityDetails">
-    <text class="details_title  title_content2">{{details.name}}</text>
-    <view class="activity_icon">
-      <image src="{{imagesUrl}}assets/static/img/dian_Icon@2x.png" />
-      <view class="activity_icon_name  title_content1">{{details.shop}}</view>
+  <view class="waidel">
+    <view class="activityDetails">
+      <text class="details_title  title_content2">{{details.name}}</text>
+      <view class="activity_icon">
+        <image src="{{imagesUrl}}assets/static/img/dian_Icon@2x.png" />
+        <view class="activity_icon_name  title_content1">{{details.shop}}</view>
+      </view>
     </view>
   </view>
   <view class="activityDetails_txt">

@@ -2,19 +2,24 @@ page {
   background-color: #f9f9f9;
 }
 .container {
-  padding: 32rpx;
+  padding: 32rpx 0;
   box-sizing: border-box;
 }
-.container .activityDetails {
+.container .waidel {
+  width: 100%;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  border-radius: 8rpx;
+}
+.container .waidel .activityDetails {
   width: 100%;
   display: flex;
   flex-direction: column;
   background-color: #fff;
-  padding: 20rpx 32rpx;
+  padding: 20rpx 28rpx;
   box-sizing: border-box;
-  border-radius: 8rpx;
 }
-.container .activityDetails .details_title {
+.container .waidel .activityDetails .details_title {
   width: 100%;
   font-size: 36rpx;
   font-family: PingFang SC;
@@ -22,18 +27,18 @@ page {
   color: #06121e;
   opacity: 1;
 }
-.container .activityDetails .activity_icon {
+.container .waidel .activityDetails .activity_icon {
   width: 100%;
   display: flex;
   align-items: center;
   padding: 10rpx 0;
   box-sizing: border-box;
 }
-.container .activityDetails .activity_icon image {
+.container .waidel .activityDetails .activity_icon image {
   width: 34rpx;
   height: 34rpx;
 }
-.container .activityDetails .activity_icon .activity_icon_name {
+.container .waidel .activityDetails .activity_icon .activity_icon_name {
   margin-left: 10rpx;
   height: 34rpx;
   font-size: 24rpx;
@@ -46,7 +51,7 @@ page {
 .container .activityDetails_txt {
   margin-top: 20rpx;
   width: 100%;
-  padding: 20rpx 32rpx;
+  padding: 20rpx 0rpx;
   box-sizing: border-box;
   background-color: #fff;
   border-radius: 8rpx;

@@ -25,6 +25,8 @@ Page({
     obj: '',
     texts: 0,
     code: '',
+    avatar_arr: [], // 头像数组
+    can_num: 0, // 参加人数
   },
   onShow: function () {},
 
@@ -65,6 +67,8 @@ Page({
         data: {
           id: that.data.id,
           type: that.data.type
+          // id: 40,
+          // type: 2
         },
       })
       console.log(data, "活动兴趣");
@@ -73,7 +77,9 @@ Page({
         time_data: data.time_num,
         content: data.content,
         time: data.time_num,
-        content2: that.text(data.say)
+        content2: that.text(data.say),
+        avatar_arr: data.avatar_arr,
+        can_num: data.can_num
       })
       WxParse.wxParse('content', 'html', that.data.content, that, 5);
     } catch (err) {

@@ -108,7 +108,7 @@ page {
           width: 88rpx;
           height: 88rpx;
           border-radius: 50%;
-          margin-left: -34rpx;
+          margin-left: -44rpx;
           flex-shrink: 0;
 
 
@@ -121,6 +121,12 @@ page {
           //   width: 100%;
           // }
         }
+
+        .is_img {
+          width: 88rpx;
+          height: 88rpx;
+          margin-left: -44rpx;
+        }
       }
 
       .share_name {

@@ -30,17 +30,17 @@
       </view>
     </view>
   </view>
-  <!-- <view class="fen_share">
+  <view class="fen_share" wx:if="{{avatar_arr.length !=0}}">
     <view class="share_box">
       <view class="share_imgs">
-        <block wx:for="{{four}}" wx:if="{{index< 6}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-          <image class="imgs" src="../../static/icon/10_icon@3x.png" />
+        <block wx:for="{{avatar_arr}}" wx:if="{{index< 8}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+          <image class="imgs" src="{{item}}" />
         </block>
-        <image src="../../static/img/more_img.png" wx:if="{{}}"/>
+        <image src="../../static/img/more_img.png" class="is_img" wx:if="{{avatar_arr.length > 8}}" />
       </view>
-      <view class="share_name">已有501400人参加</view>
+      <view class="share_name">已有{{can_num}}人参加</view>
     </view>
-  </view> -->
+  </view>
   <view class="details3">
     <view class="smalltitle">
       <view class="title">活动详情</view>

@@ -93,12 +93,17 @@
   width: 88rpx;
   height: 88rpx;
   border-radius: 50%;
-  margin-left: -34rpx;
+  margin-left: -44rpx;
   flex-shrink: 0;
 }
 .container .fen_share .share_box .share_imgs .imgs:first-child {
   margin: 0;
 }
+.container .fen_share .share_box .share_imgs .is_img {
+  width: 88rpx;
+  height: 88rpx;
+  margin-left: -44rpx;
+}
 .container .fen_share .share_box .share_name {
   max-width: 270rpx;
   flex-shrink: 0;

@@ -348,8 +348,6 @@ Page({
         setTimeout(() => {
           that.getSuccessPage()
         }, 500);
-
-
       } catch (err) {
         console.log(err);
         that.setData({
@@ -645,6 +643,16 @@ Page({
             url: '/pages/carDetails/carDetails?id=' + good_id
           })
           break;
+        case -1: //推广活动详情
+          wx.navigateTo({
+            url: '/pages/activityDetails/activityDetails?id=' + good_id + '&type=1' + '&tap=0'
+          })
+          break;
+        case -2: //限时活动详情
+          wx.navigateTo({
+            url: '/pages/details/details?id=' + good_id + '&type=2'
+          })
+          break;
         default:
           break;
       }

@@ -84,6 +84,11 @@
           "pathName": "pages/VtuanDetail/VtuanDetail",
           "query": "type=4&id=4073",
           "scene": null
+        },
+        {
+          "name": "pages/home/home",
+          "pathName": "pages/home/home",
+          "scene": null
         }
       ]
     }