From 296fc0dbd38fb9528c9d1f91ec9bc3758e27e994 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 19:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/ShopService.java | 2
wechat_staff/utils/config.js | 4
wechat_staff/pages/index/index.wxml | 14 ++-
wechat_staff/pages/index/index.wxss | 9 ++
wechat_staff/pages/store/staff.less | 39 +++++++++
wechat_staff/pages/store/staff.wxml | 4
wechat_staff/pages/detailDis/product.wxss | 1
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 5 +
wechat_staff/pages/homeId/index.js | 10 +-
server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java | 2
wechat_staff/pages/store/staff.wxss | 36 +++++++++
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 10 ++
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 40 ++++++++++
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 11 ++
wechat_staff/api/index.js | 2
server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java | 32 +++++--
17 files changed, 190 insertions(+), 33 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index a236b56..c58b046 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -695,7 +695,7 @@
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
- /* ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ /*ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int len = -1;
while ((len = inputStream.read(buffer)) != -1) {
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..eb36ce5 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,14 +393,22 @@
}return null;
}
private static BufferedImage getImgIO(InputStream is) {
+ if(is ==null){
+ log.error("=============================qrcode error 灏忕▼搴忕爜涓虹┖");
+ }else{
+
+ log.error("=============================qrcode okay 灏忕▼搴忕爜鏈夋湁鏁告摎");
+ }
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) {
+ public static InputStream generateShareImg(String imgurl, InputStream mpCode1, String title) {
BufferedImage bi = new BufferedImage(750, 976, BufferedImage.TYPE_INT_RGB);
//寰楀埌瀹冪殑缁樺埗鐜(杩欏紶鍥剧墖鐨勭瑪)
@@ -438,8 +448,9 @@
g2.drawString("鏌ョ湅鏇村绮惧僵鍐呭", 40,820+th);
- BufferedImage img3 = getImgIO(mpCode);
+ BufferedImage img3 = getImgIO(mpCode1);
if(img3!=null){
+ g2.setColor(Color.white);
g2.drawImage(img3, 530, 736, 180, 180, null);
}
InputStream inputStream = bufferedImageToInputStream(bi);
@@ -529,16 +540,15 @@
g2.drawImage(setRadius(img1,img1.getWidth(),0,0), (int)(20*rate), (int)(h-68*rate), (int)(48*rate) ,(int)(48*rate), null);
}
- Font font =new Font("榛戜綋", Font.PLAIN, (int)(28 * rate));
- FontMetrics fontMetrics = g2.getFontMetrics(font);
- int textWidth = fontMetrics.stringWidth(name);
-
+ g2.setColor(Color.white);
+ g2.setFont(new Font("榛戜綋", Font.PLAIN, (int)(28 * rate)));
+ g2.drawString(name, (int) (80*rate),h-(int)((64-th)*rate));
+ Font font =new Font("榛戜綋", Font.PLAIN, (int)(24 * rate));
g2.setColor(Color.white);
g2.setFont(font);
- g2.drawString(name, (int) (80*rate),h-(int)((64-th)*rate));
- g2.setColor(Color.white);
- g2.setFont(new Font("榛戜綋", Font.PLAIN, (int)(24* rate)));
- g2.drawString("鎵弿鐪嬫洿澶�", (int)(w -(textWidth+30*rate)),h-(int)(rate*(50-th)));
+ FontMetrics fontMetrics = g2.getFontMetrics(font);
+ int textWidth = fontMetrics.stringWidth("鎵爜鐪嬫洿澶�");
+ g2.drawString("鎵爜鐪嬫洿澶�", (int)(w -(textWidth+20*rate)),h-(int)(rate*(50-th)));
BufferedImage img3 = getImgIO(mpCode);
if(img3!=null){
diff --git a/server/service/src/main/java/com/doumee/service/business/ShopService.java b/server/service/src/main/java/com/doumee/service/business/ShopService.java
index 33c3568..8160c27 100644
--- a/server/service/src/main/java/com/doumee/service/business/ShopService.java
+++ b/server/service/src/main/java/com/doumee/service/business/ShopService.java
@@ -93,6 +93,8 @@
*/
PageData<Shop> findPage(PageWrap<Shop> pageWrap);
+ List<Shop> getUserShopList(Long userId);
+
/**
* 鏉′欢缁熻
*
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
index 0afa131..f3dd58e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
@@ -216,7 +216,7 @@
public BjParamConfigResponse getBjParamConfig(){
BjParamConfigResponse bjParamConfigResponse = new BjParamConfigResponse();
List<BjParam> bjParamList = bjParamMapper.selectList(new QueryWrapper<BjParam>()
- .lambda().eq(BjParam::getIsdeleted,Constants.ZERO));
+ .lambda().eq(BjParam::getIsdeleted,Constants.ZERO).orderByAsc(BjParam::getSortnum));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roughList)){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 10cdaf7..a57de5b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -338,6 +338,11 @@
ztContentListRequest.setId(id);
ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
if(Objects.nonNull(response)){
+// if(StringUtils.isNotBlank(response.getPanorama())){
+// response.setPanorama(
+// response.getPanorama().replace("https://720.","https://720-3.").replace("https://720-2.","https://720-3.")
+// );
+// }
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
if(StringUtils.isNotBlank(salesId)){
Users users = usersMapper.selectById(salesId);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index a1c246c..41cfa35 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -1032,4 +1032,44 @@
);
}
+ @Override
+ public List<Shop> getUserShopList(Long userId) {
+ Users users = usersMapper.selectById(userId);
+ if(Objects.isNull(users)){
+ return new ArrayList<>();
+ }
+ Shop userShop = shopMapper.selectById(users.getDepartmentId());
+ if(Objects.isNull(userShop)){
+ return new ArrayList<>();
+ }
+ List<Shop> shopList = shopMapper.selectList(new QueryWrapper<Shop>()
+ .lambda()
+ .eq(Shop::getScode,userShop.getScode())
+ .eq(Shop::getType,Constants.TWO)
+ .eq(Shop::getSecondType,Constants.THREE)
+ );
+ //鏌ヨ缁忚惀鑼冨洿淇℃伅
+ List<CategorySeg> categorySegAllList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda()
+ .isNotNull(CategorySeg::getOrgId)
+ .eq(CategorySeg::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categorySegAllList)){
+ for (Shop shop:shopList) {
+ if(StringUtils.isBlank(shop.getOrgId())){
+ continue;
+ }
+ List<CategorySeg> categorySegList = categorySegAllList.stream().filter(i->i.getOrgId().equals(shop.getOrgId())).collect(Collectors.toList());
+ List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
+ List<String> seqNameList = new ArrayList<>();
+ for(CategorySeg model : categorySegList){
+ String seqName = systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList);
+ if(Objects.nonNull(seqName)){
+ seqNameList.add(seqName);
+ }
+ }
+ shop.setSeqNameList(seqNameList);
+ }
+ }
+ return shopList;
+ }
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 6429dc8..a80c6a7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -45,6 +45,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.interfaces.MPJBaseJoin;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
import okhttp3.Response;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
@@ -78,6 +79,7 @@
* @date 2024/07/04 14:40
*/
@Service
+@Slf4j
public class UsersServiceImpl implements UsersService {
@@ -441,7 +443,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏇存柊鎵嬫満鍙峰け璐�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇鎵嬫満鍙峰け璐�");
}
@@ -676,6 +678,7 @@
@Override
public String getContentShareImg(Users users, ContentShareImgDto param){
+ log.error("======================start===========:娴锋姤寮�濮�"+JSONObject.toJSONString(param));
users = usersMapper.selectById(users.getId());
this.getUsersDetail(users);
if(StringUtils.isBlank(param.getImgurl())){
@@ -727,18 +730,20 @@
private String dealShareImgNoUser(ContentShareImgDto param, Users users, String shareFolder, String path) {
String url =null;
- //鍐呭鍒嗕韩娴锋姤鍥剧墖
- //鍐呭鍒嗕韩娴锋姤鍥剧墖
+ log.error("======================start===========:娴锋姤寮�濮�");
InputStream mpCode = Constants.generateWxMiniImgStream(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG, Constants.WX_TOKEN_CUSTOMER).getCode(),
//"userId="+users.getId()+"&articleId="+param.getArticleId(),
param.getArticleId()+"_"+users.getId(),
param.getPageUrl());//灏忕▼搴�
+ log.error("======================mpcode===========:鑾峰彇灏忕▼搴忕爜寮�濮�");
String title = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.SHARE_HAIBAO_HEADER_TITLE).getCode();
InputStream inputStream = GeneratePicUtil.generateShareImg(
param.getImgurl()
,mpCode
,title);
+
+ log.error("======================huatu===========:鐢诲浘缁撴潫");
TyyZosUtil obs = new TyyZosUtil( systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ENDPOINT).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_ID).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_KEY).getCode());
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index bbe8434..4899dd7 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -151,6 +151,16 @@
}
@UserLoginRequired
+ @ApiOperation(value = "鑾峰彇鍛樺伐绠＄悊闂ㄥ簵鍒楄〃", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/userShopList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<Shop>> userShopList () {
+ return ApiResponse.success(shopService.getUserShopList(getMemberId()));
+ }
+
+ @UserLoginRequired
@ApiOperation(value = "闂ㄥ簵璇︽儏", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/shopDetail")
@ApiImplicitParams({
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/detailDis/product.wxss b/wechat_staff/pages/detailDis/product.wxss
index 0f4017a..0a94bed 100644
--- a/wechat_staff/pages/detailDis/product.wxss
+++ b/wechat_staff/pages/detailDis/product.wxss
@@ -61,6 +61,7 @@
margin-bottom: 26rpx;
}
.main_content .text {
+ line-height: 36rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 40rpx;
diff --git a/wechat_staff/pages/homeId/index.js b/wechat_staff/pages/homeId/index.js
index 4f403de..0a7dded 100644
--- a/wechat_staff/pages/homeId/index.js
+++ b/wechat_staff/pages/homeId/index.js
@@ -53,11 +53,11 @@
itemClick(e) {
const item = e.currentTarget.dataset.item
console.log('item', item);
- actionDo({actionType: 'view',id: item.id})
if(item.contentType == 'video'){
wx.previewMedia({
sources: [{ url: item.content, type: 'video' }]
- })
+ })
+ actionDo({actionType: 'view',id: item.id})
}
if(item.contentType == 'link'){
wx.navigateTo({
@@ -66,13 +66,15 @@
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
res.eventChannel.emit('data',{link:item.content} );
}
- })
+ })
+ actionDo({actionType: 'view',id: item.id})
}
if(item.contentType == 'page'){
getApp().globalData.catalogCode=item.content
wx.switchTab({
url: '/pages/discover/discover'
- })
+ })
+ actionDo({actionType: 'view',id: item.id})
}
},
cateClick(e) {
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index fa31f05..ffd31f8 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 931add4..d96c1e8 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/staff.less b/wechat_staff/pages/store/staff.less
index dde80eb..0888924 100644
--- a/wechat_staff/pages/store/staff.less
+++ b/wechat_staff/pages/store/staff.less
@@ -8,6 +8,7 @@
z-index: -1;
}
+
.container {
padding: 26rpx 40rpx;
.avatar {
@@ -198,4 +199,40 @@
color: #999999;
text-align: center;
}
-}
\ No newline at end of file
+}
+.card_wrap{
+ position: fixed;
+ border-radius: 8rpx;
+ top: 50%;
+ left: 75rpx;
+ transform: translate(0, -50%);
+ width: 600rpx;
+ background-color: rgba(0, 0, 0, .2);
+ z-index: 999;
+ .img1{
+ image{
+ width: 600rpx;
+ border-radius: 8rpx ;
+ }
+ }
+ .btns{
+ margin-top: 30rpx;
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ .btn{
+ width: 290rpx;
+ height: 88rpx;
+ border-radius: 8rpx;
+ border: 2rpx solid #FFFFFF;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #fff;
+ }
+ .save{
+ border: none;
+ background: linear-gradient( 180deg, #E0B49C 0%, #B68B74 100%);
+ }
+ }
+}
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 1ec8c09..13f881d 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -20,12 +20,12 @@
<view class="card">
<image src="../../static/images/mingpian_bg_nianxian.png" class="bg"></image>
<view>浠庝笟骞撮檺</view>
- <view class="num">{{ info.jobDate || '5' }}</view>
+ <view class="num">{{ userInfo.jobDate || '5' }}</view>
</view>
<view class="card">
<image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
<view>鏈嶅姟瀹㈡埛</view>
- <view class="num" wx:if="{{ info.costomerNum || info.costomerNum == 0 }}">{{ info.costomerNum || '--' }}+</view>
+ <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}+</view>
<view wx:else class="num">--</view>
</view>
</view>
diff --git a/wechat_staff/pages/store/staff.wxss b/wechat_staff/pages/store/staff.wxss
index 19a1e15..dffb74d 100644
--- a/wechat_staff/pages/store/staff.wxss
+++ b/wechat_staff/pages/store/staff.wxss
@@ -105,6 +105,7 @@
font-size: 40rpx;
display: flex;
}
+
.guide .title {
font-weight: 500;
font-size: 32rpx;
@@ -187,3 +188,38 @@
color: #999999;
text-align: center;
}
+
+.card_wrap {
+ position: fixed;
+ border-radius: 8rpx;
+ top: 50%;
+ left: 75rpx;
+ transform: translate(0, -50%);
+ width: 600rpx;
+ background-color: rgba(0, 0, 0, 0.2);
+ z-index: 999;
+}
+.card_wrap .img1 image {
+ width: 600rpx;
+ border-radius: 8rpx ;
+}
+.card_wrap .btns {
+ margin-top: 30rpx;
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+}
+.card_wrap .btns .btn {
+ width: 290rpx;
+ height: 88rpx;
+ border-radius: 8rpx;
+ border: 2rpx solid #FFFFFF;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #fff;
+}
+.card_wrap .btns .save {
+ border: none;
+ background: linear-gradient(180deg, #E0B49C 0%, #B68B74 100%);
+}
\ No newline at end of file
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