Merge remote-tracking branch 'remotes/origin/master' into online-reserve

@@ -174,7 +174,8 @@
 .book-info{
 .book-info{
   width:100%;
   width:100%;
   padding-top:20rpx;
   padding-top:20rpx;
-  margin:0 auto 300rpx;
+  margin:0 auto;
+  padding-bottom: 300rpx;
 }
 }
 .book-info-single{
 .book-info-single{
   width:100%;
   width:100%;

@@ -42,7 +42,7 @@ Page({
 	},
 	},
 	getlabellist:function(){
 	getlabellist:function(){
 		App.User.GetCustomRemark({
 		App.User.GetCustomRemark({
-			uid:util.cache('enter_params')['manage_id']
+			uid:util.cache('enter_params')['manager_id']
 		}).then(res=>{
 		}).then(res=>{
 			console.log(res)
 			console.log(res)
 			this.setData({
 			this.setData({
@@ -55,7 +55,7 @@ Page({
 	},
 	},
 	setlabel:function(id,flag){
 	setlabel:function(id,flag){
 		App.User.GetCustomRemark({
 		App.User.GetCustomRemark({
-			uid:util.cache('enter_params')['manage_id'],
+			uid:util.cache('enter_params')['manager_id'],
 			kid:id,
 			kid:id,
 			flag:flag,
 			flag:flag,
 		}).then(res=>{
 		}).then(res=>{
@@ -77,7 +77,7 @@ Page({
 	//添加自定义标签
 	//添加自定义标签
 	addlabel:function(custom){
 	addlabel:function(custom){
 		App.User.AddCustomRemark({
 		App.User.AddCustomRemark({
-			uid:util.cache('enter_params')['manage_id'],
+			uid:util.cache('enter_params')['manager_id'],
 			custom:custom,
 			custom:custom,
 		}).then(res=>{
 		}).then(res=>{
 			console.log(res)
 			console.log(res)

@@ -31,7 +31,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 21,
+			"current": 38,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -201,8 +201,8 @@
 					"id": 21,
 					"id": 21,
 					"name": "预定本-80商家",
 					"name": "预定本-80商家",
 					"pathName": "pages/book/b_index",
 					"pathName": "pages/book/b_index",
-					"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763",
-					"scene": 1001
+					"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=762",
+					"scene": "1001"
 				},
 				},
 				{
 				{
 					"id": -1,
 					"id": -1,
@@ -321,6 +321,13 @@
 						"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
 						"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
 						"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
 						"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
 					}
 					}
+				},
+				{
+					"id": 38,
+					"name": "预定商家2",
+					"pathName": "pages/book/b_index",
+					"query": "seller_id=1&manage_id=1902&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ",
+					"scene": "1001"
 				}
 				}
 			]
 			]
 		}
 		}