Merge branch 'dev_wm' into 'master'

Dev wm

See merge request !94

H5/src/api/bank.js

@@ -76,3 +76,17 @@ export function getBankList() {
     method: "get"
   });
 }
+
+
+
+/**
+ * 获取扣稅説明
+ * @returns
+ */
+export function getTaxRate(params) {
+    return request({
+        url: "/bank/getTaxRate",
+        method: "get",
+        params
+    });
+}

H5/src/views/cashOut/cash-out.vue

@@ -31,11 +31,15 @@
         <p class="explain">
           <span>扣税说明</span>
           <img
+            @click="taxtClick"
             class="explain-img"
             src="@/assets/images/explain.png"
             alt="解释"
           />
         </p>
+        <p class="explain">
+          <span>{{this.textName}}</span>
+        </p>
       </div>
     </div>
     <div style="padding: 10px 16px">
@@ -85,7 +89,7 @@
 
 <script>
 import { getWithdrawalAmount } from "@/api/wallet";
-import { getUserBankInfo, sendSms, cashOut } from "@/api/bank";
+import { getUserBankInfo, sendSms, cashOut,getTaxRate } from "@/api/bank";
 import BaseDialog from "@/components/BaseDialog.vue";
 export default {
   components: { BaseDialog },
@@ -102,6 +106,7 @@ export default {
       resultDialogTip: "",
       resultDialogImg: "",
       resultDialog: false,
+      textName:'',
       validCodeDialogShow: false,
       validCode: null
     };
@@ -159,6 +164,16 @@ export default {
       this.validCode = null;
       this.validCodeDialogShow = true;
     },
+      taxtClick(){
+            const params = {
+                money: 1
+            }
+          getTaxRate(params).then(res => {
+              if (res.code === 0) {
+                 this.textName = res.data.taxDesc
+              }
+          });
+      },
     getUserInfo() {
       const params = {
         userId: this.$userId

H5/src/views/invite.vue

@@ -52,7 +52,7 @@ export default {
         binaryString[len] = String.fromCharCode(uInt8Array[len]);
       }
       let data = window.btoa(binaryString.join(""));
-      let imageType = "image/jpeg";
+      let imageType = "image/png";
       let imageUrl = "data:" + imageType + ";base64," + data;
       return imageUrl;
     }