Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

src/views/user_manage/user_list.vue

@@ -97,14 +97,6 @@
                 <el-dropdown-item>增减余额</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <!-- <el-button type="text" @click="editPop(scope.row)">增减余额</el-button> -->
-            <!-- <el-button type="text" @click="">历史订单</el-button>
-            <el-button type="text" @click="">充值记录</el-button> -->
-
-            <!-- <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
-                            <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
-                                slot="reference">删除</el-button>
-                        </el-popconfirm> -->
           </template>
         </el-table-column>
       </el-table>
@@ -162,13 +154,13 @@
             <el-radio label="out">扣除</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="余额">
+        <el-form-item label="金额">
           <el-input v-model="userinfo.amount" @input="amountNum" style="width: 200px;"></el-input>
         </el-form-item>
         <el-form-item label="类型">
           <el-radio-group v-model="userinfo.type">
-            <el-radio label="consume">消费</el-radio>
-            <el-radio label="inMoney ">充值退款</el-radio>
+            <el-radio label="consume">充值</el-radio>
+            <el-radio label="inMoney ">消费退款</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -208,7 +200,8 @@ export default {
       userinfo: {
         nickName: '',
         operationType: 'in',
-        type: 'consume'
+        type: 'consume',
+        amount: ''
       },
       userinfos: {
         levelConsume: "0",
@@ -232,9 +225,9 @@ export default {
     checkIfNum() {
       this.userinfos.telephone = this.userinfos.telephone.toString().replace(/\D/g, '');
     },
-    amountNum(){
+    amountNum() {
       this.userinfo.amount = this.userinfo.amount.toString().replace(/[^\d|\.]/g, '')
-      
+
     },
     handleClose() {
       this.dialogVisible = false
@@ -261,6 +254,7 @@ export default {
       this.userinfo.nickName = d.nickName
       this.userinfo.amounts = d.amount
       this.userinfo.id = d.id
+      this.userinfo.amount = ""
     },
     edituser(d) {
       let obj = { ...d }