Merge branch 'feature/v1/plb' into 'master'

金额改为查看model

See merge request !11

src/views/financialManagement/income/index.vue

@@ -147,8 +147,12 @@
         align="center"
         align="center"
         prop="amount"
         prop="amount"
         key="amount"
         key="amount"
-        :show-overflow-tooltip="true"
-      />
+        width="100"
+      >
+        <template slot-scope="{ row }">
+          <el-button type="primary" @click="handleLook(row)">查看</el-button>
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="提现状态"
         label="提现状态"
         align="center"
         align="center"
@@ -240,6 +244,22 @@
         <el-button @click="cancel">取 消</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
+
+    <template v-if="openArticleInfo">
+      <el-dialog
+        title="提现金额"
+        :visible.sync="openArticleInfo"
+        width="600px"
+        append-to-body
+      >
+        <div class="contl">
+          <div class="contl-item">
+            <p class="contl-item-label">提现金额：</p>
+            <p class="contl-item-rig">{{ VisitorData.amount }}</p>
+          </div>
+        </div>
+      </el-dialog>
+    </template>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -256,6 +276,8 @@ export default {
   name: "Income",
   name: "Income",
   data() {
   data() {
     return {
     return {
+      openArticleInfo: false,
+      VisitorData: {},
       // 按钮loading
       // 按钮loading
       buttonLoading: false,
       buttonLoading: false,
       // 遮罩层
       // 遮罩层
@@ -299,6 +321,10 @@ export default {
     this.getList();
     this.getList();
   },
   },
   methods: {
   methods: {
+    handleLook(row) {
+      this.VisitorData = row;
+      this.openArticleInfo = true;
+    },
     clickBH(row, status) {
     clickBH(row, status) {
       updateIncome({
       updateIncome({
         id: row.id,
         id: row.id,
@@ -438,3 +464,21 @@ export default {
   },
   },
 };
 };
 </script>
 </script>
+
+<style lang="scss" scoped>
+.contl {
+  padding: 20px;
+  width: calc(100 - 40px);
+  color: #333333;
+  font-size: 16px;
+  &-item {
+    display: flex;
+    &-label {
+      width: 20%;
+    }
+    &-rig {
+      width: 80%;
+    }
+  }
+}
+</style>

src/views/financialManagement/paymentRecord/index.vue

@@ -106,8 +106,12 @@
         align="center"
         align="center"
         prop="money"
         prop="money"
         key="money"
         key="money"
-        :show-overflow-tooltip="true"
-      />
+        width="100"
+      >
+        <template slot-scope="{ row }">
+          <el-button type="primary" @click="handleLook(row)">查看</el-button>
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="用户"
         label="用户"
         align="center"
         align="center"
@@ -190,6 +194,22 @@
         <el-button @click="cancel">取 消</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
+
+    <template v-if="openArticleInfo">
+      <el-dialog
+        title="金额"
+        :visible.sync="openArticleInfo"
+        width="600px"
+        append-to-body
+      >
+        <div class="contl">
+          <div class="contl-item">
+            <p class="contl-item-label">金额：</p>
+            <p class="contl-item-rig">{{ VisitorData.money }}</p>
+          </div>
+        </div>
+      </el-dialog>
+    </template>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -206,6 +226,8 @@ export default {
   name: "PaymentRecord",
   name: "PaymentRecord",
   data() {
   data() {
     return {
     return {
+      openArticleInfo: false,
+      VisitorData: {},
       // 按钮loading
       // 按钮loading
       buttonLoading: false,
       buttonLoading: false,
       // 遮罩层
       // 遮罩层
@@ -248,6 +270,10 @@ export default {
     this.getList();
     this.getList();
   },
   },
   methods: {
   methods: {
+    handleLook(row) {
+      this.VisitorData = row;
+      this.openArticleInfo = true;
+    },
     /** 查询支付订单列表 */
     /** 查询支付订单列表 */
     getList() {
     getList() {
       this.loading = true;
       this.loading = true;
@@ -375,3 +401,21 @@ export default {
   },
   },
 };
 };
 </script>
 </script>
+
+<style lang="scss" scoped>
+.contl {
+  padding: 20px;
+  width: calc(100 - 40px);
+  color: #333333;
+  font-size: 16px;
+  &-item {
+    display: flex;
+    &-label {
+      width: 20%;
+    }
+    &-rig {
+      width: 80%;
+    }
+  }
+}
+</style>
\ No newline at end of file