kevin_zhangl 3 роки тому
батько
коміт
8728637da2

+ 19 - 7
backendEle/src/views/config/transfer.vue

@@ -16,12 +16,16 @@
           </el-table-column>
           <el-table-column label="转出金额下限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.outMin" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.outMin" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="转出金额上限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.outMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.outMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="手续费%" width="120">
@@ -31,22 +35,30 @@
           </el-table-column>
           <el-table-column label="手续费下限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.feeMin" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.feeMin" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="手续费上限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.feeMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.feeMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="期转出总额上限" width="120">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.weekMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.weekMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="结算月转出总额上限" width="150">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.monthMax" size="small" maxlength="16"></el-input>
+              <el-input v-model="scope.row.monthMax" size="small" maxlength="16">
+                <template slot="append">₦</template>
+              </el-input>
             </template>
           </el-table-column>
           <!--<el-table-column width="90" label="同体系转账">-->
@@ -133,4 +145,4 @@
 
 <style scoped>
 
-</style>
+</style>

+ 8 - 8
backendEle/src/views/user/index.vue

@@ -205,13 +205,13 @@
     </el-dialog>
 
     <el-dialog :title="formModifyProfile.typeName" :visible.sync="dialogModifyProfileVisible" width="50%">
-      <el-form ref="form" :model="formModifyProfile" label-width="120px" class="form-dialog">
-        <el-form-item label="nation"><!-- 民族 -->
-          <el-select v-model="formModifyProfile.nation" placeholder="Please select nationality"><!-- 请选择民族 -->
-            <el-option v-for="(item,index) in allNation" :key="index" :label="item.name"
-                       :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
+      <el-form ref="form" :model="formModifyProfile" label-width="150px" class="form-dialog">
+<!--        <el-form-item label="nation">&lt;!&ndash; 民族 &ndash;&gt;-->
+<!--          <el-select v-model="formModifyProfile.nation" placeholder="Please select nationality">&lt;!&ndash; 请选择民族 &ndash;&gt;-->
+<!--            <el-option v-for="(item,index) in allNation" :key="index" :label="item.name"-->
+<!--                       :value="item.id"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="Member name"><!-- 会员姓名 -->
           <el-input v-model="formModifyProfile.realName"></el-input>
         </el-form-item>
@@ -662,7 +662,7 @@
         // })
       },
       handleExport() {
-        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//(`确定要导出当前数据吗?`, '提示', 
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//(`确定要导出当前数据吗?`, '提示',
           confirmButtonText: 'confirm',//确定
           cancelButtonText: 'cancel',//取消
           type: 'warning'

+ 5 - 5
common/models/forms/UserBasicForm.php

@@ -39,7 +39,7 @@ class UserBasicForm extends Model {
      */
     public function rules() {
         return [
-            [['userId', 'password', 'passwordType','nation','realName', 'mobile','openBank','bankAddress','bankNo','status'], 'trim'],
+            [['userId', 'password', 'passwordType','realName', 'mobile','openBank','bankAddress','bankNo','status'], 'trim'],
             [['userId'], 'required'],
             [['idCard', 'allData'], 'required', 'on'=>['addWithUserName']],
             [['nation','realName', 'mobile', 'idCard', 'openBank', 'bankAddress', 'bankNo'], 'required', 'on'=>'modifyProfile'],
@@ -55,7 +55,7 @@ class UserBasicForm extends Model {
         $parentScenarios = parent::scenarios();
         $customScenarios = [
             'modifyPassword' => ['userId', 'password', 'passwordType'],
-            'modifyProfile' => ['userId','nation','realName','idCard','mobile','openBank','bankAddress','bankNo'],
+            'modifyProfile' => ['userId','realName','idCard','mobile','openBank','bankAddress','bankNo'],
             'modifyStatus' => ['userId','status'],
             'isModifyPasswordStatus' => ['userId','status'],
         ];
@@ -67,7 +67,7 @@ class UserBasicForm extends Model {
             'ID' => 'ID',
             'password' => '密码',
             'passwordType' => '密码类型',
-            'nation' => '民族',
+//            'nation' => '民族',
             'realName' => '真实姓名',
             'idCard' => '身份证号',
             'mobile' => '手机号',
@@ -129,7 +129,7 @@ class UserBasicForm extends Model {
         try {
             $userModel = User::findOne(['ID' => $this->userId]);
             $this->adminOperateLogger->beforeUpdate($userModel);
-            $userModel->NATION = $this->nation;
+//            $userModel->NATION = $this->nation;
             $userModel->REAL_NAME = $this->realName;
             $userModel->MOBILE = $this->mobile;
             $userModel->ID_CARD = $this->idCard;
@@ -144,7 +144,7 @@ class UserBasicForm extends Model {
                 'optType' => '修改会员资料',
                 'userId' => $this->userId,
                 'userName' => $userModel->USER_NAME,
-                'nation' => $this->nation,
+//                'nation' => $this->nation,
                 'realName' => $this->realName,
                 'mobile' => $this->mobile,
                 'idCard' => $this->idCard,