Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/AppInfo/models.py

@@ -469,7 +469,7 @@ class Pick_Pub(models.Model):
     company = models.CharField(u'采摘企业', max_length=20, blank=True, null=True)
     pick_img = models.CharField(u'农场图片', max_length=200, blank=True, null=True)
     upl_time = models.CharField(u'采摘时间', max_length=200,blank=True, null=True)
-    content = RichTextUploadingField('民宿详情',null=True, blank=True)
+    content = RichTextUploadingField('详细介绍',null=True, blank=True)
     pub_time = models.DateTimeField(u'数据上传时间', default=timezone.now)
     hidden = models.BooleanField(default=False,verbose_name="是否隐藏")
 

apps/Equipment/views.py

@@ -1121,7 +1121,10 @@ class Farm_Choice(ListView):
         username = request.user.username
         print('username:',username)
         current_user = MyUser.objects.get(username=username)
-        farmlist = FarmList.objects.filter(user=current_user)
+        if current_user.is_staff == True:
+            farmlist = FarmList.objects.all()
+        else:
+            farmlist = FarmList.objects.filter(user=current_user)
         dat = []
         for i in farmlist:
             dat.append({"name":i.name})
@@ -1648,7 +1651,14 @@ class Garden_Check_List(ListView):
                     "company":i.company,
                     "pick_img":i.pick_img,
                     "time": i.upl_time,
-                    "farm":i.farm.name
+                    "farm":i.farm.name,
+                    "scale":i.scale,
+                    "pick_s":i.pick_s,
+                    "pick_e":i.pick_e,
+                    "ripe_time":i.ripe_time,
+                    "addr":i.addr,
+                    "content":i.content
+                    
                     })
         #删除
         elif req == "del":

templates/backstageNet/infoManage/newsManage.html

@@ -217,6 +217,7 @@
                         // , count: 30
                         , count: $('#totalPage').val()
                         , theme: '#2ca9f9'
+                        , curr:page
                         , layout: ['prev', 'page', 'next', 'skip']
                         , jump: function (obj, first) {
                             if (!first) {
@@ -277,6 +278,8 @@
                     body.find('input[name= "intro"]').val(window.data.intro) //文章简介
                     body.find('textarea[name= "intro"]').val(window.data.intro) //文章简介
                     body.find('textarea[id= "editor1"]').val(window.data.content) //文章正文
+                    body.find('#demo1').attr('src',window.data.head_img) //图片
+                    body.find('#img_url').val(window.data.head_img) //图片
                 }
             });
         }
@@ -299,7 +302,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('news_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -325,7 +329,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('news_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -397,7 +402,7 @@
                 getData('news_check_list', 1, type)
             }
         })
-
+        
 
         // windowAddMouseWheel();
         function windowAddMouseWheel() {

templates/backstageNet/infoManage/productManage.html

@@ -234,7 +234,7 @@
             });
 
             //第一个实例
-            getData('news_check_list', 1, 0) //url,page，信息类型
+            getData('equip_check_list', 1, 0) //url,page，信息类型
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
@@ -261,6 +261,7 @@
                         // , count: 30
                         , count: $('#totalPage').val()
                         , theme: '#2ca9f9'
+                        , curr:page
                         , layout: ['prev', 'page', 'next', 'skip']
                         , jump: function (obj, first) {
                             if (!first) {
@@ -315,6 +316,8 @@
                     body.find('input[name="mobile"]').val(window.data.mobile) //联系电话
                     body.find('textarea[id="editor1"]').val(window.data.content) //产品详情
                     body.find('input[name="id"]').val(window.data.id) //id
+                    body.find('#demo1').attr('src',window.data.head_img) //图片
+                    body.find('#img_url').val(window.data.head_img) //图片
                 }
             });
         }
@@ -335,7 +338,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('equip_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -362,7 +366,8 @@
                             // layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('equip_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })

templates/backstageNet/infoManage/videoManage.html

@@ -235,7 +235,7 @@
             });
 
             //第一个实例
-            getData('news_check_list', 1, 0) //url,page，信息类型
+            getData('video_check_list', 1, 0) //url,page，信息类型
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
@@ -262,6 +262,7 @@
                         // , count: 30
                         , count: $('#totalPage').val()
                         , theme: '#2ca9f9'
+                        , curr:page
                         , layout: ['prev', 'page', 'next', 'skip']
                         , jump: function (obj, first) {
                             if (!first) {
@@ -314,6 +315,9 @@
                     body.find('input[name="title"]').val(window.data.title) //标题
                     body.find('textarea[name="intro"]').val(window.data.intro) //内容
                     body.find('input[name="id"]').val(window.data.id) // id
+                    body.find('#demo1').attr('src',window.data.video_img) //图片
+                    body.find('#img_url').val(window.data.video_img) //图片
+                    body.find('#video_url').val(window.data.video_url) //图片
                 }
             });
         }
@@ -334,7 +338,8 @@
                             layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('video_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
                         }
                     }
                 })
@@ -361,7 +366,9 @@
                             // layer.close(index);
                             // parent.layer.msg("操作成功!", {time: 1000}, function () {
                             //重新加载父页面
-                            location.reload();
+                            // location.reload();
+                            getData('video_check_list', $('.layui-laypage-curr em').eq(1).html(), $('.permission .active').data('type'))
+
                         }
                     }
                 })

templates/backstageNet/systemSet/creatUser.html

@@ -163,7 +163,11 @@
             /* margin-right: 10px; */
             margin-top: -4px;
         }
-
+        input:read-only#userNameInp,input:read-only#emailInp {
+            cursor: not-allowed;
+            color: #939192;
+            background: #F5F5F5!important;
+        }
 
         /* 基地范围 */
     </style>
