订单管理

apps/account/models.py

@@ -57,6 +57,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     gender = models.PositiveSmallIntegerField(choices=settings.GENDER_CHOICES, verbose_name=u"性别",
                                               default=settings.MALE)
     face = models.CharField(max_length=200, verbose_name=u'头像', null=True)
+    tel = models.CharField(max_length=15, verbose_name=u"手机", null=True, )
     ID_card = models.CharField(max_length=18, verbose_name=u"身份证号", null=True, blank=True)
     address = models.CharField(max_length=100, verbose_name=u"家庭住址", null=True, blank=True)
     position = models.CharField(max_length=15, verbose_name=u"岗位", null=True)

apps/order/models.py

@@ -54,13 +54,13 @@ class ProductImages(models.Model):
 class Order(models.Model):
 
     category = models.PositiveSmallIntegerField(choices=order.CATEGORY_CHOICES, verbose_name=u"订单类型", default=order.ZERO)
-    status = models.PositiveSmallIntegerField(choices=order.STATUS_CHOICES, verbose_name=u"订单状态", default=order.ZERO)
+    status = models.PositiveSmallIntegerField(choices=order.STATUS_CHOICES, verbose_name=u"订单状态", default=order.ZERO, editable=False)
     seller = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='order_seller', verbose_name=u"业务人员",
                                     on_delete=models.PROTECT, editable=False)
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='order_create_user', verbose_name=u"添加人",
                                     on_delete=models.PROTECT, editable=False)
     create_time = models.DateTimeField(verbose_name=u'添加时间', auto_now_add=True, editable=False)
-    cancel_reason = models.CharField(max_length=100, verbose_name=u"未通过原因", null=True)
+    cancel_reason = models.CharField(max_length=100, verbose_name=u"未通过原因", null=True, editable=False)
 
     vmodel = models.CharField(max_length=100, verbose_name=u"车型", null=True)
     invioce = models.CharField(max_length=10, verbose_name=u"车辆发票金额", null=True)
@@ -75,7 +75,7 @@ class Order(models.Model):
     package = models.ForeignKey(Product, verbose_name=u'贷款产品', on_delete=models.PROTECT, null=True)
 
     name = models.CharField(max_length=10, verbose_name=u"姓名", null=True)
-    sex = models.PositiveSmallIntegerField(choices=order.STATUS_CHOICES, verbose_name=u"性别", default=order.ZERO)
+    sex = models.PositiveSmallIntegerField(choices=order.GENDER_CHOICES, verbose_name=u"性别", default=order.ZERO)
     bdate = models.DateField(verbose_name=u"出生日期", null=True)
     rpr = models.PositiveSmallIntegerField(choices=order.HUKOU_CHOICES, verbose_name=u"户口", default=order.ZERO)
     nationality = models.PositiveSmallIntegerField(choices=order.NATIONALITY_CHOICES, verbose_name=u"国籍/地区", default=order.ZERO)
@@ -191,8 +191,9 @@ class OrderDetailEdit(models.Model):
         (ONE, '图片'),
     )
     type = models.PositiveSmallIntegerField(choices=TYPE_CHOICE, default=ZERO)
-    order_detail = models.IntegerField(verbose_name=u'订单明细对象') # 文字资料和图片资料id
-    edit_time = models.DateTimeField(verbose_name=u'修改时间')
+    order = models.ForeignKey(Order, verbose_name=u'产品', on_delete=models.PROTECT, related_name='order_detail_edit')
+    value = models.CharField(max_length=20, verbose_name=u'订单明细对象值') # 文字资料和图片资料id
+    edit_time = models.DateTimeField(verbose_name=u'修改时间', auto_now_add=True)
 
     class Meta:
         db_table = "order_detail_edit"

apps/order/serializers.py

@@ -32,6 +32,24 @@ class ProductSerializer(serializers.ModelSerializer):
         instance.save()
         return instance
 
