wesmiler ECY 画画交易平台

application/common/library/CoinRate.php

@@ -64,7 +64,7 @@ class CoinRate
         $rate = isset($data['rate'])? floatval($data['rate']) : 0.00;
         $expired = isset($data['expired'])? intval($data['expired']) : 0;
         if($rate<=0 || $expired<time()){
-            $result = curl_api_get(sprintf(self::$apiUrlRp, 1, $to, $from, time()));
+            $result = curl_api_get(sprintf(self::$apiUrlRp, 1, $from, $to, time()));
             $result = $result? json_decode($result, true) : [];
             $rate = isset($result['dangqianhuilv'])? floatval($result['dangqianhuilv']) : 0.00;
             if($rate > 0){

application/common/model/Trade.php

@@ -37,7 +37,7 @@ class Trade Extends Model
         $awardBase = isset($config['award_base'])? floatval($config['award_base']['value']) : 0;
         $award = round($total + $awardBase, 2);
         $counts = [
-            'total_usdt'=> CoinRate::transfer($award),
+            'total_usdt'=> round(CoinRate::transfer($award), 2),
             'total'=> $award,
             'award'=> $total,
             'award_base'=> $awardBase,
@@ -57,10 +57,12 @@ class Trade Extends Model
     {
         $total = Trade::where(['status'=> 4,'on_resale'=>1,'relevant_userid'=> $userId])->sum('endnums');
         $releaseTotal = Trade::where(['status'=> 4,'on_resale'=>1,'relevant_userid'=> $userId])->sum('release_usdt');
+        $totalUsdt = round(CoinRate::transfer($total), 2);
         $counts = [
             'total'=> $total,
-            'release_usdt'=> $releaseTotal,
-            'surplus_usdt'=> $total-$releaseTotal,
+            'total_usdt'=> $totalUsdt,
+            'release_usdt'=> round($releaseTotal, 2),
+            'surplus_usdt'=> round($totalUsdt-$releaseTotal, 2),
         ];
 
         return $counts;

application/shop/controller/Trade.php

@@ -439,10 +439,8 @@ class Trade extends Frontend{
         $bcf=db('bonus_config')->where(['id'=>1])->find();
         $rtx=$bcf['value'];
         $goods['price_usdt'] = round(CoinRate::transfer($goods['price1']),2);
-        $goods['price_thb'] = round(CoinRate::transfer($goods['price1'],'USD','THB'),2);
-        $goods['price_idr'] = round(CoinRate::transferRp($goods['price1'],'USD','IDR'),2);
-
-        var_dump($goods);
+        $goods['price_thb'] = round(CoinRate::transfer($goods['price1'],'CNY','THB'),2);
+        $goods['price_idr'] = round(CoinRate::transferRp($goods['price1'],'CNY','IDR'),2);
         $this->view->assign([
             'selluser'=>$selluser,
             'info'=>$trade,

application/shop/view/trade/topay.html

@@ -95,6 +95,21 @@
                     <span class="am-block am-fl am-padding-right-sm">{$selluser.mobile}</span>
                 </span>
             </li>
+            {if $selluser['usdt_address'] != ''}
+            <li>
+                <span class="">USDT付款金额</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$goods.price_usdt} USDT</span>
+                </span>
+            </li>
+            <li>
+                <span class="">USDT收款地址</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$selluser.usdt_address}</span>
+                </span>
+            </li>
+            <li style="background-color: #f5f5f5; height: 8px;"></li>
+            {/if}
             {if $selluser['alipayname'] != ''}
             <li>
                 <span class="">支付宝账户</span>
@@ -137,6 +152,82 @@
                 </span>
             </li>
             {/if}
+            <li style="background-color: #f5f5f5; height: 8px;"></li>
+            {php}$thb = ($selluser['thb_bank_number'] != '' || $selluser['thb_qrcode'] != '')? true: false;{/php}
+            {if $thb}
+            <li>
+                <span class="">THB</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$goods.price_thb} THB</span>
+                </span>
+            </li>
+            {/if}
+            {if $selluser['thb_bank_number'] != ''}
+            <li>
+                <span class="">ชื่อธนาคาร</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$selluser.thb_bank}</span>
+                </span>
+            </li>
+            <li>
+                <span class="">ชื่อ นามสกุล</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$selluser.thb_bank_user_name}</span>
+                </span>
+            </li>
+            <li>
+                <span class="">เลขบัญชีธนาคาร</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$selluser.thb_bank_number}</span>
+                </span>
+            </li>
+            {/if}
+            {if $selluser['thb_qrcode'] != ''}
+            <li>
+                <span class="">คิวอาร์โค้ดธนาคาร</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm"><img src="{$selluser.thb_qrcode}" style="width: 30px"/></span>
+                </span>
+            </li>
+            {/if}
+            <li style="background-color: #f5f5f5; height: 8px;"></li>
+            {php}$idr = ($selluser['idr_bank_number'] != '' || $selluser['idr_qrcode'] != '')? true: false;{/php}
+            {if $idr}
+            <li>
+                <span class="">IDR</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$goods.price_idr} IDR</span>
+                </span>
+            </li>
+            {/if}
+            {if $selluser['idr_bank_number'] != ''}
+            <li>
+                <span class="">Bank name</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$selluser.idr_bank}</span>
+                </span>
+            </li>
+            <li>
+                <span class="">Name</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$selluser.idr_bank_user_name}</span>
+                </span>
+            </li>
+            <li>
+                <span class="">Bank card number</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm">{$selluser.idr_bank_number}</span>
+                </span>
+            </li>
+            {/if}
+            {if $selluser['idr_qrcode'] != ''}
+            <li>
+                <span class="">Payment QR code</span>
+                <span class="am-fr">
+                    <span class="am-block am-fl am-padding-right-sm"><img src="{$selluser.idr_qrcode}" style="width: 30px"/></span>
+                </span>
+            </li>
+            {/if}
         </ul>
     </div>
     <div class="am-padding-sm am-margin-top-sm am-bg-white">

