From 17f68ef261c539717bf9f4cd19e934f15622b8eb Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 29 Apr 2020 16:23:14 +0800
Subject: [PATCH] article

---
 test_client/src/api/cms.js                    |   6 ++
 test_client/src/views/analyse/examtest.vue    |   3 +
 test_client/src/views/crm/consumer.vue        |   2 +-
 test_client/src/views/news/news.vue           |  40 ++++++-
 test_client/src/views/news/newscreate.vue     |  21 +++-
 test_client/src/views/news/newsupdate.vue     |  21 +++-
 test_mini/app.js                              |   4 +-
 test_mini/app.json                            |  12 ++-
 test_mini/images/feeds-fill.png               | Bin 0 -> 1372 bytes
 test_mini/images/feeds.png                    | Bin 0 -> 1384 bytes
 test_mini/images/icon_doc.png                 | Bin 0 -> 1568 bytes
 test_mini/images/icon_doc_fill.png            | Bin 0 -> 1273 bytes
 test_mini/pages/article/detail.js             |  75 +++++++++++++
 test_mini/pages/article/detail.json           |   3 +
 test_mini/pages/article/detail.wxml           |  16 +++
 test_mini/pages/article/detail.wxss           |   1 +
 test_mini/pages/article/index.js              | 100 ++++++++++++++++++
 test_mini/pages/article/index.json            |   3 +
 test_mini/pages/article/index.wxml            |  22 ++++
 test_mini/pages/article/index.wxss            |   5 +
 .../cms/migrations/0002_auto_20200429_0944.py |  23 ++++
 .../cms/migrations/0003_auto_20200429_1147.py |  18 ++++
 .../cms/migrations/0004_auto_20200429_1205.py |  18 ++++
 test_server/cms/models.py                     |   4 +-
 test_server/cms/serializers.py                |  10 ++
 test_server/cms/views.py                      |  22 +++-
 test_server/crm/permission.py                 |   1 +
 test_server/crm/views.py                      |   7 +-
 28 files changed, 414 insertions(+), 23 deletions(-)
 create mode 100644 test_mini/images/feeds-fill.png
 create mode 100644 test_mini/images/feeds.png
 create mode 100644 test_mini/images/icon_doc.png
 create mode 100644 test_mini/images/icon_doc_fill.png
 create mode 100644 test_mini/pages/article/detail.js
 create mode 100644 test_mini/pages/article/detail.json
 create mode 100644 test_mini/pages/article/detail.wxml
 create mode 100644 test_mini/pages/article/detail.wxss
 create mode 100644 test_mini/pages/article/index.js
 create mode 100644 test_mini/pages/article/index.json
 create mode 100644 test_mini/pages/article/index.wxml
 create mode 100644 test_mini/pages/article/index.wxss
 create mode 100644 test_server/cms/migrations/0002_auto_20200429_0944.py
 create mode 100644 test_server/cms/migrations/0003_auto_20200429_1147.py
 create mode 100644 test_server/cms/migrations/0004_auto_20200429_1205.py

diff --git a/test_client/src/api/cms.js b/test_client/src/api/cms.js
index 0f65da2..a35be50 100644
--- a/test_client/src/api/cms.js
+++ b/test_client/src/api/cms.js
@@ -32,3 +32,9 @@ export function getArticle(id) {
     method: 'get',
   })
 }
+export function topArticle(id) {
+  return request({
+    url: `/cms/article/${id}/top/`,
+    method: 'put',
+  })
+}
diff --git a/test_client/src/views/analyse/examtest.vue b/test_client/src/views/analyse/examtest.vue
index 70c8dc8..08a6547 100644
--- a/test_client/src/views/analyse/examtest.vue
+++ b/test_client/src/views/analyse/examtest.vue
@@ -69,6 +69,9 @@
       <el-table-column align="left" label="消费者">
         <template slot-scope="scope">{{ scope.row.consumer_name }}</template>
       </el-table-column>
+      <el-table-column align="left" label="单位">
+        <template slot-scope="scope">{{ scope.row.consumer_company_name }}</template>
+      </el-table-column>
       <el-table-column align="left" label="工作类别">
         <template slot-scope="scope">{{ scope.row.workscope_name }}</template>
       </el-table-column>
diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index 15859ab..33ca475 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -33,7 +33,7 @@
       </el-select> -->
       <el-input
         v-model="listQuery.search"
-        placeholder="姓名或手机号"
+        placeholder="姓名/手机号/单位"
         style="width: 200px;"
         class="filter-item"
         @keyup.enter.native="handleFilter"
diff --git a/test_client/src/views/news/news.vue b/test_client/src/views/news/news.vue
index aa383b8..c9df686 100644
--- a/test_client/src/views/news/news.vue
+++ b/test_client/src/views/news/news.vue
@@ -33,6 +33,15 @@
       <el-table-column align="left" label="标题">
         <template slot-scope="scope">{{ scope.row.title }}</template>
       </el-table-column>