+class ProductListSerializer(serializers.ModelSerializer):
+    mail_image = serializers.SerializerMethodField()
+    details_image = serializers.SerializerMethodField()
+
+    def get_mail_image(self, obj):
+        return '%s%s' % (settings.SERVER_DOMAIN, obj.main_image.picture)
+
+    def get_details_image(self, obj):
+        data = []
+        images = ProductImages.objects.filter(product=obj)
+        for image in images:
+            data.append('%s%s' % (settings.SERVER_DOMAIN, image.image.picture))
+        return data
+
+    class Meta:
+        model = Product
+        fields = ('id','name','month','mail_image','details_image',)
+
 class OrderListSerializer(serializers.ModelSerializer):
     seller_text = serializers.CharField(source='seller.name', read_only=True)
     create_user_text = serializers.CharField(source='create_user.name', read_only=True)
@@ -43,7 +61,7 @@ class OrderListSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Order
-        fields = ('name','tel','sex_text','inumber','package_text','status_text','create_time_f','create_user_text',)
+        fields = ('name','tel','sex_text','inumber','package_text','status_text','create_time_f','create_user_text','seller_text',)
 
 class OrderSerializer(serializers.ModelSerializer):
     create_user_text = serializers.CharField(source='create_user.username', read_only=True)

apps/order/urls.py

@@ -7,10 +7,11 @@ from .views import *
 urlpatterns = [
     url(r'^deleteProductImage/$', DeleteProductImageView.as_view()),
     url(r'productDict/$', ProductView.as_view()),
+    url(r'productList/$', ProductListViewSet.as_view()),
+    url(r'list/$', OrderListViewSet.as_view()),
 ]
 
 router = SimpleRouter()
 router.register(r'product', ProductViewSet)
-router.register(r'list', OrderListViewSet)
 router.register(r'', OrderViewSet)
 urlpatterns += router.urls

apps/order/views.py

@@ -4,11 +4,11 @@ from django.db.models import Sum, F
 from django.db import transaction
 from django.db.models import Q
 from rest_framework.views import APIView
+from rest_framework.generics import ListAPIView
 from utils.custom_modelviewset import CustomModelViewSet
 from .serializers import *
 from .filters import *
 from apps.log.models import BizLog
-from apps.base import Formater
 from utils import response_ok, response_error
 from utils.permission import isLogin
 from apps.order.models import Order
@@ -118,12 +118,20 @@ class ProductViewSet(CustomModelViewSet):
             data.append(commodity_image_item)
         return response_ok(data)
 
-class OrderListViewSet(CustomModelViewSet):
+class ProductListViewSet(ListAPIView):
+    queryset = Product.objects.filter()
+    serializer_class = ProductListSerializer
+
+    def filter_queryset(self, queryset,):
+        f = ProductFilter(self.request.GET, queryset=queryset)
+        return f.qs
+
+class OrderListViewSet(ListAPIView):
     permission_classes = [isLogin, ]
     queryset = Order.objects.filter()
     serializer_class = OrderListSerializer
 
-    def filter_queryset(self, queryset):
+    def filter_queryset(self, queryset,):
         queryset = queryset.filter(Q(create_user=self.request.user) | Q(seller=self.request.user))
         f = OrderFilter(self.request.GET, queryset=queryset)
         return f.qs
@@ -145,11 +153,73 @@ class OrderViewSet(CustomModelViewSet):
                 if serializer.is_valid(raise_exception=True):
                     instance = serializer.save()
                     BizLog.objects.addnew(self.request.user, BizLog.INSERT,
-                                          u'添加订单[%s]，id=%d' % (instance.id), request.data)
+                                          u'添加订单[%s]，id=%d' % (instance.name, instance.id), request.data)
                     return response_ok()
         except CustomError as e:
             return response_error(e.get_error_msg())
         except Exception as e:
-            import traceback
-            traceback.print_exc()
             return response_error(str(e))
