wupengfei 2 年之前
父节点
当前提交
be3d783322

+ 8 - 6
.idea/workspace.xml

@@ -2,8 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/application/common/model/UserFacility.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/user/view/member/facility.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Member.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/member/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/member/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -121,7 +123,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/common/model" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/user/view/member" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -137,11 +139,11 @@
       <recent name="D:\zs\gaoyixia\application\api\controller" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\zs\gaoyixia\application\user\view\member" />
       <recent name="D:\zs\gaoyixia\application\common\model" />
       <recent name="D:\zs\gaoyixia\application\common\service" />
       <recent name="D:\zs\gaoyixia\application\synth\view\bill_header" />
       <recent name="D:\zs\gaoyixia\application\synth\view" />
-      <recent name="D:\zs\gaoyixia\application\synth\controller" />
     </key>
   </component>
   <component name="SvnConfiguration">
@@ -212,7 +214,7 @@
       <workItem from="1672880479757" duration="22897000" />
       <workItem from="1672966192005" duration="19617000" />
       <workItem from="1673052319155" duration="16867000" />
-      <workItem from="1673226266250" duration="4554000" />
+      <workItem from="1673226266250" duration="6814000" />
     </task>
     <servers />
   </component>
@@ -375,10 +377,10 @@
     </state>
     <state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
     <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1673053690530" />
-    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1673072066577">
+    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1673233483831">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1673072066577" />
+    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1673233483831" />
     <state x="1291" y="317" key="run.anything.popup" timestamp="1672903043103">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 16 - 0
application/user/controller/Member.php

@@ -15,6 +15,7 @@
 
 namespace app\user\controller;
 use app\common\model\User;
+use app\common\model\UserFacility;
 use app\common\model\UserGroup;
 use app\common\model\UserLevel;
 use app\common\model\UserLevelRank;
@@ -273,6 +274,21 @@ class Member extends Controller
     }
 
 
+    public function facility()
+    {
+        if($this->request->isGet())
+        {
+            $user_id = input('get.user_id');
+            $list = UserFacility::where('user_id',$user_id)->column('type','facility');
+            $this->fetch('', ['list' =>$list,'user_id'=>$user_id]);
+        }else{
+            $this->success('编辑成功');
+        }
+
+
+    }
+
+
 
 
     public function export(){

+ 63 - 0
application/user/view/member/facility.html

@@ -0,0 +1,63 @@
+<style>
+    .layui-form-item {
+        margin-bottom: 1px;
+    }
+    .layui-form-radio{
+
+        margin: 0 !important;
+        padding-right:0 !important;
+    }
+    .layui-form-select{
+        margin-right: 10px !important;
+    }
+</style>
+
+<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
+
+    <div class="layui-card-body think-box-shadow padding-left-40">
+
+        <div class="layui-form-item layui-row layui-col-space15">
+            <label class="  relative">
+                <span class="color-green">安卓手机:</span>
+                <input name="facility_1" value='{$list[1]|default=""}' placeholder="" class="layui-input">
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-row layui-col-space15">
+            <label class="  relative">
+                <span class="color-green">IOS手机:</span>
+                <input name="facility_2"  value='{$list[2]|default=""}' placeholder="" class="layui-input">
+            </label>
+        </div>
+        <div class="layui-form-item layui-row layui-col-space15">
+            <label class="  relative">
+                <span class="color-green">安卓iPad:</span>
+                <input name="facility_3"  value='{$list[3]|default=""}' placeholder="" class="layui-input">
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-row layui-col-space15">
+            <label class="  relative">
+                <span class="color-green">IOSiPad:</span>
+                <input name="facility_4"  value='{$list[4]|default=""}' placeholder="" class="layui-input">
+            </label>
+        </div>
+
+    </div>
+
+
+    <div class="hr-line-dashed"></div>
+    <div class="layui-form-item text-center">
+        {notempty name='user_id'}<input type='hidden' value='{$user_id}' name='user_id'>{/notempty}
+        <button class="layui-btn" type='submit'>提交</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-close>取消</button>
+    </div>
+</form>
+<script>
+    window.form.render();
+    laydate.render({
+        elem: '#over_time'
+        ,type: 'datetime'
+        ,min:new Date().toLocaleString()
+    });
+</script>

+ 1 - 0
application/user/view/member/index.html

@@ -45,6 +45,7 @@
             </td>
             <td class='text-left'>{$vo.create_at}</td>
             <td class='text-left nowrap'>
+                <span class="layui-btn layui-btn-sm"  data-modal='{:url("facility")}?user_id={$vo.id}'>设备号</span>
                 <span class="layui-btn layui-btn-sm"  data-modal='{:url("edit")}?id={$vo.id}'>编 辑</span>
                 {if $vo.status eq 1 and auth("forbid")}
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0">禁 用</a>