diff --git a/pages/giftpack/birthdaygift/birthdaygift.json b/pages/giftpack/birthdaygift/birthdaygift.json
index c719040..ebd948e 100644
--- a/pages/giftpack/birthdaygift/birthdaygift.json
+++ b/pages/giftpack/birthdaygift/birthdaygift.json
@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "生日礼包",
-  "navigationStyle": "custom",
     "usingComponents": {
       "warn": "/components/long_warn/long_warn",
       "my_confirm": "/components/my_confirm/my_confirm"
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 2c03c45..4573cdb 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -200,6 +200,7 @@ Page({
     var th = this;
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
+    
   },
   //下拉事件
   onReachBottom: function() {
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.json b/pages/giftpack/buygiftpack/giftpackbuy.json
index b7705d4..6acc1c4 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.json
+++ b/pages/giftpack/buygiftpack/giftpackbuy.json
@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "礼包列表",
-  "enablePullDownRefresh": false,
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm"
diff --git a/pages/giftpack/evaluategift/evaluategift.json b/pages/giftpack/evaluategift/evaluategift.json
index 750821f..608e979 100644
--- a/pages/giftpack/evaluategift/evaluategift.json
+++ b/pages/giftpack/evaluategift/evaluategift.json
@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "评价有礼",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm"
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 61a8f5c..ac50a85 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -42,6 +42,7 @@ Page({
     th.setData({
       giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
     })
+    th.close();
   },
   onShow: function() {
 
@@ -294,4 +295,11 @@ Page({
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
 
   },
+  //关闭导航
+  close: function () {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+    nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy");
+  }
 });
\ No newline at end of file
diff --git a/pages/giftpack/giftpacklist/giftpacklist.json b/pages/giftpack/giftpacklist/giftpacklist.json
index 3fa7e88..a97fd58 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.json
+++ b/pages/giftpack/giftpacklist/giftpacklist.json
@@ -1,9 +1,9 @@
 {
   "navigationBarTitleText": "礼包详情",
-  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
-      "qr_code": "/components/qr_code/qr_code"
+      "qr_code": "/components/qr_code/qr_code",
+      "nav_b": "/components/nav_b/nav_b"
   }
 }
\ No newline at end of file
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 0bd70a9..f1ea307 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -128,4 +128,6 @@
 <warn id="warn"></warn>
 <my_confirm id="my_confirm"></my_confirm>
 <!-- 弹出框扫描 -->
-<qr_code id="qc_com"></qr_code>
\ No newline at end of file
+<qr_code id="qc_com"></qr_code>
+<!--  制作一个圆球导航  -->
+<nav_b id="nav_b"></nav_b>
\ No newline at end of file
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss
index 877fea4..4e9ef50 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxss
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxss
@@ -75,10 +75,12 @@
 	border: #999999 solid 1rpx;
 } */
 .box_ware_img image.data-v-3a5b7e36 {
-	width: 185rpx;
-	height: 190rpx;
+	/* width: 185rpx;
+	height: 190rpx; */
   /* background-color: rgba(138, 138, 138, 0.63); */
   border: 2rpx solid #999999;
+  width: 120rpx;
+	height: 120rpx;
 }
 .box_ware_item.data-v-3a5b7e36 {
 	width: 70%;
@@ -86,7 +88,7 @@
 	position: relative;
 }
 .box_ware_item_title.data-v-3a5b7e36 {
-	font-size: 30rpx;
+	font-size: 24rpx;
 	word-break: break-all;
 	text-overflow: ellipsis;
 	display: -webkit-box;
@@ -107,19 +109,19 @@
 	left: 0;
 }
 .box_ware_item_qty.data-v-3a5b7e36 {
-	font-size: 25rpx;
+	font-size: 22rpx;
 	position: absolute;
 	bottom: 15rpx;
 	left: 0;
 }
 .box_ware_code.data-v-3a5b7e36 {
 	position: absolute;
-	bottom: 10rpx;
 	right: 10rpx;
+  bottom:10rpx;
 }
 .box_ware_code image.data-v-3a5b7e36 {
-	width: 60rpx;
-	height: 60rpx;
+	width: 50rpx;
+	height: 50rpx;
 }
 .box_ware_code text.data-v-3a5b7e36 {
 	font-size: 20rpx;
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index b8b172f..b9ba287 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -47,8 +47,9 @@
               <view class="ellipsis-1">豪华任务一
               </view>
             </view>
-
-            <view class="flex-center width state">
+           
+           <!-- 已完成的颜色nostate -->
+            <view class="flex-center width state {{index==0?'nostate':''}}">
               <view class="ellipsis-1">进行中
               </view>
             </view>
diff --git a/pages/user/assistance/assistance.wxss b/pages/user/assistance/assistance.wxss
index 4013374..cdb82da 100644
--- a/pages/user/assistance/assistance.wxss
+++ b/pages/user/assistance/assistance.wxss
@@ -120,7 +120,9 @@ page {
 .state {
   text-decoration: underline;
 }
-
+.nostate{
+  color: rgb(195,155,156);
+}
 .nothing {
   padding: 50rpx 0rpx;
 }