application/shop/view/user/profile.html

@@ -29,7 +29,9 @@
 		}
 		#up-img-touch{ position: relative;}
 		#up-img-touch1{ position: relative;}
-		#file,#file1{
+		#up-img-touch2{ position: relative;}
+		#up-img-touch3{ position: relative;}
+		#file,#file1,#file2,#file3{
 			position: absolute;
 			top: 0;
 			width: 100%;
@@ -83,84 +85,70 @@
 				</div>
 			</div>
 		</div>
-		<div class="am-link-muted am-padding-xs">泰国银行收款</div>
+		<div class="am-link-muted am-padding-xs">THB</div>
 		<div class="am-bg-white">
 			<div class="am-form-group sc-bg">
-				<label class="am-u-sm-3 am-form-label">输入泰国银行</label>
+				<label class="am-u-sm-3 am-form-label">ชื่อ นามสกุล</label>
 				<div class="am-u-sm-9">
-					<input type="text" class=" am-text-right" placeholder="{:__('请输入银行')}" name="thb_bank" value="{$user.thb_bank}">
+					<input type="text" class="am-text-right " placeholder="{:__('请输入持卡人姓名')}" name="thb_bank_user_name" value="{$user.thb_bank_user_name}">
 				</div>
 			</div>
 			<div class="am-form-group sc-bg">
-				<label class="am-u-sm-3 am-form-label">持卡人</label>
+				<label class="am-u-sm-3 am-form-label">ื่อธนาคาร</label>
 				<div class="am-u-sm-9">
-					<input type="text" class="am-text-right " placeholder="{:__('请输入持卡人姓名')}" name="thb_bank_user_name" value="{$user.thb_bank_user_name}">
+					<input type="text" class=" am-text-right" placeholder="{:__('请输入银行')}" name="thb_bank" value="{$user.thb_bank}">
 				</div>
 			</div>
 			<div class="am-form-group sc-bg" style="margin-bottom:0!important;">
