xcx

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

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer != undefined ? userInfo.customer.CustomerName : ''" @selectCase="ShowSelect = true"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
@@ -36,7 +36,7 @@
                         <router-link tag="li" class="flex-item flex-h" v-for="(subItem,subIndex) in item.Tables" :key="subIndex" :to="{name: 'placeOrder', query: { tableid: encodeURI(subItem.TableId), tableno: encodeURI(subItem.TableNo), caseid: encodeURI(subItem.CaseId), casename: encodeURI(topCaseInfoData.CaseName), areaid: encodeURI(subItem.AreaId), areaname: encodeURI(item.AreaName)}}">
                           <caseTableItem :item="subItem" :index="subIndex"></caseTableItem>
                         </router-link>
-                        <li class="flex-item noData" v-if="item.Tables.length % 2 != 0"></li>
+                        <li class="flex-item noData" v-if="(item.Tables || []).length % 2 != 0"></li>
                       </ul>
                     </li>
                   </ul>
@@ -54,7 +54,8 @@
                     <span>万</span>
                   </div>
                 </div>
-                <router-link :to="{name: 'salesRecord',query: {}}">销售记录</router-link>
+                <a :href="getUrl('salesRecord')">销售记录</a>
+                <!-- <router-link :to="{name: 'salesRecord',query: {}}">销售记录</router-link> -->
               </div>
               <myCard v-for="(item,index) in cardList" :key="index" :data='item' @share='share'></myCard>
             </div>
@@ -71,10 +72,10 @@
     <van-picker :hidden="!showSelect"
       show-toolbar
       title="选择案场"
-      :columns="caseList"
+      :columns="CaseList"
       @cancel="showSelect = false"
       @confirm="selectCase"
-      value-key="value"
+      value-key="CaseName"
     />
   </div>
 </template>
@@ -105,29 +106,15 @@ export default {
         id: '3',
       }],
       topCaseInfoData: {
-        caseName: '',
-        caseId: '',
-        showSelect: true,
-        userName: ''
+        CaseName: '',
+        CaseId: '',
+        ShowSelect: true,
       },
       caseInfo: {
         value: '',
         id: ''
       },
       showSelect: false,
-      caseList: [{
-        value: '案场一',
-        id: ''
-      }, {
-        value: '案场二',
-        id: ''
-      }, {
-        value: '案场三',
-        id: ''
-      }, {
-        value: '案场四',
-        id: ''
-      }],
       list: [{
         name: '案场名称1',
         list: [{}, {}, {}, {}, {}],
@@ -156,7 +143,7 @@ export default {
     }),
     ...mapCaseState({
       caseTotal: x => x.caseTotal,
-    })
+    }),
   },
   components: {
     topCaseInfo,
@@ -186,13 +173,20 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
     ]),
+    getUrl (val) {
+      var url = window.location.pathname
+      return url.replace('user.html', 'sales.html') + '' + val
+    },
+    showVanPicker () {
+      this.showSelect = true
+    },
     selectCase (val) { // 选择案场
       this.topCaseInfoData.CaseName = val.CaseName
       this.topCaseInfoData.CaseId = val.CaseId
       this.getCaseTableList({
         caseid: this.topCaseInfoData.CaseId
       })
-      this.ShowSelect = false
+      this.showSelect = false
     },
     cutNav (index) { // 切换nav
       this.navActive = index
@@ -206,5 +200,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>