Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-09 58508692587d5d99ae905e8f1e4e4249ffb3b08a

Merge remote-tracking branch 'origin/api' into api

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -142,7 +142,7 @@
        }

        if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
            return AjaxResult.buildSuccessInstance("资金密码错误");
            return AjaxResult.buildFailInstance("资金密码错误");
        }

        SysProjServices sysProjServices = new SysProjServices();

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -575,6 +575,7 @@
        vipInfoDetailVo.setBirthday(sysVipInfo.getBirthday1());
        vipInfoDetailVo.setPassword(sysVipInfo.getPassWord());
        vipInfoDetailVo.setPhoto(sysVipInfo.getPhoto());
        vipInfoDetailVo.setVipNo(sysVipInfo.getVipNo());

        List<SysVipLabel> labels = sysVipLabelDao.selectByVipId(sysVipInfo.getId());
        vipInfoDetailVo.setLabels(labels);

 zq-erp/src/main/resources/config/lhx/system.properties

@@ -102,3 +102,6 @@

#hive仓库地址
hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/

gzh_appid=wx57e6335559bdbda6
gzh_secret=ecb408af170e3890e6544290cad33760

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -460,7 +460,7 @@
                                        <el-button matrix:btn="serviceClub-paidan" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="giveServiceOrder(scope.$index, scope.row)">派单</el-button>
                                        <el-button matrix:btn="serviceClub-edit" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="modifyServiceOrder(scope.$index, scope.row)">修改</el-button>
                                        <el-button matrix:btn="serviceClub-peiliao" type="text" size="small" v-if="scope.row.state=='需配料'" @click="peiliao(scope.$index, scope.row)">配料</el-button>
                                        <el-button matrix:btn="serviceClub-huakou" type="text" size="small" v-if="scope.row.state=='服务完成'" @click="openHKService(scope.$index, scope.row)">划扣</el-button>
                                        <el-button matrix:btn="serviceClub-huakou" type="text" size="small" v-if="scope.row.state=='服务完成'" @click="hkService(scope.$index, scope.row)">划扣</el-button>
                                        <el-button matrix:btn="serviceClub-edit" type="text" size="small" @click="modifyTime(scope.$index, scope.row)">修改时间</el-button>
                                        <el-button matrix:btn="serviceClub-del" type="text" size="small" v-if="scope.row.state!='预约取消'" @click="cancelServiceOrder(scope.$index, scope.row)">取消</el-button>
                                    </template>
@@ -1096,7 +1096,7 @@
                }));
            },
            // 划扣
            openHkService(index, row) {
            hkService(index, row) {
                openHkServcie(row.id);
            },
            // 取消