From 2b65fa2a67736d4316115ce91c26792f6c0b2377 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 17:53:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/components/disRealpic/index.js | 62 ++++--
wechat_jiaxuan/components/disCase/index.js | 69 ++++--
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCustomerBindingUsersRequest.java | 162 ++++++++++++++++
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 14 +
wechat_staff/pages/store/staff.less | 3
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 6
wechat_jiaxuan/components/disCase/index.wxml | 4
wechat_staff/pages/store/staff.wxml | 3
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 2
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 4
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 54 +++-
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 18 +
wechat_staff/components/disCase/index.js | 59 +++--
wechat_jiaxuan/pages/store/staff.wxss | 4
wechat_jiaxuan/pages/homeId/index.js | 2
wechat_jiaxuan/pages/store/staff.less | 4
wechat_jiaxuan/components/disRealpic/index.js | 66 ++++--
wechat_staff/components/disCase/index.wxml | 4
wechat_staff/pages/store/staff.wxss | 3
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 1
wechat_jiaxuan/components/disRealpic/index.wxml | 4
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 7
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 1
23 files changed, 427 insertions(+), 129 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 8ad9fc8..d06af5a 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
@@ -50,4 +50,5 @@
ZTCusCarouselImageResponse carouselImageDetail(ZTDataDetailRequest param);
ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest param);
ZTBaseResponse batchAddLike(ZTBatchAddListRequest param);
+ ZTBaseResponse customerBinDingUsers(ZTCustomerBindingUsersRequest 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 dc18be7..84106af 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
@@ -772,4 +772,18 @@
return null;
}
+
+ @Override
+ public ZTBaseResponse customerBinDingUsers(ZTCustomerBindingUsersRequest param){
+ ZTBaseResponse result = sendHttpRequest(
+ ZTConstants.IntegerUrl.CUSTOMER_BINDING_USERS,
+ ZTConstants.IntegerName.CUSTOMER_BINDING_USERS_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+
+ return result;
+ }
+
}
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 e9df120..f1bc720 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
@@ -79,6 +79,7 @@
String REALCASE_INFO_URL ="/content/api/realCaseDetail";
String FAVORITES_PAGE_URL ="/behavior/api/favoritesPageList";
String BATCH_ADD_LIKE_URL ="/content/api/batchAddLike";
+ String CUSTOMER_BINDING_USERS ="/api/bind";
}
@@ -122,5 +123,6 @@
String FAVORITES_NAME ="鑾峰彇鎴戠殑鍠滄/鏀惰棌鍒楄〃";
String BATCH_ADD_LIKE_NAME ="鎵归噺缁戝畾鍠滄缁欏鎴�";
+ String CUSTOMER_BINDING_USERS_NAME ="瀹㈡埛缁戝畾瀵艰喘";
}
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCustomerBindingUsersRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCustomerBindingUsersRequest.java
new file mode 100644
index 0000000..11a8272
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCustomerBindingUsersRequest.java
@@ -0,0 +1,162 @@
+package com.doumee.biz.zbom.model.zhongtai.response;
+
+import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 瀹㈡埛缁戝畾鍛樺伐淇℃伅
+ */
+@Data
+public class ZTCustomerBindingUsersRequest extends ZTBaseRequst {
+
+
+ /**
+ * 鍩庡競
+ */
+ private String address;
+ /**
+ * 骞撮緞
+ */
+ private String age;
+ /**
+ * 搴旂敤鐮�
+ */
+ private String appCode;
+ /**
+ * AppID
+ */
+ private String appId;
+ /**
+ * 瀹㈡埛澶村儚
+ */
+ private String avatarUrl;
+ /**
+ * 鐢熸棩
+ */
+ private String birthday;
+ /**
+ * 瀹㈡埛娓犻亾鏉ユ簮缂栫爜
+ */
+ private String channelSourceCode;
+ /**
+ * 瀹㈡埛鍗曚綅
+ */
+ private String customerCompany;
+ /**
+ * 瀹㈡埛绾у埆
+ */
+ private String customerLevel;
+ /**
+ * 瀹㈡埛鎵�灞炶涓�
+ */
+ private String customerTrade;
+ /**
+ * 瀵艰喘璐﹀彿
+ */
+ private String daoGouAccount;
+ /**
+ * 瀵艰喘绫诲瀷
+ */
+ private String daoGouType;
+ /**
+ * 瀵艰喘鐢ㄦ埛Id
+ */
+ private String daoGouUserId;
+ /**
+ * 鐢靛瓙閭
+ */
+ private String email;
+ /**
+ * 璇︾粏鍦板潃
+ */
+ private String fullAddress;
+ /**
+ * 鎬у埆
+ */
+ private String gender;
+ /**
+ * 鎴垮眿闈㈢Н
+ */
+ private String houseArea;
+ /**
+ * 鎴垮眿鎴峰瀷
+ */
+ private String houseLayout;
+ /**
+ * 韬唤璇�
+ */
+ private String idCard;
+ /**
+ * 鍚嶇О
+ */
+ private String name;
+ /**
+ * 鏄电О
+ */
+ private String nickName;
+ /**
+ * OpenID
+ */
+ private String openId;
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ private String phone;
+ /**
+ * 骞冲彴绫诲瀷
+ */
+ private String platform;
+ /**
+ * 骞冲彴鏉ユ簮 1-pad 2-灏忕▼搴�
+ */
+ private String platSource;
+ /**
+ * 鑱屼笟
+ */
+ private String position;
+ /**
+ * 鎰忓悜浜у搧缂栫爜锛岀敤閫楀彿闅斿紑
+ */
+ private String productCode;
+ /**
+ * 鎺ㄨ崘浜�
+ */
+ private String referee;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+ /**
+ * 鏉ユ簮绯荤粺瀹㈡埛ID
+ */
+ private String sourceCustomerId;
+ /**
+ * 瀛愬簲鐢ㄧ爜
+ */
+ private String subAppCode;
+ /**
+ * 涓彴鐢ㄦ埛鍞竴缂栫爜
+ */
+ private String token;
+ /**
+ * UnionID
+ */
+ private String unionId;
+ /**
+ * 灏忓尯
+ */
+ private String uptown;
+ /**
+ * CMS璐﹀彿
+ */
+ private String userName;
+ /**
+ * 寰俊鍙�
+ */
+ private String weixin;
+
+
+
+}
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 1b156d0..bc45290 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
@@ -164,4 +164,10 @@
* @return
*/
void batchAddLike(ZTBatchAddListRequest param);
+
+ /**
+ * 涓彴 瀹㈡埛缁戝畾瀵艰喘
+ * @param ztCustomerBindingUsersRequest
+ */
+ void customerBinDingUsers(ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
index 172c042..da0d1fa 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
@@ -239,9 +239,7 @@
PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
for (CustomerLog customerLog:pageData.getRecords()) {
if(Objects.nonNull(pageWrap.getModel().getIsHiddenPhone())&& Constants.equalsInteger(pageWrap.getModel().getIsHiddenPhone(),Constants.ZERO)){
- customerLog.setPhone(
- Constants.desensitizationPhone(customerLog.getPhone())
- );
+ customerLog.setPhone(Constants.desensitizationPhone(customerLog.getPhone()));
if(Constants.equalsInteger(customerLog.getType(),Constants.TWO)&& StringUtils.isNotBlank(customerLog.getMemberName())){
customerLog.setName(customerLog.getMemberName());
}
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 a57de5b..6e0ed45 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
@@ -285,12 +285,13 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
- if(Objects.nonNull(response)){
+ if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
if(StringUtils.isNotBlank(salesId)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -337,17 +338,13 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
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(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
if(StringUtils.isNotBlank(salesId)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -388,12 +385,13 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
- if(Objects.nonNull(response)){
+ if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
if(StringUtils.isNotBlank(salesId)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -439,12 +437,13 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
- if(Objects.nonNull(response)){
+ if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
if(StringUtils.isNotBlank(salesId)){
Users users = usersMapper.selectById(salesId);
- if(Objects.nonNull(users)){
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
+ Member member = memberMapper.selectById(userId);
+ if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -502,6 +501,23 @@
zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
}
-
-
+ @Override
+ public void customerBinDingUsers(ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest){
+ if(Objects.isNull(ztCustomerBindingUsersRequest)
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getOpenId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getUserId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getSourceCustomerId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouAccount())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouType())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouUserId())
+ || StringUtils.isBlank(ztCustomerBindingUsersRequest.getUserName())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztCustomerBindingUsersRequest.getUserId()),ztCustomerBindingUsersRequest.getUserType());
+ ztCustomerBindingUsersRequest.setToken(ztBaseInfoResponse.getToken());
+ zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
+ }
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index c6c0fa3..0d0b8a6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.biz.zbom.model.zhongtai.ZTUserGetTokenRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTUserInfoUpdateRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTBaseResponse;
+import com.doumee.biz.zbom.model.zhongtai.response.ZTCustomerBindingUsersRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTSysuserGetTokenResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -299,14 +300,14 @@
member.setToken(ztUserGetTokenResponse.getToken());
}
memberMapper.insert(member);
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,member.getId());
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member.getId(),member.getOpenid());
}else{
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
memberMapper.updateById(member);
}
- MemberServiceImpl.saveCustomerUser(customerUserMapper,users,member.getId());
+ MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member.getId(),member.getOpenid());
member = this.getMemberInfo(member.getId());
}
String token = JwtTokenUtil.generateTokenForZb(member.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
@@ -321,7 +322,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
- public static void saveCustomerUser(CustomerUserMapper customerUserMapper,Users users,Long memberId){
+ public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService,CustomerUserMapper customerUserMapper,Users users,Long memberId,String openId){
if(Objects.nonNull(users)&&Objects.nonNull(memberId)) {
if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
.eq(CustomerUser::getIsdeleted, Constants.ZERO)
@@ -337,7 +338,16 @@
customerUser.setUsername(users.getIamUsername());
customerUser.setAddr(users.getShopAddress());
customerUserMapper.insert(customerUser);
- //TODO 绛夊緟璋冭捣涓彴鎺ュ彛
+ //绛夊緟璋冭捣涓彴鎺ュ彛
+ ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
+ ztCustomerBindingUsersRequest.setOpenId(openId);
+ ztCustomerBindingUsersRequest.setSourceCustomerId(memberId.toString());
+ ztCustomerBindingUsersRequest.setDaoGouUserId(users.getId().toString());
+ ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
+ ztCustomerBindingUsersRequest.setDaoGouType(users.getUserTypes());
+ ztCustomerBindingUsersRequest.setUserName(users.getIamId());
+ ztCustomerBindingUsersRequest.setPlatSource(ZTConstants.PLATFORM_MP_WX);
+ zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
}
}
}
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 5e8210c..4bf3254 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
@@ -399,6 +399,7 @@
.eq(News::getType,Constants.ZERO)
.eq(News::getStatus,Constants.ZERO)
.eq(News::getFileType,Constants.ZERO)
+ .apply(" now() >= t.PUBLISH_DATE ")
.last( "limit 3" )
.orderByDesc(News::getCreateDate)
);
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 a80c6a7..fd91fd6 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
@@ -843,13 +843,12 @@
Shop shop = shopMapper.selectById(users.getDepartmentId());
if(Objects.nonNull(shop)){
users.setShopName(shop.getName());
- if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
- users.setShopCity(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
- }
if(StringUtils.isNotBlank(shop.getAddress())){
users.setShopAddress(shop.getAddress());
}else{
- users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName()+shop.getTown()+shop.getRegAddr());
+ if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
+ users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
+ }
}
}
}
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 0c52299..fe190d4 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -11,7 +11,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading :false,
cateList: [],
dataList: [],
@@ -42,6 +42,10 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize, catalogCode } = this.data
getZhongTaiWholecasePage({
catalogCode, pageNum, pageSize, tagCodes, sortType, query
@@ -52,6 +56,8 @@
dataList: [...this.data.dataList, ...res.data.records],
})
}
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -90,48 +96,65 @@
})
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
if (index === -1) {
- // 鍚宲aram閲宑ode閲嶅
- if (activeParam && activeParam.length > 0) {
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if (indexTemp > -1) {
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ // // 鍚宲aram閲宑ode閲嶅
+ // if (activeParam && activeParam.length > 0) {
+ // activeParam.forEach(item => {
+ // const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ // if (indexTemp > -1) {
+ // tagCodes.splice(indexTemp, 1)
+ // }
+ // })
+ // }
+ // tagCodes.push(code)
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
} else {
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ // tagCodes.splice(index, 1)
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
}
- this.setData({ pageNum: 1, dataList: [], total: 0 })
- this.setData({ tagCodes, cateList })
+ // this.setData({ pageNum: 1, dataList: [], total: 0 })
+ this.setData({cateList })
console.log('tagCodes', tagCodes)
},
cancelParam() {
+
const { cateList } = this.data
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = item.paramName || ''
+ item.tempParamIndex =item.paramIndex
+ item.tempParamName =item.paramName
+ item.tempParamCode =item.paramCode
})
- this.setData({ tagCodes: [], activeParam: [], cateList, activeIndex: -1 })
+ this.setData({ activeParam: [],cateList , activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1, dataList: [], total: 0 })
this.getList()
},
- subParam() {
+ subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
+ const { cateList } = this.data
+ var codes = []
+ cateList.forEach(item => {
+ item.paramIndex =item.tempParamIndex
+ item.paramName =item.tempParamName
+ item.paramCode =item.tempParamCode
+ if(item.paramIndex >-1 && item.paramCode){
+ codes.push(item.paramCode)
+ }
+ })
+ this.setData({tagCodes:codes, pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
this.getList()
},
changeShowParams(e) {
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index 8a18d4a..53ca131 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -11,7 +11,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -19,7 +19,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index de55855..24d02de 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -11,7 +11,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
@@ -41,6 +41,10 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiRealcasePage({
catalogCode,tagCodes,pageNum,pageSize, sortType,query
@@ -49,6 +53,8 @@
dataList: [...this.data.dataList, ...res.data.records],
total: res.data.total,
})
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltoupper() {
@@ -125,47 +131,61 @@
}
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
if(index === -1){
- if(activeParam && activeParam.length > 0){
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ // if(activeParam && activeParam.length > 0){
+ // activeParam.forEach(item => {
+ // const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ // if(indexTemp > -1){
+ // tagCodes.splice(indexTemp, 1)
+ // }
+ // })
+ // }
+ // tagCodes.push(code)
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
}else{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ // tagCodes.splice(index, 1)
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
}
- this.setData({ pageNum: 1,dataList: [],total: 0})
- this.setData({ tagCodes, cateList })
- console.log('tagCodes', tagCodes);
+ // this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ cateList })
},
cancelParam() {
const { cateList } = this.data
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = ''
+ item.tempParamIndex = item.paramIndex
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
})
- this.setData({ tagCodes: [],datalist:[],pageNum:1, activeParam: [],cateList,activeIndex: -1 })
- this.getList()
+ this.setData({ activeParam: [],cateList,activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
subParam() {
- this.setData({ activeParam: [] })
+ const { cateList } = this.data
+ var codes =[]
+ cateList.forEach(item => {
+ item.paramIndex = item.tempParamIndex
+ item.paramName = item.tempParamName
+ item.paramCode = item.tempParamCode
+ if(item.tempParamIndex >-1 && item.tempParamCode){
+ codes.push(item.tempParamCode)
+ }
+ })
+ this.setData({ activeParam: [],tagCodes:codes })
this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
this.getList()
},
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 4842835..758ba67 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -12,7 +12,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -20,7 +20,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_jiaxuan/pages/homeId/index.js b/wechat_jiaxuan/pages/homeId/index.js
index 792b2b2..5827e4d 100644
--- a/wechat_jiaxuan/pages/homeId/index.js
+++ b/wechat_jiaxuan/pages/homeId/index.js
@@ -53,6 +53,8 @@
total: res.data.total,
dataList: [ ...this.data.dataList, ...res.data.records ]
})
+ }).finally(()=>{
+ wx.stopPullDownRefresh()
})
},
itemClick(e) {
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index 0c0943f..8d23bb3 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -109,7 +109,9 @@
margin-top: 8rpx;
font-weight: 600;
font-size: 40rpx;
- display: flex;
+ display: flex;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
}
}
}
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index 8858e2b..3118704 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -101,7 +101,9 @@
margin-top: 8rpx;
font-weight: 600;
font-size: 40rpx;
- display: flex;
+ display: flex;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
}
.guide .title {
font-weight: 500;
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 441e32a..5c4fd11 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -12,7 +12,7 @@
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
total: 0,
@@ -42,6 +42,11 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiWholecasePage({
catalogCode,pageNum,pageSize,tagCodes, sortType,query
@@ -52,6 +57,8 @@
dataList: [...this.data.dataList, ...res.data.records],
})
}
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -90,40 +97,34 @@
})
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
- if(index === -1){
- // 鍚宲aram閲宑ode閲嶅
- if(activeParam && activeParam.length > 0){
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
- }else{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ if(index === -1){
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
+ } else {
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
}
- this.setData({ tagCodes, cateList })
+ this.setData({cateList })
console.log('tagCodes', tagCodes);
},
cancelParam() {
const { cateList } = this.data
- console.log('cateList', cateList);
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = item.paramName || ''
+ item.tempParamIndex =item.paramIndex
+ item.tempParamName =item.paramName
+ item.tempParamCode =item.paramCode
})
- this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+ this.setData({ activeParam: [],cateList , activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1,dataList: [],total: 0})
@@ -131,7 +132,17 @@
},
subParam() {
this.setData({ activeParam: [] })
- this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
+ const { cateList } = this.data
+ var codes = []
+ cateList.forEach(item => {
+ item.paramIndex =item.tempParamIndex
+ item.paramName =item.tempParamName
+ item.paramCode =item.tempParamCode
+ if(item.paramIndex >-1 && item.paramCode){
+ codes.push(item.paramCode)
+ }
+ })
+ this.setData({tagCodes:codes, pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
this.getList()
},
changeShowParams(e){
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 6877ba0..e5bd206 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -11,7 +11,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -19,7 +19,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index fe2f8ef..928b214 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -11,7 +11,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
@@ -41,6 +41,11 @@
})
},
getList() {
+ if(this.data.isLoading){
+ return
+ }
+
+ this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiRealcasePage({
catalogCode,tagCodes,pageNum,pageSize, sortType,query
@@ -49,6 +54,8 @@
dataList: [...this.data.dataList, ...res.data.records],
total: res.data.total,
})
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltolower() {
@@ -122,44 +129,59 @@
}
},
tagClick(e) {
+ if(this.data.isLoading){
+ return
+ }
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
if(index === -1){
- if(activeParam && activeParam.length > 0){
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ // if(activeParam && activeParam.length > 0){
+ // activeParam.forEach(item => {
+ // const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ // if(indexTemp > -1){
+ // tagCodes.splice(indexTemp, 1)
+ // }
+ // })
+ // }
+ // tagCodes.push(code)
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
}else{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ cateList[activeIndex].tempParamIndex = -1
+ cateList[activeIndex].tempParamName = null
+ cateList[activeIndex].tempParamCode = null
}
- this.setData({ tagCodes, cateList })
+ this.setData({ cateList })
},
cancelParam() {
const { cateList } = this.data
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = item.paramName || ''
+ item.tempParamIndex = item.paramIndex
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
})
- this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
+ this.setData({ activeParam: [],cateList,activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
subParam() {
- this.setData({ activeParam: [] })
+ const { cateList } = this.data
+ var codes =[]
+ cateList.forEach(item => {
+ item.paramIndex = item.tempParamIndex
+ item.paramName = item.tempParamName
+ item.paramCode = item.tempParamCode
+ if(item.tempParamIndex >-1 && item.tempParamCode){
+ codes.push(item.tempParamCode)
+ }
+ })
+ this.setData({ activeParam: [],tagCodes:codes })
this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
this.getList()
},
diff --git a/wechat_staff/pages/store/staff.less b/wechat_staff/pages/store/staff.less
index 3518d95..4922b43 100644
--- a/wechat_staff/pages/store/staff.less
+++ b/wechat_staff/pages/store/staff.less
@@ -111,6 +111,9 @@
font-weight: 600;
font-size: 40rpx;
display: flex;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
+
}
}
}
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 13f881d..4fb840c 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -25,7 +25,8 @@
<view class="card">
<image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
<view>鏈嶅姟瀹㈡埛</view>
- <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.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 cae38d7..157d955 100644
--- a/wechat_staff/pages/store/staff.wxss
+++ b/wechat_staff/pages/store/staff.wxss
@@ -186,6 +186,9 @@
font-size: 26rpx;
color: #999999;
text-align: center;
+ align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
+ justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
+
}
.card_wrap {
position: fixed;
--
Gitblit v1.9.3