ytj

src/components/topCaseInfo/index.vue

@@ -2,7 +2,7 @@
   <div class="topCaseInfo flex-h">
     <i class="iconfont icon-dingwei"></i>
       <span>{{data.caseName}}</span>
-      <a v-if="data.ShowSelect" @click="selectCase">请选择</a>
+      <a v-if="data.ShowSelect && from !== 'sales'" @click="selectCase">请选择</a>
       <div class="flex-item">
         <span>{{userName}}您好！</span>
       </div>
@@ -16,7 +16,7 @@ export default {
   props: ['data', 'userName'],
   data () {
     return {
-
+      from: ''
     }
   },
   computed: {
@@ -26,7 +26,8 @@ export default {
 
   },
   created () {
-
+    this.from = sessionStorage.getItem('from')
+    console.log(this.from)
   },
   methods: {
     selectCase () { // 选择案场

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

@@ -3,14 +3,14 @@
     <div class="top">
       <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name" @selectCase="showVanPicker"></topCaseInfo>
     </div>
-    <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
+    <nav class="flex-h" v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '4'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
     </nav>
       <div class="content">
         <div>
           <ul>
             <li :hidden="navActive !== 0 && userInfo.customer.MapUser !== ''" class="placeOrder">
-              <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== ''">
+              <div class="topInfo flex-h" v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">
                 <div class="flex-item">
                   <div>
                     <span>共计已使用：{{caseTotal.total}}杯</span>
@@ -146,6 +146,7 @@ export default {
   name: '',
   data () {
     return {
+      fromPage: '',
       myRecommendUserList: [],
       forbidList: [],
       postCustomerData: {
@@ -261,6 +262,7 @@ export default {
     noMore
   },
   created () {
+    this.fromPage = sessionStorage.getItem('from')
     if (!this.userInfo.customer.MapUser) {
       this.topCaseInfoData.ShowSelect = true
     }
@@ -562,7 +564,7 @@ export default {
     toOrders (subItem, item) {
       const _that = this
       this.getCaseConf({ caseid: subItem.CaseId }).then(res => {
-        if (this.checkCanOrder()) {
+        if (this.checkCanOrder() && sessionStorage.getItem('from') === 'sales') {
           _that.$toast('您的点单功能已被关闭！')
           return
         }

src/pages/user/mainPage/index.vue

@@ -48,8 +48,8 @@ export default {
     if (!this.userInfo.customer.MapUser || !this.$route.query.hideTabbar) {
       this.showTabBar = true
     }
-    if (this.$route.query.hideTabbar){
-      sessionStorage.setItem('from','sales')
+    if (this.$route.query.hideTabbar) {
+      sessionStorage.setItem('from', 'sales')
     }
   }
 }

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

@@ -86,6 +86,8 @@ export default {
       this.user = this.userInfo.customer
       if (this.user.AccountInfo) {
         this.AccountInfo = JSON.parse(this.user.AccountInfo)
+
+        
       }
       this.headimgurl = this.user.Headimgurl
     })
@@ -109,7 +111,7 @@ export default {
       this.$router.push({ name: 'bindMobile' })
     },
     toGoodsOrder () {
-      this.$router.push({ name: 'orderList' })
+      this.$router.push({ name: 'orderList', query: { from: 'c' } })
     },
     toBodyCheck () {
       var url = window.location.pathname

src/pages/user/orderList/index.vue

@@ -79,6 +79,7 @@ export default {
     this.getCustomerGoodsOrder({
       page: this.page,
       pagesize: this.pagesize,
+      from: this.$route.query.from || ''
     }).then((res) => {
       // console.log(JSON.stringify(res))
       if(res.list === null){

src/pages/user/placeOrder/index.vue

@@ -213,7 +213,7 @@ export default {
     ]),
     toPlaceOrder () { // 下单 
       if (this.selGoods.length) {
-        if (this.userInfo.customer.MapUser === '') {
+        if (this.userInfo.customer.MapUser === '' || (this.userInfo.customer.MapUser !== '' && sessionStorage.getItem('from') !== 'sales')) {
           this.$router.push({ name: 'placeOrderDetail', query: { info: JSON.stringify(this.selGoods), 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.showCalcMenu = true
@@ -305,7 +305,7 @@ export default {
         this.toPay({
           info: JSON.stringify(this.postData.info),
           detail: JSON.stringify(this.postData.detail),
-          customercouponid: JSON.stringify(this.postData.coupon) || '',
+          customercouponid: '',
           from: this.postData.from
         }).then((res) => {
           this.ajaxOff = true