@@ -200,7 +204,7 @@
                 <div class="site-title">
                     <fieldset>
                         <legend>
-                            <a name="use">创建用户</a>
+                            <a name="use" id="titleTxt">创建用户</a>
                         </legend>
                     </fieldset>
                 </div>
@@ -209,24 +213,33 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">用户名：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="name" value="" required lay-verify="required" placeholder="请输入用户名" autocomplete="off" class="layui-input">
+                                <input type="text" name="name" id="userNameInp" value="" maxlength="11" required lay-verify="required|phone" placeholder="请填写手机号" autocomplete="off" class="layui-input">
+                                <input type="hidden" name="id" value="{{userId|default:''}}">
                             </div>
                             <div class="layui-form-mid layui-word-aux">*</div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">邮箱：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="email" value="" required lay-verify="required|email" placeholder="请填写邮箱" autocomplete="off" class="layui-input">
+                                <input type="text" name="email" id="emailInp" value="" required lay-verify="required|email" placeholder="请填写邮箱" autocomplete="off" class="layui-input">
                             </div>
                             <div class="layui-form-mid layui-word-aux">*</div>
                         </div>
                         <div class="layui-form-item">
+                            <label class="layui-form-label">用户类型：</label>
+                            <div class="layui-input-inline">
+                                <select name="role" id="">
+                                    <option value="0">用户</option>
+                                    <option value="1">管理员</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
                             <label class="layui-form-label">手机号：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="phone" value="" placeholder="请填写手机号" autocomplete="off" class="layui-input">
+                                <input type="text" name="phone" value="" maxlength="11" placeholder="请填写手机号" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-
                         <div class="layui-form-item layui-form-text">
                             <label class="layui-form-label">备注：</label>
                             <div class="layui-input-block">
@@ -249,6 +262,7 @@
                 <!-- 上页所需数据 -->
                 <input type="hidden" value="{{f_name}}" id="f_name">
                 <input type="hidden" value="{{currpage}}" id="currPage">
+                <input type="hidden" value="{{userId|default:''}}" id="userId">
             </div>
         </div>
     </div>
@@ -268,15 +282,44 @@
                 console.log(data);
             });
 
+            if($("#userId").val()){
+                $('#userNameInp').attr('readonly','readonly')
+                $('#emailInp').attr('readonly','readonly')
+                $('#titleTxt').html('编辑用户');
+                $.ajax({
+                    url: 'user_info',
+                    data: {
+                        id:$("#userId").val()
+                    },
+                    type: 'post',
+                    dataType:'json',
+                    success: function (dat) {
+                        var rol = dat.role?1:0;
+                        form.val("newsFormDiv", { 
+                            "name": dat.name
+                            ,"email": dat.email
+                            ,"phone": dat.phone
+                            ,"role": rol
+                            ,"desc": dat.desc
+                        });
+                        form.render();
+                    },
+                    error: function (type) {
+
+                    }
+                })
+            }
+            
+            
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
                 if (data.field.phone) {
-                    if (!(/^1[3456789]\d{9}$/.test(data.field.phone))) {
-                        layer.msg("手机号码有误，请重填", { icon: 2 });                   
-                        return false;
+                        if (!(/^1[3456789]\d{9}$/.test(data.field.phone))) {
+                            layer.msg("手机号码有误，请重填", { icon: 2 });                   
+                            return false;
+                        }
                     }
-                }
                 $.ajax({
                     url: 'create_user',
                     data: $("#formDiv").serialize(),

templates/backstageNet/systemSet/userManage.html

@@ -80,9 +80,8 @@
 							<th>用户邮箱</th>
 							<th>用户电话</th>
 							<th>用户类型</th>
-							<th>是否可用</th>
 							<th>创建时间</th>
-							<th style="width:250px">操作</th>
+							<th style="width:270px">操作</th>
 						</tr>
 					</thead>
 					<tbody>

templates/backstageNet/systemSet/user_list.html

@@ -12,10 +12,10 @@
 	<td>
 		{% if user.is_superuser == 1 %} 超级管理员 {% elif user.is_staff == 1 %} 管理员 {% else %} 用户 {% endif %}
 	</td>
-	<td>{% if user.is_active == True %} 可用 {% else %} 不可用 {% endif %}</td>
 	<td>{{ user.date_joined }}</td>
 	<td>
 		<button class="layui-btn layui-btn-sm  btn-shaixuan" onclick="allotEquipPage('{{ user.username }}')">在线分地</button>
+		<button class="layui-btn layui-btn-sm  layui-btn-warm" onclick="addUser('{{ user.id }}')">编辑</button>
 		<button class="layui-btn layui-btn-sm layui-btn-normal btn-shaixuan" onclick="resetPwd('{{ user.username }}')">重置密码</button>
 		{% if user.username == 'admin' %}  {% else %}
 		<button class="layui-btn layui-btn-sm layui-btn-danger btn-shaixuan" onclick="deluser('{{ user.username }}')">删除</button>

templates/static/js/systemSet/userManage.js

@@ -134,10 +134,11 @@ function allotEquipPage(uname) {
 }
 
 // 创建新用户
-function addUser() {
+function addUser(userId) {
     var currPage = $('#page .layui-laypage-curr em').eq(1).html();
     var f_name = $('#uname').val();
-    window.location.href = 'create_user?currpage=' + currPage + '&f_name=' + f_name;
+    var userId = userId || '';
+    window.location.href = 'create_user?currpage=' + currPage + '&f_name=' + f_name+ '&userId=' + userId;
 }
 
 //重置密码