添加权限和确认付款按钮连接小程序接口

jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java

@@ -52,6 +52,10 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
         List<String> organizeIdList = new ArrayList<>();
         if(userInfo != null && StringUtil.isNotEmpty(userInfo.getOrganizeId())){
             OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
+            if (organizeEntity==null){
+//                organizeEntity.setId("-1");
+                organizeIdList.add("-1");
+            }else {
                 organizeIdList.add(organizeEntity.getId());
                 if(PermissionConst.DEPARTMENT.equals(organizeEntity.getCategory())){
                     userInfo.setDepartmentId(organizeEntity.getId());
@@ -66,6 +70,8 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
                     companyId = organizeEntity.getId();
                 }
             }
+
+        }
         organizeIdList.add("96240625-934F-490B-8AA6-0BC775B18468");
         Collections.reverse(organizeIdList);
         String organizeId = JSON.toJSONString(organizeIdList);

jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml

@@ -239,3 +239,7 @@ wx:
     appid: wxf82bcc798891a29d
     appsecret: f37fb0ab2b5f691d8507acced60a58fb
 
+nxhs:
+  url: 'http://222.71.165.188:8808'
+#  url: 'http://192.168.0.166:8808'
+  token: '8bd2aa89033ead51c505e44994e42189'

jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml

@@ -192,3 +192,9 @@ xxl:
       task-update-address: ${xxl.job.admin.addresses}api/ScheduleTask
       task-remove-address: ${xxl.job.admin.addresses}api/ScheduleTask/remove
       task-start-or-remove-address: ${xxl.job.admin.addresses}api/ScheduleTask/updateTask
+
+
+nxhs:
+#  url: 'http://118.195.155.9:8808'
+  url: 'http://222.71.165.188:8808'
+  token: '8bd2aa89033ead51c505e44994e42189'

jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/OrganizeController.java

@@ -469,6 +469,11 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
         if (organizeService.isExistByFullName(entity, false, false)) {
             return ActionResult.fail("公司名称不能重复");
         }
+
+        boolean areEqual =   organizeCrForm.getCode().equals("000000");
+        if (areEqual==false) {
+            return ActionResult.fail("验证码必须为000000");
+        }
 //        if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
 //            return ActionResult.fail("公司编码不能重复");
 //        }

jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/entity/OrganizeEntity.java

