From f7b89b3101755ae049dd69e5cba204657951831e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 11 Dec 2020 09:38:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/views/crm/company.vue | 15 ++++---
 test_server/analyse/views.py          |  8 ++--
 test_server/crm/views.py              | 63 ++++++++++++++++++++++-----
 3 files changed, 66 insertions(+), 20 deletions(-)

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"
         >
-          <el-table-column type="selection" width="50"></el-table-column>
+          <el-table-column type="selection" width="40"></el-table-column>
           <el-table-column label="单位名称">
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
+          
+          <el-table-column label="所在地区">
+            <template slot-scope="scope" v-if="scope.row.geo">
+              <span v-if="scope.row.geo.pname">{{ scope.row.geo.pname }}</span>
+              <span v-if="scope.row.geo.cityname">/{{ scope.row.geo.cityname }}</span>
+              <span v-if="scope.row.geo.adname">/{{ scope.row.geo.adname }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="创建日期">
             <template slot-scope="scope">
               <span>{{ scope.row.create_time }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="所在地区">
-            <template slot-scope="scope" v-if="scope.row.geo">
-              <span>{{ scope.row.geo.province }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="所属">
             <template slot-scope="scope">
               <span>{{ scope.row.create_admin_name }}</span>
diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py
index 76c6578..1b4d1c0 100644
--- a/test_server/analyse/views.py
+++ b/test_server/analyse/views.py
@@ -101,9 +101,9 @@ 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__isnull=True).values('pname').annotate(total=Count('pname'))
         for i in tmp:
-            ret['s'].append({'name':nameMap[i['geo__province']], 'value':i['total']})
+            ret['s'].append({'name':nameMap[i['pname']], 'value':i['total']})
         return Response(ret)
 
 class Consumerdis(APIView):
@@ -112,9 +112,9 @@ 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__isnull=True).values('company__pname').annotate(total=Count('company__pname'))
         for i in tmp:
-            ret['s'].append({'name':nameMap[i['company__geo__province']], 'value':i['total']})
+            ret['s'].append({'name':nameMap[i['company__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 9781cbc..97ef230 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.all().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()

From 61bd80141aa3eb852d64a60ebebd4ecf1dd35f1d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 11 Dec 2020 09:53:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_server/analyse/views.py | 8 ++++----
 test_server/crm/views.py     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py
index 1b4d1c0..52c96b4 100644
--- a/test_server/analyse/views.py
+++ b/test_server/analyse/views.py
@@ -101,9 +101,9 @@ class Companydis(APIView):
     """
     def get(self, request, format=None):
         ret = {'s':[], 't':'单位分布', 'max':300, 'min':0}
-        tmp = Company.objects.exclude(geo__isnull=True).values('pname').annotate(total=Count('pname'))
+        tmp = Company.objects.exclude(geo__isnull=True).values('geo__pname').annotate(total=Count('geo__pname'))
         for i in tmp:
-            ret['s'].append({'name':nameMap[i['pname']], 'value':i['total']})
+            ret['s'].append({'name':nameMap[i['geo__pname']], 'value':i['total']})
         return Response(ret)
 
 class Consumerdis(APIView):
@@ -112,9 +112,9 @@ 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__pname').annotate(total=Count('company__pname'))
+        tmp = Consumer.objects.exclude(company__geo__isnull=True).values('company__geo__pname').annotate(total=Count('company__geo__pname'))
         for i in tmp:
-            ret['s'].append({'name':nameMap[i['company__pname']], 'value':i['total']})
+            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 97ef230..a287040 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -209,7 +209,7 @@ class CompanyViewSet(ModelViewSet):
         """
         地理位置
         """
-        companys = Company.objects.all().order_by('-create_time')
+        companys = Company.objects.filter(geo__pname__isnull=True).order_by('-create_time')
         for i in companys:
             geo = None
             try:

From 22b9254ce874498a787a4cab1eedcfa6da7df6dd Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 11 Dec 2020 10:03:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=B1=95=E7=A4=BAbugserv?=
 =?UTF-8?q?er=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_mini/app.js                 |  4 ++--
 test_mini/pages/test/detail.wxml |  3 ++-
 test_mini/project.config.json    |  2 +-
 test_server/analyse/views.py     | 10 ++++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

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 @@
     <span style="color:gray">({{tm_current.question.questioncat_name}})</span>
     </view>
     <view class="weui-article__title">
-    <parser html="{{tm_current.question.name}}" domain="{{domain}}" selectable/>
+    <!-- <parser html="{{tm_current.question.name}}" domain="{{domain}}" selectable/> -->
+    <rich-text nodes="{{tm_current.question.name}}"></rich-text>
     </view>
     <view wx:if="{{tm_current.img}}" style="text-align:center"><image src="{{tm_current.img}}" mode="aspectFit"></image></view>
   </view>
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 52c96b4..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__pname').annotate(total=Count('geo__pname'))
+        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__pname']], '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__pname').annotate(total=Count('company__geo__pname'))
+        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__pname']], '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):
     '''

From a7af0ba8c35dfe2844339e49da48408d32765dd9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 14 Dec 2020 16:46:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E5=90=8E=E5=8F=8A=E6=97=B6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_server/crm/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index a287040..50027d5 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -567,6 +567,7 @@ class ConsumerViewSet(ModelViewSet):
         except:
             raise Http404
 
+from .permission import get_consumerperm_list
 class ConsumerMPLoginView(APIView):
     """
     小程序登陆颁发token
@@ -581,6 +582,7 @@ class ConsumerMPLoginView(APIView):
         openid = info['openid']
         session_key = info['session_key']
         consumer = Consumer.objects.get_or_create(openid = openid)[0]
+        get_consumerperm_list(consumer)
         serializer = ConsumerDetailSerializer(instance=consumer)
         payload = jwt_payload_handler(consumer)
         token = jwt_encode_handler(payload)