Browse Source

社区必填

linwu 2 years ago
parent
commit
e357566036

+ 1 - 1
app/BaseController.php

@@ -73,7 +73,7 @@ abstract class BaseController
      * @return array|string|true
      * @throws ValidateException
      */
-    protected function validate(array $data, $validate, array $message = [], bool $batch = false)
+    protected function validate(array $data, $validate, array $message = [], $batch = false)
     {
         if (is_array($validate)) {
             $v = new Validate();

+ 9 - 9
app/admin/controller/User.php

@@ -254,7 +254,7 @@ class User extends BaseController
         )));
     }
     
-    // 用户聘豆
+    // 用户积分
     public function integralList()
     {
         return view('user/integrallist');
@@ -307,15 +307,15 @@ class User extends BaseController
             array('user.bankcard.openbank','开户行'),
             array('user.bankcard.account','帐户名'),
             array('user.bankcard.number','账户号'),
-            array('title','聘豆标题'),
+            array('title','积分标题'),
             array('itype_text','类型'),
 			array('status_text','状态'),
-            array('intvalue','聘豆变更值'),
-            array('intmoney','聘豆金额'),
+            array('intvalue','积分变更值'),
+            array('intmoney','积分金额'),
             array('remark','备注'),
             array('createtime','注册时间'),
         );
-        export_excel("用户聘豆", $xlsCell, $xlsData);
+        export_excel("用户积分", $xlsCell, $xlsData);
     }
     
     
@@ -354,7 +354,7 @@ class User extends BaseController
         if ($integral->isEmpty()) {
             exit(json_encode(array(
                 'code' 	=> 1,
-                'msg'	=> "用户聘豆记录不存在"
+                'msg'	=> "用户积分记录不存在"
             )));
         }
         $createtime = input('createtime/s', date("Y-m-d H:i:s"));
