wesmiler ECY 画画交易平台

application/api/controller/Index.php

@@ -67,7 +67,7 @@ class Index extends Api
             $this->error('非法请求');
         }
 
-        if(date('H:i') >= '20:00'){
+        if(date('H:i') >= '23:00'){
             $this->error('不在释放处理时间段内');
         }
 

application/api/controller/Shop.php

@@ -45,7 +45,7 @@ class Shop extends Api
 		$map['on_sale']=1;
 		$map['on_resale']=2;
 		$pagesize=10;
-        $map['istrade']=0;
+//        $map['istrade']=0;
         /*获取茶室*/
         $studio=db('studio')->where(['title'=>$this->auth->login_studio])->find();
         if($studio)
@@ -64,7 +64,8 @@ class Shop extends Api
         if(time()>=strtotime(date("Y-m-d {$studio['start']}")) && time()<=strtotime(date("Y-m-d {$studio['end']}")))
         {
             $list=db('goods')->where($map)->page($p,$pagesize)->order('id desc')->select();
-            $data['sql']=db()->getlastsql();
+
+            //$data['sql']=db()->getlastsql();
         }else{
             $totalPage=0;
             $list=[];

application/api/controller/Trade.php

@@ -69,9 +69,9 @@ class Trade extends Api
             $this->error('已结束');
         }else{
             $user=get_user_data($this->auth->id);
-            if(empty($user['bank_number'])  && empty($user['wxprc'])  &&empty($user['alipayprc']))
+            if(empty($user['bank_number'])  && empty($user['wxprc'])  &&empty($user['alipayprc']) && empty($user['usdt_address']) && empty($user['thb_bank_number']) && empty($user['idr_bank_number']))
             {
-                $this->error('请完善收款账户信息，在交易');
+                $this->error('请至少完善一个收款账户信息，在交易');
             }
             // if($user['isreal'] != 2)
             // {
@@ -80,7 +80,7 @@ class Trade extends Api
             $addressCnt=db('user_address')->where(['userid'=>$user['id']])->count();
             if($addressCnt == 0)
             {
-                $this->error('您还未添加地址~');
+                //$this->error('您还未添加地址~');
             }
             if($ginfo['userid'] == $this->auth->id)
             {
@@ -755,9 +755,9 @@ class Trade extends Api
             {
                 $v['status_desc']='交易完成';
             }elseif($v['status'] == 3 && $v['issell'] == 1){
-                $v['status_desc']='代售审核中';
+                $v['status_desc']='上架审核中';
             }elseif($v['status'] == 3 && $v['issell'] == 2){
-                $v['status_desc']='已代售';
+                $v['status_desc']='已上架';
             }else{
                 $v['status_desc']=config('tradeStatus')[$v['status']];
             }
@@ -895,7 +895,7 @@ class Trade extends Api
         }
 
         db()->startTrans();
-        $res=db('trade')->where(['id'=>$id,'status'=>4])->update(['on_resale'=>1]);
+        $res=db('trade')->where(['id'=>$id,'status'=>3])->update(['on_resale'=>1,'status'=>4]);
         $res1=db('goods')->where(['id'=>$trade['goodsid']])->update(['time1'=>time(),'on_resale'=> 1]);
         if($res && $res1)
         {

application/api/controller/User.php

@@ -940,32 +940,12 @@ class User extends Api
     function profile()
     {
         $param = $this->request->post();
-        // if (empty($param['verify'])) {
-        //     $this->error(__('请填写验证码'));
-        // }
-        // if($param['verify'] != config('site')['verify_code'])
-        // {
-        //     if ($param['verify'] != session('mobileVerify')) {
-        //         $this->error(__('验证码输入有误'));
-        //     }
-        // }
-        //unset($param['verify'] );
-        //if(!$param['wxprc'])
-        //{
-        //    $this->error('请完善微信资料');
-        //}
-        if(isset($param['usdt_address']) && !$param['usdt_address'])
+        $check = (($param['bank'] && $param['bank_user_name'] && $param['bank_number']) || ($param['alipayprc'] && $param['alipay_name'] && $param['alipayname']) || ($param['wxprc']) || ($param['usdt_address']) || ($param['thb_bank_user_name'] && $param['thb_bank'] && ($param['thb_bank_number'] || $param['thb_qrcode'])) || ($param['idr_bank_user_name'] && $param['idr_bank'] && ($param['idr_bank_number'] || $param['idr_qrcode'])));
+        if(!$check)
         {
-            $this->error('请填写USDT钱包地址');
+            $this->error('请至少完整填写一项收款信息');
         }
-        if(isset($param['bank']) && !($param['bank'] && $param['bank_user_name'] && $param['bank_number']))
-        {
-            $this->error('请完善银行卡资料');
-        }
-        //if(!($param['alipayname'] && $param['alipayprc']))
-        //{
-        //    $this->error('请完善支付宝资料');
-        //}
+
         $intime=get_user_data($this->auth->id,'intime');
         $userid = $this->auth->id;
         $param['isuser']=1;

application/shop/view/goods/goodsdetailed.html

@@ -138,8 +138,10 @@
                     console.log(data);
                     if(data.code>0)
                     {
-                        layer.msg(data.msg);
-                        //location="/shop/index/index";
+						layer.msg(data.msg);
+                        setTimeout(function(){
+							location.reload();
+						}, 800)
                     }else{
                         layer.msg(data.msg);
                     }

application/shop/view/goods/goodslist.html

@@ -347,7 +347,7 @@
 						var json=data.data.list;
 						for(var i = 0; i < json.length; i++){
 						    var _saleout='';
-						    if(json[i].flag == 1)
+						    if(json[i].istrade == 1 || json[i].flag == 1)
 							{
                                 _saleout='<img src="__CDN__/assets/shop/img/saleout1.png" class="saleout"/>';
 							}

application/shop/view/goods/index.html

@@ -97,6 +97,8 @@
 
         .account .block .money {
             color: #fcc315;
+            /*font-family: '黑体';*/
+            font-weight: bold;
         }
 
         .account .award {
@@ -106,6 +108,7 @@
         .account .award .money {
             font-weight: bold;
             margin-top: 20px;
+            font-size: 18px;
         }
 
         .account .release {

application/shop/view/trade/trade2.html

@@ -72,7 +72,7 @@
                             <div class="am-u-sm-4 am-padding-left-0 am-text-right am-text-danger">价值￥{$v.nums}</div>
                         </div>
                         <div class="am-padding-top-sm am-text-right">
-                            {if $v['flag'] == 1 && $v['status'] == 2}
+                            {if $v['flag'] == 1 && $v['status'] == 2 }
                            <span><input type="button" class="am-btn am-btn-danger am-btn-xs confirmorder" value="确认收款" data-id="{$v.id}"></span>
                            <span><input type="button" class="am-btn am-btn-success am-btn-xs appeal" value="申诉" data-id="{$v.id}"></span>
                            {/if}

application/shop/view/trade/tradelist.html

@@ -133,6 +133,7 @@
                     }else{
                         newprice=json[i].nums
                     }
+
                     if(json[i].flag == 2 && json[i].status == 1)
                     {
                         btn='<span><input type="button" class="am-btn am-btn-danger am-btn-xs" value="支付" onclick="topay('+json[i].id+')"></span>&nbsp;';
@@ -145,10 +146,14 @@
                         btn='<span><input type="button" class="am-btn am-btn-danger am-btn-xs" value="取消申诉" onclick="tocancelappeal('+json[i].id+')"></span>&nbsp;';
                     }else if(json[i].flag == 2 && json[i].status == 3 && json[i].issell == 0)
                     {
-                        btn='<span><input type="button" class="am-btn am-btn-danger am-btn-xs" value="代售" onclick="tosell('+json[i].id+')"></span>&nbsp;'+
-                           '<span><input type="button" class="am-btn am-btn-success am-btn-xs" value="发货到家" onclick="toorder('+json[i].id+')"></span>&nbsp;';
+                        btn='<span><input type="button" class="am-btn am-btn-danger am-btn-xs" value="上架" onclick="tosell('+json[i].id+')"></span>&nbsp;'+
+                           '<span><input type="button" class="am-btn am-btn-success am-btn-xs" value="发货到家" ></span>&nbsp;';
+                           // '<span><input type="button" class="am-btn am-btn-success am-btn-xs" value="发货到家" onclick="toorder('+json[i].id+')"></span>&nbsp;';
+                    }
+                    if(json[i].issell == 2 && json[i].on_resale != 1)
+                    {
+                        btn+='<span><input type="button" class="am-btn am-btn-danger am-btn-xs" value="转售平台" onclick="toresell('+json[i].id+')"></span>&nbsp;';
                     }
-
                     var _ =
                         '<div class="am-margin-bottom-xs am-bg-white">'+
                             '<div class="am-g   am-padding-xs am-text-left ubb">'+
@@ -200,6 +205,27 @@
             getList();
         }
     }
+    function toresell(e)
+    {
+        //询问框
+        layer.confirm('确认要转售此商品给平台？', {
+            title:'提示',
+            btn: ['确认','取消'] //按钮
+        }, function(){
+            jQuery.post("{:url('api/trade/resaletrade')}" ,{id:e,type:1},function(data) {
+                if(data.code>0)
+                {
+                    layer.msg(data.msg,{time:1000},function(){
+                        location=location;
+                    });
+                }else{
+                    layer.msg(data.msg);
+                }
+            });
+        }, function(){
+
+        });
+    }
     function showtrade(e)
     {
         location="/shop/trade/showtrade/id/"+e;

application/shop/view/user/index.html

@@ -48,7 +48,7 @@
 	<div class="am-g " style="background: #274704">
 		<div  class="am-u-sm-4 am-padding-top-lg am-text-center am-text-white">
 			<p>余额</p>
-			<p class="am-text-warning am-text-lg">{$user.bonus}</p>
+			<p class="am-text-warning am-text-lg">{$user.usdt}</p>
 			<p style="border: 1px solid #fff;border-radius: 10px;" onclick="window.location='withdraw.html'">提现</p>
 		</div>
 		<div  class="am-u-sm-4 am-padding-top-lg am-padding-bottom-lg am-text-center">

application/shop/view/user/profile.html

@@ -83,13 +83,19 @@
 				<div class="am-u-sm-6 am-text-right">
 					<div class=" userIcon"  id="up-img-touch">
 						<form id="form1" class="am-form am-form-horizontal" method="post" enctype="multipart/form-data">
-							<img src="{$user.wxprc|default='__CDN__/assets/shop/img/upload.png'}" id="img" width="50" height="50"/>
+							<img src="{$user.alipayprc|default='__CDN__/assets/shop/img/upload.png'}" id="img" width="50" height="50"/>
 							<input type="file" id="file" name="file" />
 						</form>
 					</div>
 				</div>
 			</div>
 			<div class="am-form-group sc-bg">
+				<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="alipay_name" value="{$user.alipay_name}">
+				</div>
+			</div>
+			<div class="am-form-group sc-bg">
 				<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="alipayname" value="{$user.alipayname}">
@@ -372,6 +378,7 @@
     $('#submit').click(function(){
         var params={};
 		params.alipayname=$('input[name=alipayname]').val();
+		params.alipay_name=$('input[name=alipay_name]').val();
 		params.alipayprc=$('#alipayprc').val();
 		params. wxprc=$('#wxprc').val();
 

public/assets/shop/css/menu/bootstrapmb.com.css

@@ -4,12 +4,12 @@ body {
     /*background: linear-gradient(top, #F68344 0.00%, #98370F 60.00%);*/
     /*background-size: 2500px 1600px;*/
     background-repeat: no-repeat;
-    font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+    /*font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;*/
     font-weight: 300;
     -webkit-font-smoothing: subpixel-antialiased;
 
     font-size: 100%;
-    font-family: Helvetica;
+    /*font-family: Helvetica;*/
 }
 
 #warp {