+
+    def update(self, request, *args, **kwargs):
+        data = request.POST
+        try:
+            instance = self.get_object()
+            with transaction.atomic():
+                serializer = self.get_serializer(instance,data=request.data)
+                if serializer.is_valid(raise_exception=True):
+                    instance = serializer.save()
+                    for key in data:
+                        edit, create = OrderDetailEdit.objects.get_or_create(type=OrderDetailEdit.ZERO, order=instance, value=key)
+                        if not create:
+                            edit.edit_time = datetime.datetime.now()
+                            edit.save()
+
+                    BizLog.objects.addnew(self.request.user, BizLog.INSERT,
+                                          u'修改订单[%s]，id=%d' % (instance.name, instance.id), request.data)
+                    return response_ok()
+        except CustomError as e:
+            return response_error(e.get_error_msg())
+        except Exception as e:
+            return response_error(str(e))
+
+    @action(methods=['post'], detail=False)
+    def upload_image(self, request):
+        file = self.request.FILES.get('file')
+        type = self.request.FILES.get('type')
+        order_id = self.request.FILES.get('order_id')
+        upload = Upload.objects._addnew(file)
+        if upload:
+            OrderImages.objects.create(order_id=order_id, type=type, image=upload)
+            return response_ok(upload.id)
+        return response_error('上传失败，请重新上传！')
+
+    @action(methods=['post'], detail=True)
+    def update_image(self, request):
+        file = self.request.FILES.get('file')
+        upload_id = self.request.FILES.get('upload_id')
+        upload = Upload.objects.filter(id=upload_id).first()
+        if upload:
+            upload.del_images()
+            Upload.objects._update(file, 'user_image', upload)
+            return response_ok(upload.id)
+        return response_error('更新失败，请重新上传！')
+
+    def destroy(self, request, *args, **kwargs):
+        try:
+            instance = self.get_object()
+            if instance.category == order.ONE:
+                raise CustomError('已上报信息，禁止删除!')
+            with transaction.atomic():
+                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.del_images()
+                images.delete()
+                super(OrderViewSet, self).destroy(request, *args, **kwargs)
+        except CustomError as e:
+            return response_error(e.get_error_msg())
+        except Exception as e:
+            return response_error(str(e))
+        return response_ok()
+

apps/upload/models.py

@@ -37,22 +37,34 @@ class UploadManager(models.Manager):
         instance.save()
         return instance
 
-    def _addnew_voice(self, file, time):
+    def _update(self, file, path, upload):
+        DeleteFile(upload.picture)
 
-        path = UploadManager.calculatePath()
+        width = None
+        height = None
+
+        path = UploadManager.calculatePath(path)
         filename = UploadFile(file, path)
         fullname = "%s%s" % (settings.MEDIA_ROOT, filename)
         size = os.path.getsize(fullname)
 
