Merge branch 'fix/add_publishCertificates_ch' into 'msb_prod'

fix: 文字样式

See merge request yanxuan-frontend/shop-pc!100

layouts/module/footer/index.vue

@@ -17,7 +17,8 @@
       <div class="layout-footer-wrap__line"></div>
       <div class="layout-footer-wrap__address">
         © 2020 马士兵（北京）教育科技有限公司
-        地址：北京市海淀区北三环中路44号4号楼1层114 京ICP备17012835号-1 <a href="https://oss-cdn.mashibing.com/default/cbwxkz.jpg​​" target="_blank">出版物经营许可证：新出发京零字第海210140号</a>
+        地址：北京市海淀区北三环中路44号4号楼1层114 京ICP备17012835号-1 
+        <a :href="'https://oss-cdn.mashibing.com/default/cbwxkz.jpg'"​ target="_blank">出版物经营许可证：新出发京零字第海210140号</a>
       </div>
     </div>
   </div>
@@ -89,6 +90,9 @@ export default {
       color: #999999;
       text-align: center;
       line-height: 20px;
+      a{
+        color: #999;
+      }
     }
   }
 }

nuxt.config.js

@@ -2,75 +2,69 @@
  * @Author: ch
  * @Date: 2022-05-03 22:14:16
  * @LastEditors: ch
- * @LastEditTime: 2022-07-15 11:39:08
+ * @LastEditTime: 2023-04-21 16:14:15
  * @Description: file content
  */
 export default {
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
-		title: '马士兵严选',
+    title: "马士兵严选",
     htmlAttrs: {
-			lang: 'zh'
+      lang: "zh",
     },
     meta: [
-			{ charset: 'utf-8' },
-			{ name: 'viewport', content: 'width=device-width, initial-scale=1' },
-			{ hid: 'description', name: 'description', content: '' },
-			{ name: 'format-detection', content: 'telephone=no' }
+      { charset: "utf-8" },
+      { name: "viewport", content: "width=device-width, initial-scale=1" },
+      { hid: "description", name: "description", content: "" },
+      { name: "format-detection", content: "telephone=no" },
     ],
-		link: [
-			{ rel: 'icon', type: 'image/x-icon', href: '/logo.ico' }
-		]
+    link: [{ rel: "icon", type: "image/x-icon", href: "/logo.ico" }],
   },
   router: {
     extendRoutes(routes, resolve) {
       routes.push({
-				name: 'custom',
-				path: '/',
-				component: resolve(__dirname, 'pages/index/index.vue')
-			})
+        name: "custom",
+        path: "/",
+        component: resolve(__dirname, "pages/index/index.vue"),
+      });
     },
-		middleware: ['redirect']
+    middleware: ["redirect"],
   },
 
   // Global CSS: https://go.nuxtjs.dev/config-css
-	css: [
-		'@assets/scss/global.scss',
-		'element-ui/lib/theme-chalk/index.css'
-	],
+  css: ["@assets/scss/global.scss", "element-ui/lib/theme-chalk/index.css"],
 
   // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
   plugins: [
-		'@/plugins/element-ui',
-		'@/plugins/axios',
-		'@/plugins/axiosTk.js',
-		'@plugins/vue-inject.js',
-    	'@/plugins/v-distpicker', 
-		'@/plugins/router', 
-		'@/plugins/im',
-		'@/plugins/chat'
+    "@/plugins/element-ui",
+    "@/plugins/axios",
+    "@/plugins/axiosTk.js",
+    "@plugins/vue-inject.js",
+    "@/plugins/v-distpicker",
+    "@/plugins/router",
+    "@/plugins/im",
+    "@/plugins/chat",
   ],
 
   // Auto import components: https://go.nuxtjs.dev/config-components
   components: true,
 
   // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
-	buildModules: [
-	],
+  buildModules: [],
 
   build: {
-    vendor: ['v-distpicker']
+    vendor: ["v-distpicker"],
   },
 
   styleResources: {
-		scss: '@/assets/scss/global.scss'
+    scss: "@/assets/scss/global.scss",
   },
 
   // Modules: https://go.nuxtjs.dev/config-modules
   modules: [
-		'@nuxtjs/axios',
-		'cookie-universal-nuxt',
-		'@nuxtjs/style-resources'
+    "@nuxtjs/axios",
+    "cookie-universal-nuxt",
+    "@nuxtjs/style-resources",
   ],
 
   // Build Configuration: https://go.nuxtjs.dev/config-build
@@ -91,7 +85,7 @@ export default {
     // },
   },
   server: {
-		port: 3000, 
-		host: '0.0.0.0' 
+    port: 4000,
+    host: "0.0.0.0",
   },
-}
+};

package.json

@@ -31,16 +31,16 @@
   "devDependencies": {
     "@vue/test-utils": "^1.3.0",
     "babel-core": "7.0.0-bridge.0",
-    "webpack": "^4.46.0",
-    "node-sass": "^4.14.1",
-    "sass": "^1.32.13",
-    "sass-loader": "^7.3.1",
     "babel-jest": "^27.4.4",
     "eslint": "^8.15.0",
     "eslint-plugin-prettier": "^4.0.0",
     "git-repo-info": "^2.1.1",
     "jest": "^27.4.4",
+    "node-sass": "^4.14.1",
     "prettier": "^2.6.2",
-    "vue-jest": "^3.0.4"
+    "sass": "^1.32.13",
+    "sass-loader": "^7.3.1",
+    "vue-jest": "^3.0.4",
+    "webpack": "^4.46.0"
   }
 }