Commit 66746c56 by 吴学德

合伙人页面

parent 1d349650
......@@ -30,6 +30,7 @@
"nprogress": "^0.2.0",
"reqwest": "^2.0.5",
"tinymce": "^5.1.1",
"vant": "^2.5.2",
"viser-vue": "^2.4.7",
"vue": "^2.6.10",
"vue-apexcharts": "^1.5.1",
......
......@@ -34,7 +34,7 @@ export const asyncRouterMap = [{
{
path: 'home',
name: 'TestHome',
component: () => import('@/views/Home')
component: () => import('@/views/user/Test')
}
]
}, {
......@@ -67,7 +67,7 @@ export const constantRouterMap = [{
{
path: 'home',
name: 'TestHome',
component: () => import('@/views/Home')
component: () => import('@/views/user/Test')
}
]
}, {
......
......@@ -3,7 +3,8 @@ import App from './App.vue'
import Storage from 'vue-ls'
import router from './router'
import store from './store/'
import Vant from 'vant';
import 'vant/lib/index.css';
import { VueAxios } from "@/utils/request"
import Antd from 'ant-design-vue'
......@@ -42,6 +43,7 @@ import JeecgComponents from '@/components/jeecg/index'
import '@/assets/less/ws.less'
Vue.config.productionTip = false
Vue.use(Vant)
Vue.use(Storage, config.storageOptions)
Vue.use(Antd)
Vue.use(VueAxios, router)
......
......@@ -15,7 +15,7 @@ NProgress.configure({
showSpinner: false
}) // NProgress Configuration
const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/ueditor2'] // no redirect whitelist
const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/ueditor2','/user/Test'] // no redirect whitelist
router.beforeEach((to, from, next) => {
......
<template>
<div style=" background-image: url('./picture/hhr/01.jpg');
background-repeat: no-repeat;
background-size: 100%;
width: 100%;
height: 150%;">
<div style="height: 40px"></div>
<div style="background-image: url('./picture/hhr/02.png');background-repeat: no-repeat;background-position: center;background-size: 100%;width: 77%;height: 280px;margin: auto;">
</div>
<div v-show="!newcar">
<div @click="newcartouch" style="background-image: url('./picture/hhr/03.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;">
</div>
<div style="text-align: center;color: white;font-size: 14px;margin-top: -20px">(新开卡优惠+0息分期购机)</div>
<div style="background-image: url('./picture/hhr/04.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;"></div>
<div style="background-image: url('./picture/hhr/05.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;"></div>
<fieldset class="layui-elem-field"
style="width: 85%;margin: 0 auto;border-radius: 10px;margin-bottom: 10px;background-color: rgba(255,255,255, 0.8);">
<legend style="text-align: center;background-color: white;border-radius: 10px;font-weight: bold;background-color: rgb(244,194,124);width: 50%;">
温馨提示
</legend>
<div style="padding: 10px 15px; font-size: 11px">
<div style="width: 100%;color: black;margin: 0 auto;">
1、下单限制:根据工信部要求,未满16周岁及其他无民事行文能力的用户,应有法定代理人代为办理线上入网。
</div>
<div style="width: 100%; color: black; margin: 0 auto;">
2、异常订单:为了保障普通用户的购买需求和权益,我司有权取消异常订单。如同一用户订购两个或两个以上相同商品的订单,不予发货。
同一用户的定义包括但不限于以下情况:同一身份证、或同一联系号码、或同一个收件人(同名除外)、相同(雷同、邻近、虚构、乱码)的收货地址等。
</div>
</div>
</fieldset>
</div>
<div v-show="newcar">
<div style="background-image: url('./picture/hhr/06.png'); width: 256px; height: 64px;margin: 20px auto; background-repeat: no-repeat;background-size: 100%;"></div>
<van-button type="info" :round="true" size="large" >返回</van-button>
<div style="height: 250px"></div>
</div>
</div>
</template>
<script>
export default {
name:"Test",
data(){
return{
newcar:false,
}
}
,
methods: {
newcartouch(){
this.newcar=true
}
}
}
</script>
<style scoped>
</style>
<template>
<div>
<form class="form-horizontal form-edit">
<ueditor></ueditor>
</form>
<!-- <form class="form-horizontal form-edit">-->
<!-- <ueditor></ueditor>-->
<!-- </form>-->
<van-button type="default">默认按钮</van-button>
<van-button type="info">信息按钮</van-button>
<van-button type="danger">危险按钮</van-button>
</div>
</template>
......@@ -31,11 +34,11 @@
</script>
<style>
.info{
border-radius: 10px;
line-height: 20px;
padding: 10px;
margin: 10px;
background-color: #ffffff;
}
</style>
\ No newline at end of file
/*.info{*/
/* border-radius: 10px;*/
/* line-height: 20px;*/
/* padding: 10px;*/
/* margin: 10px;*/
/* background-color: #ffffff;*/
/*}*/
</style>
......@@ -773,6 +773,13 @@
core-js "^2.6.5"
regenerator-runtime "^0.13.2"
"@babel/runtime@7.x":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
dependencies:
regenerator-runtime "^0.13.2"
"@babel/runtime@^7.0.0":
version "7.4.5"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
......@@ -926,6 +933,11 @@
resolved "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
"@vant/icons@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@vant/icons/-/icons-1.2.1.tgz#309fecb97a4989866f045ce676b545c454701c8f"
integrity sha512-5ivsKQR4ySbdBW5UPoQDVqO6rdc1um3rvq/0VL+ZSA7Y3MdBQ3E4/NL0hoAY5/sZZeYfIDKEP21gpjUzdeEDQQ==
"@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040"
......@@ -11097,6 +11109,16 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
vant@^2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/vant/-/vant-2.5.2.tgz#e8cbb6d7c4a2544e2585da6d75b4c3966b1498fb"
integrity sha512-EwMLdGu47rsMhi5AAfQVuZYo8oaBxueDJ8HIeiiAXEn1HIU5i1Z0HoU2CmeswWrcwWpaZ8AuZ0ctBP8xbDCETA==
dependencies:
"@babel/runtime" "7.x"
"@vant/icons" "1.2.1"
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
vue-lazyload "1.2.3"
vary@~1.1.2:
version "1.1.2"
resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
......@@ -11217,6 +11239,11 @@ vue-i18n@^8.15.0:
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.15.0.tgz#9b11ef8e7a124f67cdf788c8c90a81f3606240ed"
integrity sha512-juJ/avAP39bOMycC+qQDLJ8U9z9LtLF/9PsRoJLBSfsYZo9bqYntyyX5QPicwlb1emJKjgxhZ3YofHiQcXBu0Q==
vue-lazyload@1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz#901f9ec15c7e6ca78781a2bae4a343686bdedb2c"
integrity sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==
vue-loader@^13.0.5:
version "13.7.3"
resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.3.tgz#e07440f78230a639d00ada4da7b96d0e9d62037f"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment