history

@@ -290,7 +290,7 @@
   padding: 28rpx 0;
   padding: 28rpx 0;
 }
 }
 .activity-left{
 .activity-left{
-  width: 100%;
+  width: calc(100% - 120rpx);
 }
 }
 .activity-right{
 .activity-right{
   min-width: 120rpx;
   min-width: 120rpx;
@@ -327,9 +327,12 @@
 }
 }
 .discount{
 .discount{
   margin-right: 20rpx;
   margin-right: 20rpx;
+  white-space:nowrap;
 }
 }
 .discount:last-child{
 .discount:last-child{
   margin-right: 0;
   margin-right: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 }
 .discount .discount-left{
 .discount .discount-left{
   background-image: url("http://qn.colorcun.com/reserve/images/%E5%B7%A6%E8%BE%B9.png");
   background-image: url("http://qn.colorcun.com/reserve/images/%E5%B7%A6%E8%BE%B9.png");

@@ -352,7 +352,7 @@
 					"id": 39,
 					"id": 39,
 					"name": "pages/reserve/detail   在线订座  ",
 					"name": "pages/reserve/detail   在线订座  ",
 					"pathName": "pages/reserve/detail",
 					"pathName": "pages/reserve/detail",
-					"query": "id=1009&fromid=&activeTab=",
+					"query": "id=1",
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{
@@ -562,6 +562,7 @@
 					"id": -1,
 					"id": -1,
 					"name": "pages/me/history",
 					"name": "pages/me/history",
 					"pathName": "pages/me/history",
 					"pathName": "pages/me/history",
+					"query": "",
 					"scene": null
 					"scene": null
 				}
 				}
 			]
 			]