商家端跳转页面传参修改

@@ -331,6 +331,8 @@ Page({
                 ...this.data.options
                 ...this.data.options
             }
             }
             cookbookObj.hasSuccess = 1
             cookbookObj.hasSuccess = 1
+            delete cookbookObj.navColor
+            delete cookbookObj.themeColor
             App.Advance.PlaceOrder({
             App.Advance.PlaceOrder({
                 orderid: this.data.options.oid,
                 orderid: this.data.options.oid,
                 rid: this.data.options.rid,
                 rid: this.data.options.rid,

@@ -76,8 +76,8 @@ Page({
         identity:options.identity
         identity:options.identity
       },
       },
     })
     })
-    console.log('optionsoptions',{...options});
-    this.getCookList()
+    console.log('options',{...options});
+    options.oid?this.getCookList():this.initOrder()
     mta.Page.init({
     mta.Page.init({
       "appID": "500667280",
       "appID": "500667280",
       "eventID": "500667287",
       "eventID": "500667287",
@@ -233,6 +233,7 @@ Page({
   },
   },
   // 扫桌码点餐
   // 扫桌码点餐
   initOrder() {
   initOrder() {
+    let type=this.data.options.oid?'0':'1'
     App.Advance.CreateOrder({
     App.Advance.CreateOrder({
       rid: this.data.options.rid,
       rid: this.data.options.rid,
       identity: this.data.options.identity,
       identity: this.data.options.identity,
@@ -263,6 +264,7 @@ Page({
         orderItemCount: orderItemCount,
         orderItemCount: orderItemCount,
         checkCookbooklist: res.data.cookbooklist,
         checkCookbooklist: res.data.cookbooklist,
       })
       })
+      type?this.getCookList():''
     })
     })
   },
   },
   // 过滤数据
   // 过滤数据
@@ -517,7 +519,7 @@ Page({
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
   onShow() {
   onShow() {
-    this.initOrder()
+    this.data.options.oid?this.initOrder():'';
   },
   },
   // 展示做法规格弹窗
   // 展示做法规格弹窗
   showCheckModal() {
   showCheckModal() {