From 7b7740ce0151547dd87fbf29380bf76233185f7a Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期三, 22 五月 2024 14:44:22 +0800 Subject: [PATCH] 样式优化 --- src/books/embedded/view/components/chapter001.vue | 146 +++++++++++++++++++----------------- src/assets/js/config.js | 2 src/books/embedded/assets/main.less | 12 ++ src/books/embedded/view/index.vue | 4 src/main.js | 6 - src/books/content/index.vue | 4 src/books/English/view/index.vue | 3 src/books/embedded/view/components/header.vue | 5 8 files changed, 99 insertions(+), 83 deletions(-) diff --git a/src/assets/js/config.js b/src/assets/js/config.js index f8eebe0..9924929 100644 --- a/src/assets/js/config.js +++ b/src/assets/js/config.js @@ -1,6 +1,6 @@ import axios from "axios"; export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃 -export const resourceCtx = "http://182.92.203.7:3007/books/resource/1"; // 璧勬簮璇锋眰鍦板潃 +export const resourceCtx = "http://182.92.203.7:3007/books/resource/3"; // 璧勬簮璇锋眰鍦板潃 export let activeBook = {}; // 璧勬簮璇锋眰鍦板潃 export let goodsStore = ""; // 璇锋眰鏁欐潗閰嶇疆淇℃伅 diff --git a/src/books/English/view/index.vue b/src/books/English/view/index.vue index 2777634..46ddde9 100644 --- a/src/books/English/view/index.vue +++ b/src/books/English/view/index.vue @@ -79,4 +79,5 @@ }; </script> -<style lang="less" scoped></style> +<style lang="less"> +</style> diff --git a/src/books/content/index.vue b/src/books/content/index.vue index 124cba1..ac842b7 100644 --- a/src/books/content/index.vue +++ b/src/books/content/index.vue @@ -56,4 +56,6 @@ }; </script> -<style lang="less" scoped></style> +<style lang="less"> +@import "./css/default.less"; +</style> diff --git a/src/books/embedded/assets/main.less b/src/books/embedded/assets/main.less index 01cf278..7cbc7d5 100644 --- a/src/books/embedded/assets/main.less +++ b/src/books/embedded/assets/main.less @@ -371,7 +371,8 @@ line-height: 1.3em; text-align: center; text-indent: 0; - color: #b03639; + color: #501438; + margin-top: 4px; } /*鐜粫鍥剧墖*/ @@ -651,6 +652,9 @@ .mt-100 { margin-top: 100px; } + .mb-5 { + margin-bottom: 5px; + } .mb-20 { margin-bottom: 20px; } @@ -691,6 +695,9 @@ } .w100 { width: 100%; + } + .w50 { + width: 50%; } .page-heder-img { width: 100%; @@ -762,6 +769,9 @@ .border-so { border-bottom: 1px solid #501438; } + .rw-border { + border-bottom: 2px solid #501438; + } .btn { cursor: pointer; border: 2px solid #501438; diff --git a/src/books/embedded/view/components/chapter001.vue b/src/books/embedded/view/components/chapter001.vue index 1b0d8da..a791996 100644 --- a/src/books/embedded/view/components/chapter001.vue +++ b/src/books/embedded/view/components/chapter001.vue @@ -11,7 +11,8 @@ <h2 class="secondTitle primary-color" id="sigil_toc_id_13"> 浠诲姟涓�銆�璁よ瘑宓屽叆寮忕粍鎬佸拰瑙︽懜灞� </h2> - <div class="w100 border-so mb-20"></div> + <div class="w100 border-so mb-5"></div> + <div class="w50 rw-border mb-20"></div> <p class="quotation fl al-cn t0 primary-color"> <img src="../../assets/images/icon/mubiao.png" @@ -367,7 +368,7 @@ </ul> </div> <!-- 7 --> - <div class="page-box fl fl-cl ju-bt al-end padding-96 pr" page="17"> + <div class="page-box fl fl-cl ju-bt al-end padding-96" page="17"> <div class="w100"> <div class="primary-color fz-18 fw-bl mt-100 fl ju-ed mb-20"> <img src="../../assets/images/header-one.png" alt="" /> @@ -382,11 +383,11 @@ </p> <table border="1" cellpadding="10" cellspacing="0"> <tr class="table-bc"> - <td class="table-cn"> + <td class="table-cn" colspan="2"> 璇� 鍒� 琛�<br /> <input style="width: 30px" class="input-border table-bc" /> 瀛﹀勾 </td> - <td colspan="2" class="table-cn"> + <td class="table-cn"> 宸� 浣� 褰� 寮� <br /> <input type="checkbox" name="xingshi" value="prople" /> 涓汉 <input type="checkbox" name="xingshi" value="fengong" /> 灏忕粍鍒嗗伐 @@ -446,39 +447,68 @@ class="input-border" />鏃ユ湡:<input style="width: 82px" class="input-border" /> </div> - <h2 class="secondTitle primary-color" id="sigil_toc_id_14"> - 浠诲姟浜屻��MCGS宓屽叆鐗堢粍鎬佽蒋浠跺畨瑁� - </h2> - <div class="w100 border-so mb-20"></div> - <p class="quotation fl al-cn t0 primary-color"> - <img - src="../../assets/images/icon/mubiao.png" - alt="" - class="w-35 mr-5" - /> - <b>浠诲姟鐩爣</b> - </p> - <p class="content">鎺屾彙MCGS宓屽叆鐗堢粍鎬佽蒋浠禫6.8瀹夎鏂规硶銆�</p> - <p class="quotation fl al-cn t0 primary-color"> - <img - src="../../assets/images/icon/miaoshu.png" - alt="" - class="w-35 mr-5" - /> - <b>浠诲姟鎻忚堪</b> - </p> - <p class="content">瀛︿範宓屽叆寮忕粍鎬佽蒋浠禫6.8鐨勫畨瑁呮柟娉曞拰姝ラ銆�</p> - <p class="quotation fl al-cn t0 primary-color"> - <img - src="../../assets/images/icon/xunlian.png" - alt="" - class="w-35 mr-5" - /> - <b>浠诲姟璁粌</b> - </p> - <p class="content"> - 鍦ㄦ槅浠戦�氭�佸畼缃戜笂涓嬭浇MCGS_宓屽叆鐗堝畬鏁村畨瑁呭寘锛岃В鍘嬬缉鍚庯紝鍏蜂綋瀹夎姝ラ濡備笅锛� - </p> + <div class="pr"> + <h2 class="secondTitle primary-color" id="sigil_toc_id_14"> + 浠诲姟浜屻��MCGS宓屽叆鐗堢粍鎬佽蒋浠跺畨瑁� + </h2> + <div class="w100 border-so mb-5"></div> + <div class="w50 rw-border mb-20"></div> + <p class="quotation fl al-cn t0 primary-color"> + <img + src="../../assets/images/icon/mubiao.png" + alt="" + class="w-35 mr-5" + /> + <b>浠诲姟鐩爣</b> + </p> + <p class="content">鎺屾彙MCGS宓屽叆鐗堢粍鎬佽蒋浠禫6.8瀹夎鏂规硶銆�</p> + <p class="quotation fl al-cn t0 primary-color"> + <img + src="../../assets/images/icon/miaoshu.png" + alt="" + class="w-35 mr-5" + /> + <b>浠诲姟鎻忚堪</b> + </p> + <p class="content">瀛︿範宓屽叆寮忕粍鎬佽蒋浠禫6.8鐨勫畨瑁呮柟娉曞拰姝ラ銆�</p> + <p class="quotation fl al-cn t0 primary-color"> + <img + src="../../assets/images/icon/xunlian.png" + alt="" + class="w-35 mr-5" + /> + <b>浠诲姟璁粌</b> + </p> + <p class="content"> + 鍦ㄦ槅浠戦�氭�佸畼缃戜笂涓嬭浇MCGS_宓屽叆鐗堝畬鏁村畨瑁呭寘锛岃В鍘嬬缉鍚庯紝鍏蜂綋瀹夎姝ラ濡備笅锛� + </p> + <ul class="right-resource"> + <li class="fl al-cn ju-cn border-so p-10"> + <img + src="../../assets/images/icon/anzhuang.png" + class="anzhuang-icon" + /> + <span class="primary-color">瀹夎鍖�</span> + </li> + <li class="fl fl-cl al-cn p-10"> + <img src="../../assets/images/icon/rar.png" class="rar-icon" /> + <div> + <span class="rar-text" + >MCGS宓屽叆鐗�<br /> + 瀹夎鏂囦欢.rar</span + > + <img + @click=" + downloadRar('McgsPro 3.3.6.6354 SP1.3 缁勬�佽蒋浠跺畨瑁呭寘') + " + src="../../assets/images/icon/download.png" + class="downlod-icon cu-pr" + /> + </div> + </li> + </ul> + </div> + <video v-if="videoOne" :src="config.resourceCtx + '/閰嶅瀛︿範璧勬簮/p7/MCGS瀹夎瑙嗛甯﹂煶棰�.mp4'" @@ -491,38 +521,13 @@ controls class="w100 mt-20" ></video> - <div class="primary-color fl al-cn ju-cn"> - <span>瑙嗛锛歁CGS瀹夎瑙嗛</span> - </div> + <p class="imgdescript">瑙嗛锛歁CGS瀹夎瑙嗛</p> <p class="content"> 锛�1锛夎繍琛孲etup.exe鏂囦欢锛孧CGS瀹夎绋嬪簭绐楀彛濡傚浘1-15鎵�绀恒�� </p> <p class="content"> 鍦ㄥ畨瑁呯▼搴忕獥鍙d腑鍗曞嚮鈥滃畨瑁呯粍鎬佽蒋浠垛�濇寜閽紝寮瑰嚭瀹夎绋嬪簭绐楀彛銆傚崟鍑烩�滀笅涓�姝モ�濇寜閽紝鍚姩瀹夎绋嬪簭锛屽鍥�1-16鎵�绀恒�� </p> - <ul class="right-resource"> - <li class="fl al-cn ju-cn border-so p-10"> - <img - src="../../assets/images/icon/anzhuang.png" - class="anzhuang-icon" - /> - <span class="primary-color">瀹夎鍖�</span> - </li> - <li class="fl fl-cl al-cn p-10"> - <img src="../../assets/images/icon/rar.png" class="rar-icon" /> - <div> - <span class="rar-text" - >MCGS宓屽叆鐗�<br /> - 瀹夎鏂囦欢.rar</span - > - <img - @click="downloadRar('McgsPro 3.3.6.6354 SP1.3 缁勬�佽蒋浠跺畨瑁呭寘')" - src="../../assets/images/icon/download.png" - class="downlod-icon cu-pr" - /> - </div> - </li> - </ul> </div> <ul class="page-footer fl fl-cl al-cn w-mi p0 mb-40"> <li class="footer-num">7</li> @@ -597,11 +602,11 @@ </div> <table border="1" cellpadding="10" cellspacing="0"> <tr class="table-bc"> - <td class="table-cn"> + <td class="table-cn" colspan="2"> 璇� 鍒� 琛�<br /> <input style="width: 30px" class="input-border table-bc" /> 瀛﹀勾 </td> - <td colspan="2" class="table-cn"> + <td class="table-cn"> 宸� 浣� 褰� 寮� <br /> <input type="checkbox" name="xingshi" value="prople" /> 涓汉 <input type="checkbox" name="xingshi" value="fengong" /> 灏忕粍鍒嗗伐 @@ -654,7 +659,8 @@ <h2 class="secondTitle" id="sigil_toc_id_15"> 浠诲姟涓夈��寤虹珛宸ョ▼涓庝笅杞藉伐绋� </h2> - <div class="w100 border-so mb-20"></div> + <div class="w100 border-so mb-5"></div> + <div class="w50 rw-border mb-20"></div> <div class="fl ju-bt"> <div class="left" style="width: 30%"> <p class="quotation fl al-cn t0 primary-color"> @@ -1148,11 +1154,11 @@ </div> <table border="1" cellpadding="10" cellspacing="0"> <tr class="table-bc"> - <td class="table-cn"> + <td class="table-cn" colspan="2"> 璇� 鍒� 琛�<br /> <input style="width: 30px" class="input-border table-bc" /> 瀛﹀勾 </td> - <td colspan="2" class="table-cn"> + <td class="table-cn"> 宸� 浣� 褰� 寮� <br /> <input type="checkbox" name="xingshi" value="prople" /> 涓汉 <input type="checkbox" name="xingshi" value="fengong" /> 灏忕粍鍒嗗伐 @@ -1425,8 +1431,8 @@ } .right-resource { position: absolute; - right: 10px; - bottom: 180px; + right: -80px; + top:40px } .word-resource { padding: 0; diff --git a/src/books/embedded/view/components/header.vue b/src/books/embedded/view/components/header.vue index 729948f..a11d247 100644 --- a/src/books/embedded/view/components/header.vue +++ b/src/books/embedded/view/components/header.vue @@ -60,7 +60,7 @@ <p class="contentCR">鏈功鐢变腑鍥介搧閬撳嚭鐗堢ぞ杩涜鍒朵綔涓庡彂琛屻��</p> <p class="contentCR">鐗堟潈鎵�鏈壜蜂镜鏉冨繀绌�</p> --> <div style="width: 65%;" class="fw-box"> - <img src="../../assets/images/banquan.png" style="width:90%"> + <img src="../../assets/images/banquan.png"> <!-- <p class="content">鍥句功鍦ㄧ増缂栫洰(CIP)鏁版嵁</p> <p class="content">宓屽叆寮忕粍鎬佹帶鍒舵妧鏈�/寮犳枃鏄庯紝鍗庣閾朵富缂�.-3 鐗�.</p> <p class="content">-鍖椾含:涓浗閾侀亾鍑虹増绀炬湁闄愬叕鍙革紝2019.7</p> @@ -96,7 +96,8 @@ <p class="t0">缃� 鍧�锛歨ttp:// www.tdpress.com/5 leds/</p> <p class="t0">鍗� 鍒凤細鍖椾含鏌忓姏琛屽僵鍗版湁闄愬叕鍙�</p> <p class="t0">鐗� 娆★細2011骞�8鏈堢1鐗� 2019骞�7鏈堢3鐗� 2019骞�7鏈堢1娆″嵃鍒�</p> - <p class="t0">寮� 鏈細787mmx1092mm1/16鍗板紶:18瀛楁暟:433鍗冩暟:1~2000鍐�</p> + <p class="t0">寮� 鏈細787mmx1092mm1/16鍗板紶锛�18瀛楁暟锛�433鍗�</p> + <p class="t0">鍗� 鏁帮細1~2000鍐�</p> <p class="t0">涔� 鍙凤細SBN978-7-113-25402-5</p> <p class="t0">瀹� 浠凤細59.80鍏�</p> <hr /> diff --git a/src/books/embedded/view/index.vue b/src/books/embedded/view/index.vue index 07d96f6..ef05ec6 100644 --- a/src/books/embedded/view/index.vue +++ b/src/books/embedded/view/index.vue @@ -92,4 +92,6 @@ }; </script> -<style lang="less" scoped></style> \ No newline at end of file +<style lang="less"> +@import "../assets/main.less"; +</style> \ No newline at end of file diff --git a/src/main.js b/src/main.js index 17ec245..0a4b258 100644 --- a/src/main.js +++ b/src/main.js @@ -1,12 +1,6 @@ import Vue from "vue"; import App from "./App.vue"; import less from "less"; -// 瀛﹀墠鍎跨鍗敓涓庡仴搴� - - -// import './books/content/css/default.less'; -// 宓屽叆寮忕粍鎬佹帶鍒舵妧鏈� -// import './books/embedded/assets/main.less'; import ElementUI from "element-ui"; import "element-ui/lib/theme-chalk/index.css"; import store from "./store"; -- Gitblit v1.9.1