联调修改

src/common/css/reset.css

@@ -69,4 +69,8 @@ select option {
 
 .van-picker{
 	z-index: 101;
+}
+
+.van-toast i{
+	color: white;
 }

src/components/courseItem/index.vue

@@ -10,7 +10,9 @@
         <div class="content">
           <div class="title flex-h">
             <div class="flex-item">
-              <span>{{data.title}}</span>
+              <div>
+                <span>{{data.title}}</span>
+              </div>
             </div>
             <div v-if="data.getWay=='ticket'">
               <span>{{data.defaultPrice}}</span><br>

src/components/courseItem/page.scss

@@ -21,13 +21,19 @@
       .title{
         align-items: center;
         &>.flex-item{
-          span{
+          >div{
             width: 100%;
-            font-size: .15rem;
-            display: block;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            color: #323b45;
+            position: relative;
+            overflow: hidden;
+            span{
+              width: 100%;
+              font-size: .15rem;
+              display: block;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              color: #323b45;
+              overflow: hidden;
+            }
           }
           &+div{
             text-align: right;

src/components/orderListItem/index.vue

@@ -1,17 +1,21 @@
 <template>
   <div class="orderListItem">
     <div class="title flex-h">
-      <div class="orange" v-if="data.Status === 0">
+      <div class="orange" v-if="returnStatus(data.MakeStatus) === '已下单'">
         <i class="iconfont icon-dengdai"></i><br>
-        <span>制作中</span>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>
-      <div class="grey" v-if="data.Status === -1">
+      <div class="orange" v-if="returnStatus(data.MakeStatus) === '制作中'">
+        <i class="iconfont icon-dengdai"></i><br>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
+      </div>
+      <div class="grey" v-if="returnStatus(data.MakeStatus) === '已取消'">
         <i class="iconfont icon-quxiao"></i><br>
-        <span>已取消</span>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>
-      <div class="green" v-if="data.Status === 1">
+      <div class="green" v-if="returnStatus(data.MakeStatus) === '已完成'">
         <i class="iconfont icon-gouxuan"></i><br>
-        <span>已完成</span>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>
       <div class="flex-item">
         <div>
@@ -41,6 +45,7 @@
 </template>
 
 <script>
+import dict from '../../util/contants'
 
 export default {
   name: '',
@@ -49,23 +54,27 @@ export default {
     return {
 
     }
-  },
-  computed: {
-
   },
   components: {
 
   },
   created () {
-
+    // console.log(dict)
+    // console.log(JSON.stringify(this.data.MakeStatus))
   },
   methods: {
-    
+    returnStatus (val) {
+      for (var n = 0; n < dict.orderStatus.length; n++) {
+        if(val === dict.orderStatus[n].key){
+          return dict.orderStatus[n].value
+        }
+      }
+    },
   }
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/bindMobile/bindMobile.vue

@@ -155,6 +155,7 @@ export default {
       }, 1000)
     },
     submit () {
+      var _that = this
       if (!this.postData.captcha) {
         this.$toast('请先获取验证码')
         return
@@ -169,6 +170,9 @@ export default {
       }
       this.submitData(this.postData).then((res) => {
         this.$toast(res)
+        setTimeout(function(){
+          _that.$router.push({name: 'userCenter'})
+        },300)
       })
     }
   }

src/pages/user/fiveA/index.vue

@@ -17,13 +17,14 @@
           </div>
           <h5>结识更多朋友</h5>
           <div class="courseList flex-h">
-            <ul class="flex-item">
-              <router-link tag="li" :to="{name:'',query:{}}" v-for="(item,index) in courseList" :key="index">
+            <ul class="flex-item" v-if="!fiveANoData">
+              <router-link tag="li" v-for="(item,index) in courseList" :key="index" :to="{name:'majorProjectsDetail',query:{id: item.id}}">
                 <courseItem :data="item"></courseItem>
               </router-link>
             </ul>
+            <span v-if="fiveANoData" style="width:100%;line-height:.3rem;display:block;text-align:center;color:#ccc;margin-bottom:.1rem;">暂无数据</span>
           </div>
-          <router-link :to="{name:'',query:{}}" class="more">查看更多</router-link>
+          <router-link :to="{name:'',query:{}}" class="more" v-if="!fiveANoData">查看更多</router-link>
           <div style="width:100%;height:.1rem;background:#f8f8f8;margin:0 auto;"></div>
           <h5>资讯</h5>
           <div class="newsList flex-h">
@@ -50,8 +51,9 @@ export default {
   name: '',
   data () {
     return {
+      fiveANoData: false,
       active: {
-        index: 1,
+        index: 0,
         locationid: ''
       },
       swiperOption: {
@@ -65,63 +67,8 @@ export default {
         LocationId: "selected",
         LocationName: "精选"
       }],
-      courseList: [{ // 课程列表
-        id: '',
-        title: '课程名称',
-        img: '',
-        time: '2018.04.04 18:30-20:00',
-        address: '南京南',
-        tag: ['儿童教育', '小小外交官'],
-        courseType: '团体课',
-        defaultPrice: '168/节',
-        getWay: 'ticket'
-      }, {
-        id: '',
-        title: '课程名称',
-        img: '',
-        time: '2018.04.04 18:30-20:00',
-        address: '南京南',
-        tag: ['儿童教育', '小小外交官'],
-        courseType: '团体课',
-        defaultPrice: '168/节',
-        getWay: 'free'
-      }, {
-        id: '',
-        title: '课程名称',
-        img: '',
-        time: '2018.04.04 18:30-20:00',
-        address: '南京南',
-        tag: ['儿童教育', '小小外交官'],
-        courseType: '团体课',
-        defaultPrice: '168/节',
-        getWay: 'free'
-      }],
-      newsList: [{ // 资讯列表
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }]
+      courseList: [], // 课程列表
+      newsList: [], // 资讯列表
     }
   },
   computed: {
@@ -129,7 +76,8 @@ export default {
       orgid: x => x.app.orgId,
       navList: x => x.fiveA.nav,
       banner: x => x.fiveA.banner,
-      cms: x => x.fiveA.cms
+      cms: x => x.fiveA.cms,
+      fiveAList: x => x.fiveA.fiveAList,
     }),
     MySwiper () {
       return this.$refs.mySwiper.swiper
@@ -147,22 +95,65 @@ export default {
   created () {
     this.getNav({ orgid: this.orgid, issys: '0' }).then(() => {
       this.nav = this.nav.concat(this.navList)
-      this.active.locationid = this.nav[this.active.index].LocationId
+      for (var n = 0; n < this.nav.length; n++) {
+        if(this.nav[n].LocationId === this.$route.query.id){
+          this.active.index = n
+          this.active.locationid = this.nav[n].LocationId
+        }
+      }
+      this.getFiveAList({ locationid: this.active.locationid, orgid: this.orgid }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.courseList = []
+        if (res !== null) {
+          this.fiveANoData = false
+          this.returnCourseList(res)
+        } else {
+          this.fiveANoData = true
+        }
+      })
       this.getFiveAInfo({ orgid: this.orgid, locationid: this.active.locationid }).then(() => {
         this.newsList = this.cms
       })
     })
   },
   methods: {
-    ...mapFiveAActions(['getNav']),
-    ...mapFiveAActions(['getFiveAInfo']),
+    ...mapFiveAActions([
+      'getNav',
+      'getFiveAInfo',
+      'getFiveAList',
+    ]),
     changeLocation (item, index) {
       this.active.index = index
       this.active.locationid = item.LocationId
+      this.getFiveAList({ locationid: this.active.locationid, orgid: this.orgid }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.courseList = []
+        if (res !== null) {
+          this.fiveANoData = false
+          this.returnCourseList(res)
+        } else {
+          this.fiveANoData = true
+        }
+      })
       this.getFiveAInfo({ orgid: this.orgid, locationid: this.active.locationid }).then(() => {
         this.newsList = this.cms
       })
     },
+    returnCourseList (arr) { // 转换课程列表格式
+      for (var n = 0; n < arr.length; n++) {
+        this.courseList.push({
+          id: arr[n].CourseId,
+          title: arr[n].CourseName,
+          img: arr[n].CourseImg,
+          time: this.toolClass.dateFormat(arr[n].BeginDate),
+          address: arr[n].CaseInfo.CaseAddress,
+          tag: arr[n].CourseTags || [],
+          courseType: '',
+          defaultPrice: arr[n].Price + '/节',
+          getWay: 'ticket'
+        })
+      }
+    },
     jump (item) {
       console.log(item)
       item.ForwardType = item.ForwardType || ''
@@ -180,5 +171,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/lessonDetail/index.vue

@@ -2,29 +2,29 @@
   <div class="mainPage">
     <div class="title">课程详情</div>
     <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1, 'gray': courseOrderDetail.IsDone === 1}">
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>订单编号</span>
-        <span>{{courseOrderDetail.OrdersNo !== undefined ? courseOrderDetail.OrdersNo : ''}}</span>
+        <span class="flex-item" style="font-size:.11rem;">{{courseOrderDetail.OrdersNo !== undefined ? courseOrderDetail.OrdersNo : ''}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>课程名称</span>
-        <span>{{courseOrderDetail.CourseName}}</span>
+        <span class="flex-item">{{courseOrderDetail.CourseName}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>课时数</span>
-        <span>{{courseOrderDetail.JoinNum}}/{{courseOrderDetail.CourseNum}}</span>
+        <span class="flex-item">{{courseOrderDetail.JoinNum}}/{{courseOrderDetail.CourseNum}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>类型</span>
-        <span>{{returnLocationName(courseOrderDetail.LocationId)}}</span>
+        <span class="flex-item">{{returnLocationName(courseOrderDetail.LocationId)}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>商品价格</span>
-        <span>¥{{courseOrderDetail.Price}}</span>
+        <span class="flex-item">¥{{courseOrderDetail.Price}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>下单时间</span>
-        <span>{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
+        <span class="flex-item">{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
       </div>
       <!-- <div class="list-item">
         <span>地点</span>

src/pages/user/lessonDetail/page.scss

@@ -21,12 +21,13 @@
     .list-item{
       display: flex;
       justify-content: space-between;
-      align-items: flex-start;
+      align-items: center;
       padding: 0 .22rem;
       margin-bottom: .1rem;
       span{
         display: block;
         color: #666;
+        white-space: nowrap;
       }
       span:nth-of-type(2){
         width: 60%;

src/pages/user/lessonOrder/index.vue

@@ -5,7 +5,7 @@
         <div class="order-card flex-h" v-for="(item,index) in courseOrderList.list" :key='index' :class="{'opacity' : item.status === 1}" @click="toDetail(item)">
           <div class="card-pic">
             <div :class="{'gray-location' : item.status === 1}"><span>{{returnLocationName(item.LocationId)}}</span></div>
-            <img src="" class="cover" width="100%" height="100%" alt="">
+            <img :src="item.CourseImg" class="cover" width="100%" height="100%" alt="">
           </div>
           <div class="card-msg">
             <div class="title">{{item.CourseName}}</div>

src/pages/user/mainPage/indexPage/index.vue

@@ -83,7 +83,6 @@ export default {
       locationId: '',
       swiperOption: {
         observer: true,
-        loop: true,
         autoplay: {
           disableOnInteraction: false,
         }
@@ -126,11 +125,13 @@ export default {
       this.locationId = 'index'
       this.getIndexInfo({ orgid: this.orgid, locationid: this.locationId }).then(() => {
         this.newsList = this.cms
-        for (let i = 0; i < this.project.length; i++) {
-          if (this.project[i].CmsCaseImgs != null) {
-            for (let j = 0; j < this.project[i].CmsCaseImgs.length; j++) {
-              if (this.project[i].CmsCaseImgs[j].ImageType === 'cover') {
-                this.project[i].CaseImageUrl = this.project[i].CmsCaseImgs[j].CaseImageUrl
+        if (this.project !== undefined && this.project !== null) {
+          for (let i = 0; i < this.project.length; i++) {
+            if (this.project[i].CmsCaseImgs != null) {
+              for (let j = 0; j < this.project[i].CmsCaseImgs.length; j++) {
+                if (this.project[i].CmsCaseImgs[j].ImageType === 'cover') {
+                  this.project[i].CaseImageUrl = this.project[i].CmsCaseImgs[j].CaseImageUrl
+                }
               }
             }
           }
@@ -157,5 +158,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/mainPage/userCenter/index.vue

@@ -80,7 +80,7 @@ export default {
 
   },
   mounted () {
-    this.$nextTick(() => {
+    this.getUserInfo({ org: this.org }).then(() => {
       if (this.userInfo != 406) {
         this.user = this.userInfo.customer
         this.AccountInfo = JSON.parse(this.user.AccountInfo)

src/pages/user/majorProjects/index.vue

@@ -160,12 +160,15 @@ export default {
     },
     returnDate (val) {
       val = new Date(val)
-      return val.getFullYear() + '.' + this.returnNum(val.getMonth()+1) + '.' + this.returnNum(val.getDate())
+      return val.getFullYear() + '.' + this.returnNum(val.getMonth() + 1) + '.' + this.returnNum(val.getDate())
     },
     initData () { // 初始化数据
       this.getProjectInfo({ id: this.$route.query.id }).then((res) => {
         // console.log(JSON.stringify(res))
         // this.initList
+        if (res.Courses === null) {
+          res.Courses = []
+        }
         var aArr = []
         for (var n = 0; n < res.Courses.length; n++) {
           aArr.push({
@@ -217,5 +220,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/majorProjectsDetail/index.vue

@@ -41,12 +41,12 @@
             <div class="flex-item">
               <div class="img">
                 <router-link :to="{name: '', query: {}}">
-                  <img :src="courseDetail.CaseInfo.CaseIcon" class="centerLabel cover" alt="">
+                  <img v-if="courseDetail.CaseInfo !== undefined" :src="courseDetail.CaseInfo.CaseIcon" class="centerLabel cover" alt="">
                   <div class="flex-h">
                     <i class="iconfont icon-dingwei"></i>
                     <div class="flex-item">
                       <div>
-                        <span>{{courseDetail.CaseInfo.CaseName}}（{{courseDetail.CaseInfo.CaseAddress}}）</span>
+                        <span v-if="courseDetail.CaseInfo !== undefined">{{courseDetail.CaseInfo.CaseName}}（{{courseDetail.CaseInfo.CaseAddress}}）</span>
                       </div>
                     </div>
                   </div>
@@ -112,6 +112,9 @@ export default {
   created () {
     this.getCourseDetailInfo({ id: this.$route.query.id }).then((res) => {
       var arr = res.CourseDetail
+      if(arr === null){
+        arr = []
+      }
       this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
       // console.log(JSON.stringify(res))
     })

src/pages/user/placeOrder/index.vue

@@ -19,7 +19,8 @@
             <!-- <span>本月已用：150杯</span> -->
           </div>
         </div>
-        <router-link :to="{name: 'coffeeIndex', query: {}}">返回选择桌号</router-link>
+        <a @click="reback">返回选择桌号</a>
+        <!-- <router-link :to="{name: 'coffeeIndex', query: {}}">返回选择桌号</router-link> -->
       </div>
       <div class="content flex-item flex-h">
         <div class="slideMenus">
@@ -66,8 +67,8 @@
           <i class="iconfont" :class="{'icon-jiantou-up': !showCalcMenu,'icon-jiantou-down': showCalcMenu}" @click="showCalcMenu = true"></i>
         </div>
       </div>
-      <router-link :to="{name: 'placeOrderDetail', query: {info: JSON.stringify(settlementList), caseid: encodeURI(caseId), areaid: encodeURI(areaId), areaname: encodeURI(areaName), areaid: encodeURI(areaId), tableid: encodeURI(tableId), tableno: encodeURI(tableNo)}}">下单</router-link>
-      <!-- <a @click="showCalcMenu = true">下单</a> -->
+      <!-- <router-link :to="{name: 'placeOrderDetail', query: {info: JSON.stringify(settlementList), caseid: encodeURI(caseId), areaid: encodeURI(areaId), areaname: encodeURI(areaName), areaid: encodeURI(areaId), tableid: encodeURI(tableId), tableno: encodeURI(tableNo)}}">下单</router-link> -->
+      <a @click="toPlaceOrder">下单</a>
     </div>
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
     <calcMenu :show="showCalcMenu" :totalNum="totalCupNum" :data="settlementList" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
@@ -161,6 +162,13 @@ export default {
       'getGoodsTypeList',
       'getGoodsList',
     ]),
+    toPlaceOrder () { // 下单 
+      if(this.settlementList.length){
+        this.$router.push({name: 'placeOrderDetail', query: {info: JSON.stringify(this.settlementList), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo)}})
+      }else{
+        this.$toast('您还没有选择商品哦~')
+      }
+    },
     mapArr () { // 匹配商品规格
       var aArr = this.goodsTypeList, bArr = this.goodsList
       for (var n = 0; n < aArr.length; n++) {
@@ -189,7 +197,7 @@ export default {
             status: aArr[x].list[y].Status,
             price: aArr[x].list[y].Price,
           })
-          if(aArr[x].list[y].Specs !== null){
+          if (aArr[x].list[y].Specs !== null) {
             for (var z = 0; z < aArr[x].list[y].Specs.length; z++) {
               this.menuList[x].list[y].spec.push({
                 value: aArr[x].list[y].Specs[z].SpecName,
@@ -204,6 +212,14 @@ export default {
       }
       // console.log(JSON.stringify(this.menuList))
     },
+    reback () { // 返回桌位选择
+      this.$dialog.confirm({
+        title: '提示',
+        message: '返回页面将清空当前选择的商品，确定要返回吗?'
+      }).then(() => {
+        this.$router.push({ name: 'coffeeIndex' })
+      })
+    },
     placeOrder () { // 下单
       this.$router.push({ name: 'orderList', query: {} })
     },

src/pages/user/placeOrderForCourse/index.vue

@@ -36,7 +36,7 @@
                     <span>地点</span>
                   </div>
                 </div>
-                <!-- <span>{{courseDetail.CaseInfo.CaseAddress}}</span> -->
+                <span v-if="courseDetail.CaseInfo !== undefined">{{courseDetail.CaseInfo.CaseAddress}}</span>
               </li>
               <li class="flex-h">
                 <div class="flex-item">

src/pages/user/router.js

@@ -124,7 +124,10 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
-  
+  // console.log(to)
+  // if(){
+    
+  // }
   next()
 })
 

src/store/fiveA/fiveA.js

@@ -20,7 +20,7 @@ http.getNav = (data) => {
 }
 
 http.getBanner = (data) => {
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.index.banner.url, {
       method: api.index.banner.method,
@@ -37,7 +37,7 @@ http.getBanner = (data) => {
 }
 
 http.getList = (data) => {
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.index.list.url, {
       method: api.index.list.method
@@ -50,7 +50,7 @@ http.getList = (data) => {
 }
 
 http.getCms = (data) => {
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.index.cms.url, {
       method: api.index.cms.method,
@@ -72,7 +72,8 @@ export default {
     nav: [],
     banner: [],
     list: [],
-    cms: []
+    cms: [],
+    fiveAList: [],
   },
   mutations: {
     setNav (state, data) {
@@ -86,9 +87,25 @@ export default {
     },
     setCms (state, data) {
       state.cms = data
-    }
+    },
+    setFiveAList (state, data) {
+      state.fiveAList = data
+    },
   },
   actions: {
+    getFiveAList (context, { ...payload }) { // 获取5A列表
+      return new Promise((resolve) => {
+        Ajax(api.index.getFiveAList.url, {
+          method: api.index.getFiveAList.method,
+          queryData: {
+            ...payload
+          },
+        }).then(res => {
+          context.commit('setFiveAList', res)
+          resolve(res)
+        })
+      })
+    },
     getNav (context, data) {
       return new Promise((resolve) => {
         http.getNav(data).then((res) => {
@@ -96,10 +113,9 @@ export default {
           resolve(res)
         })
       })
-      
     },
     getFiveAInfo (context, data) {
-      console.log(data)
+      // console.log(data)
       http.getBanner(data).then((res) => {
         context.commit('setBanner', res)
       })

src/store/userCenter/userCenter.js

@@ -93,10 +93,10 @@ export default {
       state.courseLocationList = data
     },
     setCourseOrder (state, { res, page }) { // 设置我的课程订单信息
-      if (page === 1) {
+      if (page <= 1) {
         state.courseOrderList = res
       } else {
-        state.courseOrderList = { ...res, list: [...state.courseOrderList.list, res.list] }
+        state.courseOrderList = {...res, list: [...state.courseOrderList.list, ...res.list]}
       }
     }
   },

src/util/ajax.js

@@ -17,7 +17,7 @@ const Axios = axios.create({
 
 Axios.interceptors.request.use((config) => {
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
-  config.urlData = {...config.urlData, org: 'MQ'}
+  config.urlData = { ...config.urlData, org: 'MQ' }
   let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
   // 判断是通过斜杠传参还是通过query传参
@@ -64,9 +64,11 @@ const ajax = (...args) => {
         // }
         resolve(code)
       } else {
-        Toast({
-          message: message,
-          type: 'error'
+        console.log(message)
+        Toast.fail({
+          duration: 2000, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          message: message
         })
       }
     }).catch(reject)

src/util/api.js

@@ -25,6 +25,10 @@ const $api = {
     cms: { // 获取cms消息
       method: 'get',
       url: `${baseUrl}${guest}/cms/news`
+    },
+    getFiveAList: { // 获取5A列表
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/course`
     }
   },
   caseForCoffee: {

src/util/contants.js

@@ -0,0 +1,54 @@
+
+const dict = {
+  orderStatus: [{ // 商品订单状态字典
+    value: '已下单',
+    key: 'not started'
+  }, {
+    value: '制作中',
+    key: 'doing'
+  }, {
+    value: '已完成',
+    key: 'finished'
+  }, {
+    value: '已取消',
+    key: 'cancel'
+  }],
+  gymCard: [{ // 健身卡字典
+    value: '次卡',
+    key: 'once'
+  }, {
+    value: '月卡',
+    key: 'month'
+  }, {
+    value: '季卡',
+    key: 'quarter'
+  }, {
+    value: '年卡',
+    key: 'year'
+  }],
+  consumptionType: [{ // 消费类型字典
+    value: '系统用户',
+    key: 'sys user'
+  }, {
+    value: '优惠券',
+    key: 'coupon'
+  }, {
+    value: '积分',
+    key: 'points'
+  }, {
+    value: '城币',
+    key: 'cheng-coin'
+  }],
+  userType: [{ // 用户类型
+    value: '销售',
+    key: 'sales'
+  }, {
+    value: '主管',
+    key: 'manager'
+  }, {
+    value: '用户',
+    key: 'customer'
+  }],
+}
+
+export default dict

vue.config.js

@@ -25,8 +25,8 @@ module.exports = {
       // '/api-v2': {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', //wf
-        target: 'http://192.168.0.11', //ys
+        target: 'http://192.168.0.62:8080', //wf
+        // target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {