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>

view/22.js

@@ -20,7 +20,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n  var _vm = this\n  var _h = _vm.$createElement\n  var _c = _vm._self._c || _h\n  return _c(\n    \"section\",\n    { staticClass: \"news\" },\n    [\n      _c(\"Header\", {\n        attrs: {\n          bgcolor: \"#fff\",\n          title: _vm.title,\n          meaushow: _vm.meaushow,\n          download: _vm.loginCheck\n        }\n      }),\n      _vm._m(0),\n      _vm.getfileuploadbanner.length > 0\n        ? [\n            _c(\n              \"van-swipe\",\n              {\n                staticClass: \"a\",\n                attrs: { autoplay: 3000, height: _vm.bannerHeight }\n              },\n              _vm._l(_vm.getfileuploadbanner, function(item, index) {\n                return _c(\"van-swipe-item\", { key: index }, [\n                  _c(\n                    \"a\",\n                    {\n                      attrs: {\n                        href: item.url,\n                        target: item.window_open > 0 ? \"_blank\" : \"_self\"\n                      }\n                    },\n                    [\n                      _c(\"img\", {\n                        attrs: {\n                          src: item.images,\n                          height: \"100%\",\n                          width: \"100%\"\n                        }\n                      })\n                    ]\n                  )\n                ])\n              }),\n              1\n            )\n          ]\n        : _vm._e(),\n      _c(\"div\", { staticClass: \"nav-tab\" }, [\n        _c(\n          \"ul\",\n          _vm._l(_vm.showClass, function(item, index) {\n            return _c(\n              \"li\",\n              {\n                key: index,\n                class: { curr: _vm.active == index },\n                on: {\n                  click: function($event) {\n                    return _vm.handleSelect(index, item.class_id)\n                  }\n                }\n              },\n              [_vm._v(_vm._s(item.class_name))]\n            )\n          }),\n          0\n        )\n      ]),\n      _c(\"div\", { staticClass: \"down-list\" }, [\n        _c(\n          \"ul\",\n          { staticClass: \"boxsiz\" },\n          _vm._l(_vm.articleShowData, function(item, index) {\n            return _c(\n              \"li\",\n              { key: index, staticClass: \"boxsiz\" },\n              [\n                _vm.loginCheck\n                  ? [\n                      _c(\n                        \"p\",\n                        {\n                          staticClass: \"t1\",\n                          on: {\n                            click: function($event) {\n                              return _vm.download(item.data_id)\n                            }\n                          }\n                        },\n                        [_vm._v(_vm._s(item.title))]\n                      )\n                    ]\n                  : [\n                      _c(\"p\", { staticClass: \"t1\", on: { click: _vm.toUrl } }, [\n                        _vm._v(_vm._s(item.title))\n                      ])\n                    ],\n                _c(\n                  \"div\",\n                  { staticClass: \"bar\" },\n                  [\n                    _c(\"p\", { staticClass: \"t2\" }, [\n                      _vm._v(\"已下载\" + _vm._s(item.download_num) + \"次\")\n                    ]),\n                    _vm.loginCheck\n                      ? [\n                          _c(\n                            \"a\",\n                            {\n                              staticClass: \"btn\",\n                              on: {\n                                click: function($event) {\n                                  return _vm.download(item.data_id, 1)\n                                }\n                              }\n                            },\n                            [_vm._v(\"下载\")]\n                          )\n                        ]\n                      : [\n                          _c(\n                            \"a\",\n                            { staticClass: \"btn\", on: { click: _vm.toUrl } },\n                            [_vm._v(\"下载\")]\n                          )\n                        ]\n                  ],\n                  2\n                )\n              ],\n              2\n            )\n          }),\n          0\n        ),\n        _c(\"p\", { staticClass: \"txt-tip\" }, [\n          _vm._v(\n            \"\\n            法律声明：本资料库的文档为网络收集，仅供学习使用，勿做商用\\n        \"\n          )\n        ])\n      ]),\n      !_vm.loginCheck\n        ? [\n            _c(\"div\", { staticClass: \"islogin\", on: { click: _vm.toUrl } }, [\n              _c(\"img\", {\n                attrs: {\n                  src: __webpack_require__(/*! ../../assets/images/download/loading.png */ \"./src/assets/images/download/loading.png\"),\n                  alt: \"\"\n                }\n              }),\n              _c(\"a\", { attrs: { href: \"javascript:;\" } }, [\n                _vm._v(\"登录查看更多哦\")\n              ])\n            ])\n          ]\n        : _vm._e(),\n      _c(\n        \"div\",\n        {\n          directives: [{ name: \"backTopWindow\", rawName: \"v-backTopWindow\" }],\n          staticClass: \"slide-bar\",\n          staticStyle: { cursor: \"pointer\" }\n        },\n        [\n          _vm.navListfixed\n            ? _c(\"div\", { staticClass: \"backtop\" }, [\n                _c(\"i\", { staticClass: \"iconfont icon-xiangshang1\" })\n              ])\n            : _vm._e()\n        ]\n      )\n    ],\n    2\n  )\n}\nvar staticRenderFns = [\n  function() {\n    var _vm = this\n    var _h = _vm.$createElement\n    var _c = _vm._self._c || _h\n    return _c(\"div\", { staticClass: \"new-head boxsiz\" }, [\n      _c(\"a\", { staticClass: \"logo\", attrs: { href: \"/\" } }, [\n        _c(\"img\", {\n          attrs: {\n            src: __webpack_require__(/*! ../../assets/images/download/logo.png */ \"./src/assets/images/download/logo.png\"),\n            alt: \"猎芯网\"\n          }\n        })\n      ]),\n      _c(\"span\", { staticClass: \"t1\" }, [_vm._v(\"猎芯网\")])\n    ])\n  }\n]\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/views/download/Index.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%221627c33a-vue-loader-template%22%7D!./node_modules/_vue-loader@15.7.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.1@vue-loader/lib??vue-loader-options");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"render\", function() { return render; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"staticRenderFns\", function() { return staticRenderFns; });\nvar render = function() {\n  var _vm = this\n  var _h = _vm.$createElement\n  var _c = _vm._self._c || _h\n  return _c(\n    \"section\",\n    { staticClass: \"news\" },\n    [\n      _c(\"Header\", {\n        attrs: {\n          bgcolor: \"#fff\",\n          title: _vm.title,\n          meaushow: _vm.meaushow,\n          download: _vm.loginCheck\n        }\n      }),\n      _vm._m(0),\n      _vm.getfileuploadbanner.length > 0\n        ? [\n            _c(\n              \"van-swipe\",\n              {\n                staticClass: \"a\",\n                attrs: { autoplay: 3000, height: _vm.bannerHeight }\n              },\n              _vm._l(_vm.getfileuploadbanner, function(item, index) {\n                return _c(\"van-swipe-item\", { key: index }, [\n                  _c(\n                    \"a\",\n                    {\n                      attrs: {\n                        href: item.url,\n                        target: item.window_open > 0 ? \"_blank\" : \"_self\"\n                      }\n                    },\n                    [\n                      _c(\"img\", {\n                        attrs: {\n                          src: item.images,\n                          height: \"100%\",\n                          width: \"100%\"\n                        }\n                      })\n                    ]\n                  )\n                ])\n              }),\n              1\n            )\n          ]\n        : _vm._e(),\n      _c(\"div\", { staticClass: \"nav-tab\" }, [\n        _c(\n          \"ul\",\n          _vm._l(_vm.showClass, function(item, index) {\n            return _c(\n              \"li\",\n              {\n                key: index,\n                class: { curr: _vm.active == index },\n                on: {\n                  click: function($event) {\n                    return _vm.handleSelect(index, item.class_id)\n                  }\n                }\n              },\n              [_vm._v(_vm._s(item.class_name))]\n            )\n          }),\n          0\n        )\n      ]),\n      _c(\"div\", { staticClass: \"down-list\" }, [\n        _c(\n          \"ul\",\n          { staticClass: \"boxsiz\" },\n          _vm._l(_vm.articleShowData, function(item, index) {\n            return _c(\n              \"li\",\n              { key: index, staticClass: \"boxsiz\" },\n              [\n                _vm.loginCheck\n                  ? [\n                      _c(\"p\", { staticClass: \"t1\" }, [\n                        _vm._v(_vm._s(item.title))\n                      ])\n                    ]\n                  : [\n                      _c(\"p\", { staticClass: \"t1\", on: { click: _vm.toUrl } }, [\n                        _vm._v(_vm._s(item.title))\n                      ])\n                    ],\n                _c(\n                  \"div\",\n                  { staticClass: \"bar\" },\n                  [\n                    _c(\"p\", { staticClass: \"t2\" }, [\n                      _vm._v(\"已下载\" + _vm._s(item.download_num) + \"次\")\n                    ]),\n                    _vm.loginCheck\n                      ? [\n                          _c(\n                            \"a\",\n                            {\n                              staticClass: \"btn\",\n                              on: {\n                                click: function($event) {\n                                  return _vm.download(item.data_id, 1)\n                                }\n                              }\n                            },\n                            [_vm._v(\"下载\")]\n                          )\n                        ]\n                      : [\n                          _c(\n                            \"a\",\n                            { staticClass: \"btn\", on: { click: _vm.toUrl } },\n                            [_vm._v(\"下载\")]\n                          )\n                        ]\n                  ],\n                  2\n                )\n              ],\n              2\n            )\n          }),\n          0\n        ),\n        _c(\"p\", { staticClass: \"txt-tip\" }, [\n          _vm._v(\n            \"\\n            法律声明：本资料库的文档为网络收集，仅供学习使用，勿做商用\\n        \"\n          )\n        ])\n      ]),\n      !_vm.loginCheck\n        ? [\n            _c(\"div\", { staticClass: \"islogin\", on: { click: _vm.toUrl } }, [\n              _c(\"img\", {\n                attrs: {\n                  src: __webpack_require__(/*! ../../assets/images/download/loading.png */ \"./src/assets/images/download/loading.png\"),\n                  alt: \"\"\n                }\n              }),\n              _c(\"a\", { attrs: { href: \"javascript:;\" } }, [\n                _vm._v(\"登录查看更多哦\")\n              ])\n            ])\n          ]\n        : _vm._e(),\n      _c(\n        \"div\",\n        {\n          directives: [{ name: \"backTopWindow\", rawName: \"v-backTopWindow\" }],\n          staticClass: \"slide-bar\",\n          staticStyle: { cursor: \"pointer\" }\n        },\n        [\n          _vm.navListfixed\n            ? _c(\"div\", { staticClass: \"backtop\" }, [\n                _c(\"i\", { staticClass: \"iconfont icon-xiangshang1\" })\n              ])\n            : _vm._e()\n        ]\n      )\n    ],\n    2\n  )\n}\nvar staticRenderFns = [\n  function() {\n    var _vm = this\n    var _h = _vm.$createElement\n    var _c = _vm._self._c || _h\n    return _c(\"div\", { staticClass: \"new-head boxsiz\" }, [\n      _c(\"a\", { staticClass: \"logo\", attrs: { href: \"/\" } }, [\n        _c(\"img\", {\n          attrs: {\n            src: __webpack_require__(/*! ../../assets/images/download/logo.png */ \"./src/assets/images/download/logo.png\"),\n            alt: \"猎芯网\"\n          }\n        })\n      ]),\n      _c(\"span\", { staticClass: \"t1\" }, [_vm._v(\"猎芯网\")])\n    ])\n  }\n]\nrender._withStripped = true\n\n\n\n//# sourceURL=webpack:///./src/views/download/Index.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?%7B%22cacheDirectory%22:%22node_modules/.cache/vue-loader%22,%22cacheIdentifier%22:%221627c33a-vue-loader-template%22%7D!./node_modules/_vue-loader@15.7.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.1@vue-loader/lib??vue-loader-options");
 
 /***/ }),