diff --git a/test_client/src/views/crm/company.vue b/test_client/src/views/crm/company.vue
index 7f5323d..ab2415e 100644
--- a/test_client/src/views/crm/company.vue
+++ b/test_client/src/views/crm/company.vue
@@ -35,20 +35,23 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@selection-change="handleSelectionChange"
>
-
+
{{ scope.row.name }}
+
+
+
+ {{ scope.row.geo.pname }}
+ /{{ scope.row.geo.cityname }}
+ /{{ scope.row.geo.adname }}
+
+
{{ scope.row.create_time }}
-
-
- {{ scope.row.geo.province }}
-
-
{{ scope.row.create_admin_name }}
diff --git a/test_mini/app.js b/test_mini/app.js
index 75f30df..4e9ce27 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -69,9 +69,9 @@ App({
globalData: {
userInfo: {},
userinfo: {}, // 服务器传回的消费者信息
- //host: 'https://apitest.ahctc.cn',
+ host: 'https://apitest.ahctc.cn',
mediahost: 'https://apitest.ahctc.cn',
- host: 'http://127.0.0.1:8000',
+ //host: 'http://127.0.0.1:8000',
//mediahost: 'http://127.0.0.1:8000',
token : '',
}
diff --git a/test_mini/pages/test/detail.wxml b/test_mini/pages/test/detail.wxml
index 740381c..abd7706 100644
--- a/test_mini/pages/test/detail.wxml
+++ b/test_mini/pages/test/detail.wxml
@@ -8,7 +8,8 @@
({{tm_current.question.questioncat_name}})
-
+
+
diff --git a/test_mini/project.config.json b/test_mini/project.config.json
index 251a781..ba4292c 100644
--- a/test_mini/project.config.json
+++ b/test_mini/project.config.json
@@ -25,7 +25,7 @@
"disablePlugins": [],
"outputPath": ""
},
- "useCompilerModule": true,
+ "useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py
index 76c6578..a2e0b89 100644
--- a/test_server/analyse/views.py
+++ b/test_server/analyse/views.py
@@ -101,9 +101,10 @@ class Companydis(APIView):
"""
def get(self, request, format=None):
ret = {'s':[], 't':'单位分布', 'max':300, 'min':0}
- tmp = Company.objects.exclude(geo__isnull=True).values('geo__province').annotate(total=Count('geo__province'))
+ tmp = Company.objects.exclude(geo__pname__isnull=True).values('geo__pname').annotate(total=Count('geo__pname'))
for i in tmp:
- ret['s'].append({'name':nameMap[i['geo__province']], 'value':i['total']})
+ if i['geo__pname'] in nameMap:
+ ret['s'].append({'name':nameMap[i['geo__pname']], 'value':i['total']})
return Response(ret)
class Consumerdis(APIView):
@@ -112,9 +113,10 @@ class Consumerdis(APIView):
"""
def get(self, request, format=None):
ret = {'s':[], 't':'学员分布', 'max':600, 'min':0}
- tmp = Consumer.objects.exclude(company__geo__isnull=True).values('company__geo__province').annotate(total=Count('company__geo__province'))
+ tmp = Consumer.objects.exclude(company__geo__pname__isnull=True).values('company__geo__pname').annotate(total=Count('company__geo__pname'))
for i in tmp:
- ret['s'].append({'name':nameMap[i['company__geo__province']], 'value':i['total']})
+ if i['company__geo__pname'] in nameMap:
+ ret['s'].append({'name':nameMap[i['company__geo__pname']], 'value':i['total']})
return Response(ret)
class Quota(APIView):
'''
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 39a8f48..50027d5 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -91,14 +91,40 @@ class ConsumerPermViewSet(ModelViewSet):
ordering_fields = ['create_time']
ordering = ['-create_time']
-
-def getPosition(address):
- url = 'http://restapi.amap.com/v3/geocode/geo'
- par = {'address': address, 'key': '86e0993305a427ac2d0b5371ad97f242'}
+keys1 = ['86e0993305a427ac2d0b5371ad97f242']
+def getPosition(name):
+ # 高德接口
+ url = 'http://restapi.amap.com/v3/place/text'
+ par = {'keywords': name, 'key': keys1[0]}
res = requests.get(url, par)
json_data = json.loads(res.text)
+ fdata = {}
if json_data['status'] == '1' and int(json_data['count']) > 0:
- return json_data['geocodes'][0]
+ alldata = json_data['pois'][0]
+ fdata['cname'] = '中国'
+ fdata['pname'] = alldata['pname']
+ fdata['cityname'] = alldata['cityname']
+ fdata['adname'] = alldata['adname']
+ fdata['address'] = alldata['address']
+ return fdata
+ return None
+
+keys2 = ['v31TjiNQoCCF1PwDVWU43yUjSoyQSdmj']
+def getPosition2(name):
+ # 百度接口
+ url = 'http://api.map.baidu.com/place/v2/search'
+ par = {'query': name, 'ak': keys2[0], 'region':'全国', 'output':'json'}
+ res = requests.get(url, par)
+ json_data = json.loads(res.text)
+ fdata = {}
+ if len(json_data['results'])> 0 and 'province' in json_data['results'][0]:
+ alldata = json_data['results'][0]
+ fdata['cname'] = '中国'
+ fdata['pname'] = alldata['province']
+ fdata['cityname'] = alldata['city']
+ fdata['adname'] = alldata['area']
+ fdata['address'] = alldata['address'] if 'address' in alldata else ''
+ return fdata
return None
class CompanyViewSet(ModelViewSet):
@@ -118,14 +144,22 @@ class CompanyViewSet(ModelViewSet):
def perform_create(self, serializer):
instance = serializer.save(create_admin=self.request.user)
- geo = getPosition(instance.name)
+ geo = None
+ try:
+ geo = getPosition2(instance.name)
+ except:
+ pass
if geo:
instance.geo = geo
instance.save()
def perform_update(self, serializer):
instance = serializer.save()
- geo = getPosition(instance.name)
+ geo = None
+ try:
+ geo = getPosition2(instance.name)
+ except:
+ pass
if geo:
instance.geo = geo
instance.save()
@@ -175,12 +209,17 @@ class CompanyViewSet(ModelViewSet):
"""
地理位置
"""
- companys = Company.objects.filter(geo__isnull=True).order_by('-create_time')
+ companys = Company.objects.filter(geo__pname__isnull=True).order_by('-create_time')
for i in companys:
- geo = getPosition(i.name)
+ geo = None
+ try:
+ geo = getPosition2(i.name)
+ except:
+ pass
if geo:
i.geo = geo
i.save()
+ print(str(i.id) + '-' + i.name + '-ok')
return Response(status=status.HTTP_200_OK)
@@ -419,7 +458,11 @@ class ConsumerViewSet(ModelViewSet):
companyobj = Company.objects.get(name=companyname)
else:
companyobj = Company.objects.create(name=companyname, create_admin=request.user)
- geo = getPosition(companyobj.name)
+ geo = None
+ try:
+ geo = getPosition2(companyobj.name)
+ except:
+ pass
if geo:
companyobj.geo = geo
companyobj.save()