xcx

src/pages/user/placeOrder/index.vue

@@ -67,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>
@@ -259,6 +259,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++) {
@@ -307,7 +314,7 @@ export default {
         title: '提示',
         message: '返回页面将清空当前选择的商品，确定要返回吗?'
       }).then(() => {
-        this.$router.push({name: 'coffeeIndex'})
+        this.$router.push({ name: 'coffeeIndex' })
       })
     },
     placeOrder () { // 下单

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/util/contants.js

@@ -12,7 +12,43 @@ const dict = {
   }, {
     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