Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/2/head
TianYu 2023-05-18 18:09:43 +08:00
commit 3a0fd70313
17 changed files with 878 additions and 471 deletions

View File

@ -22,7 +22,7 @@ services:
limits: limits:
memory: 800MB memory: 800MB
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:48080/admin-api/actuator/health"] test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"]
timeout: 30s timeout: 30s
interval: 45s interval: 45s
retries: 3 retries: 3

View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.shop.controller.app.buy; package cn.iocoder.yudao.module.shop.controller.app.buy;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
import cn.iocoder.yudao.module.shop.request.member.OrderContentRequest; import cn.iocoder.yudao.module.shop.request.member.OrderContentRequest;
import cn.iocoder.yudao.module.shop.request.member.RefundRequest; import cn.iocoder.yudao.module.shop.request.member.RefundRequest;
import cn.iocoder.yudao.module.shop.response.member.InitOrderResponse; import cn.iocoder.yudao.module.shop.response.member.InitOrderResponse;
@ -9,11 +10,9 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid; import javax.validation.Valid;
@ -32,22 +31,21 @@ public class TopUpOrderController {
@Autowired @Autowired
private StoreOrderService storeOrderService; private StoreOrderService storeOrderService;
@PreAuthenticated
@Operation(summary = "会员充值") @Operation(summary = "会员充值")
@RequestMapping(value = "/memberTopUp", method = RequestMethod.POST) @RequestMapping(value = "/memberTopUp", method = RequestMethod.POST)
public CommonResult<InitOrderResponse> memberTopUp(@Valid @RequestBody OrderContentRequest request, HttpServletRequest servletRequest) throws Exception { public CommonResult<InitOrderResponse> memberTopUp(@Valid @RequestBody OrderContentRequest request, HttpServletRequest servletRequest) throws Exception {
log.info("initOrder会员充值===>{}", request); log.info("initOrder会员充值===>{}", request);
return CommonResult.success(storeOrderService.memberTopUp(request, servletRequest)); return CommonResult.success(storeOrderService.memberTopUp(request, servletRequest));
} }
@PreAuthenticated
@Operation(summary = "退款") @Operation(summary = "退款")
@RequestMapping(value = "/memberRefund", method = RequestMethod.POST) @RequestMapping(value = "/memberRefund", method = RequestMethod.POST)
public CommonResult<Object> memberRefund(@Valid @RequestBody RefundRequest request, HttpServletRequest servletRequest) throws Exception { public CommonResult<Object> memberRefund(@Valid @RequestBody RefundRequest request, HttpServletRequest servletRequest) throws Exception {
log.info("memberRefund会员退款===>{}", request); log.info("memberRefund会员退款===>{}", request);
return CommonResult.success(storeOrderService.memberRefund(request, servletRequest)); return CommonResult.success(storeOrderService.memberRefund(request, servletRequest));
} }
@PreAuthenticated
@Operation(summary = "申请退款") @Operation(summary = "申请退款")
@RequestMapping(value = "/memberApplyRefund", method = RequestMethod.POST) @RequestMapping(value = "/memberApplyRefund", method = RequestMethod.POST)
public CommonResult<Boolean> memberApplyRefund(@Valid @RequestBody RefundRequest request){ public CommonResult<Boolean> memberApplyRefund(@Valid @RequestBody RefundRequest request){
@ -55,4 +53,13 @@ public class TopUpOrderController {
return CommonResult.success(storeOrderService.memberApplyRefund(request)); return CommonResult.success(storeOrderService.memberApplyRefund(request));
} }
@PermitAll
@Operation(summary = "获取openid")
@RequestMapping(value = "/getOpenId", method = RequestMethod.GET)
public CommonResult<String> getOpenId(@RequestParam(value = "code") String code){
log.info("获取openid===>{}", code);
return CommonResult.success(storeOrderService.getOpenId(code));
}
} }

View File

@ -403,4 +403,6 @@ public interface StoreOrderService extends IService<StoreOrder> {
Boolean wxPayNotify(WxPayOrderNotifyV3Result.DecryptNotifyResult result); Boolean wxPayNotify(WxPayOrderNotifyV3Result.DecryptNotifyResult result);
Boolean memberApplyRefund(RefundRequest request); Boolean memberApplyRefund(RefundRequest request);
String getOpenId(String code);
} }

View File

