提前点餐

@@ -332,7 +332,7 @@ Page({
         rid: this.data.bookInfo.id,
         oid: this.data.bookInfo.orderid,
         identity: 2
-      }, '/pack-cookbook/pages/success')
+      }, '/pack-cookbook/pages/success_new')
     });
   },
   refuseOrder(){

@@ -91,7 +91,7 @@ Page({
       identity:this.data.options.identity,
     }).then(res=>{
       wx.redirectTo({
-        url: util.http_build_query({...this.data.options,hasSuccess:1},'./success')
+        url: util.http_build_query({...this.data.options,hasSuccess:1},'./success_new')
       })
     })
   },

@@ -330,11 +330,11 @@ Page({
                 ...this.data.options
             }
             cookbookObj.hasSuccess = 1
-            cookbookObj.notes=this.data.notes
             App.Advance.PlaceOrder({
                 orderid: this.data.options.oid,
                 rid: this.data.options.rid,
                 identity: this.data.options.identity,
+                remark:this.data.notes+''
             }).then(res => {
                 wx.navigateTo({
                     url: `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`,

@@ -102,7 +102,7 @@
 .btns button {
 	width: 50%;
 	box-sizing: border-box;
-	color: #BFC4D4;
+	color: #fff;
 	height: 100%;
 	border-radius: 0;
 }

@@ -237,6 +237,7 @@ Page({
           let cookbookObj = {
             ...this.data.options
           }
+          cookbookObj.hasSuccess='1'
           cookbookObj.sellerName=res.data.seller.sellername;
           cookbookObj.oid=res.data.id;
           wx.redirectTo({

@@ -43,6 +43,21 @@ Page({
         });
         this.getCheckCookList()
         this.getDetail()
+        this.initOrder()
+    },
+    // 获取备注信息
+    initOrder(){
+        App.Advance.CreateOrder({
+            rid: this.data.options.rid,
+            identity: this.data.options.identity,
+            status: '0,1',
+            openid: getApp().openid,
+        }).then(res => {
+            console.log(res.data.remark);
+            this.setData({
+                notes:res.data.remark
+            })
+        })
     },
     // 过滤数据
     formatCookList(list) {
@@ -321,6 +336,7 @@ Page({
             url
         })
     },
+    // 获取订单信息
     getDetail() {
         App.Reserve.Detail({
             openid: getApp().openid,
@@ -364,6 +380,7 @@ Page({
             console.log(res, '详情请求失败');
         })
     },
+    // 获取券 充值信息
     getSellerTemplateConfFun() {
         App.Seller.GetSellerTemplateConf({
             sid: this.data.options.sid
@@ -420,7 +437,8 @@ Page({
             ...this.data.options,
             hasOnlyShow: 1
         };
-        delete cookbookObj.hasSuccess
+        console.log(cookbookObj);
+        delete cozokbookObj.hasSuccess
         return {
             title: '菜品已点好，快来看看都点了什么~',
             path: `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`,

@@ -17,7 +17,7 @@
 			</view>
 			<view class="info" style="color: rgba({{textColor}});">
 				<view class="texts font28r">备注信息：</view>
-				<view class="texts font28r">{{options.notes}}</view>
+				<view class="texts font28r">{{notes?notes:''}}</view>
 			</view>
 			<image class="imgs" src="https://qn.colorcun.com/001.png" mode="" />
 		</view>
@@ -99,7 +99,7 @@
 			</view>
 		</view>
 	</scroll-view>
-	<view class="btns flex-cc">
+	<view class="btns flex-cc" wx:if="{{options.hasSuccess==1}}">
 		<button class="font32r continue flex-cc" style="background: rgba({{themeColor}});color: rgba({{textColor}});" bindtap="continueOrdering">菜品更换</button>
 		<button class="font32r determine flex-cc" open-type="share">分享菜单</button>
 	</view>

@@ -101,7 +101,7 @@
 .btns button {
 	width: 50%;
 	box-sizing: border-box;
-	color: #BFC4D4;
+	color: #fff;
 	height: 100%;
 	border-radius: 0;
 }

@@ -226,7 +226,7 @@ Page({
           rid: this.id,
           oid: this.data.detail.order.id,
           identity: 1
-        }, '/pack-cookbook/pages/success')
+        }, '/pack-cookbook/pages/success_new')
       });
     } else {
       App.Advance.CreateOrder({
@@ -242,7 +242,7 @@ Page({
             oid: res.data.id,
             identity: 1,
             sid: res.data.sellerid
-          }, '/pack-cookbook/pages/index')
+          }, '/pack-cookbook/pages/index_news')
         });
       })
     }

@@ -161,7 +161,7 @@
     </view>
 
     <block wx:if="{{seller.seller_config_info.is_display_dish==1}}">
-        <navigator url="/pack-cookbook/pages/index?rid=18599&oid=273&identity=1&seeAll={{seller.sellername}}&sid={{seller.id}}" hover-class="navigator-hover">
+        <navigator url="/pack-cookbook/pages/index_new?rid=18599&oid=273&identity=1&seeAll={{seller.sellername}}&sid={{seller.id}}" hover-class="navigator-hover">
             <view class="view padding-lg margin-top-sm bg-white text-black">
                 <view class="view flex justify-between align-center">
                     <view class="view txt-40-h text-bold">查看菜单</view>