杨世雄 / chemai2 · 提交

转到一个项目

作者 李芳银
提交 5b3d326bfd1e5a3a3161716b212c6fde65786620 1 个父辈 b6ddd128

车唛提交

内嵌 并排对比
正在显示 10 个修改的文件 包含 77 行增加 和 37 行删除
@@ -31,12 +31,11 @@ Page({ @@ -31,12 +31,11 @@ Page({
31 31
32 async getDeatils() { 32 async getDeatils() {
33 let that = this 33 let that = this
34 - wx.showLoading({  
35 - mask: true  
36 - }) 34 + // wx.showLoading({
  35 + // mask: true
  36 + // })
37 if (that.data.type == 1) { 37 if (that.data.type == 1) {
38 if (that.data.tap == '') { 38 if (that.data.tap == '') {
39 -  
40 try { 39 try {
41 const { 40 const {
42 data: { 41 data: {
@@ -48,18 +47,17 @@ Page({ @@ -48,18 +47,17 @@ Page({
48 id: that.data.id 47 id: that.data.id
49 } 48 }
50 }) 49 })
  50 + console.log(data);
51 that.setData({ 51 that.setData({
52 details: data, 52 details: data,
53 content: that.text(data.content) 53 content: that.text(data.content)
54 }) 54 })
55 WxParse.wxParse('content', 'html', that.data.content, that, 5); 55 WxParse.wxParse('content', 'html', that.data.content, that, 5);
56 wx.hideLoading() 56 wx.hideLoading()
57 - console.log(data); 57 +
58 } catch (err) { 58 } catch (err) {
59 - that.setData({  
60 - msg: err.msg  
61 - })  
62 - that.popMaskTest() 59 + console.log(err);
  60 + a.popTest(err.msg)
63 } 61 }
64 } else { 62 } else {
65 try { 63 try {
@@ -82,10 +80,8 @@ Page({ @@ -82,10 +80,8 @@ Page({
82 WxParse.wxParse('content', 'html', that.data.content, that, 5); 80 WxParse.wxParse('content', 'html', that.data.content, that, 5);
83 console.log(data, "type"); 81 console.log(data, "type");
84 } catch (err) { 82 } catch (err) {
85 - that.setData({  
86 - msg: err.msg  
87 - })  
88 - that.popMaskTest() 83 + console.log(err);
  84 + a.popTest(err.msg)
89 } 85 }
90 } 86 }
91 87
@@ -3,17 +3,23 @@ page { @@ -3,17 +3,23 @@ page {
3 } 3 }
4 4
5 .container { 5 .container {
6 - padding: 32rpx; 6 + padding: 32rpx 0;
7 box-sizing: border-box; 7 box-sizing: border-box;
8 8
  9 + .waidel {
  10 + width: 100%;
  11 + padding: 0 32rpx;
  12 + box-sizing: border-box;
  13 + border-radius: 8rpx;
  14 +
  15 +
9 .activityDetails { 16 .activityDetails {
10 width: 100%; 17 width: 100%;
11 display: flex; 18 display: flex;
12 flex-direction: column; 19 flex-direction: column;
13 background-color: #fff; 20 background-color: #fff;
14 - padding: 20rpx 32rpx; 21 + padding: 20rpx 28rpx;
15 box-sizing: border-box; 22 box-sizing: border-box;
16 - border-radius: 8rpx;  
17 23
18 .details_title { 24 .details_title {
19 width: 100%; 25 width: 100%;
@@ -49,11 +55,12 @@ page { @@ -49,11 +55,12 @@ page {
49 } 55 }
50 } 56 }
51 } 57 }
  58 + }
52 59
53 .activityDetails_txt { 60 .activityDetails_txt {
54 margin-top: 20rpx; 61 margin-top: 20rpx;
55 width: 100%; 62 width: 100%;
56 - padding: 20rpx 32rpx; 63 + padding: 20rpx 0rpx;
57 box-sizing: border-box; 64 box-sizing: border-box;
58 background-color: #fff; 65 background-color: #fff;
59 border-radius: 8rpx; 66 border-radius: 8rpx;
1 <view class="container"> 1 <view class="container">
  2 + <view class="waidel">
2 <view class="activityDetails"> 3 <view class="activityDetails">
3 <text class="details_title title_content2">{{details.name}}</text> 4 <text class="details_title title_content2">{{details.name}}</text>
4 <view class="activity_icon"> 5 <view class="activity_icon">
@@ -6,6 +7,7 @@ @@ -6,6 +7,7 @@
6 <view class="activity_icon_name title_content1">{{details.shop}}</view> 7 <view class="activity_icon_name title_content1">{{details.shop}}</view>
7 </view> 8 </view>
8 </view> 9 </view>
  10 + </view>
9 <view class="activityDetails_txt"> 11 <view class="activityDetails_txt">
10 <!-- <rich-text class="txt" nodes="{{content}}"></rich-text> --> 12 <!-- <rich-text class="txt" nodes="{{content}}"></rich-text> -->
11 <import src="../../wxParse/wxParse.wxml" /> 13 <import src="../../wxParse/wxParse.wxml" />
@@ -2,19 +2,24 @@ page { @@ -2,19 +2,24 @@ page {
2 background-color: #f9f9f9; 2 background-color: #f9f9f9;
3 } 3 }
4 .container { 4 .container {
5 - padding: 32rpx; 5 + padding: 32rpx 0;
6 box-sizing: border-box; 6 box-sizing: border-box;
7 } 7 }
8 -.container .activityDetails { 8 +.container .waidel {
  9 + width: 100%;
  10 + padding: 0 32rpx;
  11 + box-sizing: border-box;
  12 + border-radius: 8rpx;
  13 +}
  14 +.container .waidel .activityDetails {
9 width: 100%; 15 width: 100%;
10 display: flex; 16 display: flex;
11 flex-direction: column; 17 flex-direction: column;
12 background-color: #fff; 18 background-color: #fff;
13 - padding: 20rpx 32rpx; 19 + padding: 20rpx 28rpx;
14 box-sizing: border-box; 20 box-sizing: border-box;
15 - border-radius: 8rpx;  
16 } 21 }
17 -.container .activityDetails .details_title { 22 +.container .waidel .activityDetails .details_title {
18 width: 100%; 23 width: 100%;
19 font-size: 36rpx; 24 font-size: 36rpx;
20 font-family: PingFang SC; 25 font-family: PingFang SC;
@@ -22,18 +27,18 @@ page { @@ -22,18 +27,18 @@ page {
22 color: #06121e; 27 color: #06121e;
23 opacity: 1; 28 opacity: 1;
24 } 29 }
25 -.container .activityDetails .activity_icon { 30 +.container .waidel .activityDetails .activity_icon {
26 width: 100%; 31 width: 100%;
27 display: flex; 32 display: flex;
28 align-items: center; 33 align-items: center;
29 padding: 10rpx 0; 34 padding: 10rpx 0;
30 box-sizing: border-box; 35 box-sizing: border-box;
31 } 36 }
32 -.container .activityDetails .activity_icon image { 37 +.container .waidel .activityDetails .activity_icon image {
33 width: 34rpx; 38 width: 34rpx;
34 height: 34rpx; 39 height: 34rpx;
35 } 40 }
36 -.container .activityDetails .activity_icon .activity_icon_name { 41 +.container .waidel .activityDetails .activity_icon .activity_icon_name {
37 margin-left: 10rpx; 42 margin-left: 10rpx;
38 height: 34rpx; 43 height: 34rpx;
39 font-size: 24rpx; 44 font-size: 24rpx;
@@ -46,7 +51,7 @@ page { @@ -46,7 +51,7 @@ page {
46 .container .activityDetails_txt { 51 .container .activityDetails_txt {
47 margin-top: 20rpx; 52 margin-top: 20rpx;
48 width: 100%; 53 width: 100%;
49 - padding: 20rpx 32rpx; 54 + padding: 20rpx 0rpx;
50 box-sizing: border-box; 55 box-sizing: border-box;
51 background-color: #fff; 56 background-color: #fff;
52 border-radius: 8rpx; 57 border-radius: 8rpx;
@@ -25,6 +25,8 @@ Page({ @@ -25,6 +25,8 @@ Page({
25 obj: '', 25 obj: '',
26 texts: 0, 26 texts: 0,
27 code: '', 27 code: '',
  28 + avatar_arr: [], // 头像数组
  29 + can_num: 0, // 参加人数
28 }, 30 },
29 onShow: function () {}, 31 onShow: function () {},
30 32
@@ -65,6 +67,8 @@ Page({ @@ -65,6 +67,8 @@ Page({
65 data: { 67 data: {
66 id: that.data.id, 68 id: that.data.id,
67 type: that.data.type 69 type: that.data.type
  70 + // id: 40,
  71 + // type: 2
68 }, 72 },
69 }) 73 })
70 console.log(data, "活动兴趣"); 74 console.log(data, "活动兴趣");
@@ -73,7 +77,9 @@ Page({ @@ -73,7 +77,9 @@ Page({
73 time_data: data.time_num, 77 time_data: data.time_num,
74 content: data.content, 78 content: data.content,
75 time: data.time_num, 79 time: data.time_num,
76 - content2: that.text(data.say) 80 + content2: that.text(data.say),
  81 + avatar_arr: data.avatar_arr,
  82 + can_num: data.can_num
77 }) 83 })
78 WxParse.wxParse('content', 'html', that.data.content, that, 5); 84 WxParse.wxParse('content', 'html', that.data.content, that, 5);
79 } catch (err) { 85 } catch (err) {
@@ -108,7 +108,7 @@ page { @@ -108,7 +108,7 @@ page {
108 width: 88rpx; 108 width: 88rpx;
109 height: 88rpx; 109 height: 88rpx;
110 border-radius: 50%; 110 border-radius: 50%;
111 - margin-left: -34rpx; 111 + margin-left: -44rpx;
112 flex-shrink: 0; 112 flex-shrink: 0;
113 113
114 114
@@ -121,6 +121,12 @@ page { @@ -121,6 +121,12 @@ page {
121 // width: 100%; 121 // width: 100%;
122 // } 122 // }
123 } 123 }
  124 +
  125 + .is_img {
  126 + width: 88rpx;
  127 + height: 88rpx;
  128 + margin-left: -44rpx;
  129 + }
124 } 130 }
125 131
126 .share_name { 132 .share_name {
@@ -30,17 +30,17 @@ @@ -30,17 +30,17 @@
30 </view> 30 </view>
31 </view> 31 </view>
32 </view> 32 </view>
33 - <!-- <view class="fen_share"> 33 + <view class="fen_share" wx:if="{{avatar_arr.length !=0}}">
34 <view class="share_box"> 34 <view class="share_box">
35 <view class="share_imgs"> 35 <view class="share_imgs">
36 - <block wx:for="{{four}}" wx:if="{{index< 6}}" wx:for-item="item" wx:for-index="index" wx:key="index">  
37 - <image class="imgs" src="../../static/icon/10_icon@3x.png" /> 36 + <block wx:for="{{avatar_arr}}" wx:if="{{index< 8}}" wx:for-item="item" wx:for-index="index" wx:key="index">
  37 + <image class="imgs" src="{{item}}" />
38 </block> 38 </block>
39 - <image src="../../static/img/more_img.png" wx:if="{{}}"/> 39 + <image src="../../static/img/more_img.png" class="is_img" wx:if="{{avatar_arr.length > 8}}" />
  40 + </view>
  41 + <view class="share_name">已有{{can_num}}人参加</view>
40 </view> 42 </view>
41 - <view class="share_name">已有501400人参加</view>  
42 </view> 43 </view>
43 - </view> -->  
44 <view class="details3"> 44 <view class="details3">
45 <view class="smalltitle"> 45 <view class="smalltitle">
46 <view class="title">活动详情</view> 46 <view class="title">活动详情</view>
@@ -93,12 +93,17 @@ @@ -93,12 +93,17 @@
93 width: 88rpx; 93 width: 88rpx;
94 height: 88rpx; 94 height: 88rpx;
95 border-radius: 50%; 95 border-radius: 50%;
96 - margin-left: -34rpx; 96 + margin-left: -44rpx;
97 flex-shrink: 0; 97 flex-shrink: 0;
98 } 98 }
99 .container .fen_share .share_box .share_imgs .imgs:first-child { 99 .container .fen_share .share_box .share_imgs .imgs:first-child {
100 margin: 0; 100 margin: 0;
101 } 101 }
  102 +.container .fen_share .share_box .share_imgs .is_img {
  103 + width: 88rpx;
  104 + height: 88rpx;
  105 + margin-left: -44rpx;
  106 +}
102 .container .fen_share .share_box .share_name { 107 .container .fen_share .share_box .share_name {
103 max-width: 270rpx; 108 max-width: 270rpx;
104 flex-shrink: 0; 109 flex-shrink: 0;
@@ -348,8 +348,6 @@ Page({ @@ -348,8 +348,6 @@ Page({
348 setTimeout(() => { 348 setTimeout(() => {
349 that.getSuccessPage() 349 that.getSuccessPage()
350 }, 500); 350 }, 500);
351 -  
352 -  
353 } catch (err) { 351 } catch (err) {
354 console.log(err); 352 console.log(err);
355 that.setData({ 353 that.setData({
@@ -645,6 +643,16 @@ Page({ @@ -645,6 +643,16 @@ Page({
645 url: '/pages/carDetails/carDetails?id=' + good_id 643 url: '/pages/carDetails/carDetails?id=' + good_id
646 }) 644 })
647 break; 645 break;
  646 + case -1: //推广活动详情
  647 + wx.navigateTo({
  648 + url: '/pages/activityDetails/activityDetails?id=' + good_id + '&type=1' + '&tap=0'
  649 + })
  650 + break;
  651 + case -2: //限时活动详情
  652 + wx.navigateTo({
  653 + url: '/pages/details/details?id=' + good_id + '&type=2'
  654 + })
  655 + break;
648 default: 656 default:
649 break; 657 break;
650 } 658 }
@@ -84,6 +84,11 @@ @@ -84,6 +84,11 @@
84 "pathName": "pages/VtuanDetail/VtuanDetail", 84 "pathName": "pages/VtuanDetail/VtuanDetail",
85 "query": "type=4&id=4073", 85 "query": "type=4&id=4073",
86 "scene": null 86 "scene": null
  87 + },
  88 + {
  89 + "name": "pages/home/home",
  90 + "pathName": "pages/home/home",
  91 + "scene": null
87 } 92 }
88 ] 93 ]
89 } 94 }