+      <el-table-column align="left" label="来源">
+        <template slot-scope="scope">{{ scope.row.ifrom }}</template>
+      </el-table-column>
+      <el-table-column align="left" label="外链">
+        <template slot-scope="scope">
+          {{ scope.row.elink }}
+          <el-tag v-if="!scope.row.elink">原创</el-tag>
+          </template>
+      </el-table-column>
       <el-table-column align="left" label="新建时间">
         <template slot-scope="scope">{{ scope.row.create_time }}</template>
       </el-table-column>
@@ -41,6 +50,22 @@
       </el-table-column>
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
+          <el-button
+          v-show="scope.row.is_top"
+            type="danger"
+            size="small"
+            @click="handleTop(scope)"
+            icon=""
+            :disabled="!checkPermission(['article_top'])"
+          >取消置顶</el-button>
+          <el-button
+          v-show="!scope.row.is_top"
+            type="primary"
+            size="small"
+            @click="handleTop(scope)"
+            icon="el-icon-upload2"
+            :disabled="!checkPermission(['article_top'])"
+          >置顶</el-button>
           <el-button
             type="primary"
             size="small"
@@ -69,7 +94,7 @@
 </template>
 
 <script>
-import { getArticleList, deleteArticle } from "@/api/cms";
+import { getArticleList, deleteArticle, topArticle } from "@/api/cms";
 import checkPermission from "@/utils/permission";
 import Pagination from "@/components/Pagination";
 
@@ -140,6 +165,19 @@ export default {
         }).catch(() => {      
         });
     },
+    handleTop(scope) {
+        topArticle(scope.row.id).then(response => {
+          if(response.code>=200){
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+              this.getList()
+          }
+
+          
+      });
+    }
   }
 };
 </script>
diff --git a/test_client/src/views/news/newscreate.vue b/test_client/src/views/news/newscreate.vue
index 75fb358..8f0c852 100644
--- a/test_client/src/views/news/newscreate.vue
+++ b/test_client/src/views/news/newscreate.vue
@@ -14,7 +14,10 @@
   <el-form-item label="来源" prop="ifrom">
     <el-input v-model="Form.ifrom" style="width: 500"></el-input>
   </el-form-item>
-  <el-form-item label="内容" prop="content">
+  <el-form-item label="外部链接" prop="elink" >
+    <el-input v-model="Form.elink" style="width: 500"></el-input>
+  </el-form-item>
+  <el-form-item label="内容" prop="content" v-show="is_show">
       <tinymce v-model="Form.content" :height="400" :width="600"/>
       </el-form-item>
       <el-form-item>
@@ -39,6 +42,7 @@ export default {
       Form:{
         title:'',
         ifrom:'',
+        elink:'',
         content:''
       },
       submitLoding: false,
@@ -49,12 +53,13 @@ export default {
         ifrom: [
           { required: true, message: "请输入", trigger: "blur" }
         ],
-        content: [
-          { required: true, message: "请输入", trigger: "blur" }
-        ],
       },
+      is_show: true
     }
   },
+  watch:{
+    'Form.elink':'showEditor'
+  },
   methods:{
     goBack() {
       this.$router.go(-1)
@@ -80,6 +85,14 @@ export default {
         }
       });
     },
+    showEditor(){
+      if(this.Form.elink){
+        this.Form.content = ''
+        this.is_show = false
+      }else{
+        this.is_show = true
+      }
+    }
   }
 }
 </script>
diff --git a/test_client/src/views/news/newsupdate.vue b/test_client/src/views/news/newsupdate.vue
index 335ac6a..29620da 100644
--- a/test_client/src/views/news/newsupdate.vue
+++ b/test_client/src/views/news/newsupdate.vue
@@ -14,7 +14,10 @@
   <el-form-item label="来源" prop="ifrom">
     <el-input v-model="Form.ifrom" style="width: 500"></el-input>
   </el-form-item>
-  <el-form-item label="内容" prop="content">
+  <el-form-item label="外部链接" prop="elink" >
+    <el-input v-model="Form.elink" style="width: 500"></el-input>
+  </el-form-item>
+  <el-form-item label="内容" prop="content" v-show="is_show">
       <tinymce v-model="Form.content" :height="400" :width="600"/>
       </el-form-item>
       <el-form-item>
@@ -39,6 +42,7 @@ export default {
       Form:{
         title:'',
         ifrom:'',
+        elink:'',
         content:''
       },
       submitLoding: false,
@@ -49,16 +53,17 @@ export default {
         ifrom: [
           { required: true, message: "请输入", trigger: "blur" }
         ],
-        content: [
-          { required: true, message: "请输入", trigger: "blur" }
-        ],
       },
+      is_show: false
     }
   },
   created() {
     this.Form.id = this.$route.query.id  //接收参数
     this.getArticle();
   },
+  watch:{
+    'Form.elink':'showEditor'
+  },
   methods:{
     goBack() {
       this.$router.go(-1)
@@ -89,6 +94,14 @@ export default {
         this.Form = response.data ;
       });
     },
