8

plugin/admin/public/js/user.js

@@ -1,4 +1,4 @@
-define(['table', 'upload','form'], function (Table,Upload,Form) {
+define(['table', 'upload','form','qrcode'], function (Table,Upload,Form) {
     var User = {
         //Do setup work hereAction
         index: function () {
@@ -29,6 +29,10 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                     filter: "number",
                     sortable: true    // 是否排序
                 },
+                {
+                    title: "上级",
+                    field: "referrer.username"
+                },
                 {
                     title: "角色",
                     field: "role_id",
@@ -84,10 +88,10 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             };
             columns.push({
                 title: "注册时间",
-                field: "createTime",
-                formatter:function(v,row){
-                    return Table.api.formatter.datetime(parseInt(v/1000));
-                },
+                field: "created_at",
+                // formatter:function(v,row){
+                //     return Table.api.formatter.datetime(parseInt(v/1000));
+                // },
                 filter:'datetime'
             });
             columns.push({
@@ -106,6 +110,7 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
                         name:"team",
                         icon:"mdi mdi-account-group-outline",
                         classname:"btn btn-xs btn-info btn-dialog",
+                        extend:' data-offset="r" data-area="80%,100%" data-anim="5" data-shade="0.3" data-move="false"',
                         url:'user/team'
                     }
                 ]
@@ -128,6 +133,11 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             var form = $('form');
             Form.api.bindevent(form)
             this.getRole();
+            
+            $('#qrcode div').qrcode({
+                width: 128,height: 128,
+                text: $('#qrcode').data("url")
+            });
         },
         insert:function(){
             Config['upload_url'] = '/files/avatar';

plugin/admin/public/js/version.js

@@ -97,12 +97,23 @@ define(['table', 'upload','form'], function (Table,Upload,Form) {
             Table.api.bindevent(table);
         },
         update:function(){
-            var form = $('form');
-            Form.api.bindevent(form);
+            this.insert();
         },
         insert:function(){
             var form = $('form');
             Form.api.bindevent(form);
+            var calc_version = function(v){
+                var _v = v.split('');
+                console.log(_v);
+                $('#version').val(_v.join('.'));
+            }
+            $('#version_wgt').on('change',function(){
+                var v = $(this).val();
+                calc_version(v);
+            }).on('input',function(){
+                var v = $(this).val();
+                calc_version(v);
+            });
         }
     };
     return Version

plugin/admin/public/libs/require-form.js

@@ -511,7 +511,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
                             values[name] = $field.val();
                         }
                     });
-                    console.log(values);
+                    //console.log(values);
                     
                     return values;
                 }