实名认证调整

application/admin/view/party/party/edit.html

@@ -87,7 +87,7 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('工会长抽成(%)')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('族长抽成(%)')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-guilderRate" data-rule="required" class="form-control" name="row[guilderRate]" type="number" value="{$row.guilderRate|htmlentities}">
         </div>

application/api/controller/Dispatch.php

@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
+use app\common\model\Message;
 use think\Db;
 use app\common\library\Sms as Smslib;
 /**
@@ -430,6 +431,7 @@ class Dispatch extends Common
             $data["createtime"] = time();
             $res = $orderModel->insertGetId($data);
             if($res) {
+                \app\common\model\Message::addMessage($authInfo["user_id"],"派单通知","您的技能：".$skillInfo["name"]."有人下单啦，请注意查看！");
                 Db::commit();
                 $this->success('订单创建成功！',["order_no"=>$out_trade_no]);
             } else {
@@ -554,7 +556,7 @@ class Dispatch extends Common
                 $reciveuserInfo = $userModel->where(["id"=>$orderInfo["recive_id"]])->find();
                 //Smslib::notice($reciveuserInfo->mobile, $orderInfo["skill_name"],"有人接单啦",'orderNotice');
                 // 系统消息通知
-                \app\common\model\Message::addMessage($orderInfo["recive_id"],"派单通知","您的派单，技能：".$orderInfo["skill_name"]."有人接单啦，请登录伴声app查看！");
+                \app\common\model\Message::addMessage($orderInfo["recive_id"],"派单通知","您的派单，技能：".$orderInfo["skill_name"]."有人接单啦，请注意查看！");
 
                 $this->success('支付成功！');
             } else {
@@ -639,7 +641,7 @@ class Dispatch extends Common
                     //$reciveuserInfo = $userModel->where(["id"=>$orderInfo["user_id"]])->find();
                     //Smslib::notice($reciveuserInfo->mobile, $orderInfo["skill_name"],"被拒绝接单",'orderNotice');
                     // 系统消息通知
-                    \app\common\model\Message::addMessage($orderInfo["user_id"],"派单通知","您的订单，技能：".$orderInfo["skill_name"]."已被拒绝接单，请登录查看！");
+                    \app\common\model\Message::addMessage($orderInfo["user_id"],"派单通知","您的订单，技能：".$orderInfo["skill_name"]."已被拒绝接单，请注意查看！");
 
                     $this->success('订单完成。');
                 } else {
@@ -702,7 +704,7 @@ class Dispatch extends Common
                     //Smslib::send($reciveuserInfo->mobile, $orderInfo["skill_name"], "顺利完成啦！",'orderNotice');
 
                     // 系统消息通知
-                    \app\common\model\Message::addMessage($orderInfo["recive_id"],"派单通知","您的派单，技能：".$orderInfo["skill_name"]." 完成啦！，请登录查看！");
+                    \app\common\model\Message::addMessage($orderInfo["recive_id"],"派单通知","您的派单，技能：".$orderInfo["skill_name"]." 完成啦！，请注意查看！");
 
                     $this->success('恭喜！订单完成。');
                 } else {
@@ -775,6 +777,9 @@ class Dispatch extends Common
             $where["order_no"] = $order_no;
             $res = $orderModel->update($data,$where);
             if($res) {
+                if ($status == 2) {//接单发
+                    \app\common\model\Message::addMessage($orderInfo['user_id'],"订单单通知","您的订单：".$order_no."已被接单，请登录查看！");
+                }
                 $this->success('更新成功！');
             } else {
                 $this->error(__('订单创建失败！'));

application/common/service/UserService.php

@@ -132,6 +132,9 @@ class UserService
             if (isset($resultData['code']) && !empty($resultData['code'])) {
                 throw new Exception($resultData['message']);
             }
+            if (isset($resultData['result']['res']) && $resultData['result']['res'] != 1) {
+                throw new Exception($resultData['result']['description']);
+            }
             $result['data'] = $resultData;
         } catch (Exception $e) {
             $result['status'] = 0;

public/assets/js/backend/party/party.js

@@ -37,14 +37,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'party_logo', title: __('Party_logo'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
                         // {field: 'party_notice', title: __('Party_notice'), operate: 'LIKE'},
                         // {field: 'party_notice_detail', title: __('Party_notice_detail'), operate: 'LIKE'},
-                        {field: 'naming', title: __('Naming')},
+                        //{field: 'naming', title: __('Naming')},
                         // {field: 'is_online', title: __('Is_online'), searchList: {"1":__('Is_online 1'),"0":__('Is_online 0')}, formatter: Table.api.formatter.normal},
                         {field: 'status', title: __('Status'), searchList: {"-1":__('Status -1'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
                         {field: 'is_close', title: __('Is_close'), searchList: {"1":__('Is_close 1'),"0":__('Is_close 0')}, formatter: Table.api.formatter.normal},
                         {field: 'is_recommend', title: __('Is_recommend'), searchList: {"1":__('Is_recommend 1'),"0":__('Is_recommend 0')}, formatter: Table.api.formatter.normal},
-                        {field: 'party_type', title: __('Party_type')},
+                        //{field: 'party_type', title: __('Party_type')},
                         {field: 'platRate', title: __('平台抽成(%)')},
-                        {field: 'guilderRate', title: __('工会长抽成(%)')},
+                        {field: 'guilderRate', title: __('族长抽成(%)')},
                         // {field: 'party_pass', title: __('Party_pass'), operate: 'LIKE'},
                         // {field: 'is_screen', title: __('Is_screen'), searchList: {"1":__('Is_screen 1'),"0":__('Is_screen 0')}, formatter: Table.api.formatter.normal},
                         {field: 'on_model', title: __('On_model'), searchList: {"1":__('On_model 1'),"2":__('On_model 2')}, formatter: Table.api.formatter.normal},