From 7cede2696df830f56a1f7edc4cff4ca483c8aeb8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:40:50 +0800
Subject: [PATCH] 提交
---
wechat_staff/utils/config.js | 4 ++--
wechat_staff/pages/index/index.wxml | 14 ++++++++------
wechat_staff/pages/index/index.wxss | 9 ++++++++-
wechat_staff/api/index.js | 2 +-
server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java | 9 ++++++++-
wechat_staff/pages/store/index.js | 2 +-
6 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
index 7d16eae..15c94e1 100644
--- a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
@@ -1,6 +1,7 @@
package com.doumee.core.utils;
import com.google.zxing.common.BitMatrix;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -21,6 +22,7 @@
import java.math.RoundingMode;
import java.net.URL;
+@Slf4j
public class GeneratePicUtil {
static String bg="https://shoeslxkj.oss-cn-beijing.aliyuncs.com/file/20230404/SysBaseBackGround/D56231512C0B4A4C9D06B02F9566B0B0.png";
@@ -391,11 +393,16 @@
}return null;
}
private static BufferedImage getImgIO(InputStream is) {
+ if(is ==null){
+ log.error("=============================qrcode error 灏忕▼搴忕爜涓虹┖");
+ }
try {
return ImageIO.read(is);
}catch (Exception e){
+ log.error("=============================qrcode error 灏忕▼搴忕爜涓虹┖11111111111:"+e.getMessage());
- }return null;
+ }
+ return null;
}
public static InputStream generateShareImg(String imgurl, InputStream mpCode, String title) {
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 86fcab2..c7d07d3 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -13,7 +13,7 @@
export const loginByPhone = (data) => {
return request({
url: '/web/personnel/loginByPhone',
- datas
+ data
})
}
// 鍙戦�侀獙璇佺爜
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index b49b893..5391ba8 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -1,10 +1,12 @@
-<view class="container">
- <view style="height: {{clientTop - 2}}px;"></view>
- <view class="search_wrap">
- <image class="icon" src="../../static/home_ic_search@2x.png" mode="widthFix"></image>
- <input model:value="{{ searchValue }}" placeholder="鎼滅储" type="text" />
+<view class="container" >
+ <view class="search_fix">
+ <view style="height: {{clientTop - 2}}px;"></view>
+ <view class="search_wrap">
+ <image class="icon" src="../../static/home_ic_search@2x.png" mode="widthFix"></image>
+ <input model:value="{{ searchValue }}" placeholder="鎼滅储" type="text" />
+ </view>
</view>
- <view class="everyday">
+ <view class="everyday" >
<view class="header" bindtap="promotionClick">
<view class="title">姣忔棩涓婃柊</view>
<view class="more">
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index 143cd79..867da8c 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -1,3 +1,10 @@
+.search_fix{
+ position: fixed;
+ z-index: 10000;
+ width: 100%;
+ height: 206rpx;
+ background-color: white;
+}
.search_wrap {
display: flex;
align-items: center;
@@ -15,7 +22,7 @@
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 40rpx;
+ margin: 206rpx 40rpx;
background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%), #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
diff --git a/wechat_staff/pages/store/index.js b/wechat_staff/pages/store/index.js
index f85a27c..666ccef 100644
--- a/wechat_staff/pages/store/index.js
+++ b/wechat_staff/pages/store/index.js
@@ -9,7 +9,7 @@
shopId: null,
shopInfo:{},
shopList:[]
- },buo
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index e672602..a150c8d 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,5 +1,5 @@
-// export const baseUrl = 'http://192.168.0.135:10027'
-export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
+export const baseUrl = 'http://192.168.0.135:10027'
+// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //娴嬭瘯鏈嶅姟鍣�
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
--
Gitblit v1.9.3