Merge branch 'test' into 'qa'

Test See merge request !275

Merge branch 'test' into 'qa'
Test See merge request !275
后端研发-苏明海
2 parents fdbc7451 e87172d9
Showing 5 changed files with 7 additions and 4 deletions
pages/giftpack/birthdaygift/birthdaygift.wxss
pages/giftpack/evaluategift/evaluategift.wxss
pages/giftpack/festival/festival.js
pages/giftpack/festival/festival.wxss
pages/giftpack/newvipgift/newvipgift.wxss
@@ -110,7 +110,7 @@
 	line-height: 45rpx;
 }
 .top_card {
-	width: 355rpx;
+	width: 300rpx;
 	display: inline-block;
 	margin: 15rpx;
 }
@@ -121,7 +121,7 @@
 }
  
 .top_card {
-  width: 355rpx;
+  width: 300rpx;
   display: inline-block;
   margin: 15rpx;
 }
@@ -125,6 +125,9 @@ Page({
     })
     th.is_festival();
     th.GetList();
+    wx.setNavigationBarTitle({
+      title: "节日有礼",
+    });
   },
   onShow: function() {
  
@@ -126,7 +126,7 @@
 }
  
 .top_card {
-  width: 355rpx;
+   width: 300rpx;
   display: inline-block;
   margin: 15rpx;
 }
@@ -126,7 +126,7 @@
 }
  
 .top_card {
-  width: 355rpx;
+  width: 300rpx;
   display: inline-block;
   margin: 15rpx;
 }