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

# Conflicts:
#	project.config.json

@@ -62,7 +62,7 @@ Page({
     let tags=this.data.tags;
     let tags=this.data.tags;
     tags[i].active=!tags[i].active;
     tags[i].active=!tags[i].active;
     console.log(i,tags);
     console.log(i,tags);
-    let remark=this.data.remark;
+    let remark=this.data.remark||'';
     remark=remark.replace(tags[i].remark+'、','')
     remark=remark.replace(tags[i].remark+'、','')
     if(tags[i].active){
     if(tags[i].active){
       remark+=tags[i].remark+'、'
       remark+=tags[i].remark+'、'

@@ -31,7 +31,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 45,
+			"current": 38,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -229,8 +229,8 @@
 					"id": 25,
 					"id": 25,
 					"name": "pack-cookbook/pages/index",
 					"name": "pack-cookbook/pages/index",
 					"pathName": "pack-cookbook/pages/index",
 					"pathName": "pack-cookbook/pages/index",
-					"query": "rid=1196&oid=1&identity=1&sid=80",
-					"scene": "1001"
+					"query": "rid=5328&oid=173&identity=1&sid=154",
+					"scene": 1001
 				},
 				},
 				{
 				{
 					"id": 26,
 					"id": 26,
@@ -336,13 +336,13 @@
 					"query": "id=154",
 					"query": "id=154",
 					"scene": null
 					"scene": null
 				},
 				},
-				{
-					"id": 40,
-					"name": "邀请Ren   pages/customer/index ",
-					"pathName": "pages/customer/detail_owner_invitation",
-					"query": "id=3672&fromid=test&hasInvitation=1&hasSellerShare=1",
-					"scene": null
-				},
+                {
+                  "id": 40,
+                  "name": "邀请Ren   pages/customer/index ",
+                  "pathName": "pages/customer/detail_owner_invitation",
+                  "query": "id=3672&fromid=test&hasInvitation=1&hasSellerShare=1",
+                  "scene": null
+                },
 				{
 				{
 					"id": -1,
 					"id": -1,
 					"name": "我的收藏 pages/me/follow",
 					"name": "我的收藏 pages/me/follow",