新邀请函包间字段显示问题处理、提前点餐跳转到分享下单页问题处理

@@ -242,7 +242,7 @@ Page({
     }).then(res => {
     }).then(res => {
       let orderItemCount = 0;
       let orderItemCount = 0;
       res.data.cookbooklist.forEach(cb => {
       res.data.cookbooklist.forEach(cb => {
-        if (this.data.options.identity == 1 && cb.status > 0) {
+        if (cb.status > 0) {
           let data={
           let data={
             ...this.data.options
             ...this.data.options
           }
           }

@@ -32,7 +32,7 @@ Page({
 		theme: 'blackGold', //blue green blackGold
 		theme: 'blackGold', //blue green blackGold
 		seller: {
 		seller: {
 			name: '',
 			name: '',
-			room: '',
+			tablesText: '',
 			date: '',
 			date: '',
 			addr: ''
 			addr: ''
 		},
 		},
@@ -131,17 +131,12 @@ Page({
 			openid: getApp().openid,
 			openid: getApp().openid,
 			rid: this.data.options.id
 			rid: this.data.options.id
 		}).then(res => {
 		}).then(res => {
-			let tables = [], //桌子信息
-				regions = [],//区域名称
+			let tablesText = '', //桌子信息
 				tableNum =0;
 				tableNum =0;
-			res.data.tables.forEach(t => {
-				tables.push(t.name);
+			res.data.tables.forEach((t,i) => {
 				tableNum+=t.table_pnum*1
 				tableNum+=t.table_pnum*1
-				if (regions.indexOf('t.rname') == -1) {
-					regions.push(t.rname);
-				}
+				tablesText+=t.rname+t.name+(i==(res.data.tables.length-1)?'':'、');
 			})
 			})
-			console.log(tableNum);
 			let reserev = RS.reserve(res.data)
 			let reserev = RS.reserve(res.data)
 			let dateSmart
 			let dateSmart
 			if (res.data.type == 1) {
 			if (res.data.type == 1) {
@@ -160,9 +155,8 @@ Page({
 				seller: {
 				seller: {
 					name: reserev.seller.sellername,
 					name: reserev.seller.sellername,
 					sid:reserev.sid,
 					sid:reserev.sid,
-					room: tables.join('、'),
 					date: dateSmart,
 					date: dateSmart,
-					region: regions.join('、'),
+					tablesText,
 					addr: reserev.seller.real_address || reserev.seller.map_address,
 					addr: reserev.seller.real_address || reserev.seller.map_address,
 					image: reserev.image_url,
 					image: reserev.image_url,
 					hasOwner: true,
 					hasOwner: true,

@@ -27,9 +27,9 @@
 				<view class="label">【餐段】</view>
 				<view class="label">【餐段】</view>
 				<view class="contentData">{{seller.soltName}}</view>
 				<view class="contentData">{{seller.soltName}}</view>
 			</view>
 			</view>
-			<view class="flex-11" wx:if="{{seller.region || seller.room}}">
+			<view class="flex-11" wx:if="{{seller.tablesText}}">
 				<view class="label">【包间】</view>
 				<view class="label">【包间】</view>
-				<view class="contentData">{{seller.region}}{{seller.room}}</view>
+				<view class="contentData">{{seller.tablesText}}</view>
 			</view>
 			</view>
 			<view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}">
 			<view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}">
 				<view class="label">【人数】</view>
 				<view class="label">【人数】</view>