15295036569
2023-06-12 312b8424400e6fd924a8a1595bb140c3a9e62a12
Merge branch 'master' of http://60.204.153.149:8081/r/dfgApi
已修改2个文件
13 ■■■■■ 文件已修改
application/api/logic/commission/Tb.php 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/index/js/xiguazhu4.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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'],
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;