易宝支付相关逻辑提交，订单提交

src/views/his/company/index.vue

@@ -560,19 +560,20 @@
             inactive-color="#ff4949"
             active-value="Y"
             inactive-value="N"
+            disabled
           >
           </el-switch>
         </el-form-item>
-        <el-form-item label="是否净值分账" v-if="revenueForm.percentageFlag == 'Y'">
-          <el-switch
-            v-model="revenueForm.iscCleanSplit"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            active-value="Y"
-            inactive-value="N"
-          >
-          </el-switch>
-        </el-form-item>
+<!--        <el-form-item label="是否净值分账" v-if="revenueForm.percentageFlag == 'Y'">-->
+<!--          <el-switch-->
+<!--            v-model="revenueForm.iscCleanSplit"-->
+<!--            active-color="#13ce66"-->
+<!--            inactive-color="#ff4949"-->
+<!--            active-value="Y"-->
+<!--            inactive-value="N"-->
+<!--          >-->
+<!--          </el-switch>-->
+<!--        </el-form-item>-->
         <div v-if="revenueForm.divFlag == 1">
           <el-form-item label="分账接收方配置">
             <el-tooltip content="批量设置分账接收账户" placement="top">
@@ -599,9 +600,9 @@
               </el-button>
             </div>
 
-            <el-form-item label="分账接收方ID" :prop="`acctInfos.${index}.huifuId`">
-              <el-input v-model="account.huifuId"   placeholder="斗拱开户时生成；示例值：6666000123120001"></el-input>
-            </el-form-item>
+<!--            <el-form-item label="分账接收方ID" :prop="`acctInfos.${index}.huifuId`">-->
+<!--              <el-input v-model="account.huifuId"   placeholder="斗拱开户时生成；示例值：6666000123120001"></el-input>-->
+<!--            </el-form-item>-->
             <el-form-item label="账户号" :prop="`acctInfos.${index}.acctId`" >
               <el-input v-model="account.acctId"  placeholder="可指定账户号，仅支持基本户、现金户，不填默认为基本户；示例值：F00598600"></el-input>
             </el-form-item>
@@ -940,7 +941,7 @@ export default {
           }
         }
       })