-				<label class="am-u-sm-3 am-form-label">银行卡号</label>
+				<label class="am-u-sm-3 am-form-label">เลขบัญชีธนาคาร</label>
 				<div class="am-u-sm-9">
 					<input type="text" class=" am-text-right" placeholder="{:__('请输入银行卡号')}" name="thb_bank_number" value="{$user.thb_bank_number}">
 				</div>
 			</div>
 		</div>
-		<div class="am-link-muted am-padding-xs">印尼银行收款</div>
+<!--		<div class="am-link-muted am-padding-xs">คิวอาร์โค้ดธนาคาร</div>-->
+		<div class="am-bg-white">
+			<div class=" am-form-group sc-bg" style="margin-bottom:0!important;">
+				<label class="am-u-sm-6 am-form-label">คิวอาร์โค้ดธนาคาร</label>
+				<div class="am-u-sm-6 am-text-right">
+					<div class=" userIcon "  id="up-img-touch2">
+						<form id="form3" class="am-form am-form-horizontal" method="post" enctype="multipart/form-data">
+							<img src="{$user.thb_qrcode|default='__CDN__/assets/shop/img/upload.png'}" id="img2" width="50" height="50"/>
+							<input type="file" id="file2" name="file" />
+						</form>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="am-link-muted am-padding-xs">IDR</div>
 		<div class="am-bg-white">
 			<div class="am-form-group sc-bg">
-				<label class="am-u-sm-3 am-form-label">输入印尼银行</label>
+				<label class="am-u-sm-3 am-form-label">Name</label>
 				<div class="am-u-sm-9">
-					<input type="text" class=" am-text-right" placeholder="{:__('请输入银行')}" name="idr_bank" value="{$user.idr_bank}">
+					<input type="text" class="am-text-right " placeholder="{:__('请输入持卡人姓名')}" name="idr_bank_user_name" value="{$user.idr_bank_user_name}">
 				</div>
 			</div>
 			<div class="am-form-group sc-bg">
-				<label class="am-u-sm-3 am-form-label">持卡人</label>
+				<label class="am-u-sm-3 am-form-label">Bank name</label>
 				<div class="am-u-sm-9">
-					<input type="text" class="am-text-right " placeholder="{:__('请输入持卡人姓名')}" name="idr_bank_user_name" value="{$user.idr_bank_user_name}">
+					<input type="text" class=" am-text-right" placeholder="{:__('请输入银行')}" name="idr_bank" value="{$user.idr_bank}">
 				</div>
 			</div>
 			<div class="am-form-group sc-bg" style="margin-bottom:0!important;">
-				<label class="am-u-sm-3 am-form-label">银行卡号</label>
+				<label class="am-u-sm-3 am-form-label">Bank card number</label>
 				<div class="am-u-sm-9">
 					<input type="text" class=" am-text-right" placeholder="{:__('请输入银行卡号')}" name="idr_bank_number" value="{$user.idr_bank_number}">
 				</div>
 			</div>
 		</div>
-		<div class="am-link-muted am-padding-xs">微信收款</div>
+<!--		<div class="am-link-muted am-padding-xs">IDR Payment QR code</div>-->
 		<div class="am-bg-white">
 			<div class=" am-form-group sc-bg" style="margin-bottom:0!important;">
-				<label class="am-u-sm-6 am-form-label"><img src="__CDN__/assets/shop/img/wx.png" width="30"/>微信收款码</label>
-				<div class="am-u-sm-6 am-text-right">
-					<div class=" userIcon "  id="up-img-touch1">
-						<form id="form2" class="am-form am-form-horizontal" method="post" enctype="multipart/form-data">
-							<img src="{$user.wxprc|default='__CDN__/assets/shop/img/upload.png'}" id="img1" width="50" height="50"/>
-							<input type="file" id="file1" name="file" />
-						</form>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="am-link-muted am-padding-xs">泰国微信收款</div>
-		<div class="am-bg-white">
-			<div class=" am-form-group sc-bg" style="margin-bottom:0!important;">
-				<label class="am-u-sm-6 am-form-label"><img src="__CDN__/assets/shop/img/wx.png" width="30"/>微信收款码</label>
-				<div class="am-u-sm-6 am-text-right">
-					<div class=" userIcon "  id="up-img-touch2">
-						<form id="form3" class="am-form am-form-horizontal" method="post" enctype="multipart/form-data">
-							<img src="{$user.wxprc|default='__CDN__/assets/shop/img/upload.png'}" id="img2" width="50" height="50"/>
-							<input type="file" id="file2" name="file" />
-						</form>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="am-link-muted am-padding-xs">印尼微信收款</div>
-		<div class="am-bg-white">
-			<div class=" am-form-group sc-bg" style="margin-bottom:0!important;">
-				<label class="am-u-sm-6 am-form-label"><img src="__CDN__/assets/shop/img/wx.png" width="30"/>微信收款码</label>
+				<label class="am-u-sm-6 am-form-label">Payment QR code</label>
 				<div class="am-u-sm-6 am-text-right">
 					<div class=" userIcon "  id="up-img-touch3">
 						<form id="form4" class="am-form am-form-horizontal" method="post" enctype="multipart/form-data">
