Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into feature/GFRS-1036【待确定】微信支付-卡单微信支付

# Conflicts:
#	src/views/ebiz/cardList/Pay.vue

src/views/ebiz/cardList/Pay.vue

@@ -45,32 +45,61 @@
           clearable
           required
         />
-        <van-field
-          v-model="underWriteData.bankCode"
-          maxlength="19"
-          :readonly="orderStatus != '56'"
-          label="银行卡号"
-          name="银行卡号"
-          placeholder="请输入"
-          required
-          clearable
-          v-validate="'required|bankCard'"
-          data-vv-name="银行卡号"
-        >
-          <van-button slot="button" v-if="orderStatus == '56'" size="small" type="danger" round @click="cardScanning('0')">银行卡扫描</van-button>
-        </van-field>
-        <van-field
-          :value="bankListName"
-          label="开户银行"
-          name="开户银行"
-          placeholder="请输入"
-          v-validate="'required'"
-          readonly
-          @click="focus"
-          right-icon="arrow"
-          data-vv-name="开户银行"
-          required
-        />
+
+        <template v-if="noEdit">
+          <van-field
+            v-model="underWriteData.bankCode"
+            maxlength="19"
+            readonly
+            label="银行卡号"
+            name="银行卡号"
+            placeholder="请输入"
+            required
+            clearable
+            v-validate="'required|bankCard'"
+            data-vv-name="银行卡号"
+          >
+          </van-field>
+          <van-field
+            :value="bankListName"
+            label="开户银行"
+            name="开户银行"
+            placeholder="请输入"
+            v-validate="'required'"
+            readonly
+            right-icon="arrow"
+            data-vv-name="开户银行"
+            required
+          />
+        </template>
+        <template v-else>
+          <van-field
+            v-model="underWriteData.bankCode"
+            maxlength="19"
+            label="银行卡号"
+            name="银行卡号"
+            placeholder="请输入"
+            required
+            clearable
+            v-validate="'required|bankCard'"
+            data-vv-name="银行卡号"
+          >
+            <van-button slot="button" size="small" type="danger" round @click="cardScanning('0')">银行卡扫描</van-button>
+          </van-field>
+          <van-field
+            :value="bankListName"
+            label="开户银行"
+            name="开户银行"
+            placeholder="请输入"
+            v-validate="'required'"
+            readonly
+            @click="focus"
+            right-icon="arrow"
+            data-vv-name="开户银行"
+            required
+          />
+        </template>
+
         <!-- <van-field v-model="bank" label="开户银行" placeholder="请选择" required @click="focus" readonly v-validate="'required'" data-vv-name="开户银行" /> -->
       </van-cell-group>
       <!-- 第三方支付所需表单 -->
@@ -138,7 +167,7 @@ Vue.use(Checkbox).use(CheckboxGroup)
 Vue.use(Field)
 Vue.use(Button)
 import { acceptInsurance, getBankList, underWrite, getOrderDetail } from '@/api/ebiz/sale/sale'
-import { saveOrUpdateAccount } from '@/api/ebiz/cardList/cardList.js'
+import { saveOrUpdateAccount, getPayTemp } from '@/api/ebiz/cardList/cardList.js'
 import BankCardScan from '@/components/ebiz/sale/BankCardScan'
 import Loading from '@/components/ebiz/Loading'
 import config from '@/config'
@@ -219,6 +248,7 @@ export default {
       },
       gotPayParam: false, // 是否已正确获取支付参数,
       payStatus: '', // 接口返回的支付状态
+      noEdit: true,
       isWeixin, // 是否为微信环境
       isLoading: false // 分享到微信后的页面loading
     }
@@ -269,6 +299,7 @@ export default {
       // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
       // }
       // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
+      this.getPayTemp()
     }
   },
   beforeRouteLeave(to, from, next) {
@@ -370,9 +401,9 @@ export default {
     },
     // 获取银行列表的focus
     focus() {
-      if (this.orderStatus == '56') {
-        this.show = true
-      }
+      // if (this.orderStatus == '56') {
+      this.show = true
+      // }
     },
     // 获取银行卡列表
     getBankList() {
@@ -396,6 +427,17 @@ export default {
       this.underWriteData.bankName = bankCode
       this.show = false
     },
+    getPayTemp() {
+      getPayTemp({ orderNo: window.localStorage.getItem('orderNo') })
+        .then(res => {
+          if (res.result == '0') {
+            this.noEdit = res.content.flag != 'false'
+          }
+        })
+        .catch(e => {
+          console.error(e)
+        })
+    },
     // 再次支付
     getOrderDetail() {
       getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then(res => {
@@ -489,11 +531,16 @@ export default {
         case '57':
           this.payMent()
           break
-        case '02':
-          this.acceptInsurance()
-          break
+        // case '02':
+        // break
         default:
-          return this.$toast('当前不可支付')
+          if (!this.noEdit) {
+            this.payMent(true)
+            return true
+          } else {
+            this.acceptInsurance()
+            return this.$toast('当前不可支付')
+          }
       }
     },
     acceptInsurance() {
@@ -553,7 +600,7 @@ export default {
       })
     },
     // 点击支付
-    async payMent() {
+    async payMent(flag) {
       let data = {
         orderDTO: {
           orderInfoDTO: {
@@ -592,18 +639,20 @@ export default {
           message: '加载中……'
         })
 
-        let rs = await this.underWrite()
+        if (!flag) {
+          let rs = await this.underWrite()
 
-        if (rs.result != '0') {
-          this.$toast.clear()
-          return this.$toast(rs.resultMessage)
+          if (rs.result != '0') {
+            this.$toast.clear()
+            return this.$toast(rs.resultMessage)
+          }
+
+          if (rs.uwResult != '02') {
+            return this.$toast(rs.message)
+          }
         }
 
-        if (rs.uwResult != '02') {
-          return this.$toast(rs.message)
-        } else {
-          this.acceptInsurance()
-        }
+        this.acceptInsurance()
       } else {
         this.$toast(res.resultMessage)
         this.isLoading = false