-        instance = self.model(
+        try:
+            img = Image.open(fullname)
+            width, height = img.size
+            # 缩略图压缩宽或高最大200
+            if width > 1440:
+                img = img.resize((1440, int((height / width) * 1440)), Image.ANTIALIAS)
+                img.save(fullname)
+                width, height = img.size
+        except:
+            pass
+
+        Upload.objects.filter(id=upload.id).update(
             picture="%s%s" % (settings.MEDIA_URL, filename),
-            width=200,
-            height=200,
+            width=width,
+            height=height,
             file_size="%.2f" % (float(size) / 1024),
-            voice_time=time,
         )
-        instance.save()
-        return instance
 
     @staticmethod
     def calculatePath(path='user_image'):

uis/views/foundation/config.html

@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>系统设置</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-</head>
-<body>
-
-  <div class="layui-fluid">
-    <div class="layui-card">
-        <div class="layui-card-body" pad15>
-        <div class="layui-row layui-col-space15">
-          <div class="layui-col-md12">
-              <form class="layui-form" action="" lay-filter="component-form-element">
-                <table class="layui-table">
-                    <tr>
-                        <td class="cell" width="120">公司全称：</td>
-                        <td class="cell">
-                            <input type="text" id="id_company_full_name" name="company_full_name" lay-verify="required" autocomplete="off" class="layui-input">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="cell">公司简称：</td>
-                        <td class="cell">
-                            <input type="text" id="id_company_short_name" name="company_short_name" lay-verify="required" autocomplete="off" class="layui-input">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="cell">公司账号：</td>
-                        <td class="cell">
-                            <input type="text" id="id_company_account" name="company_account" autocomplete="off" class="layui-input">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="cell">开户银行：</td>
-                        <td class="cell">
-                            <input type="text" id="id_company_bank" name="company_bank" autocomplete="off" class="layui-input">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="cell">信用代码：</td>
-                        <td class="cell">
-                            <input type="text" id="id_company_creditno" name="company_creditno" autocomplete="off" class="layui-input">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="cell">默认车牌号前缀：</td>
-                        <td class="cell">
-                            <input type="text" id="id_default_platenumber_prefix" name="default_platenumber_prefix" autocomplete="off" class="layui-input">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="cell">默认税率：</td>
-                        <td class="cell">
-                            <input type="number" id="id_default_tax_rate" name="default_tax_rate" autocomplete="off" class="layui-input">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="cell"></td>
-                        <td class="cell">
-                            <button class="layui-btn" lay-submit lay-filter="component-form-element">保存设置</button>
-                        </td>
-                    </tr>
-                </table>
-              </form>
-          </div>
-        </div>
-        </div>
-    </div>
-  </div>
-
-  <script src="../../layuiadmin/layui/layui.js?t=1"></script>
-  <script>
-  layui.config({
-    base: '../../../layuiadmin/'
-  }).extend({
-    index: 'lib/index'
-  }).use(['index', 'form'], function(){
-    var $ = layui.$
-    ,form = layui.form
-    ,admin = layui.admin;
-
-    admin.req({
-      url: '/foundation/config/data/',
-      done: function(res){
-        var data = res.data;
-        for (var k in data) {
-            var v = data[k];
-            $('#id_' + k).val(v);
-        }
-        form.render();
-      }
-    });
-
-    form.on('submit(component-form-element)', function(data){
-      admin.req({
-        url: '/foundation/config/save/'
-        ,data: JSON.stringify(data.field)
-        ,type: 'post'
-        ,done: function(res){
-            layer.msg('保存成功！', {icon: 6});
-        }
-    });
-
-      return false;
-    });
-  });
-  </script>
-</body>
-</html>
-

uis/views/foundation/config_price.html

@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>价格定义</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-</head>
-<body>
-
-  <div class="layui-fluid">
-    <div class="layui-card">
-        <div class="layui-card-body" pad15>
-        <div class="layui-row layui-col-space15">
-          <div class="layui-col-md12">
-            <form class="layui-form" action="" lay-filter="component-form-element" id="price_type_form">
-              <div class="layui-row layui-col-space10 layui-form-item">
-
-                <div class="layui-col-lg12">
-                  <label class="layui-form-label">价格1：</label>
-                  <div class="layui-input-block">
-                    <input type="text" id="id_price_1" name="price_1" autocomplete="off" class="layui-input" lay-verify="required">
-                  </div>
-                </div>
-                 <div class="layui-col-lg12">
-                  <label class="layui-form-label">价格2：</label>
-                  <div class="layui-input-block">
-                    <input type="text" id="id_price_2" name="price_2" autocomplete="off" class="layui-input" lay-verify="required">
-                  </div>
-                </div>
-                <div class="layui-col-lg12">
-                  <label class="layui-form-label">价格3：</label>
-                  <div class="layui-input-block">
-                    <input type="text" id="id_price_3" name="price_3" autocomplete="off" class="layui-input" lay-verify="required">
-                  </div>
-                </div>
-              <div class="layui-form-item">
-                <div class="layui-input-block">
-                  <button class="layui-btn" lay-submit lay-filter="component-form-element" id="button_save">保存</button>
-                </div>
-              </div>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-
-  <script src="../../layuiadmin/layui/layui.js"></script>
-  <script>
-  layui.config({
-    base: '../../../layuiadmin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index' //主入口模块
-  }).use(['index', 'form'], function(){
-    var $ = layui.$
-    ,admin = layui.admin
-    ,form = layui.form;
-    admin.req({
-        url: '/foundation/config/price/data/',
-        done: function(res){
-            var data = res.data;
-            for (var k in data.configs) {
-                var v = data.configs[k];
-                $('#id_' + k).val(v);
-            }
-            form.render();
-        }
-    });
-
-  form.on('submit(component-form-element)', function(data){
-      admin.req({
-        url: '/foundation/config/price/save/'
-        ,data: JSON.stringify(data.field)
-        ,type: 'post'
-        ,done: function(res){
-            layer.msg('保存成功！', {icon: 6});
-        }
-    });
-
-      return false;
-    });
-
-  });
-  </script>
-</body>
-</html>

uis/views/foundation/option.html

@@ -1,195 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>自定义项</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-</head>
-<body>
-
-<div class="layui-fluid">
-    <div class="layui-card">
-        <div class="layui-card-body" pad15>
-            <div class="layui-row layui-col-space15">
-                <div class="layui-col-md12">
-
-                    <div class="LAY-btns" style="margin-bottom: 10px;">
-                        <button class="layui-btn layui-btn-sm" id="btn_add"><i
-                                class="layui-icon layui-icon-add-circle"></i>添加
-                        </button>
-                        <button class="layui-btn layui-btn-sm" id="btn_query"><i
-                                class="layui-icon layui-icon-search"></i>查询
-                        </button>
-                    </div>
-
-                    <table class="layui-hide" id="datagrid" lay-filter="datagrid-operate"></table>
-
-                    <script type="text/html" id="datagrid-operate-bar">
-                        <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-xs" lay-event="edit">修改</a>
-                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
-                        </div>
-                    </script>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="dlg_query" style="display: none">
-    <div class="layui-card-body" pad15>
-        <form class="layui-form" lay-filter="query-form-element">
-            <div class="layui-row layui-col-space10 layui-form-item">
-                <div class="layui-col-xs12 layui-col-sm12">
-                    <label class="layui-form-label">名称：</label>
-                    <div class="layui-input-block">
-                        <input type="text" class="layui-input" name="name">
-                    </div>
-                </div>
-                <div class="layui-col-xs12 layui-col-sm12">
-                    <label class="layui-form-label">是否在用：</label>
-                    <div class="layui-input-block">
-                        <select name="enabled">
-                            <option value=""></option>
-                            <option value="1">是</option>
-                            <option value="0">否</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="layui-col-xs12 layui-col-sm12">
-                    <label class="layui-form-label">类别：</label>
-                    <div class="layui-input-block">
-                        <select name="type">
-                            <option value=""></option>
-                            <option value="0">客户类型</option>
-                            <option value="1">收银方式</option>
-                            <option value="2">维修类型</option>
-                            <option value="3">会员类别</option>
-                            <option value="4">供应商</option>
-                            <option value="5">保险公司</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item" style="text-align:right">
-                <button class="layui-btn" lay-submit lay-filter="query-form-element" id="query_btn"
-                        style="display: none;">查询
-                </button>
-            </div>
-        </form>
-    </div>
-</div>
-
-<script src="../../layuiadmin/layui/layui.js?t=1"></script>
-<script>
-    layui.config({
-        base: '../../../layuiadmin/' //静态资源所在路径
-    }).extend({
-        index: 'lib/index' //主入口模块
-    }).use(['index', 'table', 'form'], function () {
-        var $ = layui.$;
-        var table = layui.table
-            , form = layui.form;
-
-        table.render({
-            elem: '#datagrid'
-            , url: '/foundation/option/data/'
-            , cols: [[
-                {field: 'name', title: '名称', width: 200}
-                , {field: 'type_text', title: '类别', width: 200}
-                , {field: 'notes', title: '备注', minWidth: 150}
-                , {field: 'enabled_text', title: '在用', width: 80}
-                , {width: 110, align: 'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
-            ]]
-            , page: true
-            , height: 'full-103'
-        });
-
-        //监听工具条
-        table.on('tool(datagrid-operate)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'detail') {
-                layer.msg('ID：' + data.id + ' 的查看操作');
-            } else if (obj.event === 'del') {
-                layer.confirm('确定要删除吗？', function (index) {
-                    layer.close(index);
-                    layui.admin.req({
-                        url: '/foundation/option/delete/?id=' + data.id
-                        , done: function (res) {
-                            table.reload('datagrid', {});
-
-                            //obj.del();
-                        }
-                    });
-                });
-            } else if (obj.event === 'edit') {
-                table.editdata = data;
-                layer.open({
-                    type: 2,
-                    title: '修改',
-                    shadeClose: false,
-                    area: ['450px', '470px'],
-                    btn: ['保存', '取消'],
-                    yes: function (index, dom) {
-                        $(window.frames["layui-layer-iframe" + index].document).contents().find("#btn_save").click();
-                    },
-                    btn2: function (index, layero) {
-                        layer.close(index);//关闭当前按钮
-                    },
-                    content: 'option_edit.html?id=' + data.id
-                });
-            }
-        });
-
-        $('#btn_add').on('click', function () {
-            layer.open({
-                type: 2,
-                title: '添加',
-                shadeClose: false,
-                area: ['450px', '470px'],
-                btn: ['保存', '取消'],
-                yes: function (index, dom) {
-                    $(window.frames["layui-layer-iframe" + index].document).contents().find("#btn_save").click();
-                },
-                btn2: function (index, layero) {
-                    layer.close(index);//关闭当前按钮
-                },
-                content: 'option_edit.html'
-            });
-        });
-        $('#btn_query').on('click', function () {
-            layer.open({
-                type: 1,
-                shadeClose: false,
-                area: ['500px', '550px'],
-                title: '查询',
-                btn: ['查询', '取消'],
-                yes: function (index, dom) {
-                    $("#query_btn").click();
-                },
-                btn2: function (index, layero) {
-                    layer.close(index);//关闭当前按钮
-                },
-                content: $('#dlg_query')
-            });
-        });
-        form.on('submit(query-form-element)', function (data) {
-            //layer.msg(JSON.stringify(data.field));
-            _params = data.field;
-            table.reload('datagrid', {
-                where: data.field
-                , page: {curr: 1}
-            });
-            layer.closeAll();
-            return false
-        });
-
-    });
-</script>
-</body>
-</html>
-

