lyh 1 rok temu
rodzic
commit
d247359db0

+ 7 - 1
apps/account/serializers.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 import json
 from django.contrib.auth import get_user_model, authenticate
-
+from utils.exceptions import CustomError
 from rest_framework import serializers
 from rest_framework_jwt.serializers import JSONWebTokenSerializer
 from rest_framework_jwt.settings import api_settings
@@ -61,7 +61,11 @@ class EmployeeSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     def create(self, validated_data):
+        if validated_data['password'].strip() == '':
+            raise CustomError(u'密码不能为空!')
         instance = super(EmployeeSerializer, self).create(validated_data)
+        instance.set_password(validated_data['password'])
+        instance.save()
         return instance
 
     def update(self, instance, validated_data):
@@ -69,4 +73,6 @@ class EmployeeSerializer(serializers.ModelSerializer):
             instance.user.update_item(validated_data['user'])
             validated_data.pop('user')
         instance = super(EmployeeSerializer, self).update(instance, validated_data)
+        instance.set_password(validated_data['password'])
+        instance.save()
         return instance

+ 2 - 5
uis/views/account/employee_edit.html

@@ -115,18 +115,15 @@
 
     if(id){
       editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
-      editdata.password = '';
       if (editdata.status == 1) {
         editdata.status = true;
       } else {
         editdata.status = false;
       }
+      form.val("component-form-element", editdata);
     }
-
+    form.render(null, 'component-form-element');
     form.val("component-form-element", {'password':'1111'});
-    if(editdata){
-        form.val("component-form-element", editdata);
-    }
 
     form.on('submit(component-form-element)', function(data){
       if (!data.field['status']){

+ 1 - 1
utils/wechatpay.py

@@ -21,7 +21,7 @@ WEIXIN_UNIFIED_ORDER_URL = 'https://api.mch.weixin.qq.com/pay/unifiedorder'
 # 微信查询订单URL
 WEIXIN_QUERY_ORDER_URL = 'https://api.mch.weixin.qq.com/pay/orderquery'
 # 微信支付回调API
-WEIXIN_CALLBACK_API = 'https://xapp.aiche360.cn/api/wechat_notify/'
+WEIXIN_CALLBACK_API = 'https://lshop.zzliaoyuan.com/api/wechat_notify/'
 
 class WechatPay():