Skip to content

C
center-shop-show-pc
提交 811ef134 authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

update

上级 4807fb42
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 160 行增加 和 121 行删除
.config.dev.js
浏览文件 @ 811ef134
module.exports = {
domain: 'dev.ezijing.com',
url: 'https://learn-api.ezijing.com/api',
url: 'https://shop2.ezijing.com/api',
webpack: {
externals: {
CKEDITOR: 'window.CKEDITOR',
......@@ -9,20 +9,20 @@ module.exports = {
regeneratorRuntime: 'window.regeneratorRuntime',
wx: 'window.wx',
WeixinJSBridge: 'window.WeixinJSBridge'
},
devServer: {
proxy: {
'/api/shop': {
target: 'http://172.16.3.11:8089',
changeOrigin: true,
pathRewrite: { '^/api/shop': '' }
}
}
}
// devServer: {
// proxy: {
// '/api/shop': {
// target: 'http://172.16.3.11:8089',
// changeOrigin: true,
// pathRewrite: { '^/api/shop': '' }
// }
// }
// }
},
ProvidePlugin: {},
others: {
baseUrl: 'https://learn-api.ezijing.com',
loginUrl: 'https://login.ezijing.com/auth/login/index'
loginUrl: 'https://login2.ezijing.com/auth/login/index',
h5PreviewUrl: 'https://h5-shop2.ezijing.com'
}
}
\ No newline at end of file
}
.config.pro.js
浏览文件 @ 811ef134
module.exports = {
url: '//api.ezijing.com',
url: '/',
DesDir: './client-dist',
apiBaseURL: '//api.ezijing.com/',
isUploadStatic: false,
isEnableToIphoneDebugger: false,
webpack: {
externals: {
'CKEDITOR': 'window.CKEDITOR',
'Base64': 'window.Base64',
'md5': 'window.md5',
'regeneratorRuntime': 'window.regeneratorRuntime'
CKEDITOR: 'window.CKEDITOR',
Base64: 'window.Base64',
md5: 'window.md5',
regeneratorRuntime: 'window.regeneratorRuntime',
wx: 'window.wx',
WeixinJSBridge: 'window.WeixinJSBridge'
}
},
ProvidePlugin: {
},
ProvidePlugin: {},
others: {
loginUrl: 'https://login.ezijing.com/auth/login/index',
h5PreviewUrl: 'https://h5-shop.ezijing.com'
}
}
.config.test.js
浏览文件 @ 811ef134
module.exports = {
url: '//api.ezijing.com',
url: '/',
DesDir: './client-dist',
apiBaseURL: '//api.ezijing.com/',
CDN_DIR: 'static/build/learn-test/',
isUploadStatic: false,
isEnableToIphoneDebugger: true,
webpack: {
externals: {
'CKEDITOR': 'window.CKEDITOR',
'Base64': 'window.Base64',
'md5': 'window.md5',
'regeneratorRuntime': 'window.regeneratorRuntime'
CKEDITOR: 'window.CKEDITOR',
Base64: 'window.Base64',
md5: 'window.md5',
regeneratorRuntime: 'window.regeneratorRuntime',
wx: 'window.wx',
WeixinJSBridge: 'window.WeixinJSBridge'
}
},
ProvidePlugin: {
},
ProvidePlugin: {},
others: {
loginUrl: 'https://login2.ezijing.com/auth/login/index',
h5PreviewUrl: 'https://h5-shop2.ezijing.com'
}
}
package-lock.json
浏览文件 @ 811ef134
......@@ -15,6 +15,7 @@
"element-ui": "^2.13.2",
"js-cookie": "^2.2.1",
"lodash": "^4.17.20",
"qrcode.vue": "^1.7.0",
"vue": "^2.6.12",
"vue-i18n": "^8.22.0",
"vue-loader": "^15.9.3",
......@@ -10177,6 +10178,14 @@
"node": ">=6"
}
},
"node_modules/qrcode.vue": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-1.7.0.tgz",
"integrity": "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g==",
"peerDependencies": {
"vue": "^2.0.0"
}
},
"node_modules/qs": {
"version": "6.5.2",
"resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
......@@ -22736,6 +22745,12 @@
"resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
"integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
},
"qrcode.vue": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-1.7.0.tgz",
"integrity": "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g==",
"requires": {}
},
"qs": {
"version": "6.5.2",
"resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
package.json
浏览文件 @ 811ef134
......@@ -78,6 +78,7 @@
"element-ui": "^2.13.2",
"js-cookie": "^2.2.1",
"lodash": "^4.17.20",
"qrcode.vue": "^1.7.0",
"vue": "^2.6.12",
"vue-i18n": "^8.22.0",
"vue-loader": "^15.9.3",
......
src/components/layout/footer.vue
浏览文件 @ 811ef134
......@@ -23,35 +23,43 @@
</p>
</div>
<div class="qrcode">
<img src="https://zws-imgs-pub.ezijing.com/static/public/29ce10d35376f24ae1ecaccd57215d5c.jpg" alt="" />
<img src="https://zws-imgs-pub.ezijing.com/static/public/29ce10d35376f24ae1ecaccd57215d5c.jpg" />
<p>扫二维码关注官方微信</p>
<p>微信公众号zijingedu</p>
</div>
</div>
</div>
</div>
<div class="copyright" style="height: 40px;line-height: 40px;color: #fff;background: #ccc;">
<div class="inner" style="width: 100%;justify-content: center;display: flex;">
<p style="font-size: 12px;">Copyright © 2017 Zijing Education. All rights reserved. 清控紫荆（北京）教育科技股份有限公司</p>
<a target="_blank" href="https://tsm.miit.gov.cn/dxxzsp/" style="color: #fff;text-decoration:none;margin-left: 10px;">
<p style="font-size: 12px;">京ICP证150431号</p>
<div class="copyright" style="height: 40px; line-height: 40px; color: #fff; background: #ccc">
<div class="inner" style="width: 100%; justify-content: center; display: flex">
<p style="font-size: 12px">
Copyright © 2017 Zijing Education. All rights reserved. 清控紫荆（北京）教育科技股份有限公司
</p>
<a
target="_blank"
href="https://tsm.miit.gov.cn/dxxzsp/"
style="color: #fff; text-decoration: none; margin-left: 10px"
>
<p style="font-size: 12px">京ICP证150431号</p>
</a>
<a target="_blank" class="record" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802023681" style="
color: #fff;
text-decoration:none;
align-items: center;
display: flex;
margin-right: 5px;">
<img src="https://zws-imgs-pub.ezijing.com/e0a0ec47dfdfc1e0797b1d5254021d00.png" alt="" style="
width: 20px;
height: 20px;
margin: 0 6px;
display: block;
">
<p style="font-size: 12px;">安备 11010802023681号</p>
<a
target="_blank"
class="record"
href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802023681"
style="color: #fff; text-decoration: none; align-items: center; display: flex; margin-right: 5px"
>
<img
src="https://zws-imgs-pub.ezijing.com/e0a0ec47dfdfc1e0797b1d5254021d00.png"
style="width: 20px; height: 20px; margin: 0 6px; display: block"
/>
<p style="font-size: 12px">安备 11010802023681号</p>
</a>
<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index" style="color: #fff;text-decoration:none;">
<p style="font-size: 12px;">京ICP备15016866号-1</p>
<a
target="_blank"
href="https://beian.miit.gov.cn/#/Integrated/index"
style="color: #fff; text-decoration: none"
>
<p style="font-size: 12px">京ICP备15016866号-1</p>
</a>
</div>
</div>
......@@ -74,7 +82,7 @@ export default {
</script>
<style lang="scss" scoped>
.logo{
.logo {
width: 60px;
}
.app-footer {
......@@ -133,18 +141,18 @@ export default {
line-height: 40px;
color: #fff;
background: #ccc;
.inner{
.inner {
width: 100%;
justify-content: center;
display: flex;
p{
p {
font-size: 12px;
}
.record{
.record {
align-items: center;
display: flex;
margin-right: 5px;
img{
img {
width: 20px;
height: 20px;
margin: 0 6px;
......
src/components/layout/header.vue
浏览文件 @ 811ef134
......@@ -2,15 +2,12 @@
<header class="app-header">
<div class="app-header__bar">
<div class="inner">
<img class="logo" src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/shop-pc/shop-logo.png" alt="">
<img class="logo" src="https://webapp-pub.ezijing.com/shop-pc/shop-logo.png" />
</div>
</div>
<div class="app-header__menu">
<ul class="inner">
<li
v-for="(item, index) in menuItem"
:key="index"
>{{ item.title }}</li>
<li v-for="(item, index) in menuItem" :key="index">{{ item.title }}</li>
</ul>
</div>
</header>
......@@ -43,25 +40,27 @@ export default {
}
.app-header__bar {
padding: 25px 0 23px;
.logo{
.logo {
display: block;
width: 260px;
height: 56px;
}
}
.app-header__menu{
background: #1F292C;
ul{
.app-header__menu {
background: #1f292c;
ul {
display: flex;
li{
li {
line-height: 30px;
font-size: 16px;
color: #FFFFFF;
color: #ffffff;
padding: 0 24px;
cursor: pointer;
}
}
}
ul,li{
ul,
li {
padding: 0;
margin: 0;
list-style: none;
......
src/components/layout/main.vue
浏览文件 @ 811ef134
<template>
<div class="app-main">
<router-view />
<router-view :key="$route.fullPath" />
</div>
</template>
src/index.html
浏览文件 @ 811ef134
<!DOCTYPE html>
<html lang="zh-cn">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content="origin" name="referrer">
<!-- 如果只是想html禁用缓存，使用以下三行 -->
<!-- 经过验证，发现有时不一定有用，不如 wmp项目中login/is-login跳转，会自动产生 from the disk -->
<!-- 总结：彻底解决 index.html 不加缓存 请使用 `nginx上配置 no-cache` -->
<!-- 直接访问 图片、JS、CSS等资源不会出现（from the disk），只有在html中，访问资源才会出现`强缓存`。 -->
<!-- <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /> -->
<!-- <meta http-equiv="Pragma" content="no-cache" /> -->
<!-- <meta http-equiv="Expires" content="0" /> -->
<title>标题</title>
<meta name="viewport" id="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no">
</head>
<body>
<div id="app"></div>
<script type="text/javascript" src="/static/resources/js/test.js"></script>
<!-- es5 兼容 新方法 -->
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-shim.min.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-sham.min.js"></script>
<!-- 三方插件引入 -->
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/ckeditor/ckeditor.js"></script>
<!-- common -->
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/md5.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/jQuery-2.1.4.min.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"></script>
<!--[if lt IE 9]>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
<![endif]-->
</body>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta content="origin" name="referrer" />
<!-- 如果只是想html禁用缓存，使用以下三行 -->
<!-- 经过验证，发现有时不一定有用，不如 wmp项目中login/is-login跳转，会自动产生 from the disk -->
<!-- 总结：彻底解决 index.html 不加缓存 请使用 `nginx上配置 no-cache` -->
<!-- 直接访问 图片、JS、CSS等资源不会出现（from the disk），只有在html中，访问资源才会出现`强缓存`。 -->
<!-- <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /> -->
<!-- <meta http-equiv="Pragma" content="no-cache" /> -->
<!-- <meta http-equiv="Expires" content="0" /> -->
<title>紫荆教育电销平台</title>
<meta
name="viewport"
id="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no"
/>
</head>
<body>
<div id="app"></div>
<!-- es5 兼容 新方法 -->
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-shim.min.js"
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-sham.min.js"
></script>
<!-- 三方插件引入 -->
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"
></script>
<!--[if lt IE 9]>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
<![endif]-->
</body>
</html>
src/pages/components/item.vue
浏览文件 @ 811ef134
<template>
<div class="item-content">
<img :src="JSON.parse(data.chart_oss)[0].url" alt="">
<router-link :to="{ path: '/buy', query: { shop_id: data.shop_id, id: data.spu_id } }">
<img :src="imageUrl(data.chart_oss)" />
</router-link>
<div class="title">{{ data.spu_name }}</div>
<div class="money">
<span>￥</span>{{ data.price_zone }}
</div>
<div class="money"><span>￥</span>{{ data.price_zone }}</div>
</div>
</template>
......@@ -14,29 +14,41 @@ export default {
data: {
type: Object
}
},
methods: {
imageUrl(value) {
try {
const imgList = value ? JSON.parse(value) : []
const [first = {}] = imgList
return first.url
} catch (error) {
return ''
}
}
}
}
</script>
<style lang="scss" scoped>
.item-content{
.item-content {
margin-bottom: 30px;
img{
img {
width: 160px;
height: 160px;
display: block;
object-fit: cover;
}
.title{
.title {
width: 160px;
font-size: 14px;
line-height: 21px;
color: #808080;
margin-top: 6px;
}
.money{
.money {
font-size: 20px;
line-height: 19px;
color: #6A6A6A;
span{
color: #6a6a6a;
span {
font-size: 14px;
}
margin-top: 6px;
......
src/pages/shop.vue
浏览文件 @ 811ef134
差异被折叠。
src/router/routes.js
浏览文件 @ 811ef134
......@@ -6,8 +6,8 @@ export default [
path: '/',
component: Layout,
children: [
{ path: '', redirect: '/shop' },
{ path: '/shop', component: () => import('@/pages/shop.vue') }
{ path: '', redirect: '/buy' },
{ path: '/buy', component: () => import('@/pages/shop.vue') }
]
},
{ path: '*', component: () => import('@/components/errorPages/404.vue') }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论