Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into xiexiang-dev

.env.pre

@@ -6,7 +6,7 @@ NODE_ENV = 'pre'
 
 # 中正云教育管理后台/预发布环境
 # 预发布
-VUE_APP_BASE_API = 'http://192.168.1.222:8077/'
+VUE_APP_BASE_API = 'https://devpc.gdzzkj.net/'
 VUE_APP_IMG_API = 'https://file.xyyxt.net'
 
 # 路由懒加载

.gitignore

@@ -10,6 +10,7 @@ yarn-error.log*
 tests/**/coverage/
 tests/e2e/reports
 selenium-debug.log
+/dist.rar
 
 # Editor directories and files
 .idea

src/views/financed/components/refund/dislogSet.vue

@@ -101,7 +101,8 @@
           </ul>
         </div>
       </template>
-      <template v-if="form.checkType === 3">
+      <!-- v-if="form.checkType === 3" ↓ -->
+      <template>
         <!-- <em>订单信息：</em>
         <p>
           支付金额：<span
@@ -127,7 +128,10 @@
         <el-divider></el-divider>
         <em>支付方式：</em>
         <el-tag type="success" v-if="form.payType === 1">原路返回</el-tag>
-        <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag>
+        <el-tag type="danger" v-else-if="form.payType === 2 || form.payType === 5">网银支付</el-tag>
+        <el-tag type="danger" v-else-if="form.payType === 6">协议</el-tag>
+        <el-tag type="danger" v-else-if="form.payType === 7">对公转账</el-tag>
+        <el-tag type="danger" v-else>线下转账</el-tag>
       </template>
 
       <div v-if="formPay.toBankAcount" style="margin-top: 24px">

src/views/financed/subscription/dislog.vue

@@ -123,9 +123,15 @@ export default {
     };
   },
   methods: {
-    init() {},
+    init() {
+      this.formData = {
+        incomeName: "广东省祥粤建设职业培训学校",
+        incomeBank: "工商银行广州花城支行",
+        incomeAccount: "3602201209100091295",
+      };
+    },
     close() {
-      this.$refs["formData"].resetFields();
+      this.$refs["formData"].clearValidate();
     },
     submitForm() {
       this.$refs["formData"].validate((valid) => {