From 312b8424400e6fd924a8a1595bb140c3a9e62a12 Mon Sep 17 00:00:00 2001
From: 15295036569 <349234519@qq.com>
Date: 星期一, 12 六月 2023 10:45:58 +0800
Subject: [PATCH] Merge branch 'master' of http://60.204.153.149:8081/r/dfgApi
---
application/api/logic/commission/Tb.php | 9 +++++++--
public/assets/index/js/xiguazhu4.js | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/application/api/logic/commission/Tb.php b/application/api/logic/commission/Tb.php
index 471c6e5..099863e 100644
--- a/application/api/logic/commission/Tb.php
+++ b/application/api/logic/commission/Tb.php
@@ -70,6 +70,11 @@
{
$trade_id = isset($order['trade_id']) ? $order['trade_id'] : '';
if(empty($trade_id)) return ['status'=>false,'info'=>'璁㈠崟鍙蜂负绌�'];
+ //鍒ゆ柇鏄疄浠橀噾棰濇槸鍚﹀ぇ浜�4鍏冿紝澶т簬4鍏冪洿鎺ユ櫘閫氳繑鍒�
+ if(floatval($order['alipay_total_price'])>4){
+ $res=self::fanliCommission($order);
+ return $res;
+ }
//鏍规嵁娣樺疂缁戝畾娓犻亾id鏌ヨ鐢ㄦ埛淇℃伅
$ModelUser = new ModelUser();
$user = $ModelUser->where(['t_relation_id'=>$order['relation_id']])->find();
@@ -344,7 +349,7 @@
'is_own' => 1,
'alipay_total_price' => $order['alipay_total_price'],
'pub_share_pre_fee' => !empty($order['pub_share_pre_fee']) ? $order['alipay_total_price'] : "",
- 'pub_share_fee' => !empty($order['pay_price']) ? $order['alipay_total_price'] : "",
+ 'pub_share_fee' => !empty($order['pay_price'])&&$order['pay_price']>0 ? $order['alipay_total_price'] : "",
'refund_tag' => $order['refund_tag'],
'item_img' => $order['item_img'],
'item_title' => $order['item_title'],
@@ -378,7 +383,7 @@
$item_data = [
'alipay_total_price' => $order['alipay_total_price'],
'pub_share_pre_fee' => !empty($order['pub_share_pre_fee']) ? $order['alipay_total_price'] : "",
- 'pub_share_fee' => !empty($order['pay_price']) ? $order['alipay_total_price'] : "",
+ 'pub_share_fee' => !empty($order['pay_price'])&&$order['pay_price']>0 ? $order['alipay_total_price'] : "",
'refund_tag' => $order['refund_tag'],
'tk_status' => $order['tk_status'],
'pay_price' => $order['pay_price'],
diff --git a/public/assets/index/js/xiguazhu4.js b/public/assets/index/js/xiguazhu4.js
index a9fc00e..9f3a3e0 100644
--- a/public/assets/index/js/xiguazhu4.js
+++ b/public/assets/index/js/xiguazhu4.js
@@ -209,13 +209,13 @@
marketUrl="mimarket://details?id=com.dafanguan.app";
break;
case'huawei':
- // marketUrl="appmarket://details?id=com.dafanguan.app";
+ marketUrl="appmarket://details?id=com.dafanguan.app";
break;
case'oppo':
marketUrl="oppomarket://details?packagename=com.dafanguan.app";
break;
case'vivo':
- // marketUrl="vivomarket://details?id=com.dafanguan.app";
+ marketUrl="vivomarket://details?id=com.dafanguan.app";
break;
default:
marketUrl = this.androidUrl;
--
Gitblit v1.9.3