-							<img src="{$user.wxprc|default='__CDN__/assets/shop/img/upload.png'}" id="img3" width="50" height="50"/>
+							<img src="{$user.idr_qrcode|default='__CDN__/assets/shop/img/upload.png'}" id="img3" width="50" height="50"/>
 							<input type="file" id="file3" name="file" />
 						</form>
 					</div>
@@ -187,6 +175,23 @@
 				</div>
 			</div>
 		</div>
+		<div class="am-link-muted am-padding-xs">微信收款</div>
+		<div class="am-bg-white">
+			<div class=" am-form-group sc-bg" style="margin-bottom:0!important;">
+				<label class="am-u-sm-6 am-form-label"><img src="__CDN__/assets/shop/img/wx.png" width="30"/>微信收款码</label>
+				<div class="am-u-sm-6 am-text-right">
+					<div class=" userIcon "  id="up-img-touch1">
+						<form id="form2" class="am-form am-form-horizontal" method="post" enctype="multipart/form-data">
+							<img src="{$user.wxprc|default='__CDN__/assets/shop/img/upload.png'}" id="img1" width="50" height="50"/>
+							<input type="file" id="file1" name="file" />
+						</form>
+					</div>
+				</div>
+			</div>
+		</div>
+
+
+
 	</div>
 </div>
 <input type="hidden" name="alipayprc" id="alipayprc" value="{$user.alipayprc}"/>
