h5

apps/account/urls.py

@@ -2,8 +2,10 @@
 from django.conf.urls import url
 from rest_framework.routers import SimpleRouter
 from apps.account.views import *
+from apps.dashboard.views import admin_index
 
 urlpatterns = [
+    url(r'^$', admin_index),
     url(r'^login/$', LoginView.as_view()),
     url(r'^token_refresh/$', RefreshTokenView.as_view()),
     url(r'^employee/change_password/$', ChangePassword.as_view()),

apps/dashboard/views.py

@@ -3,6 +3,9 @@
 from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
 
 def index(request):
+    return HttpResponseRedirect('/dist/index.html')
+
+def admin_index(request):
     user_id = request.META.get('HTTP_USER_ID')
     token = request.META.get('HTTP_ACCESS_TOKEN')
     if not user_id or not token:

apps/order/urls.py

@@ -8,7 +8,7 @@ urlpatterns = [
     url(r'^deleteProductImage/$', DeleteProductImageView.as_view()),
     url(r'productDict/$', ProductView.as_view()),
     url(r'productList/$', ProductListView.as_view()), # 小程序首页，获取产品列表
-    url(r'list/$', OrderListView.as_view()),
+    url(r'list/$', OrderListView.as_view()), # web订单列表
     url(r'new/$', OrderCreatView.as_view()), # 匿名用户申报
     url(r'newUpload/$', OrderUploadView.as_view()), # 匿名用户上传图片
     url(r'deleteImg/$', OrderDeleteImgView.as_view()), # 匿名用户删除图片

apps/order/views.py

@@ -33,6 +33,7 @@ class ProductView(APIView):
             data.append(item)
         return response_ok(data)
 
+
 class DeleteProductImageView(APIView):
     permission_classes = [isLogin, ]
 
@@ -140,6 +141,7 @@ class OrderListView(ListAPIView):
         f = OrderFilter(self.request.GET, queryset=queryset)
         return f.qs
 
+
 class OrderCreatView(CreateAPIView):
     # 匿名用户申报
     queryset = Order.objects.filter()
@@ -166,6 +168,7 @@ class OrderCreatView(CreateAPIView):
         except Exception as e:
             return response_error(str(e))
 
+
 class OrderUploadView(CreateAPIView):
     # 匿名用户申报上传图片
     queryset = Order.objects.filter()
@@ -216,6 +219,7 @@ class OrderUploadView(CreateAPIView):
         except Exception as e:
             return response_error(str(e))
 
+
 class OrderDeleteImgView(CreateAPIView):
     # 匿名用户申报上传图片
     queryset = Order.objects.filter()
@@ -245,6 +249,7 @@ class OrderDeleteImgView(CreateAPIView):
         except Exception as e:
             return response_error(str(e))
 
+
 class OrderViewSet(CustomModelViewSet):
     permission_classes = [isLogin, ]
     queryset = Order.objects.filter()
@@ -293,15 +298,15 @@ class OrderViewSet(CustomModelViewSet):
                 else:
                     edit_file.append(item)
             # 待审核，加载图片使用
-            if instance.status == order.ZERO:
-                images = OrderImages.objects.filter(order=instance)
-                for image in images:
-                    item2 = {
-                        'upload_id': image.image.id,
-                        'url': image.image.get_path(),
-                        'type': image.type,
-                    }
-                    edit_file2.append(item2)
+            # if instance.status == order.ZERO:
+            images = OrderImages.objects.filter(order=instance)
+            for image in images:
+                item2 = {
+                    'upload_id': image.image.id,
+                    'url': image.image.get_path(),
+                    'type': image.type,
+                }
+                edit_file2.append(item2)
             result = {
                 'data': serializer.data,
                 'edit_values': edit_data,
@@ -341,6 +346,8 @@ class OrderViewSet(CustomModelViewSet):
                 serializer = self.get_serializer(instance, data=request.data)
                 if serializer.is_valid(raise_exception=True):
                     instance = serializer.save()
+                    instance.create_user = request.user
+                    instance.save()
                     # 已上报的，修改，记录修改时间
                     if instance.category == order.ONE:
                         for key in data:
@@ -351,7 +358,7 @@ class OrderViewSet(CustomModelViewSet):
                                 edit.save()
                         instance.status = order.ZERO
                         instance.save()
-                    BizLog.objects.addnew(self.request.user, BizLog.INSERT,
+                    BizLog.objects.addnew(request.user, BizLog.INSERT,
                                           u'修改订单[%s]，id=%d' % (instance.name, instance.id), request.data)
                     return response_ok(instance.id)
         except CustomError as e:
@@ -387,9 +394,14 @@ class OrderViewSet(CustomModelViewSet):
                     if not len(data):
                         raise CustomError('请填写返回修改原因')
                     # 删除已修改过的历史修改信息
-                    OrderDetailEdit.objects.filter(order=instance, edit_time__isnull=False).delete()
+                    rowss = OrderDetailEdit.objects.filter(order=instance, edit_time__isnull=False)
+                    rowss.delete()
                     for item in json.loads(data):
-                        OrderDetailEdit.objects.create(order=instance, value=item['name'], reason=item['reason'],
+                        edit = OrderDetailEdit.objects.filter(order=instance, value=item['name'], type=item['type'])
+                        if edit:
+                            edit.update(reason=item['reason'], edit_time=None)
+                        else:
+                            OrderDetailEdit.objects.create(order=instance, value=item['name'], reason=item['reason'],
                                                        type=item['type'])
                         if int(item['type']) == OrderDetailEdit.ONE:
                             OrderImages.objects.filter(order=instance, type=item['name']).update(enable=False)
@@ -484,7 +496,7 @@ class OrderViewSet(CustomModelViewSet):
             'waddress', 'itype_text', 'otype_text', 'position', 'wbst_text', 'bstname', 'bstcode', 'bsttel',
             'bstaddress',
             'cname', 'ctel', 'relation_text', 'caddress', 'ctname', 'cttel', 'thesame_text', 'tsname', 'tsbdate',
-            'tsitype_text', 'tsinumber', 'tstel', 'tsrelation_text', 'tsnaddress', 'tsmaddress', 'tsemail', 'tswx',
+            'tsitype_text', 'tsinumber', 'tstel', 'tsrelation_text', 'tsnaddress', 'tsmaddress_text', 'tsemail', 'tswx',
             'tswname', 'tswphone', 'tswaddress', 'tsmincome',
         ]
         result = []
@@ -529,8 +541,8 @@ class OrderViewSet(CustomModelViewSet):
                 item['images'].append(image.image.get_path())
             files.append(item)
         edit_dict = {
-            'order_info':result,
-            'image_info':files,
+            'order_info': result,
+            'image_info': files,
         }
         return response_ok(edit_dict)
 
@@ -545,7 +557,7 @@ class OrderViewSet(CustomModelViewSet):
                 OrderDetailEdit.objects.filter(order=instance).delete()
                 images = OrderImages.objects.filter(order=instance)
                 for image in images:
-                    upload = Upload.objects.filter(id=image.image.id)
+                    upload = Upload.objects.filter(id=image.image.id).first()
                     upload.del_images()
                 images.delete()
                 super(OrderViewSet, self).destroy(request, *args, **kwargs)

nostone_loan/urls.py

@@ -23,6 +23,7 @@ from apps.dashboard.views import index
 
 urlpatterns = [
     url(r'^$', index),
+    url(r'^admin/', include('apps.account.urls')),
     url(r'^account/', include('apps.account.urls')),
     url(r'^api/', include('apps.api.urls')),
     url(r'^order/', include('apps.order.urls')),

uis/dist/css/chunk-5548dce5.79027bda.css

@@ -0,0 +1 @@
+.box[data-v-179b14e0]{width:100vw;height:calc(100vh - 46px);display:flex;align-items:center;justify-content:center;background-color:#000}.box .no[data-v-179b14e0]{color:#fff;background-repeat:no-repeat;background-size:100%;font-size:100px;-webkit-box-reflect:below -42px -webkit-linear-gradient(transparent,transparent 30%,hsla(0,0%,100%,.5))}

uis/dist/img/wave.793b8c38.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="300" height="100">
+	<g fill="rgba(255,255,255,0.1)">
+		<path d="M 0 70 Q 75 39, 150 70 T 300 70 T 450 70 T 600 70 T 750 70 V 100 H 0 V 0"></path>
+		<animateTransform attributeName="transform" attributeType="XML" type="translate" from="0" to="-300" dur="1.5s" repeatCount="indefinite"></animateTransform>
+	</g>
+	<g fill="rgba(255,255,255,0.15)">
+		<path d="M 0 70 Q 87.5 47, 175 70 T 350 70 T 525 70 T 700 70 T 875 70 T 1050 70 V 100 H 0 V 0"></path>
+		<animateTransform attributeName="transform" attributeType="XML" type="translate" from="0" to="-350" dur="3s" repeatCount="indefinite"></animateTransform>
+	</g>
+	<g fill="rgba(255,255,255,0.18)" transform="translate(-903.868 0)">
+		<path d="M 0 70 Q 135 36, 270 70 T 540 70 T 810 70 T 1080 70 V 100 H 0 V 0" transform="translate(-38.232284367796474, 0)"></path>
+		<animateTransform attributeName="transform" attributeType="XML" type="translate" from="0" to="-540" dur="2s" repeatCount="indefinite"></animateTransform>
+	</g>
+</svg>

uis/dist/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,initial-scale=1,viewport-fit=cover"><link rel="icon" href="logo.png"><title>诺信通金融</title><link href="css/chunk-5548dce5.79027bda.css" rel="prefetch"><link href="js/chunk-5548dce5.c74e43dc.js" rel="prefetch"><link href="css/app.c76ff8b2.css" rel="preload" as="style"><link href="css/chunk-vendors.754acb04.css" rel="preload" as="style"><link href="js/app.03ec6abd.js" rel="preload" as="script"><link href="js/chunk-vendors.8ecc10bc.js" rel="preload" as="script"><link href="css/chunk-vendors.754acb04.css" rel="stylesheet"><link href="css/app.c76ff8b2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but nuoxintong doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.8ecc10bc.js"></script><script src="js/app.03ec6abd.js"></script></body></html>

uis/dist/js/chunk-5548dce5.c74e43dc.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5548dce5"],{"0f31":function(n,t,e){"use strict";e("a5e8")},"9d0d":function(n,t,e){"use strict";e.r(t);var a=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("basic",[e("div",{staticClass:"box"},[e("div",{staticClass:"no"},[n._v("404 ")])])])},c=[],s=e("0dae"),i={components:{Basic:s["a"]},data:function(){return{}}},o=i,u=(e("0f31"),e("2877")),r=Object(u["a"])(o,a,c,!1,null,"179b14e0",null);t["default"]=r.exports},a5e8:function(n,t,e){}}]);
+//# sourceMappingURL=chunk-5548dce5.c74e43dc.js.map

uis/views/order/order_detail_check.html

@@ -83,10 +83,10 @@
         </div>
         <div class="layui-tab-item">
             <div id="tableResImage" class="table-overlay">
-                <table id="imageTable" lay-filter="imageTable-operate" class="layui-hide"></table>
+                <table id="imageTable" class="layui-hide"></table>
                 <script type="text/html" id="datagrid-operate-bar">
                     {{# for(var i in d.images){ }}
-                    <a lay-event="view_{{ i }}" id="image_{{ i }}">
+                    <a href="{{ d.images[i] }}" target="_blank">
                         <img src="{{ d.images[i] }}" class="imgStyle"/>
                     </a>
                     {{# } }}
@@ -128,7 +128,7 @@
                 {title: '序号', type: 'numbers'},
                 {field: 'label', title: '名称', width: '15%',},
                 {field: 'value', title: '内容', width: '30%',},
-                {field: 'edit_time', title: '最后修改时间', width: '15%',},
+                {field: 'edit_time', title: '最后修改', width: '15%',},
                 {field: 'reason', title: '打回修改原因', edit: 'text', width: '20%',},
             ]]
         });
@@ -148,7 +148,7 @@
                 {title: '序号', type: 'numbers'},
                 {field: 'label', title: '名称', width: '15%',},
                 {field: 'images', title: '图片', toolbar: '#datagrid-operate-bar', width: '40%',},
-                {field: 'edit_time', title: '最后修改时间', width: '15%',},
+                {field: 'edit_time', title: '最后修改', width: '15%',},
                 {field: 'reason', title: '打回修改原因', edit: 'text', width: '20%',},
             ]]
         });
@@ -165,8 +165,8 @@
                                 label: rows[k].label,
                                 value: rows[k].value,
                                 name: rows[k].name,
-                                edit_time: rows[k].edit_time,
-                                reason: rows[k].reason,
+                                edit_time: rows[k].edit_time + '<br>'+rows[k].reason,
+                                reason: '',
                                 type: rows[k].type,
                             }
                         )
@@ -183,8 +183,8 @@
                                 label: image_rows[i].label,
                                 images: image_rows[i].images,
                                 name: image_rows[i].name,
-                                edit_time: image_rows[i].edit_time,
-                                reason: image_rows[i].reason,
+                                edit_time: image_rows[i].edit_time + '<br>'+image_rows[i].reason,
+                                reason: '',
                                 type: image_rows[i].type,
                             }
                         )
@@ -200,6 +200,7 @@
 
         //监听工具条
         table.on('tool(imageTable-operate)', function (obj) {
+            // 图片新页面弹窗
             var imgsList = obj.data.images;
             var index = obj.event.split('_')[1]
             var newPage = window.open();