@ -46,7 +46,6 @@ import cn.iocoder.yudao.module.shop.utils.RedisUtil;
import cn.iocoder.yudao.module.shop.vo.order.LogisticsResultVo; import cn.iocoder.yudao.module.shop.vo.order.LogisticsResultVo;
import cn.iocoder.yudao.module.shop.vo.order.StoreDateRangeSqlPram; import cn.iocoder.yudao.module.shop.vo.order.StoreDateRangeSqlPram;
import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoOldVo; import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoOldVo;
import cn.iocoder.yudao.module.shop.vo.product.MyRecord;
import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayApiException;
import com.alipay.api.internal.util.AlipaySignature; import com.alipay.api.internal.util.AlipaySignature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -59,6 +58,10 @@ import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.service.WxOAuth2Service;
import me.chanjar.weixin.mp.api.WxMpService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -130,12 +133,9 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
@Autowired @Autowired
private ExpressService expressService; private ExpressService expressService;
@Autowired @Autowired
private ApiConfigApi apiConfigApi; private WxMpService wxMpService;
// @Autowired
// private OnePassService onePassService;
/** /**
* PC * PC
@ -1310,6 +1310,18 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
return rechargeOrderMapper.updateById(orderDO) > 0; return rechargeOrderMapper.updateById(orderDO) > 0;
} }
@Override
public String getOpenId(String code) {
WxOAuth2AccessToken accessToken = null;
try {
accessToken = wxMpService.getOAuth2Service().getAccessToken(code);
return accessToken.getOpenId();
} catch (WxErrorException e) {
e.printStackTrace();
}
return null;
}
private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user) { private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user) {
RechargeOrderDO orderDO = new RechargeOrderDO(); RechargeOrderDO orderDO = new RechargeOrderDO();

View File

@ -52,11 +52,11 @@ public class AliPayStrategy implements IPayStrategy {
bizContent.put("total_amount", orderDO.getPayPrice()); bizContent.put("total_amount", orderDO.getPayPrice());
//订单标题,不可使用特殊符号 //订单标题,不可使用特殊符号
bizContent.put("subject", "会员充值"); bizContent.put("subject", "会员充值");
bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY"); bizContent.put("product_code", "QUICK_WAP_WAY");
request.setBizContent(bizContent.toString()); request.setBizContent(bizContent.toString());
AlipayTradeWapPayResponse response = null; AlipayTradeWapPayResponse response = null;
try { try {
response = alipayClient.pageExecute(request); response = alipayClient.pageExecute(request,"get");
orderResponse.setBody(response.getBody()); orderResponse.setBody(response.getBody());
} catch (AlipayApiException e) { } catch (AlipayApiException e) {
e.printStackTrace(); e.printStackTrace();

View File

@ -36,6 +36,7 @@ public class WxPayStrategy implements IPayStrategy{
private WxPayOneAutoConfiguration wxPayOneAutoConfiguration; private WxPayOneAutoConfiguration wxPayOneAutoConfiguration;
@Autowired @Autowired
private WxPayProperties payProperties; private WxPayProperties payProperties;
@Override @Override
public InitOrderResponse pay(RechargeOrderDO orderDO, HttpServletRequest servletRequest,String openid) { public InitOrderResponse pay(RechargeOrderDO orderDO, HttpServletRequest servletRequest,String openid) {
InitOrderResponse response = new InitOrderResponse(); InitOrderResponse response = new InitOrderResponse();

View File

@ -1,25 +1,25 @@
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIEQDCCAyigAwIBAgIUWP21A/krbA4ljJlAu3JsK/YCLlYwDQYJKoZIhvcNAQEL MIIEKzCCAxOgAwIBAgIUf3akrcUsoLRAxOVpj4pc0WM6D80wDQYJKoZIhvcNAQEL
BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
Q0EwHhcNMjMwNDExMDgwODE3WhcNMjgwNDA5MDgwODE3WjCBmTETMBEGA1UEAwwK Q0EwHhcNMjMwMzMwMDEzOTIzWhcNMjgwMzI4MDEzOTIzWjCBhDETMBEGA1UEAwwK
MTY0MTk5MzQxNzEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMUUwQwYDVQQL MTY0MTA3MzI3MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTAwLgYDVQQL
DDzliJvnm4jkupHnvZHnu5zvvIjph43luobvvInmnInpmZDlhazlj7jmuJ3ljJfn DCfliJvnm4jkupHnvZHnu5zvvIjph43luobvvInmnInpmZDlhazlj7gxCzAJBgNV
rKzkuIDliIblhazlj7gxCzAJBgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCC BAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANWSWLmJaVbrJJq3uhbutKC6 ADCCAQoCggEBAMlJDvT9EhoFN/hW80vrx5IG00JMDhS34n3nbmXd8FkRBk761nxE
1ly6GbAxbnJgq8O9fP/MRLOljUHDSqUleVat1sVmSNwbsJuk0Hr0e1uowxGSJ3NY Z+TzWdtC76heAf5Sl0XBzzOimae3QJ7Dq7PPfWt9zH/MpK4c5wZHBW4PvRyM2RvO
iYMXMWj3S7iPxY+9ShkCJXWfvvPPjSTabk1dg3AUM8ukREQOqvlIFRyJfCUoirlj HLZ00WXS3CAZ16GgHLTuEOXBv7XeF9hoJuQsHM4WmtbNQVRAYzi6QvfN92tLucVL
2CGXfgMvEjtPYUouFWvB0EU9k+5LzynIyXckpVstx1rWZtlSRF/iviW5BaPf2sZk 6njxeXR+N7YyebIWE5IyLkTpyJSMTdSd1+dJqEMqA3hGJSDKS+SBxL3yxmS4JgCT
0DDEbeMM13BsRSNOHS1NWU8DkV5zb1hNBq/T/OQ7glbs3kHqlD+TXEkcrN64Nr1r D0JoHhZv/bP7jI4zT/lR2GYuGLQ4JWe98GmWZiI95EwubXc9YDrlFr9CQ6fV5vmn
ErohctE6Ep0d1iRUMFYjJXFvBq/1qyi62Vp1wwk1XAqoiyuIfqKGrPhl7Z6Z++cC CL6wOxe9LEBx1OyYIBjjvw0Wj13vJxC1RPkCAwEAAaOBuTCBtjAJBgNVHRMEAjAA
AwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQ MAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2
MIGNoIGKoIGHhoGEaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1 Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJD
c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQy MDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJC
JnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcx MjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQAc
MA0GCSqGSIb3DQEBCwUAA4IBAQBChfNK0TvOcibwW7vK7ClGwolrNbGwjkAJU1MQ qtlunx6/t+aG2f2yr88kR5SQtwxY1cf3vWCowSCpE5B0nlIZxVHkyPve0w+HyuIf
IQuJUfoGnTrOLb68XKEffUqBL9SaUV9ncnkr/yJPRjltZZilbb6kFQXPqDWw6Dd1 Fz5fL55P/vf53callrZ7UJ8X5nCeQNFVeAkimYXocpyMkoZaxFe3ob+rr0fDvOcd
ffPYlxrTSofPcWmZVz6LP0Xx7snslcu/qzbPBOth/Dx/nOsexwCuAJkft72tGBww 6MUBBKpJArLYpVmKpvQOyrGKSXMhpbLakGdsHF1++s+6DnUPKdObwVO3VpK8OkVw
OeKvQcfUrc5bS7Nq9GtLRgjhMbDb4LVQ+ivXLhbU4stY6v6MttMSNpN90ngpeCV0 cdv+AN1M6YC4UTlw/u+TGCEUJY2xgzdRnFTG9kpx9CvWcMIFP47PK72njY5T5uIj
ZpRnKi2+fI/Gljyj5xEm8nMUYkg4vrJcsBK2PZVkRdlyNKiZXdrHn7dYwuujH3NS IQclkz3jGSfr9oTbX8xa5MDm6vDs05zZ1IciyHDjs3VRmacYFlPMBeNVhp7JRoGi
1Sf46cO6gTquBGvkkAnO1NWPlz558g2EwzP5zOiPZCfKWk/7 Ynd6pwH68Gku/KXAFr2j
-----END CERTIFICATE----- -----END CERTIFICATE-----

View File

@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY----- -----BEGIN PRIVATE KEY-----
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
mZcrpcHTH5/k9ucLvJ3m/8ga Iah3B7taDbqapcqhLG99rlU=
-----END PRIVATE KEY----- -----END PRIVATE KEY-----

View File

@ -162,8 +162,8 @@ debug: false
--- #################### 微信公众号、小程序相关配置 #################### --- #################### 微信公众号、小程序相关配置 ####################
wx: wx:
mp: # 公众号配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 mp: # 公众号配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
app-id: wxb1826c88da21d81e app-id: wx7e503d9cded34c07
secret: 1960c9cc785b094040a4fd4b2955c0cb secret: 31883ca14e2cbac8610d30f8f945ee47
# 存储配置,解决 AccessToken 的跨节点的共享 # 存储配置,解决 AccessToken 的跨节点的共享
config-storage: config-storage:
type: RedisTemplate # 采用 RedisTemplate 操作 Redis会自动从 Spring 中获取 type: RedisTemplate # 采用 RedisTemplate 操作 Redis会自动从 Spring 中获取
@ -179,16 +179,16 @@ wx:
pay: pay:
one: one:
enabled: true enabled: true
app-id: wxb1826c88da21d81e app-id: wx7e503d9cded34c07
mch-id: 1641993417 mch-id: 1641073271
mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM
apiv3-key: cyywl666666cyywl888888cyywl66666 apiv3-key: cyywl123456cyywl654321cyywl12345
private-cert-path: classpath:/1/apiclient_cert.pem private-cert-path: classpath:/1/apiclient_cert.pem
private-key-path: classpath:/1/apiclient_key.pem private-key-path: classpath:/1/apiclient_key.pem
key-path: classpath:/1/apiclient_cert.p12 key-path: classpath:/1/apiclient_cert.p12
cert-serial-no: 58FDB503F92B6C0E258C9940BB726C2BF6022E56 cert-serial-no: 58FDB503F92B6C0E258C9940BB726C2BF6022E56
notify-url: http://yuxy.perrymake.com/app-api/pay/wxpay/pay_notify notify-url: http://yuxy.perrymake.com/admin-api/notify/wxpay/pay_notify
refund-notify-url: http://yuxy.perrymake.com/app-api/pay/wxpay/refund_notify refund-notify-url: http://yuxy.perrymake.com/admin-api/notify/wxpay/refund_notify
two: two:
enabled: true enabled: true
app-id: wxb1826c88da21d81e app-id: wxb1826c88da21d81e
@ -205,9 +205,9 @@ wx:
ali: ali:
pay: pay:
one: one:
appId: 2021003194654312 appId: 2021003196623046
merchantPrivateKey: MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQC+m33MrrmGiSBCBTQMkBH9AN7ZKi/ECmgpjIbVIzAbUThqfiKvuWe8haVq0/F5nETZVYKb3kqqcdt5NkUbGkCrCNCOPvQ2FI8VWOalXGSQNA6ItA644m1dv84Khs5K3Tpu6RgcrL5uqmfNzid7YpLlGeSxMq8uqu/adZnEbm+coJAvEH423pnMjsdkI93FUibaDkDQ06V7Z0Su6l4ZoVzLavvPeP/u8NCvelyf5h+BY159rU8XjCaSYYF/2u4DzDV1LqQcSC+fQg/aVd+QcpnhEF715fbNmN3TLuh1ysnfUSFdVMsdWDrOsgriJ7g0D32uWwhR4Brz3dAFs0KdWTmFAgMBAAECggEBAKdX2JCVbijhx0JvUw0ch856ryw2T41sHZss10vVAu1Y15EXgNiKjLsFEv/BaCX+vquY2XyDI0aVg7zdmrp6x//hU0kvmDTKw/xX+td/UIMSURhQDQThNmeyd/Dh/cfYhu7NEvBJ8T8zuMMFlcBMAO/HVfMErqzoQoCn8wJ0euUkxU+0yWjddC5QHdhPwPgfpmPvL/DCPfSCudFy80ix7CP3YID7RwgCy5niZg3e7aDK6DgYTmk2DmoC7B8ES/7Crvf04fH4XzGrSCzL9aGKOWql6dZisbDioRdm67DEWUSjQGTggEZ+eCd9Tr0gnndVWegG5HYJhSpB/JoLsc5J/dkCgYEA8Tumn60cfJU440LWaJ+40gJWcNrOlvpPEX69DRXKG3PlTAk62sSvVBos2nstqNjhHPQDG7rFerQhmSPeGyezVcwPCbWLvLC61vpbfau+RyWvMvm33A1hgP+zXlt9C3etb9w6LUfuqh0Lzi61K3ZNKQGo4ERxgGoMlNZWO0X/mBMCgYEAykZ9PH1b3be9M55BsnCnnrzENV5Bbfj7BToRleiUWA0f0Juurxy9ZACr8rU1oa7+UF32TpXAOL1Peri5vhYF7hdSnlSk5f9lyEzQijbtRytBC9Mexagb4BZWMlars9jMhhsdWiXA2O6Pz9ykLacGOr0DHM8/6HaVJRlPydXHywcCgYEAzwIgT1/vVR18jtD5SxjdMiJdaUTrCXZNSbcXplXvdLV0rFYzUi58QlCf8vDHUuCh9QWUcURKWKyhNFgqLeVYqKSOtwc6nbaO7xIyVtp9U3KMMNNIKqa06E0E8FDUMnYFuDslFVxn+0Unr0w3nc9MEYdiEunI+KiImWSA5SaBWk8CgYEAlbwshRS/ZpfXZVinhXJDgwx1qpQFl2USXUIpNnGfLrc4b/JvE44Q3PBqWRavhurFs7R62p2cV+Q767rHNOGUrjVxoWdDUkcHj4jdbxNN/rsUQa6dPvA9AltGn6jtHgtFC5kS12LPKUcgCl1o46qav+yfWzpIMstliLr+B4lLhw0CgYEA7Bpm0s2uoyC1XtYCqeWzbjODciq/hgIpmBjnP4Xs0ELB0VE95m9CVQk47dSngRqbkrEO2G2zdMTYj5Mr5bm5AXQfUpwMv89fxCxSXq1Andqe1/UphigltW/PXOfvpD1JcHNfalEcTOTdzENVYH4lN3HAoPobj04gCsFZFcqWfps= merchantPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCAhydIKD244uxHaCAE8N4KA0kfK2UkhXayUwarvc09s/JHC7WkrtwgmeHx+JyFA/QQA1WHQREJ8jyS9HrgasmmA+BaE0vGwbu/c0R4Cde5dLeITZb4w4X1RlH+xjtF34pKLH3oVi29q9jUTRii41eCBeztL/XcbJDsxAnCNnuxcak0gk4cl8j9aoMBP/opIc5sTDSqYFSSTDSMPGh90M6KowFtCHyVZxEszcIRX9cRIuf9KtfGvBzljJMjNGshIMuaHVCFpy72E0s50HmMxC4Kodhp6HEdLV1GUBZy87PYiKTqp9WVn0CndzcfmmdUUXVUvqWPKzRN3YSxExJ0Z5KFAgMBAAECggEABovbulciXaphMnnhN581D/l+3fGN40BQ/WAxNMokDAKAUpIMHGkzmQ19bp+lCTlcUvx4fL0ZqxIFd86v+4I05xnHcY8OCv+PGn86e4q0zCNfvbeF+wGqbwW342whVLvABWsitpS9G64HCzkqChHeQScgHCyXLzTwZL7PaG7x+eWnQ3WyA5KlCpUQWOz6OBPD7flkaflVRbDDZqmhcpEwwSXC9vSQb5+E0BZ118+5nJA65Wi/EPtqCzWX4k6ioiQcN5OeJrScZ4fnQm4h4j+TRLeKqkAKCZFpAZcB7RERxA/4Mzz9mEzHOBzSbrUU+miJ3oSkd4S4ldrOZU4EVkI1AQKBgQDe5t+Qij0hOPQaMpiM2hiQnMAI3TzHRbrYf6JUlMqdzad9oasY2ap+iit60TD9OLwjRGzjy7S9WL2bUgmmU4/sOjR0NMl8z3iUTYun6EubNoMUiu9UhQXBThxBCZv/H2agJ4Uswq2lBjUuGyp383lj9qSkScngGknYgrUd/pUa5QKBgQCTnNzCsIU/1N3fhzpvh1RmUwz8JalcmPNxQqrxE53Je+hVQ4BoeVMCov8U62TjBrxmHFEDVwXqAlRUUOWsWu4ac7V/VvFlwQoqPjkjNteOW6aO+BMDAlb2FVg5GzFy/MvLw4EUtU/Sx8EmWZpyaIzjRV4IUHx4WzJoORKEUIH/IQKBgQCh+9F37p3h6Murxh0KLuwvG1qKlow2nDveXVKQeNiNuQgAyl3WX0gBUVOrmx4oxvQiBPXEzSJ5f2W62/FbR9qNZvb7g+jwpK0RyRC2Yp+fGgxD/3tRRqIaCjOKJ/uPeThRJqcnEgqypEI9UUyZgvwyYuje4yirjS8hAkuwknO06QKBgHH4tnbX5jovuBPDjHnaSm8rBqaUyZxGOAimCehTVgvgULWshbOkoVQy17KmQWIMrGBG0sI6acWRgN0NDRgzqQ3hcyxby8zd7GRLYMBwsqQm3YYbwkobf1tHhbOp7Fc1GoE8dSixCW3cb6SVoGtfkBBWWdEfm8st1tCj6EkjBAwhAoGAShd1PY/QOEJ6Cj9IDXvD25DAh0dKs54PRxENetbIxPgYpH7db6n/smmbwM69U4TXZyFfqme1Bc0JwM2J7D6gs4OV88AhXJvfj091eJQhYC5e80Eo8dySserwLp8/ka6FV/EFUplg/DD4JR/jbVzO2fbOPCLm6I+sZqG3K7mg6IM=
alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw21teFhHze8ltibg/mBE0Lo1gTvcRUszQpsiTLWLoYvLxfaEVD+5bkpTYrVFczLNqOw93MJxwF0Pj62T3BZU6IXPdXtkKhcflKiZxleSIaTxPFml8mQ8dfdcT25BPidRaeztxv/FCL+0MUTMVh29Ffm9/DHqkjozs4o/Vcf/BoDssw9L7JQffwo/h69B0O688E+s+SivqvXGbiRdARzPrvuQjUMPwUf9vQZ4/ZgGNlwsEhnF90ESCuBZDm8atOoZlqYSNw6g+TZQH5CVS0WCR41TQoW+R8OsX1cv3ERvJXvh/50dEhl8b4CN3nvdaSYcw93o/nkkTZkdZ7BdcNuW2wIDAQAB alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgIcnSCg9uOLsR2ggBPDeCgNJHytlJIV2slMGq73NPbPyRwu1pK7cIJnh8fichQP0EANVh0ERCfI8kvR64GrJpgPgWhNLxsG7v3NEeAnXuXS3iE2W+MOF9UZR/sY7Rd+KSix96FYtvavY1E0YouNXggXs7S/13GyQ7MQJwjZ7sXGpNIJOHJfI/WqDAT/6KSHObEw0qmBUkkw0jDxofdDOiqMBbQh8lWcRLM3CEV/XESLn/SrXxrwc5YyTIzRrISDLmh1Qhacu9hNLOdB5jMQuCqHYaehxHS1dRlAWcvOz2Iik6qfVlZ9Ap3c3H5pnVFF1VL6ljys0Td2EsRMSdGeShQIDAQAB
gatewayUrl: https://openapi.alipay.com/gateway.do gatewayUrl: https://openapi.alipay.com/gateway.do
notify-url: http://yuxy.perrymake.com/app-api/pay/ali/pay_notify notify-url: http://yuxy.perrymake.com/app-api/pay/ali/pay_notify
# 芋道配置项,设置当前项目所有自定义的配置 # 芋道配置项,设置当前项目所有自定义的配置

View File

@ -11,8 +11,8 @@ export function memberGradeInfo(){
/** /**
* 获取当前登录账号的充值记录 * 获取当前登录账号的充值记录
*/ */
export function memberHeadInfo(){ export function memberOrderInfo(){
return request.get('api/order/member/memberHeadInfo', {},{noAuth:true}) return request.get('api/order/member/memberOrderInfo', {},{noAuth:true})
} }
/** /**

View File

@ -573,11 +573,17 @@
"text": "分类" "text": "分类"
}, },
{ {
"pagePath": "pages/member_application/index", "pagePath": "pages/member_record/index",
"iconPath": "static/images/2-001.png", "iconPath": "static/images/2-001.png",
"selectedIconPath": "static/images/2-002.png", "selectedIconPath": "static/images/2-002.png",
"text": "会员申请" "text": "会员申请"
}, },
// {
// "pagePath": "pages/member_application/index",
// "iconPath": "static/images/2-001.png",
// "selectedIconPath": "static/images/2-002.png",
// "text": "会员申请"
// },
{ {
"pagePath": "pages/order_addcart/order_addcart", "pagePath": "pages/order_addcart/order_addcart",
"iconPath": "static/images/3-001.png", "iconPath": "static/images/3-001.png",

View File

@ -1,23 +1,16 @@
<template> <template>
<view class="box"> <view class="box">
<view class="box-phone">
<u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
<u-form-item label="手机号" prop="phone">
<u--input v-model="form.phone" maxlength="11" placeholder="请输入您的手机号"></u--input>
</u-form-item>
<u-form-item label="手机号" prop="phone">
<u--input v-model="form.phone" maxlength="11" placeholder="请再次确认您的手机号"></u--input>
</u-form-item>
</u--form>
</view>
<view class="box-member"> <view class="box-member">
<view class="member-item" v-for="(item,index) in 3" :key="index"> <view :class="[activeIndex.includes(index) && 'member-active',!!parseInt(item.isExist) && 'member-disbled', 'member-item']" v-for="(item,index) in memberData" :key="index" @click="handleMember(item,index)">
<view class="member-image"> <view class="member-image">
<image src='../../static/images/f.png'></image> <image src='../../static/images/f.png'></image>
</view> </view>
<view class="member-text"> <view class="member-text">
<text class="text-title">办理240得<text style="color: red;">360</text></text> <view class="text-title">
<text class="text-content">办理档次240可享连续12个月每个月返利30元</text> <text>{{item.name.split('得')[0]}}<text>{{item.name.split('得')[1]}}</text></text>
<view></view>
</view>
<text class="text-content">{{item.gearRemarks}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -39,6 +32,7 @@
memberGradeInfo memberGradeInfo
} from '@/api/member.js'; } from '@/api/member.js';
import paymentMember from '@/components/paymentMember'; import paymentMember from '@/components/paymentMember';
import store from '@/store/index';
export default { export default {
name: "member_application", name: "member_application",
components: { components: {
@ -46,18 +40,7 @@
}, },
data() { data() {
return { return {
total_fee: 1, // 100 = 1 memberData:[],
order_no: "", //
out_trade_no: "", //
description: "测试订单", //
type: "test", // recharge goods uni-pay-co/notify/ xxx.js
custom:{
a: "a",
b: 1
},
form: {
phone:''
},
payInfo:{ payInfo:{
userPhone: '', userPhone: '',
confirmPhone: '', confirmPhone: '',
@ -77,50 +60,44 @@
} }
], ],
pay_close: false, pay_close: false,
rules: { activeIndex:[],
phone: [ form: {
{ phone:''
required: true, },
message: '手机号不能为空',
// blurchange
trigger: ['change', 'blur']
},
{
pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g,
//
transform(value) {
return String(value);
},
message: '手机号不正确190.193号段不可充值)',
trigger: ['change', 'blur']
},
]
}
};
},
mounted() {
};
}, },
async onLoad() { async onLoad() {
const res = await memberGradeInfo() const res = await memberGradeInfo()
this.memberData = res.data
}, },
methods: { methods: {
handleMember(value,index){
if(!!parseInt(value.isExist)) return
if(this.activeIndex.includes(index)){
this.activeIndex = this.activeIndex.filter(item => item !== index)
}else{
this.activeIndex.push(index)
}
},
/** /**
* 打开支付组件 * 打开支付组件
* *
*/ */
goPay() { goPay() {
this.$set(this, 'pay_close', true); if(this.activeIndex.length){
this.$set(this, 'pay_close', true);
const orderInfos = this.activeIndex.map((item) => {
return {
...this.memberData[item],
gearId:this.memberData[item].id
}
})
this.payInfo = { this.payInfo = {
userPhone: '15760696662', userPhone: store.state.app.userInfo.mobile,
confirmPhone: '15760696662', orderInfos
orderInfos: [{
gearId: '1',
name: '套餐1',
gearRemarks: '备注1',
gearAmount: 0.01
}]
} }
}
}, },
/** /**
* 事件回调 * 事件回调
@ -163,70 +140,34 @@
let value = opt.value != undefined ? opt.value : null; let value = opt.value != undefined ? opt.value : null;
(action && this[action]) && this[action](value); (action && this[action]) && this[action](value);
}, },
submit() {
this.order_no = `test`+Date.now(); //
this.out_trade_no = `${this.order_no}-1`; //
//
this.$refs.uniPay.open({
total_fee: this.total_fee, // 100 = 1
order_no: this.order_no, //
out_trade_no: this.out_trade_no, //
description: this.description, //
type: this.type, //
custom: this.custom, //
});
// this.$refs.uForm.validate().then(res => {
// uni.$u.toast('')
// }).catch(errors => {
// uni.$u.toast('')
// })
}
} }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {
// position: relative; padding: 0 40rpx;
padding: 0 24rpx;
.box-phone {
.u-form-item{
margin-bottom: 20rpx;
}
::v-deep .u-form-item__body {
height: 100rpx;
border-radius: 20rpx;
padding: 0 30rpx;
background: #fff;
margin-bottom: 10rpx;
}
}
.box-member { .box-member {
border-radius: 20rpx; border-radius: 20rpx;
width: 100%; width: 100%;
margin-top: 40%; margin-top: 207rpx;
padding: 100rpx 20rpx 30rpx 20rpx; padding: 83rpx 30rpx 30rpx 30rpx;
// position: absolute; background: linear-gradient(#FFD55D,#FD752F);
// top: 20%;
// left: 0;
background: rgb(255, 210, 91);
.member-item { .member-item {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
background: #fff; background: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 30rpx; padding: 30rpx 20rpx 27rpx 20rpx;
border-radius: 20rpx; border-radius: 20rpx;
.member-image { .member-image {
width: 120rpx; width: 104rpx;
height: 120rpx; height: 104rpx;
border-radius: 34rpx; border-radius: 35rpx;
background: red; background: linear-gradient(#FFEBB2,#FDCB3B);
padding: 20rpx; padding: 20rpx;
image { image {
@ -242,26 +183,90 @@
flex: .9; flex: .9;
.text-title { .text-title {
margin-top: -16rpx; margin-top: -14rpx;
font-size: 40rpx; font-size: 32rpx;
font-weight: bolder; font-weight: bolder;
transform: skew(-6deg, 0); transform: skew(-6deg, 0);
display: flex;
justify-content: space-between;
text{
text{
color: #C80D00;
}
}
view{
width: 18rpx;
height: 6rpx;
background: #FEAC49;
border-radius: 3rpx;
}
} }
.text-content { .text-content {
font-size: 24rpx; font-size: 24rpx;
color: #aaa; color: #747474;
}
}
}
.member-active{
transition: .3s;
background: linear-gradient(#FF995F,#DA0E00);
.member-image {
background: linear-gradient(#FF995F,#DA0E00);
}
.member-text {
.text-title {
text{
color: #fff;
text{
color: rgb(223,208,42);
}
}
view{
background: #fff;
}
}
.text-content {
color: #fff;
}
}
}
.member-disbled{
transition: .3s;
background: linear-gradient(#EFEFEF,#BCBCBC);
.member-image {
background: linear-gradient(#AAAAAA,#989898);
}
.member-text {
.text-title {
text{
color: #868585;
text{
color: #868585;
}
}
view{
background: #fff;
}
}
.text-content {
color: #5C5C5C;
} }
} }
} }
} }
.box-privilege { .box-privilege {
border-radius: 20rpx; border-radius: 36rpx;
width: 100%; width: 100%;
margin-top: 10%; margin-top: 44rpx;
padding: 100rpx 10rpx 30rpx 10rpx; padding: 84rpx 10rpx 40rpx 10rpx;
background: rgb(255, 210, 91); background: linear-gradient(#FFD55D,#FD7630);
display: flex; display: flex;
flex: 1; flex: 1;
@ -271,35 +276,37 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background: #fff; background: #fff;
padding: 30rpx 20rpx; padding: 16rpx 16rpx;
border-radius: 20rpx; border-radius: 20rpx;
margin: 10rpx; margin: 0 10rpx;
image { image {
width: 100rpx; width: 87rpx;
height: 100rpx; height: 87rpx;
border-radius: 50%; border-radius: 50%;
margin-bottom: 10rpx; margin-bottom: 15rpx;
} }
.privilege-text { .privilege-text {
color: #000000;
line-height: 36rpx; line-height: 36rpx;
text-align: center; text-align: center;
font-size: 24rpx; font-size: 26rpx;
} }
} }
} }
.box-submit { .box-submit {
margin-top: 10%; background: linear-gradient(#FFC82B,#FD7A32);
margin-bottom: 6%; margin-top: 127rpx;
margin-bottom: 75rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 90rpx; height: 87rpx;
border-radius: 60rpx; border-radius: 44rpx;
background: royalblue;
color: #fff; color: #fff;
font-size: 32rpx;
} }
} }
</style> </style>

View File

@ -11,45 +11,44 @@
</view> </view>
<view class="member-right"> <view class="member-right">
<image src='../../static/images/f.png'></image> <image src='../../static/images/f.png'></image>
<text > <text >会员等级3级</text>
立即续费 <button>立即续费</button>
</text>
</view> </view>
</view> </view>
<view class="box-equity"> <view class="box-equity">
<view class="equity-text"> <view class="equity-text">
<view class="equity-title"> <view class="equity-title">
<text>我的会员权益</text>
</view> </view>
<text class="equity-member">我的会员权益</text>
<text class="equity-look">查看权益></text> <text class="equity-look">查看权益></text>
</view> </view>
<!-- <view class="equity-item" v-for="(item,index) in 2" :key="index"> <view class="equity-item" v-for="(item,index) in 2" :key="index">
<view class="equity-grade"> <view class="equity-grade">
<text>办理档次640</text> <text>办理档次640</text>
<text>办理日期2021.12.30</text> <text>办理日期2021.12.30</text>
</view> </view>
<view class="equity-money"> <view class="equity-money">
<view class="money-text"> <view class="money-box money-completed">
<text>已返回金额</text> <text>已返回金额</text>
<view> <view>
<text>80</text> <text class="money-text">80</text>
<text class="money-detailed">查看明细></text> <text class="money-detailed">查看明细></text>
</view> </view>
</view> </view>
<view class="money-text"> <view class="money-box money-treat">
<text>已返回金额</text> <text>已返回金额</text>
<text>80</text> <text class="money-text">80</text>
</view> </view>
<view class="money-text"> <view class="money-box money-term">
<text>已返回金额</text> <text>已返回金额</text>
<text>80</text> <text class="money-text">80</text>
</view> </view>
<view class="money-text"> <view class="money-box money-time">
<text>已返回金额</text> <text>已返回金额</text>
<text>80</text> <text class="money-text">80</text>
</view> </view>
</view> </view>
</view> --> </view>
</view> </view>
</view> </view>
</template> </template>
@ -102,20 +101,30 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {
padding: 10rpx 24rpx; padding: 36rpx 40rpx;
background: #fff;
height: 100vh;
.box-member { .box-member {
border-radius: 20rpx; border-radius: 20rpx;
width: 100%; width: 100%;
padding: 20rpx 20rpx 30rpx 20rpx; // padding: 20rpx 20rpx 30rpx 20rpx;
background: rgb(255, 210, 91);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.member-left{ .member-left{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
flex: .7; width: 69%;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #000000;
.left-title{
font-size: 35rpx;
font-family: PingFang SC;
font-weight: 600;
color: #000000;
}
.left-info{ .left-info{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -126,13 +135,29 @@
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex: .2; width: 22%;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 400;
color: #000000;
image { image {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
border-radius: 50%; border-radius: 50%;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
button{
margin-top: 10rpx;
padding: 7rpx 16rpx;
background: #F22E60;
border-image: linear-gradient(0deg, #A8052E, #FFFFFF) 10 10;
border-radius: 18rpx;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: 400;
color: #FFFFFF;
}
} }
} }
@ -147,27 +172,34 @@
.equity-text{ .equity-text{
display: flex; display: flex;
align-items: center; align-items: center;
position: relative;
.equity-title{ .equity-title{
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 240rpx; width: 200rpx;
height: 140rpx; height: 90rpx;
// background: #fff; background: #fff;
// border-radius: 8px;/* */ border-radius: 8px;/* 设置圆角 */
transform: perspective(8px)scale(1.1, 1.3) rotateX(5deg);
/* 镜头距离元素表面的位置为8pxx轴为1.1倍y轴为1.3倍绕x轴旋转5度 */
transform-origin: bottom left;
margin-right: 20rpx;
}
.equity-member{
position: absolute;
} }
.equity-look{ .equity-look{
z-index: 99;
} }
} }
.equity-item { .equity-item {
background: #eee; background: #fff;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
border-radius: 20rpx; border-radius: 20rpx;
margin: 10rpx; margin: 15rpx;
padding: 30rpx 24rpx;
.equity-grade{ .equity-grade{
background: greenyellow; background: greenyellow;
border-radius: 10rpx 10rpx; border-radius: 10rpx 10rpx;
@ -176,12 +208,68 @@
justify-content: space-between; justify-content: space-between;
} }
.equity-money { .equity-money {
// background: #fff; display: flex;
// line-height: 36rpx; justify-content: space-between;
// text-align: center; flex-wrap: wrap;
// font-size: 24rpx; .money-box{
.equity-money{ padding: 24rpx 25rpx;
background: #fff; border-radius: 10px;
display: flex;
flex-direction: column;
justify-content: space-between;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #000000;
margin-bottom: 18rpx;
.money-text{
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 400;
}
}
.money-completed{
background: #FFF2F2;
border: 1px solid #F22E60;
.money-text{
color: #F91F57;
}
view{
margin-top:26rpx;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 400;
color: #000000;
}
}
.money-treat{
background: #FFFDF1;
border: 1px solid #FF962F;
.money-text{
margin-top: 26rpx;
color: #EBAF00;
}
}
.money-term{
background: #F8FFF8;
border: 1px solid #38A74F;
.money-text{
margin-top: 26rpx;
color: #2C9E2C;
}
}
.money-time{
background: #F0FDFC;
border: 1px solid #5CA4E8;
.money-text{
margin-top: 26rpx;
color: #2D7AC9;
}
} }
} }
} }

