hrjy 2 роки тому
батько
коміт
1821d05c0c

+ 8 - 8
app/admin/view/auction/auction/product_create.php

@@ -218,7 +218,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">原价<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.price" maxlength="100" value="0">
+                                                    <input type="text" name="price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.price" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -228,7 +228,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">挂售价格<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="hanging_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.hanging_price" maxlength="100" value="0">
+                                                    <input type="text" name="hanging_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.hanging_price" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -238,7 +238,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">虚拟价格<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" maxlength="100" value="0">
+                                                    <input type="text" name="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -248,7 +248,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">涨幅<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="rise" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.rise" maxlength="100" value="0">
+                                                    <input type="text" name="rise" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.rise" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -258,7 +258,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">扣除<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="deduct" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.deduct" maxlength="100" value="0">
+                                                    <input type="text" name="deduct" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.deduct" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -268,7 +268,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">赠送<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="give" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.give" maxlength="100" value="0">
+                                                    <input type="text" name="give" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.give" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -352,8 +352,8 @@
                 is_show:1,
                 image:'',
                 price:'',
-                deduct: 1.5,
-                rise: 1,
+                deduct: 1,
+                rise: 1.5,
                 info: '',
                 sort: 0,
                 auction_id: id,

+ 6 - 6
app/admin/view/auction/auction/product_edit.php

@@ -203,7 +203,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">价格<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.price" maxlength="100" value="0">
+                                                    <input type="text" name="price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.price" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -213,7 +213,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">挂售价格<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="hanging_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.hanging_price" maxlength="100" value="0">
+                                                    <input type="text" name="hanging_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.hanging_price" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -223,7 +223,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">虚拟价格<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" maxlength="100" value="0">
+                                                    <input type="text" name="fictitious_price" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.fictitious_price" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -233,7 +233,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">涨幅<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="rise" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.rise" maxlength="100" value="0">
+                                                    <input type="text" name="rise" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.rise" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -243,7 +243,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">扣除<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="deduct" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.deduct" maxlength="100" value="0">
+                                                    <input type="text" name="deduct" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.deduct" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -253,7 +253,7 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">赠送<i class="red">*</i></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="number" name="give" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.give" maxlength="100" value="0">
+                                                    <input type="text" name="give" lay-verify="title" autocomplete="off" class="layui-input" v-model="formData.give" maxlength="100" value="0">
                                                 </div>
                                             </div>
                                         </div>

+ 3 - 3
app/admin/view/auction/auction_product/create.php

@@ -364,15 +364,15 @@
                 is_show:1,
                 image:'',
                 price:'',
-                deduct: 0,
-                rise: 0,
+                deduct: 1,
+                rise: 1.5,
                 info: '',
                 sort: 0,
                 auction_id: '',
                 hanging_price: '',
                 fictitious_price: '',
                 slider_image: [],
-                give: 0
+                give: 0.5
 
             },
             rule: { //多图选择规则

+ 13 - 3
app/api/controller/user/UserController.php

@@ -82,15 +82,25 @@ class UserController
         $info = UtilService::postMore([
             ['rname', ''],
             ['cid', ''],
-			['cidimg', ''],
+            ['cidimg', ''],
         ]);
         //规则验证
         if(!$validate->Check($info)){
             return app('json')->fail($validate->getError());
         }
+        $res= User::where('card_id',$info['cid'])->count();
+        if($res >= 2){
+            return app('json')->fail('身份证最多绑定两个账号');
+        }
+        $ress= User::where('uid',$request->uid())->find();
+        if($ress['is_auth']==1||$ress['is_auth']==2){
+            return app('json')->fail('您已提交认证,不可重复提交');
+        }
+
+        $res=User::cidUser($info['rname'],$info['cidimg'], $info['cid'],$request->uid());
+        if ($res)return app('json')->success('上传成功');
+        return app('json')->fail('上传失败');
 
-		$res=User::cidUser($info['rname'],$info['cidimg'], $info['cid'],$request->uid());
-		return app('json')->success('上传成功');
     }
 	/**
 	 * 实名信息查询

+ 0 - 7
app/models/user/User.php

@@ -395,13 +395,6 @@ class User extends BaseModel
     {
         // 查询该身份证在数据库中是否存在
         $res=self::where('card_id',$cid)->find();
-        if($res['is_auth']==2){
-            return app('json')->fail('该身份信息已被注册');
-        }
-        $ress=self::where('uid',$uid)->find();
-        if($ress['is_auth']==1||$ress['is_auth']==2){
-            return app('json')->fail('您已提交认证,不可重复提交');
-        }
         //找出出生年月日
         $time= substr($cid,6,4).substr($cid,10,2).substr($cid,12,2);
         $brithday=strtotime($time);