-
+      this.revenueForm.percentageFlag = 'Y'
       this.revenue.open = true
     },
     handleRecharge(row) {

src/views/hisStore/components/productOrder.vue

@@ -24,7 +24,7 @@
           <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
         </div>
         <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >
-          <el-button size="mini" @click="showExpress()" v-if="false">查看物流</el-button>
+          <el-button size="mini" @click="showExpress()">查看物流</el-button>
         </div>
         <div class="operate-button-container" v-if="order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
           <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>

src/views/system/config/config.vue

@@ -181,6 +181,9 @@
           <el-form-item label="用户协议" prop="userRegister">
             <editor v-model="form3.userRegister" :min-height="292"/>
           </el-form-item>
+          <el-form-item label="鸿良用户协议" prop="userRegister2">
+            <editor v-model="form3.userRegister2" :min-height="292"/>
+          </el-form-item>
           <el-form-item label="隐私协议" prop="userPrivacy">
             <editor v-model="form3.userPrivacy" :min-height="292"/>
           </el-form-item>
@@ -546,17 +549,44 @@
               <el-radio label="hf">汇付</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="appId" prop="appId">
-            <el-input v-model="form9.appId" label="请输入appId"></el-input>
-          </el-form-item>
-          <el-form-item v-if="form9.type=='yb'" label="易宝商户号" prop="ybAccount">
-            <el-input v-model="form9.ybAccount" label="请输入易宝商户号"></el-input>
-          </el-form-item>
-          <el-form-item v-if="form9.type=='yb'" label="易宝Key" prop="ybKey">
-            <el-input v-model="form9.ybKey" label="请输入易宝Key"></el-input>
-          </el-form-item>
-          <el-form-item v-if="form9.type=='yb'" label="易宝回调地址" prop="ybNotifyUrl">
-            <el-input v-model="form9.ybNotifyUrl" label="易宝回调地址"></el-input>
+<!--          <el-form-item label="appId" prop="appId">-->
+<!--            <el-input v-model="form9.appId" label="请输入appId"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item v-if="form9.type=='yb'" label="易宝商户号" prop="ybAccount">-->
+<!--            <el-input v-model="form9.ybAccount" label="请输入易宝商户号"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item v-if="form9.type=='yb'" label="易宝Key" prop="ybKey">-->
+<!--            <el-input v-model="form9.ybKey" label="请输入易宝Key"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item v-if="form9.type=='yb'" label="易宝回调地址" prop="ybNotifyUrl">-->
+<!--            <el-input v-model="form9.ybNotifyUrl" label="易宝回调地址"></el-input>-->
+<!--          </el-form-item>-->
+          <el-form-item v-if="form9.type=='yb'" label="AppKey(回调解密)" prop="ybAppKey">
+            <el-input v-model="form9.ybAppKey" placeholder="SDK配置的app_key，用于回调解密，如app_10092979478"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='yb'" label="聚合支付商户号" prop="ybMerchantNo">
+            <el-input v-model="form9.ybMerchantNo" placeholder="聚合支付用商户号，与旧商户号相同时可不填"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='yb'" label="父商户号(服务商)" prop="ybParentMerchantNo">
+            <el-input v-model="form9.ybParentMerchantNo" placeholder="服务商模式下的父商户号"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='yb'" label="支付回调地址" prop="ybPayNotifyUrl">
+            <el-input v-model="form9.ybPayNotifyUrl" placeholder="聚合支付回调地址"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='yb'" label="退款回调地址" prop="ybRefundNotifyUrl">
+            <el-input v-model="form9.ybRefundNotifyUrl" placeholder="聚合支付退款回调地址"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='yb'" label="分账回调地址" prop="ybDivideNotifyUrl">
+            <el-input v-model="form9.ybDivideNotifyUrl" placeholder="聚合支付分账回调地址"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='yb'" label="清算回调地址" prop="ybCsNotifyUrl">
+            <el-input v-model="form9.ybCsNotifyUrl" placeholder="聚合支付清算回调地址（清算成功后才可发起退款和分账）"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='yb'" label="默认场景" prop="ybDefaultScene">
+            <el-select v-model="form9.ybDefaultScene" placeholder="请选择默认场景" clearable>
+              <el-option label="线上(ONLINE)" value="ONLINE"></el-option>
+              <el-option label="线下(OFFLINE)" value="OFFLINE"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item v-if="form9.type=='tz'" label="台州商户号" prop="tzPlatMerCstNo">
             <el-input v-model="form9.tzPlatMerCstNo" label="请输入台州商户号"></el-input>

src/views/system/role/index.vue

@@ -37,6 +37,22 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="角色类型" prop="roleType">
+        <el-select
+          v-model="queryParams.roleType"
+          placeholder="角色类型"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in roleTypeOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
@@ -108,6 +124,11 @@
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
+      <el-table-column label="角色类型" align="center" width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="roleTypeOptions" :value="scope.row.roleType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" width="100">
         <template slot-scope="scope">
           <el-switch
@@ -189,6 +210,16 @@
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="角色类型" prop="roleType">
+          <el-select v-model="form.roleType" placeholder="请选择角色类型" style="width: 100%">
+            <el-option
+              v-for="dict in roleTypeOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否可以查看手机全号" v-if="isAdmin == 1">
           <span slot="label">
             <el-tooltip content="是否可以查看手机全号" placement="top">
@@ -309,6 +340,13 @@ export default {
       dateRange: [],
       // 状态数据字典
       statusOptions: [],
+      // 角色类型选项
+      roleTypeOptions: [
+        { value: 0, label: '普通角色' },
+        { value: 1, label: '系统管理员' },
+        { value: 2, label: '安全管理员' },
+        { value: 3, label: '审计管理员' }
+      ],
       // 数据范围选项
       dataScopeOptions: [
         {
@@ -472,6 +510,7 @@ export default {
         roleKey: undefined,
         roleSort: 0,
         status: "0",
+        roleType: 0,
         isCheckPhone:0,
         menuIds: [],
         deptIds: [],

src/views/system/user/index.vue

@@ -192,7 +192,7 @@
                   <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                     <el-dropdown-item command="handleSetUser" icon="el-icon-warning-outline"
-                    v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>  
+                    v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -446,8 +446,8 @@ export default {
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          { required: true, message: '请输入密码', trigger: 'blur' },
+          { pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/, message: '密码需包含大小写字母、数字和特殊字符，长度8-20位', trigger: 'blur' }
         ],
         email: [
           {
@@ -578,7 +578,7 @@ export default {
           break;
         case "handleSetUser":
           this.handleSetUser(row);
-          break  
+          break
         default:
           break;
       }
@@ -751,4 +751,4 @@ export default {
     }
   }
 };
-</script>
+</script>