2 년 전 · fab9dcce04
--- a/app/admin/view/auction/auction/product.php
+++ b/app/admin/view/auction/auction/product.php
@@ -41,12 +41,12 @@
 
				                                 </div>
			
 
				                             </div>
			
 
				                             <div class="layui-inline">
			
 
				-                                <label class="layui-form-label" style="top: -4.5px">是否上架</label>
			
 
				+                                <label class="layui-form-label" style="top: -4.5px">是否挂售</label>
			
 
				                                 <div class="layui-input-block">
			
 
				                                     <select name="is_show">
			
 
				                                         <option value="">全部</option>
			
 
				-                                        <option value="2">未上架</option>
			
 
				-                                        <option value="1">已上架</option>
			
 
				+                                        <option value="2">未挂售</option>
			
 
				+                                        <option value="1">已挂售</option>
			
 
				                                     </select>
			
 
				                                 </div>
			
 
				                             </div>
			
--- a/app/admin/view/auction/auction_product/index.php
+++ b/app/admin/view/auction/auction_product/index.php
@@ -52,12 +52,12 @@
 
				                                 </div>
			
 
				                             </div>
			
 
				                             <div class="layui-inline">
			
 
				-                                <label class="layui-form-label" style="top: -4.5px">是否上架</label>
			
 
				+                                <label class="layui-form-label" style="top: -4.5px">是否挂售</label>
			
 
				                                 <div class="layui-input-block">
			
 
				                                     <select name="is_show">
			
 
				                                         <option value="">全部</option>
			
 
				-                                        <option value="2">未上架</option>
			
 
				-                                        <option value="1">已上架</option>
			
 
				+                                        <option value="2">未挂售</option>
			
 
				+                                        <option value="1">已挂售</option>
			
 
				                                     </select>
			
 
				                                 </div>
			
 
				                             </div>
			
--- a/app/api/controller/PublicController.php
+++ b/app/api/controller/PublicController.php
@@ -17,6 +17,7 @@ use app\models\user\UserBill;
 
				 use app\models\user\WechatUser;
			
 
				 use app\Request;
			
 
				 use crmeb\services\CacheService;
			
 
				+use crmeb\services\SystemConfigService;
			
 
				 use crmeb\services\UtilService;
			
 
				 use crmeb\services\workerman\ChannelService;
			
 
				 use think\facade\Cache;
			
--- a/app/api/controller/user/UserExtractController.php
+++ b/app/api/controller/user/UserExtractController.php
@@ -68,7 +68,7 @@ class UserExtractController
 
				             ['cardnum', ''],
			
 
				             ['weixin', ''],
			
 
				         ], $request);
			
 
				-        if (time() - CacheService::get('UserExtract_' . $request->uid(), time()) < 2) return app('json')->fail('请勿连续多次提交');
			
 
				+        if (time() - CacheService::get('UserExtract_' . $request->uid(), time()) < 10) return app('json')->fail('请勿连续多次提交');
			
 
				         else CacheService::set('UserExtract_' . $request->uid(), time());
			
 
				         if (!preg_match('/^(([1-9]\d*)|0)(\.\d{1-2})?$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
			
 
				         $user = $request->user();
			
--- a/app/models/auction/AuctionOrder.php
+++ b/app/models/auction/AuctionOrder.php
@@ -43,8 +43,9 @@ class AuctionOrder extends BaseModel
 
				     {
			
 
				         if ($data['order_id']){
			
 
				             $list = self::alias('a')
			
 
				-                ->field('a.*,u.nickname,u.avatar,u.uid as user_id')
			
 
				-                ->leftJoin('user u', 'a.collection_id = u.uid')
			
 
				+                ->field('a.*,u.nickname,u.avatar,u.uid as user_id,c.nickname as c_nickname,c.phone')
			
 
				+                ->leftJoin('user u', 'a.uid = u.uid')
			
 
				+                ->leftJoin('user c', 'a.collection_id = c.uid')
			
 
				                 ->where('a.order_id', $data['order_id'])->find(); //详细订单
			
 
				             $pay = AuctionPay::where('uid', $list['collection_id'])->select();
			
 
				 
			
--- a/public/index/index.html
+++ b/public/index/index.html
@@ -1,2 +1,2 @@
 
				 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
			
 
				-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.bdef51cf.js></script></body></html>
			
 
				+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.44f7a18f.js></script></body></html>
			
--- a/public/index/static/js/index.44f7a18f.js
+++ b/public/index/static/js/index.44f7a18f.js
--- a/public/index/static/js/pages-hall-halllist.67f810fa.js
+++ b/public/index/static/js/pages-hall-halllist.67f810fa.js
--- a/public/index/static/js/pages-hall-hallpay.fa599c14.js
+++ b/public/index/static/js/pages-hall-hallpay.fa599c14.js
--- a/public/index/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~0d48236a.60cea1b7.js
+++ b/public/index/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~0d48236a.60cea1b7.js
--- a/public/index/static/js/pages-order-hallorderDetail.81112159.js
+++ b/public/index/static/js/pages-order-hallorderDetail.81112159.js
--- a/public/index/static/js/pages-order-order.7317e5be.js
+++ b/public/index/static/js/pages-order-order.7317e5be.js
--- a/public/index/static/js/pages-user-user.dea20845.js
+++ b/public/index/static/js/pages-user-user.dea20845.js