1.新增店铺装修小票设置

2.店铺装修新增pad点餐设置
3.应用中心新增会员积分
4.店铺设置新增积分设置

src/views/shop/components/fitment.vue

@@ -152,6 +152,24 @@
                         <div class="shop_name">{{ shopName }}</div>
                         <img class="content" src="@/assets/images/shop_editor_bg.png" alt="">
                     </div>
+                    <div class="ticket_wrap" v-if="tableActive == 'ticket_logo'">
+                        <img class="logo" :src="selectItem.value">
+                        <img class="ewm" src="@/assets/images/1024.png">
+                        <div class="row">
+                            <span class="num">123</span>
+                            <span>座位号：#A9</span>
+                        </div>
+                        <div class="row">甜橙马黛茶</div>
+                        <div class="row">
+                            <span class="sku">加珍珠、加糖</span>
+                        </div>
+                        <div class="row">
+                            <span class="b">2020-10-24 13:14:52</span>
+                        </div>
+                        <div class="row">
+                            <span class="sku">建议尽快享用，风味更佳</span>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="editor_wrap">
@@ -272,11 +290,11 @@ export default {
 
         .phone_wrap {
             width: 100%;
-            height: 686px;
             background-color: #fff;
             box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
 
             .index_bg {
+                padding-bottom: 50px;
                 .bg {
                     width: 100%;
                     height: 500px;
@@ -363,6 +381,7 @@ export default {
             .my_bg {
                 background-color: #f5f5f5;
                 height: 100%;
+                padding-bottom: 50px;
 
                 .bg {
                     width: 100%;
@@ -481,6 +500,7 @@ export default {
                 height: 100%;
                 background-color: #f5f5f5;
                 padding: 10px;
+                padding-bottom: 400px;
 
                 .card_wrap {
                     background-color: #fff;
@@ -616,6 +636,46 @@ export default {
                     display: block;
                 }
             }
+
+            .ticket_wrap {
+                padding: 15px;
+                position: relative;
+
+                .ewm {
+                    width: 80px;
+                    height: 80px;
+                    position: absolute;
+                    top: 10px;
+                    right: 15px;
+                }
+
+                .logo {
+                    width: 90px;
+                    height: 30px;
+                    object-fit: cover;
+                }
+
+                .row {
+                    margin-top: 5px;
+                    display: flex;
+                    align-items: center;
+
+                    .sku {
+                        font-size: 12px;
+                        color: #666;
+                    }
+
+                    .b {
+                        font-weight: bold;
+                    }
+
+                    .num {
+                        font-size: 18px;
+                        font-weight: bold;
+                        margin-right: 10px;
+                    }
+                }
+            }
         }
     }
 

src/views/shop/components/shopInfo.vue

@@ -66,6 +66,16 @@
             <el-checkbox label="take-out">允许打包</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
+        <el-form-item label="是否启用会员价">
+          <el-switch v-model.trim="form.isMemberPrice" :active-value="1" ::inactive-value="0"></el-switch>
+          <!-- <div style="color: #999;">是否允许用户在小程序端支付订单</div> -->
+        </el-form-item>
+        <el-form-item label="积分群体">
+          <el-radio-group v-model="form.consumeColony">
+            <el-radio label="all">所有</el-radio>
+            <el-radio label="vip">仅针对会员</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input v-model.trim="form.phone" placeholder="请输入联系电话" style="width: 500px;"></el-input>
         </el-form-item>
@@ -225,7 +235,8 @@ export default {
       formLoading: false,
       form: {
         eatModel: [],
-        paymentQrcode: ''
+        paymentQrcode: '',
+        consumeColony: 'all'
       },
       rules: {
         shopName: [