Commit f84dc333 authored by 李俊赕's avatar 李俊赕

change-base

parent 23860b66
...@@ -3,7 +3,6 @@ import App from './App' ...@@ -3,7 +3,6 @@ import App from './App'
import uView from "uview-ui"; import uView from "uview-ui";
import vuexStore from "@/store/$u.mixin.js"; import vuexStore from "@/store/$u.mixin.js";
import store from '@/store/index' import store from '@/store/index'
// let vuexStore = require('@/store/$u.mixin.js')
import {router,RouterMount} from '@/router/index.js' //路径换成自己的 import {router,RouterMount} from '@/router/index.js' //路径换成自己的
Vue.config.productionTip = false Vue.config.productionTip = false
......
...@@ -139,15 +139,6 @@ ...@@ -139,15 +139,6 @@
"navigationBarTitleText": "入驻考试" "navigationBarTitleText": "入驻考试"
} }
}
,{
"path" : "components/business-card/business-card",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
} }
], ],
"globalStyle": { "globalStyle": {
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
</template> </template>
<script> <script>
import util from '@/utils/util.js'; import util from '@/utils/util.js';
const app = getApp(); const app = getApp();
import OrderCell from '@/components/order/index.vue' import OrderCell from '@/components/order/index.vue'
export default { export default {
components: { components: {
OrderCell OrderCell
}, },
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
// 加载完成 // 加载完成
this.currentLoadStatus = this.loadStatus[2] this.currentLoadStatus = this.loadStatus[2]
this.$nextTick(function () { this.$nextTick(function() {
this.bottomLoading = false this.bottomLoading = false
}) })
}, 1000); }, 1000);
...@@ -185,40 +185,39 @@ export default { ...@@ -185,40 +185,39 @@ export default {
} }
} }
} }
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
height: 100vh; height: 100vh;
} }
.logo { .logo {
height: 200 rpx; height: 200 rpx;
width: 100%; width: 100%;
margin: 0 rpx auto 50 rpx auto; margin: 0 rpx auto 50 rpx auto;
} }
.text-area { .text-area {
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.title { .title {
font-size: 36 rpx; font-size: 36 rpx;
color: #8f8f94; color: #8f8f94;
} }
.sticky { .sticky {
height: 120 rpx; height: 120 rpx;
background-color: #2979ff; background-color: #2979ff;
color: #fff; color: #fff;
padding: 24 rpx; padding: 24 rpx;
text-align: left; text-align: left;
} }
.order-view { .order-view {
text-align: center; text-align: center;
} }
</style> </style>
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