Merge branch 'master' of http://119.23.72.7/sunlong_v5/test-long

# Conflicts:
#	erp2web_service.py

erp2web_service.py

@@ -38,7 +38,11 @@ class erp2web_service(base):
     def auth(self, data = ''):
         '''登录'''
         arr = json.loads(data)
-        order_id = self.db.table('order').getField({'order_sn' : order_sn}, 'order_id')
+        user = arr['user']
+        user_id = 0
+        if global_auth(user, pwd) == False:
+            return apiReturn(1, '校验失败')
+		order_id = self.db.table('order').getField({'order_sn' : order_sn}, 'order_id')
             self.db.startTrans()
         return apiReturn(0, '登录成功')