+    showEditor(){
+      if(this.Form.elink){
+        this.Form.content = ''
+        this.is_show = false
+      }else{
+        this.is_show = true
+      }
+    }
   }
 }
 </script>
diff --git a/test_mini/app.js b/test_mini/app.js
index d9d5af7..7d4f53a 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -56,9 +56,9 @@ App({
   globalData: {
     userInfo: null,
     userinfo: null, // 服务器传回的消费者信息
-    host: 'https://apitest.ctcshe.com',
+    // host: 'https://apitest.ctcshe.com',
     mediahost: 'https://apitest.ctcshe.com',
-    //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/app.json b/test_mini/app.json
index cdca009..9fc31ef 100644
--- a/test_mini/app.json
+++ b/test_mini/app.json
@@ -19,7 +19,9 @@
     "pages/my/index",
     "pages/collect/main",
     "pages/workscope/index",
-    "pages/yati/index"
+    "pages/yati/index",
+    "pages/article/index",
+    "pages/article/detail"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -39,11 +41,17 @@
         "selectedIconPath": "images/homec.png",
         "text": "主页"
       },
+      {
+        "pagePath": "pages/article/index",
+        "iconPath": "images/icon_doc.png",
+        "selectedIconPath": "images/icon_doc_fill.png",
+        "text": "资讯"
+      },
       {
         "pagePath": "pages/my/index",
         "iconPath": "images/me.png",
         "selectedIconPath": "images/mec.png",
-        "text": "个人中心"
+        "text": "我的"
       }
     ]
   },
