From 1512ffdf99484007115469495613c8024d88fd2c Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Fri, 24 Mar 2023 14:07:32 +0800
Subject: [PATCH] edit-sylive-item

---
 home/controllers/h5/market/sylive2/Notify.php | 7 ++++++-
 home/views/h5/market/sylive2/item/detail.php  | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/home/controllers/h5/market/sylive2/Notify.php b/home/controllers/h5/market/sylive2/Notify.php
index 57829daa..bb103ee4 100644
--- a/home/controllers/h5/market/sylive2/Notify.php
+++ b/home/controllers/h5/market/sylive2/Notify.php
@@ -59,7 +59,12 @@ class Notify extends CI_Controller {
                 }else{ //支付成功
                     $res = $this->order_model->update(['status'=>1,'payTime'=>date('Y-m-d H:i:s')],['id'=>$order['id']]);
                     $act = $this->market_sylive_activity_model->get(['activityId'=>$order['activityId']]);
-                    $kpi = time() > strtotime($act['timeStart']) ? 'order' : 'beforeOrder';
+                    $jsondata = json_decode($act['jsondata'],true);
+                    if($jsondata['signBespeak']['status'] && $jsondata['signBespeak']['itemId']==$order['itemId']) { //绑定新增商品订单
+                        $kpi = 'beforeOrder';
+                    }else{
+                        $kpi = 'order';
+                    }
                     if($res){
                         $act_user = $this->act_user_model->get(['userId'=>$order['userId'],'activityId'=>$order['activityId']]);
 
diff --git a/home/views/h5/market/sylive2/item/detail.php b/home/views/h5/market/sylive2/item/detail.php
index a4193d91..b5a60b9d 100644
--- a/home/views/h5/market/sylive2/item/detail.php
+++ b/home/views/h5/market/sylive2/item/detail.php
@@ -97,7 +97,7 @@
                             <option v-for="item in biz_arr" :value="item.name">{{item.name}}</option>
                         </select>
                     </div>
-                    <div class="mt30 pl5 font-26 color-666">
+                    <div class="mt30 pl5 font-26 color-666" v-if="info.protocolTitle">
                         <label class="text-middle"><input class="text-middle" type="checkbox" v-model="isXYChecked" />
                             <span class="text-middle ml5">我已阅读并同意</span>
                         </label>
@@ -305,6 +305,9 @@
             },
             toPay() {
                 var that = this
+                if(!this.info.protocolTitle){
+                    this.isXYChecked = true;
+                }
                 if(this.info.need_shop){
                     if(!this.province){
                         mDialog.msg({
@@ -353,7 +356,7 @@
                     mDialog.msg({
                         duration: 250,
                         pause: 2000,
-                        content: "请阅读并同意《"+this.protocolTitle+"》"
+                        content: "请阅读并同意《"+this.info.protocolTitle+"》"
                     });
                 }else{
                     if(that.isSubmit){