Merge branch 'feature/Feature-basic_data' into develop

src/api/basic_data/wallet_list.js

@@ -23,4 +23,12 @@ export function getWalletBiandMain(params) {
     method: 'post',
     params
   })
+}
+//现金钱包详情
+export function getWalletDetail(params) {
+  return request({
+    url: '/wallet/detail',
+    method: 'get',
+    params
+  })
 }

src/views/basic_data/taker/taker_list.vue

@@ -236,22 +236,28 @@
               <el-input v-model="addForm.phone"></el-input> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="验证码" prop="code">
-              <el-row :gutter="6">
-                <el-col :span="14">
+            <el-row :gutter="0">
+              <el-col :span="14">
+                <el-form-item label="验证码" prop="code">
                   <el-input v-model="addForm.code" />
-                </el-col>
-                <el-col :span="9">
-                  <el-button v-show="show" type="info" @click="getCodeFn"
-                    >获取验证码</el-button
-                  >
-                  <el-button v-show="!show" type="info"
-                    >{{ count }}s后重新获取</el-button
-                  >
-                </el-col>
-              </el-row>
-            </el-form-item></el-col
-          >
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-button v-show="show" type="info" @click="getCodeFn"
+                  >获取验证码</el-button
+                >
+                <el-button
+                  v-show="!show"
+                  :style="{
+                    backgroundColor: '#409eff',
+                    border: '0',
+                  }"
+                  type="info"
+                  >{{ count }}s后重新获取</el-button
+                >
+              </el-col>
+            </el-row>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -306,6 +312,7 @@ export default {
   data() {
     return {
       baseURL: process.env.VUE_APP_BASE_API,
+
       fileList: [],
       listLoading: false, // 列表加载loading
       currentPage: 1, // 当前页码
@@ -439,7 +446,7 @@ export default {
       } else {
         this.$refs.addForm.resetFields();
       }
-
+      this.count = 0;
       this.dialogForm = false;
     },
     //上传
@@ -554,6 +561,7 @@ export default {
       //   expireTime: "",
       //   code: "",
       // };
+      this.count = 0;
       this.getDataList({ pageNum: 1, pageSize: 10 });
       this.dialogForm = false;
     },
@@ -585,6 +593,7 @@ export default {
 }
 ::v-deep .el-col-9 .el-button {
   padding: 5px;
+  margin: 6px;
 }
 ::v-deep .el-dialog__header {
   background-color: #dddddd;

src/views/basic_data/wallet/wallet_list.vue

@@ -152,6 +152,7 @@ import {
   getWalletList,
   getProductCategory,
   getWalletBiandMain,
+  getWalletDetail,
 } from "@/api/basic_data/wallet_list";
 export default {
   data() {
@@ -207,9 +208,9 @@ export default {
     },
     //取消
     cancelFn() {
-      this.addForm.isRebate = null;
-      this.addForm.isZr = null;
-      this.addForm.mainId = "";
+      // this.addForm.isRebate = null;
+      // this.addForm.isZr = null;
+      // this.addForm.mainId = "";
       this.dialogForm = false;
     },
     //搜索
@@ -222,11 +223,19 @@ export default {
       this.categoryList = res.data;
     },
     //设置产品大类
-    setFn(value) {
+    async setFn(value) {
       console.log(value);
       this.walletId = value.id;
-      this.addForm.name = value.name;
-      this.addForm.number = value.number;
+      // this.addForm.name = value.name;
+      // this.addForm.number = value.number;
+      let res = await getWalletDetail({ walletId: value.id });
+      console.log(res);
+      this.addForm.name = res.data.name;
+      this.addForm.number = res.data.number;
+      this.addForm.mainId = res.data.mainId;
+      this.addForm.isRebate = res.data.isRebate;
+      this.addForm.isZr = res.data.isZr;
+
       this.dialogForm = true;
     },
     //获取列表数据