View File

@ -2,47 +2,76 @@
<view class="box"> <view class="box">
<view class="box-phone"> <view class="box-phone">
<u--form :model="form" :rules="rules" ref="uForm" labelWidth="100"> <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
<u-form-item label="手机号" prop="phone"> <u-form-item label="手机号" prop="userPhone">
<u--input v-model="form.phone" maxlength="11" placeholder="请输入您的手机号"></u--input> <u--input v-model="form.userPhone" maxlength="11" placeholder="请输入您的手机号"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="手机号" prop="phone"> <u-form-item label="手机号" prop="confirmPhone">
<u--input v-model="form.phone" maxlength="11" placeholder="请再次确认您的手机号"></u--input> <u--input v-model="form.confirmPhone" maxlength="11" placeholder="请再次确认您的手机号"></u--input>
</u-form-item> </u-form-item>
</u--form> </u--form>
</view> </view>
<view class="box-member"> <view class="box-member">
<view class="member-item" v-for="(item,index) in 3" :key="index"> <view :class="[activeIndex.includes(index) && 'member-active',!!parseInt(item.isExist) && 'member-disbled', 'member-item']" v-for="(item,index) in memberData" :key="index" @click="handleMember(item,index)">
<view class="member-image"> <view class="member-image">
<image src='../../static/images/f.png'></image> <image src='../../static/images/f.png'></image>
</view> </view>
<view class="member-text"> <view class="member-text">
<text class="text-title">办理240得<text style="color: red;">360</text></text> <view class="text-title">
<text class="text-content">办理档次240可享连续12个月每个月返利30元</text> <text>{{item.name.split('得')[0]}}<text>{{item.name.split('得')[1]}}</text></text>
</view> <view></view>
</view>
<text class="text-content">{{item.gearRemarks}}</text>
</view>
</view>
<view class="member-prompt">
* 办理三个项目即可升级会员2会员2享XX权益
</view> </view>
</view> </view>
<view class="box-privilege"> <paymentMember :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :payInfo="payInfo"></paymentMember>
<view class="privilege-item" v-for="(item,index) in 4" :key="index"> <button class="box-submit" @click="goPay"></button>
<image src='../../static/images/f.png'></image>
<text class="privilege-text">
开通立享大额话费返送
</text>
</view>
</view>
<button class="box-submit" @click="submit"></button>
</view> </view>
</template> </template>
<script> <script>
import {
memberGradeInfo
} from '@/api/member.js';
import paymentMember from '@/components/paymentMember';
import store from '@/store/index';
export default { export default {
name: "member_application", name: "member_application",
components: {
paymentMember
},
data() { data() {
return { return {
memberData:[],
payInfo:{
userPhone: '',
confirmPhone: '',
orderInfos: []
},
payMode: [{
name: "微信支付",
icon: "icon-weixinzhifu",
value: 'WXPAY',
title: '微信快捷支付'
},
{
name: "支付宝",
icon: "icon-zhifubao",
value: 'ALIPAY',
title: '支付宝快捷支付'
}
],
pay_close: false,
activeIndex:[],
form: { form: {
phone:'' userPhone:'',
confirmPhone:''
}, },
rules: { rules: {
phone: [ userPhone: [
{ {
required: true, required: true,
message: '手机号不能为空', message: '手机号不能为空',
@ -58,143 +87,251 @@
message: '手机号不正确190.193号段不可充值)', message: '手机号不正确190.193号段不可充值)',
trigger: ['change', 'blur'] trigger: ['change', 'blur']
}, },
],
confirmPhone:[
{
required: true,
message: '手机号确认不能为空',
// blurchange
trigger: ['change', 'blur']
},
{
validator: (rule, value, callback) => {
return this.form.userPhone == this.form.confirmPhone
},
message: '手机号不一致',
trigger: ['change','blur'],
}
] ]
} }
}; };
}, },
mounted() { async onLoad() {
const res = await memberGradeInfo()
}, this.memberData = res.data
onLoad() {
}, },
methods: { methods: {
submit() { handleMember(value,index){
if(!!parseInt(value.isExist)) return
this.$refs.uForm.validate().then(res => { if(this.activeIndex.includes(index)){
uni.$u.toast('校验通过') this.activeIndex = this.activeIndex.filter(item => item !== index)
}).catch(errors => { }else{
uni.$u.toast('校验失败') this.activeIndex.push(index)
}) }
} },
/**
* 打开支付组件
*
*/
goPay() {
this.$refs.uForm.validate().then(res => {
if(this.activeIndex.length){
this.$set(this, 'pay_close', true);
const orderInfos = this.activeIndex.map((item) => {
return {
...this.memberData[item],
gearId:this.memberData[item].id
}
})
this.payInfo = {
userPhone: this.form.userPhone,
confirmPhone: this.form.confirmPhone,
orderInfos
}
}
}).catch(errors => {
uni.$u.toast('校验失败')
})
},
/**
* 事件回调
*
*/
onChangeFun: function(e) {
let opt = e;
let action = opt.action || null;
let value = opt.value != undefined ? opt.value : null;
(action && this[action]) && this[action](value);
},
/**
* 关闭支付组件
*
*/
payClose: function() {
this.pay_close = false;
},
/**
* 支付成功回调
*
*/
pay_complete: function() {
this.status = false;
this.page = 1;
this.$set(this, 'bargain', []);
this.$set(this, 'pay_close', false);
this.getBargainUserList();
},
/**
* 支付失败回调
*
*/
pay_fail: function() {
this.pay_close = false;
},
onChangeFun: function(e) {
let opt = e;
let action = opt.action || null;
let value = opt.value != undefined ? opt.value : null;
(action && this[action]) && this[action](value);
},
} }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {
// position: relative; padding: 63rpx 40rpx;
padding: 0 24rpx; .box-phone {
.box-phone {
.u-form-item{ .u-form-item{
margin-bottom: 20rpx; margin-bottom: 32rpx;
} }
::v-deep .u-form-item__body { ::v-deep .u-form-item__body {
height: 100rpx; height: 100rpx;
border-radius: 20rpx; border-radius: 20rpx;
padding: 0 30rpx; padding: 0 30rpx;
background: #fff; background: #fff;
margin-bottom: 10rpx;
} }
} }
.box-member {
border-radius: 20rpx;
width: 100%;
margin-top: 60rpx;
padding: 83rpx 30rpx 30rpx 30rpx;
background: linear-gradient(#FFD55D,#FD752F);
.box-member { .member-item {
border-radius: 20rpx; display: flex;
width: 100%; justify-content: space-between;
margin-top: 40%; background: #fff;
padding: 100rpx 20rpx 30rpx 20rpx; margin-bottom: 20rpx;
// position: absolute; padding: 30rpx 20rpx 27rpx 20rpx;
// top: 20%; border-radius: 20rpx;
// left: 0;
background: rgb(255, 210, 91);
.member-item { .member-image {
display: flex; width: 104rpx;
justify-content: space-between; height: 104rpx;
background: #fff; border-radius: 35rpx;
margin-bottom: 20rpx; background: linear-gradient(#FFEBB2,#FDCB3B);
padding: 30rpx; padding: 20rpx;
border-radius: 20rpx;
.member-image { image {
width: 120rpx; width: 100%;
height: 120rpx; height: 100%;
border-radius: 34rpx; }
background: red; }
padding: 20rpx;
image { .member-text {
width: 100%; display: flex;
height: 100%; flex-direction: column;
} justify-content: space-between;
} flex: .9;
.member-text { .text-title {
display: flex; margin-top: -14rpx;
flex-direction: column; font-size: 32rpx;
justify-content: space-between; font-weight: bolder;
flex: .9; transform: skew(-6deg, 0);
display: flex;
justify-content: space-between;
text{
text{
color: #C80D00;
}
}
view{
width: 18rpx;
height: 6rpx;
background: #FEAC49;
border-radius: 3rpx;
}
}
.text-title { .text-content {
margin-top: -16rpx; font-size: 24rpx;
font-size: 40rpx; color: #747474;
font-weight: bolder; }
transform: skew(-6deg, 0); }
} }
.member-active{
transition: .3s;
background: linear-gradient(#FF995F,#DA0E00);
.text-content { .member-image {
font-size: 24rpx; background: linear-gradient(#FF995F,#DA0E00);
color: #aaa; }
}
}
}
}
.box-privilege { .member-text {
border-radius: 20rpx; .text-title {
width: 100%; text{
margin-top: 10%; color: #fff;
padding: 100rpx 10rpx 30rpx 10rpx; text{
background: rgb(255, 210, 91); color: rgb(223,208,42);
display: flex; }
flex: 1; }
view{
background: #fff;
}
}
.text-content {
color: #fff;
}
}
}
.privilege-item { .member-disbled{
display: flex; transition: .3s;
flex-direction: column; background: linear-gradient(#EFEFEF,#BCBCBC);
align-items: center;
justify-content: space-between;
background: #fff;
padding: 30rpx 20rpx;
border-radius: 20rpx;
margin: 10rpx;
image { .member-image {
width: 100rpx; background: linear-gradient(#AAAAAA,#989898);
height: 100rpx; }
border-radius: 50%;
margin-bottom: 10rpx;
}
.privilege-text { .member-text {
line-height: 36rpx; .text-title {
text-align: center; text{
font-size: 24rpx; color: #868585;
} text{
} color: #868585;
} }
}
view{
background: #fff;
}
}
.text-content {
color: #5C5C5C;
}
}
}
.member-prompt{
display: flex;
justify-content: center;
font-size: 24rpx;
color: #fff;
}
}
.box-submit { .box-submit {
margin-top: 10%; background: linear-gradient(#FFC82B,#FD7A32);
margin-bottom: 6%; margin-top: 127rpx;
display: flex; margin-bottom: 75rpx;
justify-content: center; display: flex;
align-items: center; justify-content: center;
height: 90rpx; align-items: center;
border-radius: 60rpx; height: 87rpx;
background: royalblue; border-radius: 44rpx;
color: #fff; color: #fff;
} font-size: 32rpx;
}
} }
</style> </style>

View File

@ -1,30 +1,54 @@
<template> <template>
<view class="box"> <view class="box">
<u-search placeholder="请输入关键字" v-model="keyword" :show-action="false"></u-search> <u-search placeholder="按手机号搜索查询" v-model="keyword" border-color="#F94B78" height="70" margin="0 0 35rpx 0" placeholder-color="#9C9C9C" bg-color="#fff" :show-action="false"></u-search>
<view class="list-item" v-for="(item,index) in 5" :key="index"> <view class="list-item" v-for="(item,index) in memberData" :key="index">
<text class="item-phone">充值号码13627451300</text> <view class="item-phone">
<view></view>
<text>充值号码{{item.userPhone}}</text>
</view>
<view class="item-text"> <view class="item-text">
<text>充值档次套餐1</text> <text>充值档次{{item.grade}}</text>
<text>日期2023-05-12</text> <text>日期{{item.createTime}}</text>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import {
memberOrderInfo
} from '@/api/member.js';
import { Debounce } from '@/utils/validate.js'
export default { export default {
name: "member_application", name: "member_record",
data() { data() {
return { return {
keyword:'', keyword:'',
memberData:[]
}; };
}, },
mounted() { async onLoad() {
const res = await memberOrderInfo()
}, this.memberData = res.data
onLoad() {
}, },
watch:{
keyword :Debounce (function (){
this.memberData.sort((a,b) =>{
let aIndex = this.keyword.indexOf(a.userPhone)
let bIndex = this.keyword.indexOf(b.userPhone)
if(aIndex > bIndex) return -1
if(aIndex < bIndex) return 1
if(a.userPhone == b.userPhone){
return a.createTime - b.createTime
}else{
if(a.createTime<b.createTime) return -1
if(a.createTime>b.createTime) return 1
return 0
}
})
console.log(this.memberData)
},1000)
},
methods: { methods: {
} }
@ -33,30 +57,35 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {
padding: 20rpx; padding: 45rpx 40rpx;
::v-deep .u-search__content{
background: #fff !important;
height: 70rpx;
.uni-input-form{
background: #fff !important;
}
}
.list-item{ .list-item{
padding: 20rpx; margin-bottom: 26rpx;
background: #fff; padding: 30rpx 16rpx 25rpx 16rpx;
background: #FDF0F1;
border-radius: 20rpx; border-radius: 20rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
margin: 20rpx;
.item-phone{ .item-phone{
font-size: 36rpx; display: flex;
font-weight: bolder; align-items: center;
font-size: 30rpx;
color: #E91D51;
view{
border-radius: 3rpx;
margin-right: 10rpx;
width: 5rpx;
height: 12rpx;
background: #E91D51;
}
} }
.item-text{ .item-text{
padding: 34rpx 12rpx;
background: #fff;
margin-top: 20rpx; margin-top: 20rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 30rpx;
} }
} }
} }

View File

@ -2,47 +2,72 @@
<view class="box"> <view class="box">
<view class="box-phone"> <view class="box-phone">
<u--form :model="form" :rules="rules" ref="uForm" labelWidth="100"> <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
<u-form-item label="手机号" prop="phone"> <u-form-item label="手机号" prop="phone" >
<u--input v-model="form.phone" maxlength="11" placeholder="请输入您的手机号"></u--input> <u--input v-model="form.userPhone" maxlength="11" disabled placeholder="请输入您的手机号"></u--input>
</u-form-item>
<u-form-item label="手机号" prop="phone">
<u--input v-model="form.phone" maxlength="11" placeholder="请再次确认您的手机号"></u--input>
</u-form-item> </u-form-item>
</u--form> </u--form>
</view> </view>
<view class="box-member"> <view class="box-member">
<view class="member-item" v-for="(item,index) in 3" :key="index"> <view :class="[activeIndex.includes(index) && 'member-active',!!parseInt(item.isExist) && 'member-disbled', 'member-item']" v-for="(item,index) in memberData" :key="index" @click="handleMember(item,index)">
<view class="member-image"> <view class="member-image">
<image src='../../static/images/f.png'></image> <image src='../../static/images/f.png'></image>
</view> </view>
<view class="member-text"> <view class="member-text">
<text class="text-title">办理240得<text style="color: red;">360</text></text> <view class="text-title">
<text class="text-content">办理档次240可享连续12个月每个月返利30元</text> <text>{{item.name.split('得')[0]}}<text>{{item.name.split('得')[1]}}</text></text>
</view> <view></view>
</view>
<text class="text-content">{{item.gearRemarks}}</text>
</view>
</view>
<view class="member-prompt">
* 办理三个项目即可升级会员2会员2享XX权益
</view> </view>
</view> </view>
<view class="box-privilege"> <paymentMember :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :payInfo="payInfo"></paymentMember>
<view class="privilege-item" v-for="(item,index) in 4" :key="index"> <button class="box-submit" @click="goPay"></button>
<image src='../../static/images/f.png'></image>
<text class="privilege-text">
开通立享大额话费返送
</text>
</view>
</view>
<button class="box-submit" @click="submit"></button>
</view> </view>
</template> </template>
<script> <script>
import {
memberGradeInfo
} from '@/api/member.js';
import paymentMember from '@/components/paymentMember';
import store from '@/store/index';
export default { export default {
name: "member_application", name: "member_application",
components: {
paymentMember
},
data() { data() {
return { return {
memberData:[],
payInfo:{
userPhone: '',
confirmPhone: '',
orderInfos: []
},
payMode: [{
name: "微信支付",
icon: "icon-weixinzhifu",
value: 'WXPAY',
title: '微信快捷支付'
},
{
name: "支付宝",
icon: "icon-zhifubao",
value: 'ALIPAY',
title: '支付宝快捷支付'
}
],
pay_close: false,
activeIndex:[],
form: { form: {
phone:'' userPhone:''
}, },
rules: { rules: {
phone: [ userPhone: [
{ {
required: true, required: true,
message: '手机号不能为空', message: '手机号不能为空',
@ -62,66 +87,121 @@
} }
}; };
}, },
mounted() { async onLoad() {
const res = await memberGradeInfo()
}, this.memberData = res.data
onLoad() { this.form.userPhone = store.state.app.userInfo.mobile
}, },
methods: { methods: {
submit() { handleMember(value,index){
if(!!parseInt(value.isExist)) return
this.$refs.uForm.validate().then(res => { if(this.activeIndex.includes(index)){
uni.$u.toast('校验通过') this.activeIndex = this.activeIndex.filter(item => item !== index)
}).catch(errors => { }else{
uni.$u.toast('校验失败') this.activeIndex.push(index)
}) }
},
/**
* 打开支付组件
*
*/
goPay() {
if(this.activeIndex.length){
this.$set(this, 'pay_close', true);
const orderInfos = this.activeIndex.map((item) => {
return {
...this.memberData[item],
gearId:this.memberData[item].id
}
})
this.payInfo = {
userPhone: store.state.app.userInfo.mobile,
orderInfos
} }
} }
},
/**
* 事件回调
*
*/
onChangeFun: function(e) {
let opt = e;
let action = opt.action || null;
let value = opt.value != undefined ? opt.value : null;
(action && this[action]) && this[action](value);
},
/**
* 关闭支付组件
*
*/
payClose: function() {
this.pay_close = false;
},
/**
* 支付成功回调
*
*/
pay_complete: function() {
this.status = false;
this.page = 1;
this.$set(this, 'bargain', []);
this.$set(this, 'pay_close', false);
this.getBargainUserList();
},
/**
* 支付失败回调
*
*/
pay_fail: function() {
this.pay_close = false;
},
onChangeFun: function(e) {
let opt = e;
let action = opt.action || null;
let value = opt.value != undefined ? opt.value : null;
(action && this[action]) && this[action](value);
},
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {
// position: relative; padding: 63rpx 40rpx;
padding: 0 24rpx; .u-input{
background: #fff !important;
.box-phone { }
.box-phone {
.u-form-item{ .u-form-item{
margin-bottom: 20rpx; margin-bottom: 32rpx;
} }
::v-deep .u-form-item__body { ::v-deep .u-form-item__body {
height: 100rpx; height: 100rpx;
border-radius: 20rpx; border-radius: 20rpx;
padding: 0 30rpx; padding: 0 30rpx;
background: #fff; background: #fff;
margin-bottom: 10rpx;
} }
} }
.box-member {
.box-member { border-radius: 20rpx;
border-radius: 20rpx; width: 100%;
width: 100%; margin-top: 60rpx;
margin-top: 40%; padding: 83rpx 30rpx 30rpx 30rpx;
padding: 100rpx 20rpx 30rpx 20rpx; background: linear-gradient(#FFD55D,#FD752F);
// position: absolute;
// top: 20%;
// left: 0;
background: rgb(255, 210, 91);
.member-item { .member-item {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
background: #fff; background: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
padding: 30rpx; padding: 30rpx 20rpx 27rpx 20rpx;
border-radius: 20rpx; border-radius: 20rpx;
.member-image { .member-image {
width: 120rpx; width: 104rpx;
height: 120rpx; height: 104rpx;
border-radius: 34rpx; border-radius: 35rpx;
background: red; background: linear-gradient(#FFEBB2,#FDCB3B);
padding: 20rpx; padding: 20rpx;
image { image {
@ -137,64 +217,102 @@
flex: .9; flex: .9;
.text-title { .text-title {
margin-top: -16rpx; margin-top: -14rpx;
font-size: 40rpx; font-size: 32rpx;
font-weight: bolder; font-weight: bolder;
transform: skew(-6deg, 0); transform: skew(-6deg, 0);
display: flex;
justify-content: space-between;
text{
text{
color: #C80D00;
}
}
view{
width: 18rpx;
height: 6rpx;
background: #FEAC49;
border-radius: 3rpx;
}
} }
.text-content { .text-content {
font-size: 24rpx; font-size: 24rpx;
color: #aaa; color: #747474;
} }
} }
} }
} .member-active{
transition: .3s;
background: linear-gradient(#FF995F,#DA0E00);
.box-privilege { .member-image {
border-radius: 20rpx; background: linear-gradient(#FF995F,#DA0E00);
width: 100%; }
margin-top: 10%;
padding: 100rpx 10rpx 30rpx 10rpx;
background: rgb(255, 210, 91);
display: flex;
flex: 1;
.privilege-item { .member-text {
.text-title {
text{
color: #fff;
text{
color: rgb(223,208,42);
}
}
view{
background: #fff;
}
}
.text-content {
color: #fff;
}
}
}
.member-disbled{
transition: .3s;
background: linear-gradient(#EFEFEF,#BCBCBC);
.member-image {
background: linear-gradient(#AAAAAA,#989898);
}
.member-text {
.text-title {
text{
color: #868585;
text{
color: #868585;
}
}
view{
background: #fff;
}
}
.text-content {
color: #5C5C5C;
}
}
}
.member-prompt{
display: flex; display: flex;
flex-direction: column; justify-content: center;
align-items: center; font-size: 24rpx;
justify-content: space-between; color: #fff;
background: #fff;
padding: 30rpx 20rpx;
border-radius: 20rpx;
margin: 10rpx;
image {
width: 100rpx;
height: 100rpx;
border-radius: 50%;
margin-bottom: 10rpx;
}
.privilege-text {
line-height: 36rpx;
text-align: center;
font-size: 24rpx;
}
} }
} }
.box-submit { .box-submit {
margin-top: 10%; background: linear-gradient(#FFC82B,#FD7A32);
margin-bottom: 6%; margin-top: 127rpx;
margin-bottom: 75rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 90rpx; height: 87rpx;
border-radius: 60rpx; border-radius: 44rpx;
background: royalblue;
color: #fff; color: #fff;
font-size: 32rpx;
} }
} }
</style> </style>