Commit e87172d90a27ee3586a588bb6008193a77511213

Authored by 后端研发-苏明海
2 parents 1b2ca747 f5aa51b6

Merge branch 'dev' into 'test'

优化样式营销活动

See merge request !274
pages/giftpack/birthdaygift/birthdaygift.wxss
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 line-height: 45rpx; 110 line-height: 45rpx;
111 } 111 }
112 .top_card { 112 .top_card {
113 - width: 355rpx; 113 + width: 300rpx;
114 display: inline-block; 114 display: inline-block;
115 margin: 15rpx; 115 margin: 15rpx;
116 } 116 }
pages/giftpack/evaluategift/evaluategift.wxss
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 } 121 }
122 122
123 .top_card { 123 .top_card {
124 - width: 355rpx; 124 + width: 300rpx;
125 display: inline-block; 125 display: inline-block;
126 margin: 15rpx; 126 margin: 15rpx;
127 } 127 }
pages/giftpack/festival/festival.js
@@ -125,6 +125,9 @@ Page({ @@ -125,6 +125,9 @@ Page({
125 }) 125 })
126 th.is_festival(); 126 th.is_festival();
127 th.GetList(); 127 th.GetList();
  128 + wx.setNavigationBarTitle({
  129 + title: "节日有礼",
  130 + });
128 }, 131 },
129 onShow: function() { 132 onShow: function() {
130 133
pages/giftpack/festival/festival.wxss
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 } 126 }
127 127
128 .top_card { 128 .top_card {
129 - width: 355rpx; 129 + width: 300rpx;
130 display: inline-block; 130 display: inline-block;
131 margin: 15rpx; 131 margin: 15rpx;
132 } 132 }
pages/giftpack/newvipgift/newvipgift.wxss
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 } 126 }
127 127
128 .top_card { 128 .top_card {
129 - width: 355rpx; 129 + width: 300rpx;
130 display: inline-block; 130 display: inline-block;
131 margin: 15rpx; 131 margin: 15rpx;
132 } 132 }