uis/views/foundation/option_edit.html

@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>添加自定义项</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-</head>
-<body>
-
-  <div class="layui-fluid">
-    <div class="layui-row layui-col-space15">
-      <div class="layui-col-md6">
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <form class="layui-form" action="" lay-filter="component-form-element">
-              <div class="layui-row layui-col-space10 layui-form-item">
-                <div class="layui-col-lg6">
-                  <label class="layui-form-label">类别：</label>
-                  <div class="layui-input-block">
-                     <select id="id_option_type" name="type" lay-verify="required">
-                        <option value=""></option>
-                    </select>
-                  </div>
-                </div>
-                <div class="layui-col-lg6">
-                  <label class="layui-form-label"><font color='red' size="4">*</font>名称：</label>
-                  <div class="layui-input-block">
-                    <input type="text" name="name" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
-                  </div>
-                </div>
-                <div class="layui-col-lg6">
-                  <label class="layui-form-label">备注：</label>
-                  <div class="layui-input-block">
-                    <input type="text" name="notes" placeholder="" autocomplete="off" class="layui-input">
-                  </div>
-                </div>
-              <div class="layui-form-item">
-                <label class="layui-form-label">在用：</label>
-                <div class="layui-input-block">
-                  <input type="checkbox" name="enabled" lay-skin="switch" lay-text="是|否" checked="" value="1">
-                </div>
-              </div>
-              <div class="layui-form-item">
-                <div class="layui-input-block">
-                  <button class="layui-btn" id="btn_save" lay-submit lay-filter="component-form-element" style="display: none;">保存</button>
-                  <!--<button type="button" class="layui-btn layui-btn-primary" id="btn_close">取消</button>-->
-                </div>
-              </div>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-
-  <script src="../../layuiadmin/layui/layui.js"></script>
-  <script>
-  layui.config({
-    base: '../../../layuiadmin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index' //主入口模块
-  }).use(['index', 'form'], function(){
-    var $ = layui.$
-    ,admin = layui.admin
-    ,element = layui.element
-    ,form = layui.form;
-    var p_id = layui.view.getParameterByName('id');
-
-    admin.req({
-      url: '/foundation/option/types/',
-      done: function(res){
-        var data = res.data;
-        var option_type_node = $('#id_option_type');
-        for (var i in data) {
-            var id = data[i].id;
-            var value = data[i].value;
-            option_type_node.append("<option value='"+id+"'>"+value+"</option>");
-        }
-        form.render();
-        if(p_id != ''){
-            var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
-            form.val("component-form-element", editdata);
-        }
-      }
-    });
-
-    form.render(null, 'component-form-element');
-    element.render('breadcrumb', 'breadcrumb');
-
-    form.on('submit(component-form-element)', function(data){
-      //layer.msg(JSON.stringify(data.field));
-      if(!('enabled' in data.field))
-        data.field.enabled = false;
-      admin.req({
-        url: '/foundation/option/save/?id='+p_id
-        ,data: JSON.stringify(data.field)
-        ,type: 'post'
-        ,done: function(res){
-            parent.layer.closeAll('iframe');
-            parent.layui.table.reload('datagrid',{});
-        }
-      });
-
-      return false;
-    });
-
-    // $('#btn_close').on('click', function() {
-    //     parent.layer.closeAll('iframe');
-    // });
-  });
-  </script>
-</body>
-</html>