@@ -273,8 +278,8 @@
             success: function (result) {
                 if(result.code>0)
                 {
-                    $('#img2').attr('src',result.data.url);
-                    $('#thbqrcode').val(result.data.url);
+                    $('#img1').attr('src',result.data.url);
+                    $('#wxprc').val(result.data.url);
                 }else{
                     layer.msg(result.msg);
                 }
@@ -298,9 +303,9 @@
 		/*当读取操作成功完成时调用*/
 		reader.onload = function(e) {
 			console.log(e); //查看对象
-			image1.setAttribute("src", this.result)
+			image2.setAttribute("src", this.result)
 		}
-		var formData = new FormData($( "#form2" )[0]);
+		var formData = new FormData($( "#form3" )[0]);
 		$.ajax({
 			//几个参数需要注意一下
 			type: "POST",//方法类型
@@ -312,8 +317,8 @@
 			success: function (result) {
 				if(result.code>0)
 				{
-					$('#img1').attr('src',result.data.url);
-					$('#wxprc').val(result.data.url);
+					$('#img2').attr('src',result.data.url);
+					$('#thbqrcode').val(result.data.url);
 				}else{
 					layer.msg(result.msg);
 				}
@@ -337,9 +342,9 @@
 		/*当读取操作成功完成时调用*/
 		reader.onload = function(e) {
 			console.log(e); //查看对象
-			image1.setAttribute("src", this.result)
+			image3.setAttribute("src", this.result)
 		}
-		var formData = new FormData($( "#form2" )[0]);
+		var formData = new FormData($( "#form4" )[0]);
 		$.ajax({
 			//几个参数需要注意一下
 			type: "POST",//方法类型

application/shop/view/user/releaselog.html

@@ -64,7 +64,7 @@
 								        '<div class=" am-margin-right">{:__("释放总额")}<em class="am-text-warning am-padding-left-xs">'+json[i].usdt_num+' USDT</em></div>'+
 								        '<div class=" am-margin-right">{:__("加速值")}<em class="am-text-warning am-padding-left-xs">'+json[i].speed_usdt+' USDT</em></div>'+
 								        '<div class=" am-margin-right">{:__("到账金额")}<em class="am-text-warning am-padding-left-xs">'+json[i].money+' 元</em></div>'+
-										'<div class="am-margin-right">{:__("当前余额")}<em class="am-text-warning am-padding-left-xs">'+json[i].balance+' 元</em></div>'+
+										'<div class="am-margin-right">{:__("当前余额")}<em class="am-text-warning am-padding-left-xs">'+json[i].balance+' USDT</em></div>'+
 										'<div >{:__("时间")}<em class="am-text-warning am-padding-left-xs">'+json[i].times+'</em></div>'+
 										'<div >{:__("状态")}<em class="'+(json[i].status==1? 'am-text-success':'am-text-warning')+' am-padding-left-xs">'+(json[i].status==1?'已到账':'待处理')+'</em></div>'+
 									'</li>';

application/shop/view/user/withdraw.html

@@ -91,7 +91,7 @@
 				</form>
 			</div>
 		</div>
-		<p class="am-text-xs am-padding-sm "><em class="am-text-danger">提示：</em>提现金额为{$config.withdraw_cap}的倍数,最低{$config.withdraw_min}元，汇率1元={$coinRate}USDT</p>
+		<p class="am-text-xs am-padding-sm "><em class="am-text-danger">提示：</em>提现金额为{$config.withdraw_cap}的倍数,最低{$config.withdraw_min}USDT，汇率1元={$coinRate}USDT</p>
 			<div class="am-margin-sm">
 				<button type="button" class="am-btn am-btn-danger am-round am-btn-block" id="submit">{:__('确定')}</button>
 			</div>

application/shop/view/user/withdrawdetaile.html

@@ -63,6 +63,10 @@
 										'</div>'+
 								        '<div class=" am-margin-right">{:__("提现数量")}<em class="am-text-warning am-padding-left-xs">'+json[i].amount+'</em></div>'+
 									    '<div >{:__("手续费")}<em class="am-text-warning am-padding-left-xs">'+json[i].fee+'</em></div>';
+									// if(json[i].type == 'USDT'){
+									// 	_ += '<div class="am-margin-right">{:__("到账USDT")}<em class="am-text-warning am-padding-left-xs">'+json[i].usdt_num+'</em></div>';
+									//
+									// }
 										_ +='<div >{:__("时间")}<em class="am-text-warning am-padding-left-xs">'+json[i].times+'</em></div>'+
 										'<div >{:__("状态")}<em class="'+(json[i].process_status==2? 'am-text-success':'am-text-warning')+' am-padding-left-xs">'+(json[i].process_status==2?'已通过':(json[i].process_status==-1?'已拒绝'+(json[i].remark?'('+json[i].remark+')':'')+'':'待审核'))+'</em></div>'+
 									'</li>';

public/assets/js/backend/bonus/withdrawals.js

@@ -29,8 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'fee', title: __('Fee'), operate:'BETWEEN'},
                         {field: 'fack_receive', title: __('Fack_receive'), operate:'BETWEEN'},
                         {field: 'usdt_address', title: __('收款USDT钱包'), operate:'BETWEEN'},
-                        {field: 'prc', title: __('收款码'), operate:'BETWEEN', formatter: Table.api.formatter.image},
-                        {field: 'name', title: __('姓名'), operate:'BETWEEN'},
+                        // {field: 'prc', title: __('收款码'), operate:'BETWEEN', formatter: Table.api.formatter.image},
+                        // {field: 'name', title: __('姓名'), operate:'BETWEEN'},
                         {field: 'money_type_name', title: __('Money_type')},
                         {field: 'status_desc', title: __('Process_status'), formatter: Table.api.formatter.status},
                         {field: 'remark', title: __('Remark')},