Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!148

src/views/business/coupon/add.vue

@@ -179,7 +179,7 @@ export default {
   methods: {
     update() {
       if (this.addData.type == 1) {
-        if(this.addData.useArea !== 0 && this.addData.useArea !== 1 && this.addData.useArea !== 2) {
+        if(this.addData.useArea !== 0 && this.addData.useArea !== 1 && this.addData.useArea !== 3 && this.addData.useArea !== 4) {
           this.$message({
             message: '请选择使用范围！',
             type: 'warning'

src/views/finance/withdraw/components/Detail.vue

@@ -43,13 +43,13 @@
           <el-form-item label="持卡人：">
             <span>{{ info.userName || "--" }}</span>
           </el-form-item>
-          <el-form-item label="开户行：">
-            <span>{{ info.branchName || "--" }}</span>
+          <el-form-item label="银行：">
+            <span>{{ info.bankName || "--" }}</span>
           </el-form-item>
         </div>
         <div class="form-flex">
-          <el-form-item label="银行：">
-            <span>{{ info.bankName || "--" }}</span>
+          <el-form-item label="开户行：">
+            <span>{{ info.branchName || "--" }}</span>
           </el-form-item>
         </div>
       </el-form>