提前点餐调整

@@ -65,6 +65,7 @@ Page({
       res.data.cookbooklist=cookbooklist;
       this.setData({
         order: res.data,
+        openid:getApp().openid,
       })
     })
   },

@@ -24,7 +24,7 @@
 </view>
 <view class="footer">
     <view class="total">共计：¥{{order.price}}</view>
-    <view class="infos">
+    <view class="infos" wx:if="{{openid==order.openid && openid}}">
         <view class="flex-lr item">
             <view class="item-label">人数：</view>
             <view>
@@ -41,7 +41,7 @@
             </view>
         </formids>
     </view>
-    <formids class="submit" bindclick="submitOrder">
+    <formids class="submit" bindclick="submitOrder" wx:if="{{openid==order.openid && openid}}">
         <view class="submit">确认下单</view>
     </formids>
 </view>

@@ -48,10 +48,21 @@ Page({
     App.Advance.CreateOrder({
       rid: this.data.options.rid,
       identity:this.data.options.identity,
-      status:'0,1'
+      status:'0,1',
+      openid:getApp().openid,
     }).then(res => {
       let orderItemCount=0;
       res.data.cookbooklist.forEach(cb=>{
+        if(this.data.options.identity==1 && cb.status>0){
+          wx.redirectTo({
+            url:util.http_build_query({
+              rid:this.data.options.rid,
+              oid:res.data.id,
+              identity:1
+            },'/pack-cookbook/pages/success')
+          });
+          return false;
+        }
         orderItemCount+=parseInt(cb.num)
       })
       this.setData({

@@ -8,9 +8,11 @@
         <view class="title Medium">订单提交成功</view>
         <view class="optx flex-vc">
             <view class="opt-view flex-ll">
-                <formids bindclick="gotoEditor" class="width:50%;">
+
+                <formids bindclick="gotoEditor" class="width:50%;" wx:if="{{options.identity==2}}">
                     <view class="but editor" style="width: 100%;">修改菜品</view>
                 </formids>
+
                 <button class="but share button-none" open-type="share">分享</button>
             </view>
         </view>
@@ -81,7 +83,7 @@
 <view style="height: 150rpx;width: 100%;"></view>
 <view class="optx flex-vc" wx:if="{{options.hasSuccess!=1 && options.hasOnlyShow!=1}}">
     <view class="opt-view flex-ll">
-        <formids bindclick="gotoEditor" class="width:50%;">
+        <formids bindclick="gotoEditor" class="width:50%;" wx:if="{{options.identity==2}}">
             <view class="but editor" style="width: 100%;">修改菜品</view>
         </formids>
         <button class="but share button-none" open-type="share">分享</button>

@@ -120,9 +120,10 @@
   text-align: center;
 
 }
-.opt-view .but:first-child{
+.opt-view .editor{
   border-right: 2rpx solid #979797;
 }
+
 .pages .optx{
   position: relative;
   background-color: #fefefe;

@@ -214,6 +214,7 @@ Page({
     }else{
       App.Advance.CreateOrder({
         rid:this.id,
+        openid:getApp().openid,
       }).then(res=>{
         if(res.ret!=200){
           return util.toast(res.msg,'none')

@@ -31,7 +31,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 45,
+			"current": 40,
 			"list": [
 				{
 					"id": 0,
@@ -302,7 +302,7 @@
 					"name": "pack-cookbook/pages/success",
 					"pathName": "pack-cookbook/pages/success",
 					"query": "rid=1196&oid=1&identity=1&hasSuccess=1",
-					"scene": "1001"
+					"scene": 1001
 				},
 				{
 					"id": -1,
@@ -340,7 +340,7 @@
 					"id": 40,
 					"name": "邀请Ren   pages/customer/index ",
 					"pathName": "pages/customer/detail_owner_invitation",
-					"query": "id=3672&fromid=test&hasInvitation=1&hasSellerShare=1",
+					"query": "id=6158&fromid=test&hasInvitation=1&hasSellerShare=1",
 					"scene": null
 				},
 				{