Merge branch 'sit-Leung' into sit-Carl

# Conflicts:
#	rc-busness/assets/css/index.less
#	rc-busness/pages/index.vue
#	rc-busness/pages/personal/settlement.vue
This commit is contained in:
Vion
2022-01-13 19:32:31 +08:00
10 changed files with 490 additions and 453 deletions

View File

@@ -1,7 +1,6 @@
<template>
<div>
<Myheader></Myheader>
<tabs></tabs>
<div class="online"></div>
<div class="rc-main" v-for="(item,index) in goldmedal" :key="index" >
<div class="rc-border"></div>
@@ -104,11 +103,8 @@
<script>
import Myheader from "~/components/header.vue";
import {userin} from "../../ajax/getData";
import tabs from "@/components/tabs.vue";
import { userin} from "../../ajax/getData";
export default {
middleware: 'metaTitle',
meta: {title: '订单结算'},
data() {
return {
goldmedal:[],
@@ -191,7 +187,6 @@ jiesuan(){
},
components: {
Myheader,
tabs
},
};
</script>