@@ -85,7 +85,7 @@ public class OrganizeEntity extends PermissionEntityBase{
     private String code;
 
     /**
-     * 验证码
+     * 商户资金余额
      */
     @TableField("FUND")
     private BigDecimal fund;

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/HousingEstateServiceImpl.java

@@ -262,6 +262,11 @@ public class HousingEstateServiceImpl extends ServiceImpl<HousingEstateMapper, H
     @Override
     public List<HousingEstateEntity> getHousingTypeList(HousingEstatePagination housingEstatePagination,String dataType){
         String userId=userProvider.get().getUserId();
+        String orgId=userProvider.get().getOrganizeId();
+        if (orgId!=null){
+            housingEstatePagination.setCompanyId(orgId);
+        }
+
         List<String> AllIdList =new ArrayList();
         List<List<String>> intersectionList =new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -362,6 +367,15 @@ public class HousingEstateServiceImpl extends ServiceImpl<HousingEstateMapper, H
 
             }
 
+            if(ObjectUtil.isNotEmpty(housingEstatePagination.getCompanyId())){
+                housingEstateNum++;
+                String value = housingEstatePagination.getCompanyId() instanceof List ?
+                        JsonUtil.getObjectToString(housingEstatePagination.getCompanyId()) :
+                        String.valueOf(housingEstatePagination.getCompanyId());
+                housingEstateQueryWrapper.lambda().like(HousingEstateEntity::getCompanyId,value);
+            }
+
+
             if(housingEstatePagination.getExcludeIdList() != null && housingEstatePagination.getExcludeIdList().size() > 0){
                 housingEstateNum++;
                 housingEstateQueryWrapper.lambda().notIn(HousingEstateEntity::getId,housingEstatePagination.getExcludeIdList());

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxProductServiceImpl.java

@@ -54,6 +54,11 @@ public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProduct
     @Override
     public List<NxProductEntity> getTypeList(NxProductPagination nxProductPagination,String dataType){
         String userId=userProvider.get().getUserId();
+        String orgId=userProvider.get().getOrganizeId();
+        if (orgId!=null){
+            nxProductPagination.setCompanyId(orgId);
+        }
+
         List<String> AllIdList =new ArrayList();
         List<List<String>> intersectionList =new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -159,6 +164,15 @@ public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProduct
                 nxProductQueryWrapper.lambda().notIn(NxProductEntity::getId,nxProductPagination.getExcludeIdList());
             }
 
+            if(ObjectUtil.isNotEmpty(nxProductPagination.getCompanyId())){
+                nxProductNum++;
+                String value = nxProductPagination.getCompanyId() instanceof List ?
+                        JsonUtil.getObjectToString(nxProductPagination.getCompanyId()) :
+                        String.valueOf(nxProductPagination.getCompanyId());
+                nxProductQueryWrapper.lambda().like(NxProductEntity::getCompanyId,value);
+
+            }
+
 
             if(ObjectUtil.isNotEmpty(nxProductPagination.getName())){
             nxProductNum++;

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java

@@ -17,9 +17,22 @@ import jnpf.entity.*;
 import jnpf.util.*;
 import jnpf.model.nxwallet.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.*;
 import jnpf.annotation.JnpfField;
 import jnpf.base.vo.PageListVO;
@@ -81,6 +94,14 @@ public class NxWalletController {
     @Autowired
     private ConfigValueUtil configValueUtil;
 
+
+    @Value("${nxhs.url:http://222.71.165.188:8808}")
+    private String appUrl;
+
+    @Value("${nxhs.token:8bd2aa89033ead51c505e44994e42189}")
+    private String appToken;
+
+
     /**
     * 列表
     *
@@ -387,6 +408,7 @@ public class NxWalletController {
      */
     @PostMapping("/closestatus/{id}/{status}")
     @Operation(summary = "更新状态")
+    @Transactional(rollbackFor = Exception.class)
     public ActionResult updateStatus(@PathVariable("id") String id,@PathVariable("status") String status){
         NxWalletEntity entity= nxWalletService.getInfo(id);
         if(entity!=null){
@@ -395,10 +417,7 @@ public class NxWalletController {
                     entity.setRechargeStatus(status);
                     nxWalletService.update(id, entity);
                 }else if (entity.getRechargeStatus().equals("2")){
-//                    String userId=userProvider.get().getUserId();
-//                    String userOrgId=userProvider.get().getOrganizeId();
                     String userUserAccountId=userProvider.get().getUserAccount();
-
                     QueryWrapper<OrganizeEntity> queryWrapper=new QueryWrapper<>();
                     queryWrapper.lambda().eq(OrganizeEntity::getId,entity.getCompanyId());
                     List<OrganizeEntity> organizeEntityList = organizeService.list(queryWrapper);
@@ -414,6 +433,36 @@ public class NxWalletController {
                             }else {
                                 entity.setOrderStatus(status);
                                 nxWalletService.update(id, entity);
+
+                            final String POST_URL = this.appUrl + "/api/index/recharge-balance";
+                                HttpPost httpPost = new HttpPost(POST_URL);
+                                // 设置请求头部信息
+                                httpPost.setHeader("authorization", this.appToken);
+                                JSONObject jsonObject = new JSONObject();
+                                jsonObject.put("merchantId", organizeEntityList.get(0).id);
+                                jsonObject.put("amount", entity.getPriceStar());
+                                String jsonData = jsonObject.toJSONString();
+//                                List<NameValuePair> nvps = new ArrayList<>();
+//                                nvps.add(new BasicNameValuePair("amount", String.valueOf(entity.getPriceStar())));
+//                                nvps.add(new BasicNameValuePair("merchantId", organizeEntityList.get(0).id));
+
+                                StringEntity requestEntity = new StringEntity(jsonData, ContentType.APPLICATION_JSON);
+//                                UrlEncodedFormEntity requestEntity = new UrlEncodedFormEntity(nvps);
+                                httpPost.setEntity(requestEntity);
+                                try(CloseableHttpClient httpClient = HttpClients.createDefault();
+                                    CloseableHttpResponse response = httpClient.execute(httpPost);) {
+                                    HttpEntity responseEntity = response.getEntity();
+                                    String result = EntityUtils.toString(responseEntity);
+                                    // 输出接口返回的数据
+//                                    System.out.println(result);
+//                                    response.close();
+//                                    httpClient.close();
+                                }catch (Exception e){
+                                    return ActionResult.fail("接口更改金额异常");
+
+                                }
+//                                CloseableHttpClient httpClient = HttpClients.createDefault();
+//                                CloseableHttpResponse response = httpClient.execute(httpPost);
                         }
                     }
                 }
@@ -425,8 +474,10 @@ public class NxWalletController {
         }else{
             return ActionResult.fail("更新状态失败，数据不存在");
         }
+}
+
+
 
 
-}
 
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriserecyclestationEntity.java

@@ -97,8 +97,11 @@ public class EnterpriserecyclestationEntity  {
     private String companyId;
     @TableField(value = "department_id" , fill = FieldFill.INSERT)
     private String departmentId;
-    @TableField(value = "organize_id" , fill = FieldFill.INSERT)
+//    @TableField(value = "organize_id" , fill = FieldFill.INSERT)
-    private String organizeId;
+//    private String organizeId;
+
+    @TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_TENANT_ID")
     private String tenantId;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/housingestate/HousingEstatePagination.java

@@ -43,4 +43,8 @@ public class HousingEstatePagination extends Pagination {
     /** 回收站id **/
     @JsonProperty("stationId")
     private String stationId;
+
+    /** 公司id */
+    @JsonProperty("companyId")
+    private Object companyId;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxproduct/NxProductPagination.java

@@ -40,6 +40,12 @@ public class NxProductPagination extends Pagination {
     @JsonProperty("unit")
     private Object unit;
 
+    /** 公司id */
+    @JsonProperty("companyId")
+    private Object companyId;
+
+
+
     @JsonProperty("excludeIdList")
     private List<String> excludeIdList;
 }

jnpf-java-boot/jnpf-web/src/views/login/regsiter.vue

@@ -8,22 +8,11 @@
 -->
 <template>
   <div class="JNPF-common-regsiter">
-    <el-dialog
+    <el-dialog title="" width="80%" :show-close="false" :modal="false" :close-on-click-modal="false"
-      title=""
+      :visible="dialogVisible">
-      width="80%"
-      :show-close="false"
-      :modal="false"
-      :close-on-click-modal="false"
-      :visible="dialogVisible"
-    >
       <div class="cont">
         <div class="steps">
-          <el-steps
+          <el-steps :active="active" class="steps" align-center finish-status="success">
-            :active="active"
-            class="steps"
-            align-center
-            finish-status="success"
-          >
             <el-step title="注册须知" description="确认注册须知内容"></el-step>
             <el-step title="商户描述" description="完善商户基本信息"></el-step>
             <el-step title="资质上传" description="确认商户开店资质"></el-step>
@@ -32,173 +21,107 @@
         <div class="step step1" v-if="active == 1">
           <div id="u9_text" class="text">
             <p style="font-size: 15px">
-              <span
+              <span style="
-                style="
                   font-family: 'Helvetica-Bold', 'Helvetica Bold', 'Helvetica',
                     sans-serif;
                   font-weight: 700;
-                "
+                ">1</span><span style="
-                >1</span
-              ><span
-                style="
                   font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
                     'PingFang SC', sans-serif;
                   font-weight: 650;
-                "
+                ">、我在西夏聚宝回收已经开了个店了，我用别人的身份证再开一个店可以吗？</span>
-                >、我在西夏聚宝回收已经开了个店了，我用别人的身份证再开一个店可以吗？</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="font-family: 'Helvetica', sans-serif; font-weight: 400"><br /></span>
-                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
-                ><br
-              /></span>
             </p>
             <p style="font-size: 13px">
               <span
                 style="
                   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                   font-weight: 400;
-                "
+                ">答：不可以。未经西夏聚宝平台同意，将本人西夏聚宝回收账号提供给他人做开店使用，由此导致相关争议，诉讼及因店铺经营中的违法违规行为导致一切人身，财产权益损害，均由本人自行承担全部民事、行政及刑事责任。</span>
-                >答：不可以。未经西夏聚宝平台同意，将本人西夏聚宝回收账号提供给他人做开店使用，由此导致相关争议，诉讼及因店铺经营中的违法违规行为导致一切人身，财产权益损害，均由本人自行承担全部民事、行政及刑事责任。</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="font-family: 'Helvetica', sans-serif; font-weight: 400"><br /></span>
-                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
-                ><br
-              /></span>
             </p>
             <p style="font-size: 15px">
-              <span
+              <span style="
-                style="
                   font-family: 'Helvetica-Bold', 'Helvetica Bold', 'Helvetica',
                     sans-serif;
                   font-weight: 700;
-                "
+                ">2</span><span style="
-                >2</span
-              ><span
-                style="
                   font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
                     'PingFang SC', sans-serif;
                   font-weight: 650;
-                "
+                ">、开企业店铺需要满足什么条件？</span>
-                >、开企业店铺需要满足什么条件？</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="font-family: 'Helvetica', sans-serif; font-weight: 400"><br /></span>
-                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
-                ><br
-              /></span>
             </p>
             <p style="font-size: 13px">
               <span
                 style="
                   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                   font-weight: 400;
-                "
+                ">答：企业开店需完成支付宝认证和责任人认证，店铺负责人需要对该西夏聚宝回收店铺的运营及管理全面负责，包含但不限于：该企业的法定代表人、股东、西夏聚宝回收店铺的运营人等，具体请参考：企业店铺开店流程。</span>
-                >答：企业开店需完成支付宝认证和责任人认证，店铺负责人需要对该西夏聚宝回收店铺的运营及管理全面负责，包含但不限于：该企业的法定代表人、股东、西夏聚宝回收店铺的运营人等，具体请参考：企业店铺开店流程。</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="font-family: 'Helvetica', sans-serif; font-weight: 400">3</span><span style="
-                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
-                >3</span
-              ><span
-                style="
                   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                   font-weight: 400;
-                "
+                ">、我可以开多个店铺吗？</span>
-                >、我可以开多个店铺吗？</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="font-family: 'Helvetica', sans-serif; font-weight: 400"><br /></span>
-                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
-                ><br
-              /></span>
             </p>
             <p style="font-size: 15px">
-              <span
+              <span style="
-                style="
                   font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
                     'PingFang SC', sans-serif;
                   font-weight: 650;
-                "
+                ">答：同一会员已开设的店铺均须同时满足以下要求，才能获得多店权益：</span>
-                >答：同一会员已开设的店铺均须同时满足以下要求，才能获得多店权益：</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="
-                style="
                   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                   font-weight: 400;
-                "
+                ">（一）近365天无出售假冒商品违规、严重违规、一般违规扣分达12分（含）以上等违规记录，且无其他风险特征；</span>
-                >（一）近365天无出售假冒商品违规、严重违规、一般违规扣分达12分（含）以上等违规记录，且无其他风险特征；</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="
-                style="
                   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                   font-weight: 400;
-                "
+                ">（二）满足一定经营条件（如近365天确认收货金额&gt;=120万且近12个自然月持续有成交）</span>
-                >（二）满足一定经营条件（如近365天确认收货金额&gt;=120万且近12个自然月持续有成交）</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="font-family: 'Helvetica', sans-serif; font-weight: 400"><br /></span>
-                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
-                ><br
-              /></span>
             </p>
             <p style="font-size: 15px">
-              <span
+              <span style="
-                style="
                   font-family: 'Helvetica-Bold', 'Helvetica Bold', 'Helvetica',
                     sans-serif;
                   font-weight: 700;
-                "
+                ">4</span><span style="
-                >4</span
-              ><span
-                style="
                   font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
                     'PingFang SC', sans-serif;
                   font-weight: 650;
-                "
+                ">、我已经开过西夏聚宝回收店，现在想要注销原来的店铺重新开店，可以吗?</span>
-                >、我已经开过西夏聚宝回收店，现在想要注销原来的店铺重新开店，可以吗?</span
-              >
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="font-family: 'Helvetica', sans-serif; font-weight: 400"><br /></span>
-                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
-                ><br
-              /></span>
             </p>
             <p style="font-size: 13px">
-              <span
+              <span style="
-                style="
                   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                   font-weight: 400;
-                "
+                ">答：满足条件就可以注销。具体请参考：如何注销西夏聚宝回收店铺。</span>
-                >答：满足条件就可以注销。具体请参考：如何注销西夏聚宝回收店铺。</span
-              >
             </p>
           </div>
         </div>
         <div class="step step2" v-if="active == 2">
-          <el-form
+          <el-form :model="dataForm" :rules="dataRule" ref="ruleForStep1" label-width="100px" class="demo-ruleForm">
-            :model="dataForm"
+            <el-form-item label="手机号">
-            :rules="dataRule"
+              <el-input v-model="dataForm.propertyJson.managerTelePhone"></el-input>
-            ref="ruleForStep1"
-            label-width="100px"
-            class="demo-ruleForm"
-          >
-            <el-form-item label="手机号" prop="iphone">
-              <el-input
-                v-model="dataForm.propertyJson.managerTelePhone"
-              ></el-input>
             </el-form-item>
             <el-form-item label="验证码" prop="code">
               <el-input v-model="dataForm.code"></el-input>
@@ -215,46 +138,28 @@
               <el-input v-model="dataForm.propertyJson.address"></el-input>
             </el-form-item>
             <el-form-item label="商户LOGO" prop="logo">
-              <JnpfUploadImg
+              <JnpfUploadImg v-model="dataForm.pictures" @change="changeData('stationImg', -1)" :fileSize="10"
-                v-model="dataForm.pictures"
+                sizeUnit="MB" :limit="2" pathType="defaultPath" :isAccount="0">
-                @change="changeData('stationImg', -1)"
-                :fileSize="10"
-                sizeUnit="MB"
-                :limit="2"
-                pathType="defaultPath"
-                :isAccount="0"
-              >
               </JnpfUploadImg>
             </el-form-item>
           </el-form>
         </div>
         <div class="step step3" v-if="active == 3">
-          <el-form
+          <el-form :model="dataForm" ref="ruleForStep2" label-width="160px" class="demo-ruleForm">
-            :model="dataForm"
-            ref="ruleForStep2"
-            label-width="160px"
-            class="demo-ruleForm"
-          >
             <el-form-item label="注册人姓名" prop="people">
               <el-input v-model="dataForm.propertyJson.managerName"></el-input>
             </el-form-item>
-            <el-form-item label="注册人身份证号" prop="code">
+            <el-form-item label="注册人身份证号" prop="idCard">
               <el-input v-model="dataForm.propertyJson.idCard"></el-input>
             </el-form-item>
             <el-form-item label="注册名称" prop="name">
-              <el-input
+              <el-input v-model="dataForm.propertyJson.registeredName"></el-input>
-                v-model="dataForm.propertyJson.registeredName"
-              ></el-input>
             </el-form-item>
             <el-form-item label="社会信用代码证号" prop="location">
-              <el-input
+              <el-input v-model="dataForm.propertyJson.socialCreditCode"></el-input>
-                v-model="dataForm.propertyJson.socialCreditCode"
-              ></el-input>
             </el-form-item>
             <el-form-item label="注册地址" prop="location">
-              <el-input
+              <el-input v-model="dataForm.propertyJson.registeredAddress"></el-input>
-                v-model="dataForm.propertyJson.registeredAddress"
-              ></el-input>
             </el-form-item>
             <el-form-item label="注册人手持身份证照片" prop="logo">
               <!-- <el-upload
@@ -294,27 +199,13 @@
                   </span>
                 </div>
               </el-upload> -->
-              <JnpfUploadImg
+              <JnpfUploadImg v-model="dataForm.societyPictures" @change="changeData('stationImg', -1)" :fileSize="10"
-                v-model="dataForm.societyPictures"
+                sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
-                @change="changeData('stationImg', -1)"
-                :fileSize="10"
-                sizeUnit="MB"
-                :limit="1"
-                pathType="defaultPath"
-                :isAccount="0"
-              >
               </JnpfUploadImg>
             </el-form-item>
             <el-form-item label="社会信用代码证照片" prop="logo">
-              <JnpfUploadImg
+              <JnpfUploadImg v-model="dataForm.registrantPictures" @change="changeData('stationImg', -1)" :fileSize="10"
-                v-model="dataForm.registrantPictures"
+                sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
-                @change="changeData('stationImg', -1)"
-                :fileSize="10"
-                sizeUnit="MB"
-                :limit="1"
-                pathType="defaultPath"
-                :isAccount="0"
-              >
               </JnpfUploadImg>
             </el-form-item>
           </el-form>
@@ -332,9 +223,7 @@
         <template v-if="active == 3">
           <el-button @click="pre">上一步</el-button>
 
-          <el-button type="primary" :loading="btnLoading" @click="complete()"
+          <el-button type="primary" :loading="btnLoading" @click="complete()">完成</el-button>
-            >完成</el-button
-          >
         </template>
       </span>
     </el-dialog>
@@ -420,18 +309,15 @@ export default {
       uploadLimit: 2,
       disabled: false,
       hideUploadEdit: false,
-      rules1: {
+      dataRule: {
         iphone: [{ required: true, validator: validatePhone, trigger: "blur" }],
-        code: [
-          { required: true, message: "请选择收入验证码", trigger: "change" },
-        ],
         fullName: [
           { required: true, message: "请输入商户名称", trigger: "change" },
         ],
-        // location: [
+        code: [
-        //   { required: true, message: "请选择位置", trigger: "change" },
+          { required: true, message: "请输入验证码为000000", trigger: "change" },
-        // ],
+        ],
-        // logo: [{ required: true, message: "请上传logo", trigger: "change" }],
+
       },
 
       rules2: {},
@@ -568,15 +454,16 @@ export default {
   background: linear-gradient(90deg, #9064ff 3%, #5996fd 97%);
   padding: 40px;
 
-  >>> .el-dialog {
+  >>>.el-dialog {
-    .el-dialog__body {
+    .el-dialog__body {}
-    }
   }
+
   .step {
     margin: 40px 100px;
     // height: 300px;
     overflow: auto;
   }
+
   .step1 {
     // height: 300px;
   }
@@ -584,9 +471,11 @@ export default {
   .step2 {
     //  height: 300px;
   }
+
   .step3 {
     height: 600px;
   }
+
   .foot {
     position: absolute;
     width: 100%;

jnpf-java-boot/jnpf-web/src/views/nxwallet/index.vue

@@ -113,7 +113,7 @@
                             <el-button v-if="scope.row.rechargeStatus == '未充值'" type="text" class="JNPF-table-delBtn"
                                 @click="addA(scope.row.id)">已支付
                             </el-button>
-                            <el-button v-if="scope.row.rechargeStatus == '已充值' && scope.row.orderStatus == '未出账'"
+                            <el-button v-if="scope.row.rechargeStatus == '已充值' && scope.row.orderStatus == '未入账'"
                                 type="text" @click="addA(scope.row.id)">确认已收款
                             </el-button>
 

jnpf-java-boot/jnpf-web/src/views/publicPopup/housingEstateBox.vue

@@ -1,57 +1,29 @@
 <template>
-  <el-dialog
+  <el-dialog title="选择小区" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
-    title="选择小区"
+    lock-scroll append-to-body width="800px">
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-    class="JNPF-dialog JNPF-dialog_center"
-    lock-scroll
-    append-to-body
-    width="800px"
-  >
     <el-row class="JNPF-common-search-box" :gutter="16">
       <el-form @submit.native.prevent>
         <el-col :span="10">
           <el-form-item label="关键词">
-            <el-input
+            <el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
-              v-model="keyword"
-              placeholder="请输入关键词查询"
-              clearable
-              @keyup.enter.native="search()"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="search()"
+            <el-button type="primary" icon="el-icon-search" @click="search()">{{ $t("common.search") }}
-              >{{ $t("common.search") }}
             </el-button>
-            <el-button icon="el-icon-refresh-right" @click="refresh()"
+            <el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t("common.reset") }}
-              >{{ $t("common.reset") }}
             </el-button>
           </el-form-item>
         </el-col>
       </el-form>
       <div class="JNPF-common-search-box-right">
-        <el-tooltip
+        <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-          effect="dark"
+          <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
-          :content="$t('common.refresh')"
-          placement="top"
-        >
-          <el-link
-            icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
-            :underline="false"
-            @click="search()"
-          />
         </el-tooltip>
       </div>
     </el-row>
-    <JNPF-table
+    <JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
-      v-loading="listLoading"
-      :data="list"
-      hasC
-      @selection-change="handleSelectionChange"
-      :border="false"
-    >
       <el-table-column prop="name" label="小区名" align="left">
       </el-table-column>
       <el-table-column prop="address" label="小区详细地址" align="left">
@@ -60,21 +32,12 @@
       </el-table-column>
       <el-table-column prop="latitude" label="纬度" align="left">
       </el-table-column>
-      <el-table-column
+      <el-table-column prop="hasSchedule" label="是否是定时定点回收" align="left">
-        prop="hasSchedule"
-        label="是否是定时定点回收"
-        align="left"
-      >
       </el-table-column>
       <el-table-column prop="recycleAddress" label="定点回收地址" align="left">
       </el-table-column>
     </JNPF-table>
-    <pagination
+    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
-      :total="total"
-      :page.sync="listQuery.currentPage"
-      :limit.sync="listQuery.pageSize"
-      @pagination="init"
-    />
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{
     $t("common.cancelButton")
@@ -162,7 +125,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
->>> .el-dialog__body {
+>>>.el-dialog__body {
   height: 70vh;
   padding: 0 0 10px !important;
   display: flex;