diff --git a/fuintAdmin/src/assets/styles/element-ui.scss b/fuintAdmin/src/assets/styles/element-ui.scss index ccfdd3ab2..577629a03 100644 --- a/fuintAdmin/src/assets/styles/element-ui.scss +++ b/fuintAdmin/src/assets/styles/element-ui.scss @@ -77,6 +77,9 @@ .el-range-editor.el-input__inner { display: inline-flex !important; } +.el-input__inner:focus { + border-color: #FF9655 !important; +} // to fix el-date-picker css style .el-range-separator { diff --git a/fuintAdmin/src/views/staff/storeInfo/index.vue b/fuintAdmin/src/views/staff/storeInfo/index.vue index c3dae9e66..e1056c970 100644 --- a/fuintAdmin/src/views/staff/storeInfo/index.vue +++ b/fuintAdmin/src/views/staff/storeInfo/index.vue @@ -2,79 +2,85 @@
- +
- {{ store.name }}{{store.description? "("+store.description+")":"" }} + {{ store.name }}{{ store.description ? "(" + store.description + ")" : "" }}
- + - -
- 店铺logo： - -
- -
- 门头照： - -
+ +
+ 店铺logo： + +
+ +
+ 门头照： + +

退款密码：

- - + + - -
- 店铺福利： - - - -
+ +
+ 店铺福利： + + + +
- + - 保存信息 - + 保存信息 + - -
- 油站二维码 -
- 切换样式
- 切换样式
-
- - 下载油站二维码 - - + +
+ 油站二维码 +
+
+
+
+ + 下载图片 + + 切换样式 + +
+ 切换样式 + +
+
+ - - - - - - - - - - - + + + + + + + + + + +
diff --git a/fuintAdmin_zt/src/assets/styles/element-ui.scss b/fuintAdmin_zt/src/assets/styles/element-ui.scss index ccfdd3ab2..577629a03 100644 --- a/fuintAdmin_zt/src/assets/styles/element-ui.scss +++ b/fuintAdmin_zt/src/assets/styles/element-ui.scss @@ -77,6 +77,9 @@ .el-range-editor.el-input__inner { display: inline-flex !important; } +.el-input__inner:focus { + border-color: #FF9655 !important; +} // to fix el-date-picker css style .el-range-separator { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java index da1576d8e..5b57b73bc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java @@ -339,7 +339,7 @@ public class LJStaffServiceImpl extends ServiceImpl impl LJStaff staff = this.selectStaffById(id); LJStore store = storeService.selectStoreByStoreId(staff.getStoreId()); //在图片上生成二维码 - String backgroundImage = "static/qrCodeImg/laigeyouhui_bg.jpg"; + String backgroundImage = "static/qrCodeImg/mendian_bg2.png"; String logoImage = "static/qrCodeImg/logo.png"; // if (StringUtils.isNotEmpty(store.getLogo())){ // logoImage = store.getLogo(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java index 7f5daf0c0..ae6b3ed0a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java @@ -69,10 +69,10 @@ public class QrCodeUtils { g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null); //使用工具类生成二维码 // Image image = createQrCode(logoStream, url, 360, 360); - Image image = createQrCode(logoStream, url, 270, 270); + Image image = createQrCode(logoStream, url, 294, 294); //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。 // g.drawImage(image, (bufImg.getWidth()-360)/2, 320, null); - g.drawImage(image, (bufImg.getWidth()-270)/2, 153, null); + g.drawImage(image, (bufImg.getWidth()-294)/2, 139, null); // 设置字体，样式，字体大小 // g.setFont(new Font("TimesRoman", Font.BOLD, 20)); g.setFont(chineseFont()); @@ -90,18 +90,18 @@ public class QrCodeUtils { LJStaff staff1 = staffService.selectStaffByStoreId(storeId); // 店铺名称位置文字绘制到指定位置 - g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 300); + g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 560); // 加油员姓名位置文字绘制到指定位置 if (ObjectUtil.isNotEmpty(staff)) { - g.drawString("加油员："+staff.getRealName(), returnX(g, bufImg.getWidth(), "加油员："+staff.getRealName()), 750); + g.drawString("加油员："+staff.getRealName(), 50, 680); } // 站长名称位置文字绘制到指定位置 - g.drawString("站长名称："+staff1.getRealName(), returnX(g, bufImg.getWidth(), "站长名称："+staff1.getRealName()), 810); + g.drawString("站长名称："+staff1.getRealName(), 50, 590); // 服务监督电话位置文字绘制到指定位置 - g.drawString("服务监督电话："+staff1.getMobile(), returnX(g, bufImg.getWidth(), "服务监督电话："+staff1.getMobile()), 870); + g.drawString("服务监督电话："+staff1.getMobile(), 50, 620); // 店铺地址位置文字绘制到指定位置 // g.drawString(store.getAddress(), returnX(g,bufImg.getWidth(),store.getAddress()), 900); - drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-20,20,940,10 ); + drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-90,51,650,5 ); }else { drawStringWithMultiLine(g,"欢迎光临", bufImg.getWidth()-20,20,940,10 ); g.drawString("欢迎光临：", returnX(g, bufImg.getWidth(), "服务监督电话："), 870); @@ -306,17 +306,17 @@ public class QrCodeUtils { // Font font = Font.createFont(Font.TRUETYPE_FONT, new ClassPathResource("classpath:font/msyh.ttc").getFile()); // b = font.deriveFont(Font.BOLD, 40); - b = new Font("TimesRoman", Font.BOLD, 40); + b = new Font("TimesRoman", Font.BOLD, 16); } else { prefixFont = "/usr/share/fonts" + File.separator + "msyh.ttc"; try { Font font = Font.createFont(Font.TRUETYPE_FONT, new File(prefixFont)); - b = font.deriveFont(Font.BOLD, 40); + b = font.deriveFont(Font.BOLD, 16); // b = new Font("msyh", Font.BOLD, 40); } catch (Exception e) { //如果发生异常执行默认的字体 - b = new Font("msyh", Font.BOLD, 40); + b = new Font("msyh", Font.BOLD, 16); log.error(e.getMessage(),"找不到字体"); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java index 46f30da6e..72eae07f8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java @@ -60,9 +60,9 @@ public class QRCodeServiceImpl extends ServiceImpl impleme //在图片上生成二维码 String backgroundImage = ""; if (type.equals("0")){ - backgroundImage = "static/qrCodeImg/mendian_bg1.png"; - }else { backgroundImage = "static/qrCodeImg/mendian_bg2.png"; + }else { + backgroundImage = "static/qrCodeImg/mendian_bg1.png"; } String logoImage = "static/qrCodeImg/logo.png"; diff --git a/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg1.png b/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg1.png index 3506ede5b..e1ffcab0f 100644 Binary files a/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg1.png and b/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg1.png differ diff --git a/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg2.png b/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg2.png index 867fed00b..ec4e83128 100644 Binary files a/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg2.png and b/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg2.png differ diff --git a/fuintCashierWeb/src/assets/styles/element-ui.scss b/fuintCashierWeb/src/assets/styles/element-ui.scss index 2d228a59f..0f559ea94 100644 --- a/fuintCashierWeb/src/assets/styles/element-ui.scss +++ b/fuintCashierWeb/src/assets/styles/element-ui.scss @@ -77,6 +77,9 @@ .el-range-editor.el-input__inner { display: inline-flex !important; } +.el-input__inner:focus { + border-color: #FF9655 !important; +} // to fix el-date-picker css style .el-range-separator {