Commit 7c5d769db1c40649a4249fe132d0561119d6f75c

Authored by vking
2 parents 34157f00 076581b0

Merge remote-tracking branch 'origin/master'

@@ -30,6 +30,7 @@ Page({ @@ -30,6 +30,7 @@ Page({
30 let index=e.currentTarget.dataset.index; 30 let index=e.currentTarget.dataset.index;
31 if(this.action){ 31 if(this.action){
32 let pages = getCurrentPages(); 32 let pages = getCurrentPages();
  33 + this.data.concatlist[index].remark='';
33 pages[pages.length-2].setData({ 34 pages[pages.length-2].setData({
34 user:this.data.concatlist[index] 35 user:this.data.concatlist[index]
35 }) 36 })
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 } 21 }
22 }, 22 },
23 "compileType": "miniprogram", 23 "compileType": "miniprogram",
24 - "libVersion": "2.7.7", 24 + "libVersion": "2.8.2",
25 "appid": "wxd3dc4206c76f14fc", 25 "appid": "wxd3dc4206c76f14fc",
26 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A", 26 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
27 "isGameTourist": false, 27 "isGameTourist": false,
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 "id": 0, 55 "id": 0,
56 "name": "预订本-商家1", 56 "name": "预订本-商家1",
57 "pathName": "pack-book/pages/book/b_index", 57 "pathName": "pack-book/pages/book/b_index",
58 - "query": "seller_id=154&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500", 58 + "query": "seller_id=1007&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
59 "scene": 1001 59 "scene": 1001
60 }, 60 },
61 { 61 {