Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -36,6 +36,12 @@ export default {
 .q-scrollarea__thumb {
   z-index: 999999 !important;
 }
+body{
+  min-width:1360px !important;
+}
+header{
+  min-width:1360px ;
+}
 html,
 body,
 #q-app {

src/components/school/student/transfer-order/yueke.vue

@@ -7,7 +7,7 @@
             @input="resetSearch"
             clearable
             filled
-            v-model="msg.CourseName"
+            v-model="msg.ClassName"
             label="课程名称"
             @clear="resetSearch"
             maxlength="20"

src/pages/stuMan/coffeeManage/index.vue

+<template>
+    <div class="page-body">
+        <iframe :src="url" class="coffee" frameborder="0"></iframe>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+           token:"",
+           url:`http://127.0.0.1:8080/#/coffeeManage/index?token=${this.token}` 
+        }
+    },
+    mounted(){
+        let userinfo=JSON.parse(localStorage.getItem('loginUserInfo')).data 
+        this.token=userinfo.MallToken
+        console.log(this.token,17,this.url)
+    }
+}
+</script>
+<style>
+    .coffee{
+        width: 100%;
+        height: calc(100vh - 120px);
+    }
+</style>
\ No newline at end of file

src/router/routes.js

@@ -1487,7 +1487,11 @@ const routes = [{
 
   
   
-  
+    {
+      path: "/stuMan/coffeeManage",//学管   商品管理
+      component: () =>
+        import("pages/stuMan/coffeeManage/index")
+    },
   {
     path: "/stuMan/activeList",//学管   活动列表
     component: () =>