diff --git a/test_mini/images/feeds-fill.png b/test_mini/images/feeds-fill.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6ac9c524ad17161c47ee2687cba1ac150534c99
GIT binary patch
literal 1372
zcmeAS@N?(olHy`uVBq!ia0vp^4j?SR1|)y|Tss#?v7|ftIx;Y9?C1WI$O_~$76-XI
zF|0c$^AgBWNcITwWnidMV_;}#0crsXHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9<y8f}hU2>wy$!fk$L9koEv$x0Bg+3=GUaJY5_^DsH{KW9T6rFT?)f{_fozdefX7
z7UnMTW-AVl%H4Q&!ck2p_I7ER<_S%#?L3-60$Uzr#3)IyO!wP)bfMddW+y|_tqV8q
zY~eZRsN}I^5{K(0mG4$J{`^<?aee=uFLU?ZPZyl@;qmV;-RG-MFgtK4wg@;uh`V)5
zVw+22ub0M7<8E|XAW-p*=a4|#hi3LY;%8=EP5v5TtFC@(*QRxAmIv)lnf_*yS8MsY
z)k$#-xo)#BrkV8WU0~hy;h(L=LC$mT{T2FK-g*TzT{=HsL?fW$vs(Dc(4wgsQ_9zz
zKCy<4_X|G|-rsq-z(j`k_;UY%R;`e`dH1;gWbazQz01m~V|qpB_4n`PK=A*krF){{
zbk~b@?|B^Sl4QDKTlnqOZ}-;mW_mc^dirRuL7tDnL6swybnjlezxT21bE7j{4$LMF
z%yRtiS#PpRsvS;=xLomk2hV1v2Jt-)N-Zk%Pnh{V6!EjRsyM!bXE)OVX-;khi`H_6
ziy54{3sv9Ux3?Cr{P<|mdDClB*}Yr;)|xJ9yK>?B`nE)gwu?EN&Nc66{I|{C{>SFe
zO%;C@t=|;??exF5Z~u7Isn}0C|NZFiN3|c1_eUN-$aF(yrt0RDYj4%|E}8zN?#F`6
zS<5oZ-*1}L&$>hLgoLDW^7nTaQ+N4HkKdbQdflv^`GSb=#VgOxPiSCK@lw548Fj*B
zrrPCQ=d9hiZI`rv2?&imyV;j<iDPDfRFBK1v}<Q(wH>tf?_LE2L8q*b+e^&Xe;}q{
zq0{gnXESSrqjm=CeEaK3Q9j)t{XVbXe0<aG(`Kv+hC<34172*aKm3+$JHx?5Mway1
zx(i~TGn7^LZI`|+0%C3hG9~XYv9z-a%*ox>P&SwOLGsgjpw%B_8u%gNGGYz|5n$~=
zML0Oe*D-i{IBkl1zE|P)ix$5Zf4;u{b2{t>S9IdfU(<_Y4ZiQ1A=+T#(QM)~`RX3&
z_Y!>%fBgRbS%0$ZCg(CayFKqBGJ|GKQQI6DW;j#S;i72l#p%<|y<@krN;3U^EYOj4
zYS1o6^B2c%Z-0J&ncb_!`_%pay^ol+#B-L;^w;}#t$!CCl_WYnlF?{ikN#t8t4U@{
zeKU(QINTCN+>9l|KELgA%V=?16}roH`-?Dz3B^xiEUzE$U;F*8WBCQy604JpmJ00p
z@o|+OY|b41vpxUQqCFb=e7vHIS~C=XJ!W5hCwITrwK>Mm&+J_8FS`Fx_@C|X|2b$U
zs;+U_8Wp{A?Uk@?+q;F2c0M|C^5oC+v0t-hJPRpaWqI|N{<FWe{SOUo+^p`d(@uir
zI#B*o`oSCS*1O+tPrx2vVW3*#8c~vxSdwa$T$Bo=7>o>z40H`lbd4-S3@ofnO|1+K
zw1Er*1C0xr!YCSY^HVa@DsgLw?7g@isKFOxLvdNURZ?Pcs%~jfCPP|gPO6o@zJ5l2
zZmND_N^WMJer9rho^D!xUWtB5ZULAVZ)T8~WnpMwP-$4ApO%`MQmhNqm!k(XNk&JQ
Q2WT*Zr>mdKI;Vst02J0s<p2Nx

literal 0
HcmV?d00001

diff --git a/test_mini/images/feeds.png b/test_mini/images/feeds.png
new file mode 100644
index 0000000000000000000000000000000000000000..bec64286cb376be0a95262919a17910071a14afb
GIT binary patch
literal 1384
zcmeAS@N?(olHy`uVBq!ia0vp^4j?SR1|)y|Tss#?v7|ftIx;Y9?C1WI$O_~$76-XI
zF|0c$^AgBWNcITwWnidMV_;}#0crsXHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9<y8f}hU2>wy$!fk$L9koEv$x0Bg+K<hX?T^vIyZoR!@=ph{_!T#a>?idzvZ^w=c
zTk`mxtrN-ROgk}2bGv2CK|>3XH%pq2x^}X%w_j0hQrJ;)YON_><PoP?Q`+2$+IWs0
zOuOKrDAsgC<-64q-KA<8Uykm6QoG;v5x4&R?)pFP;)>WEI22n1oFK%@`WtIIOJlE>
z-hHa&>NPRw$xY*k7T1WH9~a)SeopI+P`-BJ`}-m<zmqF-z6tPu6j&X)`}Ho}cZ>ny
zS3^rfLvO0xPMMv5|BwOC;SZ0Gm+5bLeJY@>Xzj5E#^&(#eXHEBF3z&aD~~iU{5UJ4
zC<zE3-P_x?`(fUW`}^CucQkZwG~6v-k=~ZT(Z<GR(7?#ka(JHQ`8nzD9v?rIm%4q^
z@2A~&pOz|pob}?>4-kCneZrBis9)~pUW3~+5}G<QUQWw<xjz1O>^a|*IN^;P-5Wa2
zw`=+&t~y&WEj9AnVRjEEp-E3S-Q|AHx>(}qigoe7_qIu8t;#B|HGe3^z~R8alxMy~
zfi;&&;iu~UC-t9~C5WAA%9JS6pCj%XDB_y<=GFn#m_ttwG~E4qw<VfeVQ(jsf<>Kf
z!=0{KA(OK%z0Q5x?c-Zo6_>nz<MkWXmVshZSW_QfRzD03jtsNP>(2if-`!eoUz5FG
zVd9G~mqp83V;}k~vxuFe=O^C%xbx$Yibp4f?>!A*km0*tz<d4Ju>ukI!Y_BNLxEs#
z{ru~HL>lB8H(PXX=9k+byX|mU+@1%f>y!H!rx-u=v79~YkU*Qkldrd8&*$IqkG`HL
zdu@MRs%cpAR<qAp3mTt&T_pea#s0dU1AaF(twTlPo?56eylIf#(ERh~wZ*TcwZA##
z&7Uc<r77%!(adX$pP&CP8!j3eC>onD%e}?Y<H?@=4!RBnA`AyDm$4=YG)tUGxxp2k
zs9hHRSzNZHAj0|4Nkc{h+hxbU97!s>t|*no*tD2|<D8-Hg6Q82f4_Y+&hO)NDF4p*
zWA5?q(g?}y-wd^Na{u?s2s7Mb-@v|=;b0&Gi#wx$3@g|!6pm$@`i5{tg@oDp-@kEj
z9jJfx^}TceH(2SPC<m!a6V_d~=8cZj&Q5*)yw)@R()5yBQ|-?sW=>1{yVGRNSz)$B
z0k---55892VQS#bNjPj`-B-TjTJIlauE35mxoOjusAjGVc<{C8PE^C1)4SH>=Wl<<
zUr~4OZn>w8&e=;ku`91Me@(F6vG;6tTpr^I_Rj}vKKzNfHT~PtzX2R+32bSfDx>eM
zt=q&Xz2W1}&Dp27KE1`&>h&>bkI4UTz1P3Q?hjofX`Gz)=4G&@PW#gh2fp*~S^BJ~
zc<0VPzt<(JtJ@t;|Irh(E_!<hA~PzsbUaYMV_UQTS4jUWVCkS*;u=wsl30>zm0Xkx
zq!^40j0|)QOmvMbLkujeOiir}4YYv_0|Si<nZhU<a`RI%(<*Umi0r+%9#sB-Y$z^E
zw@OMZPSq_f%4A5(%t^J<*VoU;&rQ`&Ov%m6)6Y!K&(lrI&nwX{$t?i$;>`>avn&h^
h3@Qyv^wUyPQ;PL~h8*ZP+z2$2!PC{xWt~$(6999vRxSVl

literal 0
HcmV?d00001

diff --git a/test_mini/images/icon_doc.png b/test_mini/images/icon_doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbd89d17984ea67e5dc8a6cf6d9d0581891de946
GIT binary patch
literal 1568
zcmeAS@N?(olHy`uVBq!ia0vp^4j?SR1|)y|Tss#?v7|ftIx;Y9?C1WI$O_~$76-XI
zF|0c$^AgBWNcITwWnidMV_;}#0crsXHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9<y8f}hU2>wy$!fk$L9koEv$x0Bg+K<oB-x;TbZ+<H6L*CX0n<oN&M+AZAC0x_X)
zPxXo!?rw4vXnEwms)<{CYCw2k%LHle+=H$097`{#Y!@@RnKJQ4E30GEN}(tL#}jT-
zE;*GyVvm)`iQ-<^d$MGri`=2wkCl^s)_wnD=BRe=%*>xp?|kHtY*656Qs7WN#C3O}
zZ4UqK!{+&3F^`1g<<ivOw9K`sVzK}8!Q6DA<k^gMYeZx#;=XNY-&-QZsWRcmH{RnG
z$37nKpX6!exh#BrOx^VRPw(Fqwe?*q;=}NKTJh<fq0zJRJhv~24hx?-*>dLP6d~D!
zgD>6fe+6rvNfO)aKfmgl?dy4^)4jiJS=W`uc+UP~Y|!*8qP=mqd&3)d@0`7R`7)7Z
z2Ccq+UGvWWcfEASQSYjB&g0^gNAqSB6tI^U{N-F=$$a8!(bgE*-a}m4Yrema&v`DE
z_i$Q4#HuM;OTA{F%`KaK_t|3Qi;b&~DWBe?Q(SlT{`F|L3v(DZbhzr=+r9kS9KU6g
zUq1OzurvQp>dBlB{qk9Ft4?#=VvRT~buI61Q1-mnAZTYJBAc-=!BH&b;I}fFhaB$e
z>Z{(L?ov4Zbcam+N2f1)u3pe<IQSvLHmtw2T6*sb*Z0lrKV1%}s2Toz6S=d?fhlI<
zYb7Sm1%i9K9hgKo_5wvjB=&X!NzT0;Kyqf0cq5C3;8QIo&VZy-zAQox0+xb51mqt%
z-@W_O>&$bdk`uB;$8SU|eCEi+;kHpj?5I$$QjftQS=mZg31B3|?<@IYQ6*!0_H5Mg
z|L$LyrpRhX96a?>^Vfy;eYdykn`QsaU#KPMBJlJ2YN^u^$BJB8XQzM8`FB#dMZoFB
z$H%Mryd@tfU7m65OFRFf<rAmZzDeG{H#XZ`<pApsP5Y<I&(BYvxAXq~?s@%M=@y4?
z&b5x(t;ndiphs)*sTbGRUs|_C`|T_rNx^%2otdRBeE7Wl#m~8uYeh2Nww+_p+Hor;
zcipz;<}?1x%!{4{ZZUQjJH^1(&SGGp(r{3bk%x~np}>Qo*_lZ~M(DtU2@GuR6{-Pz
zCm1agHY#)|G{xylUF<k^>((M(iv~s>8M#B8>T}FytH0{3TJ-*YcN}|Q$9aaYE8PDc
za=K`4cU)-NhLG@fiKLFoy^9Wu_f{}+EbI_hnB8?gxOgL{V#|etjNBU-xNqcuBtIA*
z_-TBD$M{V7`)N4|#%Bz=`{HaK88aw~K->X!qTs)9hm+ckN8Qq=x_y*faAoR&q{W-P
z7DJ4Nb3Yh2Z176hc+qodU=5o>ixb2*8R83s=f3#!)qAaF@qCBaxi1{P9=idC^>aFl
z?k6u0e9Od>B+wkcZ-r_2n-C!UQKNF`>51H$Rf<<9WPSK~<=*kdHm4TPx6hXK|6R){
zXsP7>rff};=<4<H)2j~laQS~=@xSr5EBvF@J@fo^xB8#)Oz>JZY2}jh?NV13q@}xm
zITTa9>2=K303cj2Pf@QsjnU{k<DY+LqawAlYky2|(Ga>>dUow+k=aSXZ_dlFy({+T
z)(%d)gX%wer9V#m;ZbuW?J!T8fw9GjZ8yzs=VhHLKiKl{r0gp5jh$!x=U4O`uXywJ
z_8s+o0n+{gEWna!<4^7lPntaE@@a?zi!{{|*NBpo#FA92<f2p{#b9J$WT0zcqHAOs
zVqjrqYH4L)qzz;k7-Zg@p@pI$H$NpatrE8ei57)vKn>m?8;Z-)t&$RpQ*}#=G8xh`
zb5gDJ_4PCIb5r#bQ*tx&^fQz5^K{el^Gftfatpw`c$37c#5_yWs*+qYh(JnyvL4VJ
Uo}St9Kw}v^UHx3vIVCg!06b}^uK)l5

literal 0
HcmV?d00001

diff --git a/test_mini/images/icon_doc_fill.png b/test_mini/images/icon_doc_fill.png
new file mode 100644
index 0000000000000000000000000000000000000000..23930a26f02bb8c6df430f6081ce80446115287d
GIT binary patch
literal 1273
zcmeAS@N?(olHy`uVBq!ia0vp^4j?SR1|)y|Tss#?v7|ftIx;Y9?C1WI$O_~$76-XI
zF|0c$^AgBWNcITwWnidMV_;}#0crsXHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9<y8f}hU2>wy$!fk$L9koEv$x0Bg+3=GVZJY5_^DsH{KYv}#iLE^y2=ZiE#*weRK
za0D%Rp%G@^Fx8K*DNN=vmzc1)dgjriXQ${*I(l@K{DD;uRGKb1uH?w$bBc9Y(jgM^
zXs`2GYZ0&e)3ZOR-1{6o^~t+W`B%J`GPDRdaZD7<{>m79eC6XSh3U%=iLU$L(zJI|
z_%|zi{@ok6cRw`fIl$3VQkv+$NAR!#&*22#>#42lKZwpdnG!iIHBznFHZIU>HQ$o>
zSJQu`#?KcDUF5YTA|?Gz&)n3_1-#b_Y|Wm1<^I2Z#<`MZ%P*I4+;}XgD%0?{>%SZb
z>WgG?n^<+(8ZQ4kO`wJONA>FIPYzxGT+MNaaf9o&6Jn1G-*hH?&gOWupZSR*|Ides
zZ#pYlWt+k-YDJ}Hb64A(?O-q9T3&GLZm+H2`I8Q8M%meM{0md-StqdB$T6`#5bJMq
zVBB#wSuubi!bXURwSm`?h3kO!1g8ZIdyYL7&|p|!qzM#wEyLHy^do+=0r%#on_fTv
z%enCCc`1zst5rZC#bNS?O}6AhsHk>Jn0-lBc{Nj<cm<CQo7~&ux5C4}#+!G!UDTL2
z$ALvjfRpVaTUG;O+mFN-d;$7wh8;_TZX7P)W(|1HDEA;S&rkYN+m?k(Ro^_c@crSt
zaMrTSS;s8DxyTrEG#gYDFt``6xbKW9U0@X;yJN4Z?`4y-S)$byi!>PKXMfXsmiEHE
z;fV&r$v}oliy2hh89n-#CdjZVSaLZOi8MU<FrUrtu(6FeSI$h`%}-sDtT)Nt?6a}8
zEZudh-uV0X?Ne`g<*Hs@GuK|~XdIi)i*knSgHapACV4K`-=k|jclJ5o>8DS%7%lWs
z5xVjDc$*x<!B)A3TJ3H5XZ_~qf2{#R8;LDWVJEm|s(t&j@#1BN`HPn~x^Td)2fE91
zyYLH>{clYc-DkXWkF#Xf{W7VG%nCa$Fc(y-U&ySxow;N#P}f`sr51?0KQb&!;97R?
z{zi4BxdJT;U%shTNql5@B+&ljukE+06K&@|NZKjyd-sS@=8&SyySIt@9VOQiWv_j%
zym**{J)t%-{@V0RC;cx@`72xY>g~UG-s=0CFF@Gw-k5_u;P$USKN2SAO!7UJB+}$u
zckOE2bKY$S&2Btj{vt8@-^RksdCxNMT@3ULn>2OFszYiyhth1$<=x=j&Ds8vS#8#a
z`jz_{xOeQ>{aF7`>;5<IZ?FFm7F*%Oq1bZbEq{{UQK^HhOjf{bs#@Y2QIe8al4_M)
zlnSI6j0}tnbPY^&jVwb9EUZi|tqhE`feZtK%$qZ`P&DM`r(~v8;?^M1qA(4pApm4U
zaap=mQettcZfQ{_Lt17|s+GRJenx(7s(xZhZf2f-W^#U>Zd!g`iGE3L0hkwWl310P
mXK7khl4}MLNXbu*2WrjH0~$8VS#Jx_Yz9wPKbLh*2~7YQo(n$!

literal 0
HcmV?d00001

diff --git a/test_mini/pages/article/detail.js b/test_mini/pages/article/detail.js
new file mode 100644
index 0000000..98e8978
--- /dev/null
+++ b/test_mini/pages/article/detail.js
@@ -0,0 +1,75 @@
+// pages/article/detail.js
+const api = require("../../utils/request.js");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.getDetail(options.id)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  getDetail: function (id) {
+    var that = this
+    api.request(`/cms/article/${id}/`,'GET').then(res => {
+      that.setData(res.data)
+    })
+  },
+  
+})
\ No newline at end of file
diff --git a/test_mini/pages/article/detail.json b/test_mini/pages/article/detail.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/test_mini/pages/article/detail.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/test_mini/pages/article/detail.wxml b/test_mini/pages/article/detail.wxml
new file mode 100644
index 0000000..1cf9409
--- /dev/null
+++ b/test_mini/pages/article/detail.wxml
@@ -0,0 +1,16 @@
+<web-view wx:if="{{elink}}" src="{{elink}}"></web-view>
+<view class="page" wx:else>
+    <view class="page__hd" style="padding:20px">
+        <view class="page__title" >{{title}}</view>
+        <view class="page__desc">
+        <span style="font-weight:bold;color:darkblue;font-size:16px">{{ifrom}}  </span>
+        <text class="weui-badge" style="background:orange" wx:if="{{is_top}}">置顶</text>
+        <text class="weui-badge" style="background:green">原创</text>
+        </view>
+    </view>
+    <view class="page__bd">
+        <view class="weui-article">
+          <rich-text nodes="{{content}}"></rich-text>
+        </view>
+    </view>
+</view>
diff --git a/test_mini/pages/article/detail.wxss b/test_mini/pages/article/detail.wxss
new file mode 100644
index 0000000..bda2f6d
--- /dev/null
+++ b/test_mini/pages/article/detail.wxss
@@ -0,0 +1 @@
+/* pages/article/detail.wxss */
\ No newline at end of file
diff --git a/test_mini/pages/article/index.js b/test_mini/pages/article/index.js
new file mode 100644
index 0000000..6dfcd92
--- /dev/null
+++ b/test_mini/pages/article/index.js
@@ -0,0 +1,100 @@
+// pages/lianxi/index.js
+const api = require("../../utils/request.js");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    results: [],
+    query: {
+      page: 1,
+      limit: 10
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function () {
+    var that = this
+    that.getList(that.data.query)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  },
+  getList: function () {
+    var that = this
+    api.request('/cms/article/', 'GET', that.data.query).then(res => {
+      if (that.data.query.page == 1) {
+        that.data.results = res.data.results
+      } else {
+        that.data.results = that.data.results.concat(res.data.results)
+      }
+
+      that.setData({
+        results: that.data.results,
+        count: res.data.count
+      })
+
+    })
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    var that = this
+    that.data.query.page = 1;
+    that.getList();
+    wx.stopPullDownRefresh();
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    var that = this
+    if (that.data.count <= that.data.query.page * that.data.query.limit) {
+      wx.showToast({
+        title: '没有更多了',
+        icon: 'none'
+      })
+    } else {
+      that.data.query.page = that.data.query.page + 1
+      that.getList()
+    }
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+})
\ No newline at end of file
diff --git a/test_mini/pages/article/index.json b/test_mini/pages/article/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/test_mini/pages/article/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/test_mini/pages/article/index.wxml b/test_mini/pages/article/index.wxml
new file mode 100644
index 0000000..a17e055
--- /dev/null
+++ b/test_mini/pages/article/index.wxml
@@ -0,0 +1,22 @@
+<view class="head">
+
+  {{count}}条资讯</view>
+<view class="weui-cells weui-cells_after-title">
+  <block wx:for="{{results}}" wx:key="unique">
+    <navigator url="detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+      <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+        <view class="weui-media-box__title">
+        <text class="weui-badge" style="background:orange" wx:if="{{item.is_top}}">置顶</text>
+        {{item.title}}</view>
+        <view class="weui-media-box__desc">
+          来源:
+          <span style="font-weight:bold;color:darkblue">{{item.ifrom}}</span>
+          {{item.update_time}}
+        </view>
+      </view>
+      <view class="weui-panel__ft weui-cell__ft_in-access">
+        <view class="weui-media-box__desc">查看详情</view>
+      </view>
+    </navigator>
+  </block>
+</view>
\ No newline at end of file
diff --git a/test_mini/pages/article/index.wxss b/test_mini/pages/article/index.wxss
new file mode 100644
index 0000000..a458506
--- /dev/null
+++ b/test_mini/pages/article/index.wxss
@@ -0,0 +1,5 @@
+.head{
+  color:#fff;
+  background-color: cornflowerblue;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/test_server/cms/migrations/0002_auto_20200429_0944.py b/test_server/cms/migrations/0002_auto_20200429_0944.py
new file mode 100644
index 0000000..4a34c73
--- /dev/null
+++ b/test_server/cms/migrations/0002_auto_20200429_0944.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.4 on 2020-04-29 01:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='article',
+            name='frame',
+            field=models.URLField(blank=True, null=True, verbose_name='外部链接'),
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='is_top',
+            field=models.BooleanField(default=False, verbose_name='置顶'),
+        ),
+    ]
diff --git a/test_server/cms/migrations/0003_auto_20200429_1147.py b/test_server/cms/migrations/0003_auto_20200429_1147.py
new file mode 100644
index 0000000..dd073d9
--- /dev/null
+++ b/test_server/cms/migrations/0003_auto_20200429_1147.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-29 03:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0002_auto_20200429_0944'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='article',
+            old_name='frame',
+            new_name='elink',
+        ),
+    ]
diff --git a/test_server/cms/migrations/0004_auto_20200429_1205.py b/test_server/cms/migrations/0004_auto_20200429_1205.py
new file mode 100644
index 0000000..c639820
--- /dev/null
+++ b/test_server/cms/migrations/0004_auto_20200429_1205.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-29 04:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0003_auto_20200429_1147'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='article',
+            name='content',
+            field=models.TextField(blank=True, verbose_name='内容'),
+        ),
+    ]
diff --git a/test_server/cms/models.py b/test_server/cms/models.py
index 4ccfb65..8a57448 100644
--- a/test_server/cms/models.py
+++ b/test_server/cms/models.py
@@ -8,8 +8,10 @@ class Article(CommonModel):
     文章
     '''
     title = models.CharField(max_length=60, verbose_name='标题')
-    content = models.TextField(verbose_name='内容')
+    elink = models.URLField(verbose_name='外部链接', null=True, blank=True)
+    content = models.TextField(verbose_name='内容', blank=True)
     ifrom = models.CharField(max_length=60, verbose_name='来源')
+    is_top = models.BooleanField('置顶', default=False)
 
     class Meta:
         verbose_name = '文章'
diff --git a/test_server/cms/serializers.py b/test_server/cms/serializers.py
index 6c1e1f1..4165e3f 100644
--- a/test_server/cms/serializers.py
+++ b/test_server/cms/serializers.py
@@ -11,3 +11,13 @@ class ArticelSerializer(serializers.ModelSerializer):
     class Meta:
         model = Article
         fields = '__all__'
+
+class ArticelListSerializer(serializers.ModelSerializer):
+    """
+    文章列表序列化
+    """
+    create_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
+    update_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
+    class Meta:
+        model = Article
+        exclude = ('content',)
diff --git a/test_server/cms/views.py b/test_server/cms/views.py
index fa40d7f..6d30954 100644
--- a/test_server/cms/views.py
+++ b/test_server/cms/views.py
@@ -22,7 +22,7 @@ from rest_framework_jwt.settings import api_settings
 # Create your views here.
 
 from .models import Article
-from .serializers import ArticelSerializer
+from .serializers import ArticelSerializer, ArticelListSerializer
 from utils.custom import CommonPagination
 class ArticleViewSet(ModelViewSet):
     """
@@ -36,5 +36,21 @@ class ArticleViewSet(ModelViewSet):
     pagination_class = CommonPagination
     filter_backends = [DjangoFilterBackend,SearchFilter, OrderingFilter]
     search_fields = ('^title','^content')
-    ordering_fields = ('id',)
-    ordering = ['-id']
\ No newline at end of file
+    ordering_fields = ('title','update_time')
+    ordering = ['-is_top', '-update_time']
+
+    def get_serializer_class(self):
+        if self.action=='list':
+            return ArticelListSerializer
+        else:
+            return ArticelSerializer
+    
+    @action(methods=['put'], detail=True, url_name='top_article', perms_map=[{'*':'top_article'}])
+    def top(self, request, *args, **kwargs):
+        '''
+        置顶文章
+        '''
+        instance = self.get_object()
+        instance.is_top = False if instance.is_top else True
+        instance.save()
+        return Response(status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/test_server/crm/permission.py b/test_server/crm/permission.py
index 9af6a13..6e417ee 100644
--- a/test_server/crm/permission.py
+++ b/test_server/crm/permission.py
@@ -12,6 +12,7 @@ ConsumerPerms = [
     'my_subjects',
     'my_examtest',
     'examtest_create',
+    'article_list'
 ]
 
 class MyPermission(RbacPermission):
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index ec8859d..152a8ad 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -85,7 +85,7 @@ class ConsumerViewSet(ModelViewSet):
     ordering = ['-create_time']
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_fields = ('company',)
-    search_fields = ('^name','^username')
+    search_fields = ('^name','^username','^company__name')
 
     def get_queryset(self):
         queryset = self.queryset
@@ -202,10 +202,7 @@ class ConsumerViewSet(ModelViewSet):
             companyname = sheet['C'+str(m)].value
             if companyname:
                 companyname = companyname.replace(' ', '')
-            if companyname not in companydict:
-                 return Response({"error":"不存在单位("+companyname+")!请先新建"})
-            else:
-                companyobj = Company.objects.get(id=companydict[companyname])
+            companyobj = Company.objects.get_or_create(id=companydict[companyname])[0]
             workscope = sheet['d'+str(m)].value
             if Consumer.objects.filter(username = username).exists():
                 obj = Consumer.objects.filter(username = username).first()