Merge remote-tracking branch 'origin/master'

@@ -30,6 +30,7 @@ Page({
 		let index=e.currentTarget.dataset.index;
 		if(this.action){
 			let pages = getCurrentPages();
+			this.data.concatlist[index].remark='';
 			pages[pages.length-2].setData({
 				user:this.data.concatlist[index]
 			})

@@ -21,7 +21,7 @@
 		}
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.7.7",
+	"libVersion": "2.8.2",
 	"appid": "wxd3dc4206c76f14fc",
 	"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
 	"isGameTourist": false,
@@ -55,7 +55,7 @@
 					"id": 0,
 					"name": "预订本-商家1",
 					"pathName": "pack-book/pages/book/b_index",
-					"query": "seller_id=154&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
+					"query": "seller_id=1007&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
 					"scene": 1001
 				},
 				{