uis/views/index.html

@@ -71,9 +71,9 @@
                 <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-muen"
                     lay-filter="layadmin-system-side-menu">
                     <li data-name="set" class="layui-nav-item">
-                        <a href="javascript:;" lay-tips="会员管理" lay-direction="2">
+                        <a href="javascript:;" lay-tips="业务管理" lay-direction="2">
                             <i class="layui-icon layui-icon-set"></i>
-                            <cite>会员管理</cite>
+                            <cite>业务管理</cite>
                         </a>
                         <dl class="layui-nav-child">
                             <dd data-name="nav">

uis/views/order/index.html

@@ -113,10 +113,10 @@
             , totalRow: true
             , cols: [[
                 {field: 'name', title: '姓名', width: 150}
-                , {field: 'sex_text', title: '性别', totalRow: true, align: 'right', width: 100}
-                , {field: 'tel', title: '手机号', totalRow: true,align: 'right', width: 130}
-                , {field: 'inumber', title: '证件号', totalRow: true,align: 'right', width: 150}
-                , {field: 'package_text', title: '贷款产品', totalRow: true,align: 'right', width: 200}
+                , {field: 'sex_text', title: '性别', width: 100}
+                , {field: 'tel', title: '手机号', width: 130}
+                , {field: 'inumber', title: '证件号', width: 150}
+                , {field: 'package_text', title: '贷款产品', width: 200}
                 , {field: 'status_text', title: '订单状态', width: 100}
                 , {field: 'create_time_f', title: '下单时间', width: 180,}
                 , {field: 'create_user_text', title: '下单人', width: 120,}