@@ -439,7 +439,7 @@ class User extends BaseController
         if ($intvalue==0) {
             exit(json_encode(array(
                 'code' 	=> 1,
-                'msg'	=> "聘豆变更值不能为0"
+                'msg'	=> "积分变更值不能为0"
             )));
         }
         $data = array(
@@ -670,8 +670,8 @@ class User extends BaseController
             array('nickname','昵称'),
             array('realname','姓名'),
             array('mobile','手机号'),
-            array('integral','可用聘豆'),
-            array('inttotal','累计聘豆'),
+            array('integral','可用积分'),
+            array('inttotal','累计积分'),
             array('status_text','状态'),
             array('isvip_text','是否VIP'),
             array('authstatus_text','是否实名认证'),

+ 2 - 2
app/admin/view/comjobs/comjobsform.html

@@ -72,9 +72,9 @@
 						</div>
 
 						<div class="layui-form-item">
-							<label class="layui-form-label">社区</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>社区</label>
 							<div class="layui-input-block">
-								<select name="community" lay-search="">
+								<select name="community" lay-search="" lay-verify="required">
 									<option value="">请选择社区</option>
 									{volist name="communitylist" id="vo"}
 									<option value="{$vo.code}" {eq name="vo.code" value="$comjobs['community']"}selected{/eq}>{$vo.name}</option>

+ 10 - 10
app/admin/view/set/param.html

@@ -174,21 +174,21 @@
 							<label class="layui-form-label">发布招聘</label>
 							<div class="layui-input-block">
 								<input type="text" name="addcomjobs" value="{$param.addcomjobs}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">发布招聘扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">发布招聘扣除积分</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">发布无忧聘</label>
 							<div class="layui-input-block">
 								<input type="text" name="addcomjobswyp" value="{$param.addcomjobswyp}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">发布无忧聘扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">发布无忧聘扣除积分</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">置顶招聘</label>
 							<div class="layui-input-block">
 								<input type="text" name="topcomjobs" value="{$param.topcomjobs}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">置顶招聘扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">置顶招聘扣除积分</div>
 							</div>
 						</div>
 						
@@ -196,21 +196,21 @@
 							<label class="layui-form-label">发布订单</label>
 							<div class="layui-input-block">
 								<input type="text" name="adddemand" value="{$param.adddemand}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">发布订单扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">发布订单扣除积分</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">发布无忧单</label>
 							<div class="layui-input-block">
 								<input type="text" name="adddemandwyd" value="{$param.adddemandwyd}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">发布无忧单扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">发布无忧单扣除积分</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">置顶订单</label>
 							<div class="layui-input-block">
 								<input type="text" name="topdemand" value="{$param.topdemand}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">置顶订单扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">置顶订单扣除积分</div>
 							</div>
 						</div>
 						
@@ -218,14 +218,14 @@
 							<label class="layui-form-label">发布供应</label>
 							<div class="layui-input-block">
 								<input type="text" name="addsupply" value="{$param.addsupply}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">发布供应扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">发布供应扣除积分</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">置顶供应</label>
 							<div class="layui-input-block">
 								<input type="text" name="topsupply" value="{$param.topsupply}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">置顶供应扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">置顶供应扣除积分</div>
 							</div>
 						</div>
 						
@@ -233,14 +233,14 @@
 							<label class="layui-form-label">订单咨询</label>
 							<div class="layui-input-block">
 								<input type="text" name="teldemand" value="{$param.teldemand}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">订单电话以及订单报名扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">订单电话以及订单报名扣除积分</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">供人咨询</label>
 							<div class="layui-input-block">
 								<input type="text" name="telsupply" value="{$param.telsupply}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">供人电话扣除聘豆</div>
+								<div class="layui-form-mid layui-word-aux">供人电话扣除积分</div>
 							</div>
 						</div> 
 						

+ 12 - 12
app/admin/view/user/integralform.html

@@ -2,7 +2,7 @@
 	<div class="layui-row layui-col-space15">
 		<div class="layui-col-md12">
 			<div class="layui-card">
-				<div class="layui-card-header">用户聘豆</div>
+				<div class="layui-card-header">用户积分</div>
 				<div class="layui-card-body" pad15>
 
 					<div class="layui-form layui-form-pane layui-form-pane" lay-filter="LAY-user-integralform-edit">
@@ -21,39 +21,39 @@
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label">当前聘豆</label>
+							<label class="layui-form-label">当前积分</label>
 							<div class="layui-input-block">
 								<input type="text" name="integral" value="{$user.integral}" readonly autocomplete="off" class="layui-input">
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label"><span style="color:#f90c05;">*</span>聘豆标题</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>积分标题</label>
 							<div class="layui-input-block">
-								<input type="text" name="title" value="" lay-verify="required" placeholder="请输入聘豆标题" autocomplete="off" class="layui-input">
+								<input type="text" name="title" value="" lay-verify="required" placeholder="请输入积分标题" autocomplete="off" class="layui-input">
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label"><span style="color:#f90c05;">*</span>聘豆变更值</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>积分变更值</label>
 							<div class="layui-input-block">
-								<input type="text" name="intvalue" value="" lay-verify="required" placeholder="请输入聘豆变更值" autocomplete="off"
+								<input type="text" name="intvalue" value="" lay-verify="required" placeholder="请输入积分变更值" autocomplete="off"
 								 class="layui-input">
-								<div class="layui-form-mid layui-word-aux">聘豆变更值不能为0,正值表示增加,负值表示减少。</div>
+								<div class="layui-form-mid layui-word-aux">积分变更值不能为0,正值表示增加,负值表示减少。</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label"><span style="color:#f90c05;">*</span>聘豆金额</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>积分金额</label>
 							<div class="layui-input-block">
-								<input type="text" name="intmoney" value="0.00" lay-verify="required" placeholder="请输入聘豆金额" autocomplete="off"
+								<input type="text" name="intmoney" value="0.00" lay-verify="required" placeholder="请输入积分金额" autocomplete="off"
 								 class="layui-input">
 								<div class="layui-form-mid layui-word-aux"></div>
 							</div>
 						</div>
 						<div class="layui-form-item" pane>
-							<label class="layui-form-label">聘豆类型</label>
+							<label class="layui-form-label">积分类型</label>
 							<div class="layui-input-block">
 								<input type="radio" name="itype" value="1" title="推荐奖励" checked />
-								<input type="radio" name="itype" value="2" title="聘豆充值" /> 
-								<input type="radio" name="itype" value="3" title="聘豆兑现" />
+								<input type="radio" name="itype" value="2" title="积分充值" /> 
+								<input type="radio" name="itype" value="3" title="积分兑现" />
 								<input type="radio" name="itype" value="4" title="招聘相关" />
 								<input type="radio" name="itype" value="5" title="订单相关" />
 								<input type="radio" name="itype" value="6" title="供人相关" />

+ 8 - 8
app/admin/view/user/integrallist.html

@@ -14,8 +14,8 @@
 						<select name="itype">
 							<option value="">全部类型</option>
 							<option value="1">推荐奖励</option>
-							<option value="2">聘豆充值</option>
-							<option value="3">聘豆兑现</option>
+							<option value="2">积分充值</option>
+							<option value="3">积分兑现</option>
 							<option value="4">招聘相关</option>
 							<option value="5">订单相关</option>
 							<option value="6">供人相关</option>
@@ -116,11 +116,11 @@
 					{ field: 'bankcardopenbank', title: '开户行', templet: '#useropenbankTpl', hide: true },
 					{ field: 'bankcardaccount', title: '帐户名', templet: '#useraccountTpl', hide: true },
 					{ field: 'bankcardnumber', title: '账户号', templet: '#usernumberTpl', hide: true },
-					{ field: 'title', title: '聘豆标题', edit: 'text', width: 200 },
+					{ field: 'title', title: '积分标题', edit: 'text', width: 200 },
 					{ field: 'itype_text', width: 150, title: '类型', align: 'center' },
 					{ field: 'status_text', width: 150, title: '状态', align: 'center' },
-					{ field: 'intvalue', title: '聘豆变更值', edit: 'text', width: 120, sort: true },
-					{ field: 'intmoney', title: '聘豆金额', edit: 'text', width: 120, sort: true },
+					{ field: 'intvalue', title: '积分变更值', edit: 'text', width: 120, sort: true },
+					{ field: 'intmoney', title: '积分金额', edit: 'text', width: 120, sort: true },
 					{ field: 'remark', title: '备注', edit: 'text', width: 200 },
 					{ field: 'createtime', title: '记录时间', width: 170, sort: true },
 					{ title: '操作', minWidth: 230, align: 'right', fixed: 'right', toolbar: '#setTpl' }
@@ -176,7 +176,7 @@
 				for (var i = 0; i < checkData.length; i++) {
 					idarr.push(checkData[i].id);
 				}
-				layer.confirm('确定删除所选用户聘豆记录吗?', function(index) {
+				layer.confirm('确定删除所选用户积分记录吗?', function(index) {
 					admin.req({
 						url: setter.baseAdminUrl + 'user/delintegral',
 						data: {
@@ -219,7 +219,7 @@
 		table.on('tool(LAY-user-integrallist-table)', function(obj) {
 			var data = obj.data;
 			if (obj.event === 'del') {
-				layer.confirm('确定删除此用户聘豆记录吗?', function(index) {
+				layer.confirm('确定删除此用户积分记录吗?', function(index) {
 					admin.req({
 						url: setter.baseAdminUrl + 'user/delintegral',
 						data: {
@@ -235,7 +235,7 @@
 			} else if (obj.event === 'edit') {
 				var index = layer.open({
 					type: 2,
-					title: '编辑用户聘豆',
+					title: '编辑用户积分',
 					content: 'integralupdate.html?id=' + data.id,
 					maxmin: true,
 					area: ['550px', '550px']

+ 10 - 10
app/admin/view/user/integralupdate.html

@@ -2,7 +2,7 @@
 	<div class="layui-row layui-col-space15">
 		<div class="layui-col-md12">
 			<div class="layui-card">
-				<div class="layui-card-header">用户聘豆 <font color="red">此处修改只是修改此条数据记录,不能改变用户可用聘豆和累计聘豆信息。</font>
+				<div class="layui-card-header">用户积分 <font color="red">此处修改只是修改此条数据记录,不能改变用户可用积分和累计积分信息。</font>
 				</div>
 				<div class="layui-card-body" pad15>
 
@@ -22,34 +22,34 @@
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label"><span style="color:#f90c05;">*</span>聘豆标题</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>积分标题</label>
 							<div class="layui-input-block">
-								<input type="text" name="title" value="{$integral.title}" lay-verify="required" placeholder="请输入聘豆标题"
+								<input type="text" name="title" value="{$integral.title}" lay-verify="required" placeholder="请输入积分标题"
 								 autocomplete="off" class="layui-input">
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label"><span style="color:#f90c05;">*</span>聘豆变更值</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>积分变更值</label>
 							<div class="layui-input-block">
-								<input type="text" name="intvalue" value="{$integral.intvalue}" lay-verify="required" placeholder="请输入聘豆变更值"
+								<input type="text" name="intvalue" value="{$integral.intvalue}" lay-verify="required" placeholder="请输入积分变更值"
 								 autocomplete="off" class="layui-input">
 								<div class="layui-form-mid layui-word-aux">正值表示增加,负值表示减少。</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label"><span style="color:#f90c05;">*</span>聘豆金额</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>积分金额</label>
 							<div class="layui-input-block">
-								<input type="text" name="intmoney" value="{$integral.intmoney}" lay-verify="required" placeholder="请输入聘豆金额"
+								<input type="text" name="intmoney" value="{$integral.intmoney}" lay-verify="required" placeholder="请输入积分金额"
 								 autocomplete="off" class="layui-input">
 								<div class="layui-form-mid layui-word-aux"></div>
 							</div>
 						</div>
 						<div class="layui-form-item" pane>
-							<label class="layui-form-label">聘豆类型</label>
+							<label class="layui-form-label">积分类型</label>
 							<div class="layui-input-block">
 								<input type="radio" name="itype" value="1" title="推荐奖励" {eq name="integral.itype|default=1" value="1" }checked{/eq} />
-								<input type="radio" name="itype" value="2" title="聘豆充值" {eq name="integral.itype" value="2" }checked{/eq} />
-								<input type="radio" name="itype" value="3" title="聘豆兑现" {eq name="integral.itype" value="3" }checked{/eq} />
+								<input type="radio" name="itype" value="2" title="积分充值" {eq name="integral.itype" value="2" }checked{/eq} />
+								<input type="radio" name="itype" value="3" title="积分兑现" {eq name="integral.itype" value="3" }checked{/eq} />
 								<input type="radio" name="itype" value="4" title="招聘相关" {eq name="integral.itype" value="4" }checked{/eq} />
 								<input type="radio" name="itype" value="5" title="订单相关" {eq name="integral.itype" value="5" }checked{/eq} />
 								<input type="radio" name="itype" value="6" title="供人相关" {eq name="integral.itype" value="6" }checked{/eq} />

+ 7 - 7
app/admin/view/user/param.html

@@ -24,35 +24,35 @@
 							<label class="layui-form-label">邀请注册</label>
 							<div class="layui-input-block">
 								<input type="text" placeholder="请输入..." name="shareintegral" value="{$param['shareintegral']}" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">邀请注册聘豆,即用户通过分享、推广二维码等方式,每拉一位新用户注册是所获得的聘豆。</div>
+								<div class="layui-form-mid layui-word-aux">邀请注册积分,即用户通过分享、推广二维码等方式,每拉一位新用户注册是所获得的积分。</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">代注册</label>
 							<div class="layui-input-block">
 								<input type="text" placeholder="请输入..." name="postintegral" value="{$param['postintegral']}" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">代注册聘豆,即用户通过推广码展示页推荐注册方式,每代注册一位新用户即可获得对应聘豆。</div>
+								<div class="layui-form-mid layui-word-aux">代注册积分,即用户通过推广码展示页推荐注册方式,每代注册一位新用户即可获得对应积分。</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label">兑现聘豆元</label>
+							<label class="layui-form-label">兑现积分元</label>
 							<div class="layui-input-block">
 								<input type="text" placeholder="请输入..." name="inttomoney" value="{$param['inttomoney']}" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">兑现聘豆/元,表示N聘豆可兑现一元。0表示不可兑现。</div>
+								<div class="layui-form-mid layui-word-aux">兑现积分/元,表示N积分可兑现一元。0表示不可兑现。</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">最低兑现分</label>
 							<div class="layui-input-block">
 								<input type="text" placeholder="请输入..." name="minintegral" value="{$param['minintegral']}" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">最低兑现分,最低提现聘豆额。</div>
+								<div class="layui-form-mid layui-word-aux">最低兑现分,最低提现积分额。</div>
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label">充值聘豆</label>
+							<label class="layui-form-label">充值积分</label>
 							<div class="layui-input-block">
 								<input type="text" name="intrecharge" value="{$param['intrecharge']}" placeholder="请输入..." autocomplete="off" class="layui-input">
-								<div class="layui-form-mid layui-word-aux">充值聘豆,充值一元得N个聘豆。</div>
+								<div class="layui-form-mid layui-word-aux">充值积分,充值一元得N个积分。</div>
 							</div>
 						</div>
 						<div class="layui-form-item">

+ 4 - 4
app/admin/view/user/userform.html

@@ -68,16 +68,16 @@
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label">可用聘豆</label>
+							<label class="layui-form-label">可用积分</label>
 							<div class="layui-input-block">
-								<input type="text" name="integral" value="{$user.integral|default=0}" readonly placeholder="请输入可用聘豆"
+								<input type="text" name="integral" value="{$user.integral|default=0}" readonly placeholder="请输入可用积分"
 								 autocomplete="off" class="layui-input layui-disabled">
 							</div>
 						</div>
 						<div class="layui-form-item">
-							<label class="layui-form-label"><span style="color:#f90c05;">*</span>累计聘豆</label>
+							<label class="layui-form-label"><span style="color:#f90c05;">*</span>累计积分</label>
 							<div class="layui-input-block">
-								<input type="text" name="inttotal" value="{$user.inttotal|default=0}" lay-verify="required" placeholder="请输入累计聘豆"
+								<input type="text" name="inttotal" value="{$user.inttotal|default=0}" lay-verify="required" placeholder="请输入累计积分"
 								 autocomplete="off" class="layui-input">
 							</div>
 						</div>

+ 4 - 4
app/admin/view/user/userlist.html

@@ -114,7 +114,7 @@
 			<script type="text/html" id="setTpl">
 				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="auths"><i class="layui-icon layui-icon-rate-half"></i>授权</a>
 				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="follow"><i class="layui-icon layui-icon-engine"></i>跟进</a>
-				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="integral"><i class="layui-icon layui-icon-edit"></i>聘豆</a>
+				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="integral"><i class="layui-icon layui-icon-edit"></i>积分</a>
 				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
 				<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
 			</script>
@@ -192,8 +192,8 @@
 					{ field: 'nickname', title: '昵称', edit: 'text' },
 					{ field: 'realname', title: '姓名', edit: 'text' },
 					{ field: 'mobile', title: '手机号' },
-					{ field: 'integral', title: '可用聘豆', width: 100, align: 'right', totalRow: true },
-					{ field: 'inttotal', title: '累计聘豆', width: 100, align: 'right', totalRow: true },
+					{ field: 'integral', title: '可用积分', width: 100, align: 'right', totalRow: true },
+					{ field: 'inttotal', title: '累计积分', width: 100, align: 'right', totalRow: true },
 					{ field: 'status_text', title: '状态', minWidth: 80, align: 'center' },
 					{ field: 'isvip_text', title: '是否VIP', minWidth: 100, align: 'center' },
 					{ field: 'authstatus_text', title: '实名认证', minWidth: 100, align: 'center' },
@@ -330,7 +330,7 @@
 			} else if (obj.event === 'integral') {
 				var index = layer.open({
 					type: 2,
-					title: '设置用户【' + data.nickname + '】聘豆',
+					title: '设置用户【' + data.nickname + '】积分',
 					content: 'integralform.html?userid=' + data.id,
 					maxmin: true,
 					area: ['750px', '550px']

+ 4 - 4
app/admin/view/user/userpublic.html

@@ -100,7 +100,7 @@
 			<script type="text/html" id="setTpl">
 				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="auths"><i class="layui-icon layui-icon-rate-half"></i>授权</a>
 				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="follow"><i class="layui-icon layui-icon-engine"></i>跟进</a>
-				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="integral"><i class="layui-icon layui-icon-edit"></i>聘豆</a>
+				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="integral"><i class="layui-icon layui-icon-edit"></i>积分</a>
 				<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
 				<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
 			</script>
@@ -169,8 +169,8 @@
 					{ field: 'nickname', title: '昵称', edit: 'text' },
 					{ field: 'realname', title: '姓名', edit: 'text' },
 					{ field: 'mobile', title: '手机号' },
-					{ field: 'integral', title: '可用聘豆', width: 100, align: 'right', totalRow: true },
-					{ field: 'inttotal', title: '累计聘豆', width: 100, align: 'right', totalRow: true },
+					{ field: 'integral', title: '可用积分', width: 100, align: 'right', totalRow: true },
+					{ field: 'inttotal', title: '累计积分', width: 100, align: 'right', totalRow: true },
 					{ field: 'status_text', title: '状态', minWidth: 80, align: 'center' },
 					{ field: 'isvip_text', title: '是否VIP', minWidth: 100, align: 'center' },
 					{ field: 'authstatus_text', title: '实名认证', minWidth: 100, align: 'center' },
@@ -295,7 +295,7 @@
 			} else if (obj.event === 'integral') {
 				var index = layer.open({
 					type: 2,
-					title: '设置用户【' + data.nickname + '】聘豆',
+					title: '设置用户【' + data.nickname + '】积分',
 					content: 'integralform.html?userid=' + data.id,
 					maxmin: true,
 					area: ['750px', '550px']

+ 1 - 1
app/common/model/UserIntegral.php

@@ -28,7 +28,7 @@ class UserIntegral extends Model
 	
 	public function getItypeTextAttr($value,$data)
 	{
-		$itype = [1=>'推荐奖励', 2=>'聘豆充值', 3=>'聘豆兑现', 4=>'招聘相关', 5=>'订单相关', 6=>'供人相关', 7=>'兑购消费', 8=>'其他'];
+		$itype = [1=>'推荐奖励', 2=>'积分充值', 3=>'积分兑现', 4=>'招聘相关', 5=>'订单相关', 6=>'供人相关', 7=>'兑购消费', 8=>'其他'];
 		return $itype[$data['itype']];
 	}
 	

+ 18 - 16
app/common/validate/Comjobs.php

@@ -7,23 +7,25 @@ use think\Validate;
 class Comjobs extends Validate
 {
     protected $rule = [
-        'title'			=>  'require',
-		'cateid'		=>  'require',
-		'province'		=>  'require',
-		'city'			=>  'require',
-		'district'		=>  'require',
-		'agegroup'		=>  'require',
-		'enddate'		=>  'require'
+        'title'     => 'require',
+        'cateid'    => 'require',
+        'province'  => 'require',
+        'city'      => 'require',
+        'district'  => 'require',
+        'agegroup'  => 'require',
+        'enddate'   => 'require',
+        'community' => 'require',
     ];
-	
-	protected $message  =   [
-		'title.require'			=> "招聘标题不能为空",
-		'cateid.require'		=> "岗位类型不能为空",
-		'province.require'		=> "工作地点不能为空",
-		'city.require'			=> "工作地点不能为空",
-		'district.require'		=> "工作地点不能为空",
-		'agegroup.require'		=> "招工年龄不能为空",
-		'enddate.require'		=> "截止日期不能为空"
+
+    protected $message = [
+        'title.require'     => "招聘标题不能为空",
+        'cateid.require'    => "岗位类型不能为空",
+        'province.require'  => "工作地点不能为空",
+        'city.require'      => "工作地点不能为空",
+        'district.require'  => "工作地点不能为空",
+        'agegroup.require'  => "招工年龄不能为空",
+        'enddate.require'   => "截止日期不能为空",
+        'community.require' => "社区不能为空",
     ];
 
 }

+ 8 - 8
app/dataTable.sql

@@ -273,7 +273,7 @@ CREATE TABLE IF NOT EXISTS `echo_user_integral` (
 	`intvalue` int(10) DEFAULT '0' COMMENT '积分变更值',
 	`intmoney` DECIMAL(10,2) NOT NULL DEFAULT 0.00 COMMENT '积分金额',
 	`remark` varchar(255) DEFAULT '' COMMENT '备注',
-	`itype` tinyint(4) NOT NULL DEFAULT '1' COMMENT '类型:1推荐奖励,2聘豆充值,3聘豆兑现,4招聘相关,5订单相关,6供人相关,7兑购消费,8其他',  
+	`itype` tinyint(4) NOT NULL DEFAULT '1' COMMENT '类型:1推荐奖励,2积分充值,3积分兑现,4招聘相关,5订单相关,6供人相关,7兑购消费,8其他',  
 	`status` tinyint(4) NOT NULL DEFAULT '2' COMMENT '状态:1待处理,2已成功',
 	`createtime` int(10) NOT NULL DEFAULT '0',
 	`yeartime` int(10) NOT NULL DEFAULT '0' COMMENT '年',
@@ -326,7 +326,7 @@ CREATE TABLE IF NOT EXISTS `echo_user_param` (
 	`postintegral` int(10) NOT NULL DEFAULT '0' COMMENT '代注册积分',
 	`inttomoney` int(10) NOT NULL DEFAULT '0' COMMENT '兑现积分/元',
 	`minintegral` int(10) NOT NULL DEFAULT '0' COMMENT '最低兑现分', 
-	`intrecharge` int(10) NOT NULL DEFAULT '0' COMMENT '充值聘豆',  
+	`intrecharge` int(10) NOT NULL DEFAULT '0' COMMENT '充值积分',  
 	PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 COMMENT='用户参数设置';
 INSERT INTO `echo_user_param` (`id`, `redmoney`, `usernumber`, `shareintegral`, `postintegral`, `inttomoney`, `minintegral`) VALUES
@@ -577,14 +577,14 @@ CREATE TABLE IF NOT EXISTS `echo_param` (
 	`agentformpic` varchar(255) NOT NULL DEFAULT '' COMMENT '代理门店申请页海报',
 	`workerformpic` varchar(255) NOT NULL DEFAULT '' COMMENT '企业提交信息页海报',
 		
-	`addcomjobs` int(10) NOT NULL DEFAULT '0' COMMENT '发布招聘扣除聘豆',
-	`topcomjobs` int(10) NOT NULL DEFAULT '0' COMMENT '置顶招聘扣除聘豆',
+	`addcomjobs` int(10) NOT NULL DEFAULT '0' COMMENT '发布招聘扣除积分',
+	`topcomjobs` int(10) NOT NULL DEFAULT '0' COMMENT '置顶招聘扣除积分',
 	
-	`addworder` int(10) NOT NULL DEFAULT '0' COMMENT '发布订单扣除聘豆',
-	`topworder` int(10) NOT NULL DEFAULT '0' COMMENT '置顶订单扣除聘豆',
+	`addworder` int(10) NOT NULL DEFAULT '0' COMMENT '发布订单扣除积分',
+	`topworder` int(10) NOT NULL DEFAULT '0' COMMENT '置顶订单扣除积分',
 	
-	`teldemand` int(10) NOT NULL DEFAULT '0' COMMENT '订单电话扣除聘豆',
-	`telsupply` int(10) NOT NULL DEFAULT '0' COMMENT '供人电话扣除聘豆',
+	`teldemand` int(10) NOT NULL DEFAULT '0' COMMENT '订单电话扣除积分',
+	`telsupply` int(10) NOT NULL DEFAULT '0' COMMENT '供人电话扣除积分',
 	
 	`defviewtol` int(10) NOT NULL DEFAULT '0' COMMENT '每天初始浏览量'
 	PRIMARY KEY (`id`)

+ 2 - 2
app/mainapp/controller/Demand.php

@@ -200,7 +200,7 @@ class Demand extends BaseController
 			$user = UserModel::where(1)->findOrEmpty($userid);
 			$param = ParamModel::where(1)->findOrEmpty();
 			if ($user->integral < $param->teldemand){
-				page_result(1, "接单&咨询该订单会扣除".$param->teldemand."聘豆,你当前聘豆不足。");
+				page_result(1, "接单&咨询该订单会扣除".$param->teldemand."积分,你当前积分不足。");
 			}
 			$intdata = array(
 			    'userid'		=> $userid,
@@ -247,7 +247,7 @@ class Demand extends BaseController
 	// 	$user = UserModel::where(1)->findOrEmpty($userid);
 	// 	$param = ParamModel::where(1)->findOrEmpty();
 	// 	if ($user->integral < $param->teldemand){
-	// 		page_result(1, "接单&咨询该订单会扣除".$param->teldemand."聘豆,你当前聘豆不足。");
+	// 		page_result(1, "接单&咨询该订单会扣除".$param->teldemand."积分,你当前积分不足。");
 	// 	}
 	// 	$intdata = array(
 	// 	    'userid'		=> $userid,

+ 9 - 9
app/mainapp/controller/My.php

@@ -133,7 +133,7 @@ class My extends BaseController
                 'intvalue'    => $param->postintegral,
                 'intmoney'    => 0.00,
                 'onlycontent' => "",
-                'remark'      => "推荐注册用户【" . $realname . "】奖励聘豆",
+                'remark'      => "推荐注册用户【" . $realname . "】奖励积分",
                 'itype'       => 1,
                 'status'      => 2,
                 'createtime'  => time(),
@@ -263,7 +263,7 @@ class My extends BaseController
         ]);
     }
 
-    // 我的聘豆
+    // 我的积分
     public function myIntegral()
     {
         $userid = input('userid/d', 0);
@@ -299,12 +299,12 @@ class My extends BaseController
         $moneyvalue = input('moneyvalue/f', 0.00);
         $intvalue   = intval($moneyvalue * $userparam->intrecharge);
         if ($moneyvalue <= 0.00 || $intvalue <= 0) {
-            page_result(1, "充值聘豆额不能小于0。");
+            page_result(1, "充值积分额不能小于0。");
         }
         $integral = new UserIntegralModel;
         $integral->save([
             'userid'      => $userid,
-            'title'       => "用户聘豆充值(¥" . $moneyvalue . "元" . $intvalue . "聘豆)",
+            'title'       => "用户积分充值(¥" . $moneyvalue . "元" . $intvalue . "积分)",
             'intvalue'    => $intvalue,
             'intmoney'    => $moneyvalue,
             'onlycontent' => "",
@@ -316,7 +316,7 @@ class My extends BaseController
             'monthtime'   => date('Ym'),
         ]);
         $payData = [
-            'body'         => "用户聘豆充值(¥" . $moneyvalue . "元" . $intvalue . "聘豆)",
+            'body'         => "用户积分充值(¥" . $moneyvalue . "元" . $intvalue . "积分)",
             'out_trade_no' => $integral->remark,
             'total_fee'    => intval($moneyvalue * 100),
             'openid'       => $userauths->identifier,
@@ -352,20 +352,20 @@ class My extends BaseController
         }
         $intvalue = input('intvalue/d', 0);
         if ($intvalue <= 0 || $intvalue < intval($userparam->minintegral)) {
-            page_result(1, "兑现聘豆值要大于" . $userparam->minintegral . "。");
+            page_result(1, "兑现积分值要大于" . $userparam->minintegral . "。");
         }
         if ($intvalue > intval($user->integral)) {
-            page_result(1, "兑现聘豆值不能大于当前可用聘豆。");
+            page_result(1, "兑现积分值不能大于当前可用积分。");
         }
         $integral = new UserIntegralModel;
         $intmoney = sprintf("%.2f", floatval($intvalue / $userparam->inttomoney));
         $integral->save([
             'userid'      => $userid,
-            'title'       => "用户聘豆兑现",
+            'title'       => "用户积分兑现",
             'intvalue'    => 0 - $intvalue,
             'intmoney'    => $intmoney,
             'onlycontent' => "",
-            'remark'      => "用户聘豆兑现现金",
+            'remark'      => "用户积分兑现现金",
             'itype'       => 3,
             'status'      => 1,
             'createtime'  => time(),

+ 2 - 2
app/mainapp/controller/Notify.php

@@ -19,7 +19,7 @@ class Notify extends BaseController
 	{
 		$snfirst = substr($ordersn , 0 , 1);
 		if ($snfirst==="M"){
-			// 聘豆商城订单
+			// 积分商城订单
 			$order = MallOrderModel::where('ordersn','=',$ordersn)->findOrEmpty();
 			if ($order->isEmpty()){
 				return false;
@@ -33,7 +33,7 @@ class Notify extends BaseController
 			return true;
 		
 		}elseif($snfirst==="R") {
-			// 聘豆充值
+			// 积分充值
 			$order = UserIntegralModel::where('remark','=',$ordersn)->findOrEmpty();
 			if ($order->isEmpty()){
 				return false;

+ 1 - 1
app/mainapp/controller/Supply.php

@@ -93,7 +93,7 @@ class Supply extends BaseController
 		$user = UserModel::where(1)->findOrEmpty($userid);
 		$param = ParamModel::where(1)->findOrEmpty();
 		if ($user->integral < $param->telsupply){
-			page_result(1, "拨打咨询电话会扣除".$param->telsupply."聘豆,你当前聘豆不足。");
+			page_result(1, "拨打咨询电话会扣除".$param->telsupply."积分,你当前积分不足。");
 		}
 		$intdata = array(
 		    'userid'		=> $userid,

+ 4 - 3
app/mainapp/controller/Wcomjobs.php

@@ -206,7 +206,7 @@ class Wcomjobs extends BaseController
         }
         $param = ParamModel::where(1)->findOrEmpty();
         if ($user->integral < $param->topcomjobs) {
-            page_result(1, "每次置顶招聘信息需要扣除" . $param->topcomjobs . "聘豆,你当前聘豆不足。");
+            page_result(1, "每次置顶招聘信息需要扣除" . $param->topcomjobs . "积分,你当前积分不足。");
         }
         $comjobsid = input('comjobsid/d', 0);
         $comjobs   = ComjobsModel::where(1)->findOrEmpty($comjobsid);
@@ -317,6 +317,7 @@ class Wcomjobs extends BaseController
             'recruitment_cate' => $recruitment_cate,
             'latitude'         => input('tlatitude/s', ""),
             'longitude'        => input('tlongitude/s', ""),
+            'community'        => input('community/s', ""),
         ];
         try {
             validate(ComjobsValidate::class)->check($data);
@@ -332,9 +333,9 @@ class Wcomjobs extends BaseController
                 'volume'     => 0,
             ]);
             if ($recruitment_cate == 1 && $user->integral < $param->addcomjobs) {
-                page_result(1, "每次发布普通招聘信息需要扣除" . $param->addcomjobs . "聘豆,你当前聘豆不足。");
+                page_result(1, "每次发布普通招聘信息需要扣除" . $param->addcomjobs . "积分,你当前积分不足。");
             } elseif ($recruitment_cate == 2 && $user->integral < $param->addcomjobswyp) {
-                page_result(1, "每次发布无忧招聘信息需要扣除" . $param->addcomjobswyp . "聘豆,你当前聘豆不足。");
+                page_result(1, "每次发布无忧招聘信息需要扣除" . $param->addcomjobswyp . "积分,你当前积分不足。");
             }
             $comjobs = ComjobsModel::create($data);
             $intdata = [

+ 2 - 2
app/mainapp/controller/Wdemand.php

@@ -161,7 +161,7 @@ class Wdemand extends BaseController
 		}
 		$param = ParamModel::where(1)->findOrEmpty();
 		if ($user->integral < $param->topdemand){
-			page_result(1, "每次置顶招聘订单信息需要扣除".$param->topdemand."聘豆,你当前聘豆不足。");
+			page_result(1, "每次置顶招聘订单信息需要扣除".$param->topdemand."积分,你当前积分不足。");
 		}
 		$demandid = input('demandid/d', 0);
 		$demand = DemandModel::where(1)->findOrEmpty($demandid);
@@ -280,7 +280,7 @@ class Wdemand extends BaseController
 				'telearr'			=> array()
 			]);
 			if ($user->integral < $param->adddemand){
-				page_result(1, "每次发布招聘订单信息需要扣除".$param->adddemand."聘豆,你当前聘豆不足。");
+				page_result(1, "每次发布招聘订单信息需要扣除".$param->adddemand."积分,你当前积分不足。");
 			}
 			$demand = DemandModel::create($data);
 			$intdata = array(

+ 2 - 2
app/mainapp/controller/Worker.php

@@ -272,11 +272,11 @@ class Worker extends BaseController
 		$worker = WorkerModel::where(['id'=>$workerid])->findOrEmpty();
 		$workerintegral = UserIntegralModel::where(['userid'=>$userid, 'onlycontent'=>'RegWorker'.$workerid])->findOrEmpty();
 		if (!$workerintegral->isEmpty()){
-			page_result(1, "你注册的该公司信息已领取过奖励聘豆,请不要重复领取。");
+			page_result(1, "你注册的该公司信息已领取过奖励积分,请不要重复领取。");
 		}
 		$userparam = UserParamModel::where(1)->find();
 		if ($userparam->intregworker<=0){
-			page_result(1, "奖励聘豆值不能小于等于0。");
+			page_result(1, "奖励积分值不能小于等于0。");
 		}
 		$data = array(
 		    'userid'		=> $userid,

+ 2 - 2
app/mainapp/controller/Wsupply.php

@@ -48,7 +48,7 @@ class Wsupply extends BaseController
 		}
 		$param = ParamModel::where(1)->findOrEmpty();
 		if ($user->integral < $param->topsupply){
-			page_result(1, "每次置顶招聘订单信息需要扣除".$param->topsupply."聘豆,你当前聘豆不足。");
+			page_result(1, "每次置顶招聘订单信息需要扣除".$param->topsupply."积分,你当前积分不足。");
 		}
 		$supplyid = input('supplyid/d', 0);
 		$supply = SupplyModel::where(1)->findOrEmpty($supplyid);
@@ -156,7 +156,7 @@ class Wsupply extends BaseController
 				'telearr'			=> array()
 			]);
 			if ($user->integral < $param->addsupply){
-				page_result(1, "每次发布供人信息需要扣除".$param->addsupply."聘豆,你当前聘豆不足。");
+				page_result(1, "每次发布供人信息需要扣除".$param->addsupply."积分,你当前积分不足。");
 			}
 			$supply = SupplyModel::create($data);
 			$intdata = array(

+ 2 - 2
app/worker/controller/Comjobs.php

@@ -359,7 +359,7 @@ class Comjobs extends BaseController
             }else{
 
                 if ($user->integral < $param->addcomjobs){
-                    page_result1(1, "每次发布招聘信息需要扣除".$param->addcomjobs."聘豆,你当前聘豆不足。");
+                    page_result1(1, "每次发布招聘信息需要扣除".$param->addcomjobs."积分,你当前积分不足。");
                 }
             }
 
@@ -478,7 +478,7 @@ class Comjobs extends BaseController
             }else{
 
                 if ($user->integral < $param->addcomjobswyp){
-                    page_result1(1, "每次发布招聘信息需要扣除".$param->addcomjobswyp."聘豆,你当前聘豆不足。");
+                    page_result1(1, "每次发布招聘信息需要扣除".$param->addcomjobswyp."积分,你当前积分不足。");
                 }
             }
 

+ 2 - 2
app/worker/controller/Demand.php

@@ -357,7 +357,7 @@ class Demand extends BaseController
             }else{
 
                 if ($user->integral < $param->adddemand){
-                    page_result1(1, "每次发布订单信息需要扣除".$param->adddemand."聘豆,你当前聘豆不足。");
+                    page_result1(1, "每次发布订单信息需要扣除".$param->adddemand."积分,你当前积分不足。");
                 }
             }
 
@@ -468,7 +468,7 @@ class Demand extends BaseController
             }else{
 
                 if ($user->integral < $param->adddemandwyd){
-                    page_result1(1, "每次发布无忧单需要扣除".$param->adddemandwyd."聘豆,你当前聘豆不足。");
+                    page_result1(1, "每次发布无忧单需要扣除".$param->adddemandwyd."积分,你当前积分不足。");
                 }
             }
 

+ 1 - 1
app/worker/controller/Worder.php

@@ -199,7 +199,7 @@ class Worder extends BaseController
 		];
 		if (empty($id)){
 			if ($user->integral < $param->addworder){
-				page_result(1, "每次发布订单信息需要扣除".$param->addworder."聘豆,你当前聘豆不足。");
+				page_result(1, "每次发布订单信息需要扣除".$param->addworder."积分,你当前积分不足。");
 			}
 			$data['priority'] = 0;
 			$data['updatetime'] = date("Y-m-d H:i:s");

+ 2 - 2
app/worker/view/Demand.php

@@ -356,7 +356,7 @@ class Demand extends BaseController
             }else{
 
                 if ($user->integral < $param->adddemand){
-                    page_result1(1, "每次发布订单信息需要扣除".$param->adddemand."聘豆,你当前聘豆不足。");
+                    page_result1(1, "每次发布订单信息需要扣除".$param->adddemand."积分,你当前积分不足。");
                 }
             }
 
@@ -467,7 +467,7 @@ class Demand extends BaseController
             }else{
 
                 if ($user->integral < $param->adddemandwyd){
-                    page_result1(1, "每次发布无忧单需要扣除".$param->adddemandwyd."聘豆,你当前聘豆不足。");
+                    page_result1(1, "每次发布无忧单需要扣除".$param->adddemandwyd."积分,你当前积分不足。");
                 }
             }
 

+ 2 - 2
app/worker/view/comjobs/comjobslist.html

@@ -189,7 +189,7 @@
 					layer.msg('待审核状态时,最多只能发3条免费消息');
 					return false;
 				}
-				layer.confirm('添加新的招聘信息时,会扣除{$param->addcomjobs}聘豆。确定新添加吗?',function(one) {
+				layer.confirm('添加新的招聘信息时,会扣除{$param->addcomjobs}积分。确定新添加吗?',function(one) {
 					layer.close(one);
 					var index = layer.open({
 						type: 2,
@@ -207,7 +207,7 @@
 					layer.msg('待审核状态时,最多只能发3条免费消息');
 					return false;
 				}
-				layer.confirm('添加新的无忧聘信息时,会扣除{$param->addcomjobswyp}聘豆。确定新添加吗?',function(one) {
+				layer.confirm('添加新的无忧聘信息时,会扣除{$param->addcomjobswyp}积分。确定新添加吗?',function(one) {
 					layer.close(one);
 					var index = layer.open({
 						type: 2,

+ 2 - 2
app/worker/view/demand/demandlist.html

@@ -204,7 +204,7 @@
 					return false;
 				}
 
-				layer.confirm('发布新的订单时,会扣除{$param->adddemand}聘豆。确定新发布吗?',function(one) {
+				layer.confirm('发布新的订单时,会扣除{$param->adddemand}积分。确定新发布吗?',function(one) {
 					layer.close(one);
 					var index = layer.open({
 						type: 2,
@@ -224,7 +224,7 @@
 					return false;
 				}
 
-				layer.confirm('发布新的无忧单时,会扣除{$param->adddemandwyd}聘豆。确定新发布吗?',function(one) {
+				layer.confirm('发布新的无忧单时,会扣除{$param->adddemandwyd}积分。确定新发布吗?',function(one) {
 					layer.close(one);
 					var index = layer.open({
 						type: 2,

+ 1 - 1
app/worker/view/worder/worderlist.html

@@ -140,7 +140,7 @@
 				});
 			},
 			add: function() {
-				layer.confirm('添加新的订单信息时,会扣除{$param->addworder}聘豆。确定新添加吗?', function(index) {
+				layer.confirm('添加新的订单信息时,会扣除{$param->addworder}积分。确定新添加吗?', function(index) {
 					var index = layer.open({
 						type: 2,
 						title: '添加订单信息',