Merge branch 'ljm_data' into Development

# Conflicts:
#	view/21.js
js

src/views/download/Index.vue

@@ -25,7 +25,7 @@
             <ul class="boxsiz">
                 <li class="boxsiz" v-for="(item, index) in  articleShowData" :key="index">
                     <template v-if="loginCheck">
-                        <p class="t1" @click="download(item.data_id)">{{item.title}}</p>
+                        <p class="t1">{{item.title}}</p>
                     </template>
                     <template v-else>
                         <p class="t1" @click="toUrl">{{item.title}}</p>