bug修改

package.json

@@ -9,7 +9,8 @@
   },
   "dependencies": {
     "element-ui": "^2.4.6",
-    "vue": "^2.5.17"
+    "vue": "^2.5.17",
+    "weixin-js-sdk": "^1.3.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.0.1",

src/components/caseTableItem/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="caseTableItem flex-h">
-    <i class="iconfont icon-yinchenglogo"></i>
+    <!-- <i class="iconfont icon-yinchenglogo"></i> -->
+    <img :src="icon" class="iconfont icon-yinchenglogo">
     <div class="itemNo">
       <a>
         <div class="centerLabel">
@@ -22,7 +23,7 @@
 
 export default {
   name: '',
-  props: ['item','index'],
+  props: ['item','index','icon'],
   data () {
     return {
       

src/components/caseTableItem/page.scss

@@ -3,14 +3,16 @@
   position: relative;
   overflow: hidden;
   align-items: center;
-  &>i{
+  &>img{
     display: inline-block;
     position: absolute;
-    right: .1rem;
-    top: .05rem;
-    font-size: .36rem;
+    right: .06rem;
+    top: 50%;
+    transform: translateY(-50%);
+    -webkit-transform: translateY(-50%);
+    width: .36rem;
     z-index: 1;
-    color: rgba(255, 0, 0, .1);
+    opacity: .3;
   }
   .itemNo{
     width: .44rem;

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

@@ -29,12 +29,13 @@
                     <ul class="areaList">
                       <li v-for="(item,index) in CaseTableList" :key="index">
                         <div class="title">
-                          <i class="iconfont icon-yinchenglogo"></i>
+                          <!-- <i class="iconfont icon-yinchenglogo"></i> -->
+                          <img :src="item.AreaIcon" class="iconfont icon-yinchenglogo">
                           <span>{{item.AreaName}}</span>
                         </div>
                         <ul class="subAreaList flex-h">
                           <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>
+                            <caseTableItem :icon="item.AreaIcon" :item="subItem" :index="subIndex"></caseTableItem>
                           </router-link>
                           <li class="flex-item noData" v-if="(item.Tables || []).length % 2 != 0"></li>
                         </ul>

src/pages/user/mainPage/coffeeIndex/page.scss

@@ -105,12 +105,17 @@
                       margin-top: .22rem;
                       *{
                         line-height: .26rem;
+                        display: inline-block;
+                        vertical-align: middle;
                         font-size: .14rem;
                       }
-                      i{
-                        color: red;
-                        margin-right: .05rem;
+                      img{
+                        width: .2rem;
                       }
+                      // i{
+                      //   color: red;
+                      //   margin-right: .05rem;
+                      // }
                     }
                     .subAreaList{
                       position: relative;

src/pages/user/placeOrder/index.vue

@@ -214,7 +214,7 @@ export default {
       }
     },
     mapArr () { // 匹配商品规格
-      var aArr = this.goodsTypeList, bArr = this.goodsList
+      var aArr = (this.goodsTypeList || []), bArr = (this.goodsList || [])
       for (var n = 0; n < aArr.length; n++) {
         aArr[n].list = []
         for (var a = 0; a < bArr.length; a++) {
@@ -337,7 +337,9 @@ export default {
           specname: (val.specname || ''),
         })
       } else {
-        this.selGoods.splice(this.selGoods.findIndex(item => item.id === val.id && item.spec === (val.spec || '')), 1)
+        if (val.defaultNum === 0) {
+          this.selGoods.splice(this.selGoods.findIndex(item => item.id === val.id && item.spec === (val.spec || '')), 1)
+        }
       }
     },
     calcTotalNum () { // 计算总数量、价格