Merge branch 'master' of http://git.weirui0755.com/liweiliang/bitcopay-ui

src/views/login.vue

@@ -27,15 +27,14 @@
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
+          placeholder="谷歌验证码"
           @keyup.enter.native="handleLogin"
         >
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
+<!--        <div class="login-code">-->
+<!--          <img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
+<!--        </div>-->
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
@@ -104,7 +103,7 @@ export default {
     }
   },
   created() {
-    this.getCode();
+    // this.getCode();
     this.getCookie();
   },
   methods: {

src/views/user/coin/index.vue

@@ -45,28 +45,28 @@
           v-hasPermi="['user:coin:add']"
         >新增</el-button>
       </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['user:coin:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['user:coin:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['user:coin:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['user:coin:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -140,7 +140,7 @@
         </el-select>
         </el-form-item> -->
        <el-form-item label="类型" prop="feeType">
-         <el-select v-model="form.feeType" placeholder="请选择状态" clearable size="small">
+         <el-select v-model="form.feeType" placeholder="请选择类型" clearable size="small">
            <el-option v-for="dict in feeTypeOptions" :key="dict.dictValue" :label="dict.dictLabel"
              :value="dict.dictValue" />
          </el-select>
@@ -315,7 +315,7 @@ export default {
         sort: null,
         cnyRate: null,
         usdRate: null,
-         status: '0',
+        status:'1',
         withdrawScale: null,
         withdrawThreshold: null
       };
@@ -351,6 +351,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改币种配置";
+        this.form.status=response.data.status+"";
       });
     },
     /** 提交按钮 */

src/views/user/wallet/index.vue

@@ -135,7 +135,9 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-
+        <el-form-item label="谷歌验证码" prop="googleSecret">
+          <el-input v-model="form.googleSecret" placeholder="请输入备注" />
+        </el-form-item>
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -185,6 +187,17 @@ export default {
       },
       // 表单参数
       form: {},
+      rules: {
+        alterationType: [
+          { required: true, message: "类型不能为空", trigger: "blur" }
+        ],
+        updateAmount: [
+          { required: true, message: "金额不能为空", trigger: "blur" }
+        ],
+        googleSecret: [
+          { required: true, message: "谷歌验证码不能为空", trigger: "blur" }
+        ],
+      }
 
     };
   },
@@ -217,7 +230,8 @@ export default {
         frozenBalance: null,
         isEnable: null,
         createTime: null,
-        updateTime: null
+        updateTime: null,
+        googleSecret:null
       };
       this.resetForm("form");
     },