Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-15 269985404f94b50d14099b83f3436d6d405c365d

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html

@@ -48,7 +48,7 @@
            </el-row>
            <el-row class="order-info" type="flex" justify="space-around"  style="height: 150px; padding: 30px 30px;">
                <el-col :span="5">
                    <p>会员姓名：{{serviceOrderInfo.vipInfo.staffName}}</p>
                    <p>会员姓名：{{serviceOrderInfo.vipInfo.vipName}}</p>
                    <p>会员电话：{{serviceOrderInfo.vipInfo.phone}}</p>
                </el-col>
                <el-col :span="5">
@@ -73,7 +73,22 @@
                        <el-table-column
                                prop="projInfo.name"
                                label="商品名称"
                                width="280">
                                width="400">
                        </el-table-column>
                        <el-table-column
                                prop="projUse.source"
                                label="来源"
                                width="400">
                        </el-table-column>
                        <el-table-column
                                :formatter="hkPrice"
                                label="划扣金额"
                                width="100">
                        </el-table-column>
                        <el-table-column
                                prop="count"
                                label="次数"
                                width="100">
                        </el-table-column>
                        <el-table-column
                                prop="projInfo.timeLength"
@@ -81,7 +96,6 @@
                                width="200">
                        </el-table-column>
                        <el-table-column
                                prop="address"
                                label="服务时间" :formatter="serviceTime">
                        </el-table-column>
                        <el-table-column