From af9f7ad7d711f0562e4394449a117da20f808fc2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 七月 2024 16:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/detailDis/case.wxml | 2
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 51 +++++--
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 21 +++
wechat_staff/pages/kefu/fond.js | 35 ++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java | 23 +++
wechat_staff/pages/kefu/fond.wxss | 1
wechat_staff/pages/kefu/fond.wxml | 16 +-
wechat_staff/project.private.config.json | 11 +
server/service/src/main/java/com/doumee/service/business/NewsService.java | 2
wechat_staff/components/detailFooter/index.wxml | 16 +-
wechat_staff/components/disCase/index.wxml | 4
wechat_staff/pages/detailDis/product.js | 50 ++++++
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 1
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 22 ++
server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java | 4
wechat_staff/components/detailFooter/index.js | 27 +++
wechat_staff/utils/config.js | 4
wechat_staff/pages/detailDis/case.js | 2
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 7 +
wechat_staff/pages/detailDis/realpic.wxml | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 3
wechat_staff/pages/detailDis/realpic.js | 2
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 20 ++
wechat_staff/pages/detailDis/product.wxml | 12 -
wechat_staff/api/index.js | 8 +
wechat_staff/pages/kefu/fond.less | 1
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 7
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 6
wechat_staff/components/disRealpic/index.wxml | 4
29 files changed, 289 insertions(+), 75 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
index 23cf7fa..8ad9fc8 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -49,4 +49,5 @@
List<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
ZTCusCarouselImageResponse carouselImageDetail(ZTDataDetailRequest param);
ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest param);
+ ZTBaseResponse batchAddLike(ZTBatchAddListRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index c00a5f4..dc18be7 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -751,4 +751,25 @@
}
return null;
}
+
+ /**
+ * 鑾峰彇鍒嗙被鍜屽垎绫讳笅鐨勬爣绛�
+ * @param param
+ * @return
+ */
+ @Override
+ public ZTBaseResponse batchAddLike(ZTBatchAddListRequest param){
+ ZTBaseResponse result = sendHttpRequest(
+ ZTConstants.IntegerUrl.BATCH_ADD_LIKE_URL,
+ ZTConstants.IntegerName.BATCH_ADD_LIKE_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+ if(result!=null){
+ return result;
+ }
+ return null;
+ }
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
index 9214dc7..19cbcb6 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
@@ -20,5 +20,9 @@
private String customerPhone;// 瀹㈡埛濮撳悕
private String customerName;// 瀹㈡埛鎵嬫満鍙�
private String address ;//鍦板潃璇︽儏
+ private String creationDate ;//鍒涘缓鏃堕棿
+ private String customerId ;//瀹㈡埛 id
+ private String platSourceId ;//浼犻�掑钩鍙� id
+ private String platSource ;//骞冲彴绫诲瀷 1 pad 绔� 2 灏忕▼搴忕
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java
new file mode 100644
index 0000000..28b8b90
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java
@@ -0,0 +1,23 @@
+package com.doumee.biz.zbom.model.zhongtai;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class ZTBatchAddListRequest extends ZTBaseRequst{
+
+ @ApiModelProperty(value = "鍐呭IDS锛岃嫳鏂囬�楀彿闅斿紑")
+ private String articleIds;
+
+ @ApiModelProperty(value = "瀹㈡埛 id")
+ private String customerId ;
+
+ @ApiModelProperty(value = "浼犻�掑钩鍙� id")
+ private String platSourceId ;
+
+ @ApiModelProperty(value = "骞冲彴绫诲瀷 1 pad 绔� 2 灏忕▼搴忕")
+ private String platSource ;
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
index 1422de9..e9df120 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -78,6 +78,7 @@
String REALCASE_PAGE_LIST_URL ="/content/api/realCasePageList";
String REALCASE_INFO_URL ="/content/api/realCaseDetail";
String FAVORITES_PAGE_URL ="/behavior/api/favoritesPageList";
+ String BATCH_ADD_LIKE_URL ="/content/api/batchAddLike";
}
@@ -119,5 +120,7 @@
String REALCASE_INFO_NAME ="鑾峰彇瀹炴櫙妗堜緥璇︽儏";
String FAVORITES_NAME ="鑾峰彇鎴戠殑鍠滄/鏀惰棌鍒楄〃";
+
+ String BATCH_ADD_LIKE_NAME ="鎵归噺缁戝畾鍠滄缁欏鎴�";
}
}
diff --git a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
index 27a41e1..e208654 100644
--- a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
+++ b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -157,4 +157,11 @@
* @return
*/
ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest ztCollectLikeRequest);
+
+ /**
+ * 涓彴 - 鎵归噺娣诲姞鍠滄缁欏鎴�
+ * @param param
+ * @return
+ */
+ void batchAddLike(ZTBatchAddListRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/NewsService.java b/server/service/src/main/java/com/doumee/service/business/NewsService.java
index 9046351..f104a18 100644
--- a/server/service/src/main/java/com/doumee/service/business/NewsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/NewsService.java
@@ -115,7 +115,7 @@
* 鑾峰彇姣忔棩涓婃柊鏁版嵁
* @return
*/
- DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType);
+ DailyUpdatesResponse getDailyUpdatesResponse();
/**
* 淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍
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 881cf57..85495af 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
@@ -341,4 +341,24 @@
ZTBasePageResponse<ZTCollectLikeInfoResponse> response = zbomZhongTaiService.collectLikePage(ztCollectLikeRequest);
return response;
}
+
+ @Override
+ public void batchAddLike(ZTBatchAddListRequest ztBatchAddListRequest){
+ if(Objects.isNull(ztBatchAddListRequest)
+ || StringUtils.isBlank(ztBatchAddListRequest.getArticleIds())
+ || StringUtils.isBlank(ztBatchAddListRequest.getCustomerId())
+ || StringUtils.isBlank(ztBatchAddListRequest.getPlatSourceId())
+ || StringUtils.isBlank(ztBatchAddListRequest.getPlatSource())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztBatchAddListRequest.getUserId()),ztBatchAddListRequest.getUserType());
+ ztBatchAddListRequest.setToken(ztBaseInfoResponse.getToken());
+ zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
+ }
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
index 48e7f1e..22a4e05 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
@@ -380,19 +380,19 @@
* @return
*/
@Override
- public DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType){
+ public DailyUpdatesResponse getDailyUpdatesResponse(){
DailyUpdatesResponse dailyUpdatesResponse = new DailyUpdatesResponse();
dailyUpdatesResponse.setDailyUpdateNum(
newsMapper.selectCount(new QueryWrapper<News>().lambda()
.eq(News::getIsdeleted,Constants.ZERO)
.like(News::getCreateDate, DateUtil.getDateLong(new Date()))
- .eq(News::getType,Constants.ONE)
+ .eq(News::getType,Constants.ZERO)
));
dailyUpdatesResponse.setShareNum(
actionsMapper.selectCount(new QueryWrapper<Actions>())
);
dailyUpdatesResponse.setNewsList(
- this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,fileType)
+ this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,Constants.ZERO)
);
return dailyUpdatesResponse;
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index d356e41..55e3fc4 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -296,6 +296,7 @@
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getCatalogList")
@@ -304,13 +305,14 @@
})
public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
ztCatalogListRequest.setUserId(getMemberId()+"");
- ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCatalogListRequest.setUserType(getUserType());
List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getCataLogTagList")
@@ -319,7 +321,7 @@
})
public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
ztCatalogListRequest.setUserId(getMemberId()+"");
- ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCatalogListRequest.setUserType(getUserType());
List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
@@ -335,7 +337,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "actionType", value = "琛屼负绫诲瀷锛氭敹钘忥細collect;鍙栨秷鏀惰棌锛歝ollect_cancel;鍠滄锛歭ike;鍙栨秷鍠滄锛歭ike_cancel锛涙祻瑙堬細view;鍒嗕韩锛歴hare;涓嬭浇锛歞ownload", required = true),
})
public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) {
- getZhongTaiDataService.actionDo(getMemberId(),ZTConstants.CUSTOMER,id,actionType);
+ getZhongTaiDataService.actionDo(getMemberId(),getUserType(),id,actionType);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -381,7 +383,7 @@
})
public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
}
@@ -396,13 +398,14 @@
})
public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponseList);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "杞挱鍥捐鎯�", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiCarouselImageDetail")
@@ -411,12 +414,13 @@
})
public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) {
ztDataDetailRequest.setUserId(getMemberId()+"");
- ztDataDetailRequest.setUserType(ZTConstants.CUSTOMER);
+ ztDataDetailRequest.setUserType(getUserType());
ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponse);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍜ㄨ鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiProductNewsPage")
@@ -425,12 +429,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTProductNewsInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "浜у搧鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiProductPage")
@@ -439,11 +444,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTProductInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹炴櫙鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiRealcasePage")
@@ -452,11 +459,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTRealcaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瑙嗛鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiVideoPage")
@@ -465,11 +474,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTVideoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiWholecasePage")
@@ -478,11 +489,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTCaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "蹇楄瑁呬慨鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiZbDecoPage")
@@ -491,12 +504,14 @@
})
public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTZbDecoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getWholecaseInfo")
@@ -505,11 +520,13 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id) {
- ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,getUserType(),getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztCaseInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@GetMapping("/getProductNewsInfo")
@ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -518,12 +535,14 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id) {
- ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,getUserType(),getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztProductNewsInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹炴櫙妗堜緥 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getRealcaseInfo")
@@ -532,12 +551,14 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id) {
- ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,getUserType(),getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztRealcaseInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "浜у搧璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getProductInfo")
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
index d367c4a..3ca5386 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -69,11 +69,10 @@
@ApiOperation(value = "銆怋绔皬绋嬪簭銆戞瘡鏃ヤ笂鏂版暟鎹�")
@GetMapping("/getDailyUpdates")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", required = false)
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) {
- return ApiResponse.success(newsService.getDailyUpdatesResponse(fileType));
+ public ApiResponse<DailyUpdatesResponse> getDailyUpdates() {
+ return ApiResponse.success(newsService.getDailyUpdatesResponse());
}
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 03ecf4d..203d880 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
@@ -4,10 +4,7 @@
import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
-import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
-import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
-import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
-import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.*;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
@@ -200,6 +197,23 @@
return ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
}
+
+ @UserLoginRequired
+ @LoginRequired
+ @ApiOperation(value = "鎵归噺娣诲姞鍠滄缁欏鎴�", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/batchAddLike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse batchAddLike(@RequestBody ZTBatchAddListRequest ztBatchAddListRequest) {
+ ztBatchAddListRequest.setUserType(getUserType());
+ ztBatchAddListRequest.setUserId(getUserId().toString());
+ getZhongTaiDataService.batchAddLike(ztBatchAddListRequest);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
@UserLoginRequired
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/logOff")
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 399269d..924f405 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -263,6 +263,14 @@
data
})
}
+// 鑾峰彇鍐呭鍒嗕韩娴锋姤
+export const getContentShareImg = (data) => {
+ return request({
+ url: '/web/personnel/getContentShareImg',
+ method: 'POST',
+ data
+ })
+}
// 0鍏冨畾鍒朵俊鎭�
export const saveFreeCustomizationApply = (data) => {
return request({
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index de45c6d..ff58f51 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -1,10 +1,11 @@
-// components/detailFooter/index.js
+import { getContentShareImg } from '../../api/index'
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
*/
properties: {
-
+ info: Object,
+ path: String,
},
/**
@@ -21,6 +22,28 @@
})
},
methods: {
+ handleEnjoy() {
+ const { info } = this.data
+ this.triggerEvent('enjoy', {
+ type: 'enjoy', flag: !info.isEnjoy
+ })
+ },
+ handleCollec() {
+ const { info } = this.data
+ this.triggerEvent('enjoy', {
+ type: 'collec', flag: !info.isCollection
+ })
+ },
+ handleDown() {
+ const { info, path } = this.data
+ getContentShareImg({
+ articleId: info.id,
+ type: '1',
+ pageUrl: path,
+ imgurl: info.coverImage,
+
+ })
+ },
openShare() {
console.log('鐐瑰嚮鎵撳紑');
this.setData({ showShare: true })
diff --git a/wechat_staff/components/detailFooter/index.wxml b/wechat_staff/components/detailFooter/index.wxml
index ed66dfa..9ee532a 100644
--- a/wechat_staff/components/detailFooter/index.wxml
+++ b/wechat_staff/components/detailFooter/index.wxml
@@ -2,15 +2,17 @@
<view class="footer_wrap" style="padding-bottom: {{bottomLift}}px;">
<view class="content">
<view class="btns">
- <view class="item">
- <image src="../../static/icon/detail_nav_like_sel@2x.png"></image>
+ <view bindtap="handleEnjoy" class="item">
+ <image wx:if="{{ info.isEnjoy }}" src="../../static/icon/detail_nav_like_sel@2x.png"></image>
+ <image wx:else src="../../static/icon/detail_nav_like@2x.png"></image>
<text>鍠滄</text>
</view>
- <view class="item">
- <image src="../../static/icon/detail_nav_collected.png"></image>
+ <view bindtap="handleCollec" class="item">
+ <image wx:if="{{ info.isCollection }}" src="../../static/icon/detail_nav_collected.png"></image>
+ <image wx:else src="../../static/icon/detail_nav_collect.png"></image>
<text>鏀惰棌</text>
</view>
- <view class="item">
+ <view bindtap="handleDown" class="item">
<image src="../../static/icon/detail_nav_download@2x.png"></image>
<text>涓嬭浇</text>
</view>
@@ -19,7 +21,7 @@
</view>
</view>
<!-- -->
- <view class="shade_modal" style="padding-bottom: {{bottomLift}}px;">
+ <view wx:if="{{ showShare }}" class="shade_modal" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button open-type="share" class="item" bindtap="handleShare">
<image src="../../static/icon/wechat.png"></image>
@@ -32,5 +34,5 @@
</view>
<view bindtap="onClose" class="cancel">鍙栨秷</view>
</view>
- <view class="shade" bindtap="onClose"></view>
+ <view wx:if="{{ showShare }}" class="shade" bindtap="onClose"></view>
</view>
\ No newline at end of file
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 1d0bda2..792ec77 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -44,9 +44,9 @@
<view class="content">
<view class="name">{{ item.title }}</view>
<view class="info">
- <image wx:if="{{ !item.collection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:if="{{ !item.isCollection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<image wx:else data-code="like_cancel" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <text class="num {{item.collection ? 'primary' : ''}}">{{ item.collectCount }}</text>
+ <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount }}</text>
<image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
<text>{{ item.viewCount }}</text>
</view>
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index 7d967f4..91172ab 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -51,9 +51,9 @@
<view class="name">{{ item.title }}</view>
</view>
<view class="info">
- <image wx:if="{{ !item.collection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:if="{{ !item.isCollection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<image wx:else data-code="like_cancel" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <text class="num {{item.collection ? 'primary' : ''}}">{{ item.collectCount }}</text>
+ <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount }}</text>
<image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
<text>{{ item.viewCount }}</text>
</view>
diff --git a/wechat_staff/pages/detailDis/case.js b/wechat_staff/pages/detailDis/case.js
index 09050e9..71a0531 100644
--- a/wechat_staff/pages/detailDis/case.js
+++ b/wechat_staff/pages/detailDis/case.js
@@ -56,7 +56,7 @@
actionType,
id: this.data.info.id
}).then(res => {
- info.collection = !info.collection
+ info.isCollection = !info.isCollection
this.setData({info})
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
diff --git a/wechat_staff/pages/detailDis/case.wxml b/wechat_staff/pages/detailDis/case.wxml
index 768b6f1..f6f7c8c 100644
--- a/wechat_staff/pages/detailDis/case.wxml
+++ b/wechat_staff/pages/detailDis/case.wxml
@@ -26,7 +26,7 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
<image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<view class="name">鏀惰棌</view>
</button>
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index 0d00d28..b7e5dfd 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -3,6 +3,7 @@
getProductInfo,
actionDo
} from '../../api/index'
+import moment from "moment";
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -33,6 +34,43 @@
member
})
},
+ // 缁勪欢浜嬩欢
+ handleEnjoy(e) {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
+ const { type, flag } = e.detail
+ console.log('type', type);
+ console.log('flag', flag);
+ const info = this.data.info
+ if(type == 'enjoy'){
+ // 鐐瑰嚮浜嗗枩娆�
+ const index = enjoyList.findIndex( i => i.id === info.id )
+ if(index === -1){
+ info.isEnjoy = true
+ this.setData({ info })
+ enjoyList.push({
+ ...info,
+ joinType: 'product',
+ timestamp: new Date().getTime()
+ })
+ }else{
+ info.isEnjoy = false
+ this.setData({ info })
+ enjoyList.splice(index, 1)
+ }
+ wx.setStorageSync('enjoyList', enjoyList)
+ }else{
+ actionDo({
+ id: info.id,
+ actionType: flag ? 'collect' : 'collect_cancel'
+ }).then(res => {
+ info.isCollection = flag
+ wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌'})
+ this.setData({
+ info
+ })
+ })
+ }
+ },
handleAction(e) {
const actionType = e.currentTarget.dataset.code
const {
@@ -42,7 +80,7 @@
actionType,
id: this.data.info.id
}).then(res => {
- info.collection = !info.collection
+ info.isCollection = !info.isCollection
this.setData({
info
})
@@ -51,12 +89,20 @@
})
})
},
+ onShareAppMessage() {
+ console.log('鐢ㄦ埛鐐瑰嚮浜嗗垎浜�');
+ },
getDetail(id) {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
getProductInfo({
id
}).then(res => {
+ const index = enjoyList.findIndex( i => i.id === res.data.id )
this.setData({
- info: res.data
+ info: {
+ ...res.data,
+ isEnjoy: index > -1
+ }
})
wx.setNavigationBarTitle({
title: res.data.title
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 6743e03..514b179 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -1,14 +1,6 @@
<view class="main_app">
<buoyClient showPurpose="1" />
- <detailFooter />
- <view class="user" wx:if="{{ false }}">
- <view class="avatar"></view>
- <view class="content">
- <view class="name">涓佹鏋�</view>
- <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
- </view>
- <view class="btn">鑱旂郴TA</view>
- </view>
+ <detailFooter bindenjoy="handleEnjoy" path="/pages/detailDis/product" info="{{info}}" />
<!-- banner杞挱 -->
<swiper class="banner_swiper" circular indicator-dots autoplay style="height:{{bannerHeight}}rpx" duration>
<block wx:for="{{ info.bannerImgList }}">
@@ -38,7 +30,7 @@
</view>
</view>
<!-- 瀵屾枃鏈� -->
- <view>
+ <view wx:if="{{info.content}}">
<mp-html content="{{info.content}}"></mp-html>
</view>
<view class="spaceList">
diff --git a/wechat_staff/pages/detailDis/realpic.js b/wechat_staff/pages/detailDis/realpic.js
index 9d56aa5..a6c9d1b 100644
--- a/wechat_staff/pages/detailDis/realpic.js
+++ b/wechat_staff/pages/detailDis/realpic.js
@@ -35,7 +35,7 @@
actionType,
id: this.data.info.id
}).then(res => {
- info.collection = !info.collection
+ info.isCollection = !info.isCollection
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
})
diff --git a/wechat_staff/pages/detailDis/realpic.wxml b/wechat_staff/pages/detailDis/realpic.wxml
index 4766d86..2923d1d 100644
--- a/wechat_staff/pages/detailDis/realpic.wxml
+++ b/wechat_staff/pages/detailDis/realpic.wxml
@@ -14,7 +14,7 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
<image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<view class="name">鏀惰棌</view>
</button>
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index fb178bd..7219087 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -1,11 +1,12 @@
-// pages/kefu/fond.js
+import moment from "moment";
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- bottomLift: 0
+ bottomLift: 0,
+ enjoyList: []
},
/**
@@ -16,11 +17,35 @@
this.setData({
bottomLift: app.bottomLift
})
+ this.initData()
},
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
+ initData() {
+ let temp = []
+ let enjoyList = wx.getStorageSync('enjoyList') || []
+ enjoyList = enjoyList.sort((a,b)=>{
+ return b.timestamp - a.timestamp
+ })
+ enjoyList.forEach(item => {
+ item.joinDate = moment(item.timestamp).format('YYYY骞碝M鏈圖D鏃�')
+ item.joinTime = moment(item.timestamp).format('HH:mm')
+ item.checked = false
+ const index = temp.findIndex( i => i.joinDate === item.joinDate )
+ if(index === -1){
+ temp.push({
+ joinDate: item.joinDate,
+ list: [item]
+ })
+ }else{
+ temp[index].list.push(item)
+ }
+ });
+ this.setData({ enjoyList: temp })
+
+
+ console.log('enjoyList', temp);
+
+ },
onReady() {
},
diff --git a/wechat_staff/pages/kefu/fond.less b/wechat_staff/pages/kefu/fond.less
index 8e33916..1e3b6ba 100644
--- a/wechat_staff/pages/kefu/fond.less
+++ b/wechat_staff/pages/kefu/fond.less
@@ -50,7 +50,6 @@
border-radius: 8rpx;
margin-left: 26rpx;
margin-right: 20rpx;
- border: 1px solid;
}
}
}
diff --git a/wechat_staff/pages/kefu/fond.wxml b/wechat_staff/pages/kefu/fond.wxml
index 0d4421e..7bc3998 100644
--- a/wechat_staff/pages/kefu/fond.wxml
+++ b/wechat_staff/pages/kefu/fond.wxml
@@ -1,14 +1,14 @@
<view class="container">
- <view class="date_item">
- <view class="date">2024骞�07鏈�10鏃�</view>
+ <view wx:for="{{ enjoyList }}" wx:for-item="day" class="date_item">
+ <view class="date">{{ day.joinDate }}</view>
<view class="list">
- <view class="line">
- <image class="icon" src="../../static/icon/ic_select_sel@2x.png" mode="widthFix"></image>
- <image class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
- <image class="img" src=""></image>
+ <view class="line" wx:for="{{ day.list }}" wx:for-item="item">
+ <image wx:if="{{ item.check }}" class="icon" src="../../static/icon/ic_select_sel@2x.png" mode="widthFix"></image>
+ <image wx:else class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
+ <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
<view class="content">
- <view class="name">绠�绾﹁交濂綔涓囩鍏洯閲岋紝宸插厜涓哄獟绠�绾﹁交濂綔涓囩鍏洯閲岋紝宸插厜涓哄獟绠�绾﹁交濂綔涓囩鍏洯閲岋紝宸插厜涓哄獟</view>
- <view class="time">18:00</view>
+ <view class="name">{{ item.title }}</view>
+ <view class="time">{{ item.joinTime }}</view>
</view>
</view>
</view>
diff --git a/wechat_staff/pages/kefu/fond.wxss b/wechat_staff/pages/kefu/fond.wxss
index e70f839..19ff615 100644
--- a/wechat_staff/pages/kefu/fond.wxss
+++ b/wechat_staff/pages/kefu/fond.wxss
@@ -50,7 +50,6 @@
border-radius: 8rpx;
margin-left: 26rpx;
margin-right: 20rpx;
- border: 1px solid;
}
.footer {
position: fixed;
diff --git a/wechat_staff/project.private.config.json b/wechat_staff/project.private.config.json
index 719e31e..c1097ec 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -31,8 +31,8 @@
},
{
"name": "",
- "pathName": "pages/promotion/index",
- "query": "",
+ "pathName": "pages/detailDis/product",
+ "query": "id=1813372914895843329",
"launchMode": "default",
"scene": null
},
@@ -42,6 +42,13 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/kefu/fond",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
}
]
}
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a488a8e..2d00a25 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,7 +1,7 @@
-// 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