fix:合并支付开发

package.json

@@ -36,6 +36,7 @@
     "@hips/plugin-vue-jssdk": "^1.1.2",
     "@vant/area-data": "^1.3.2",
     "axios": "^0.27.2",
+    "big.js": "^6.2.1",
     "crypto-js": "^4.1.1",
     "moment": "^2.29.4",
     "pinia": "^2.0.23",

src/App.vue

@@ -42,8 +42,8 @@ export default {
   methods: {
     async getBusinessToken(jumpRouter) {
       if (import.meta.env.VITE_LOCAL == 'true') {
-        window.localStorage.setItem('userId', 17)  //5
-        window.localStorage.setItem('phone', "17864386578")  //17864386578
+        window.localStorage.setItem('userId', 5)  //5
+        window.localStorage.setItem('phone', "18762670654")  //17864386578 ; 18762670654
       }
       const baseURL = import.meta.env.VITE_LOCAL== 'true' ? '/api' : import.meta.env.VITE_HTTP_BASE_URL
       let res = await post(`${baseURL}/app/api/app/user/token/get`, {

src/modules/makeRepayment/components/Pay.vue

@@ -15,7 +15,7 @@
     </div>
     <div class="pay-money-content">
       <Field v-model="orderAmount" type="number" label="¥" readonly />
-      <div class="pay-money-update" style="float: right" @click="updatAmount" v-if="isModify">修改</div>
+      <div class="pay-money-update" style="float: right" @click="updateAmount" v-if="isModify">修改</div>
     </div>
     <div class="pay-money-mode">
       <div class="van-cell-mode van-cell--clickable" role="button" tabindex="0" data-v-8b47ba6a="">
@@ -107,9 +107,11 @@ const props = defineProps({
     default: {
       cashflowId: '',
       payAmount: '',
-      cfItem: '',
-      cfItemN:'',
-      times: ''
+      payCashflowList: [],
+      isCombinePay: '',
+      // cfItem: '',
+      // cfItemN:'',
+      // times: ''
     }
   },
 })
@@ -132,16 +134,24 @@ const miniprogramId = import.meta.env.VITE_MiniprogramId;
 const miniprogramType = +import.meta.env.VITE_MiniprogramType;
 
 watchEffect(() => {
+    debugger
   payAmount.value = props.payInfoObj.payAmount
   orderAmount.value = props.payInfoObj.payAmount
-  isModify = (props.payInfoObj.cfItem == 1 || props.payInfoObj.cfItem == 9)?true:false
+    // 合并支付不支持 部分支付
+    if(props.payInfoObj.isCombinePay === 'Y') {
+        isModify = false
+    } else {
+        let item = props.payInfoObj.payCashflowList?props.payInfoObj.payCashflowList[0]:[]
+        isModify = (item.cfItem == 1 || item.cfItem == 9)?true:false
+    }
+
 })
 
 const cancel = () => {
   emit('closePage', false);
 }
 
-const updatAmount = () => {
+const updateAmount = () => {
   show.value = true;
 }
 
@@ -160,8 +170,9 @@ const payMoney = () => {
       payAmount: orderAmount.value,
       payType: checked.value,
       cashflowId: props.payInfoObj.cashflowId,
-      cfItemN:props.payInfoObj.cfItemN,
-      times: props.payInfoObj.times
+      isCombinePay: props.payInfoObj.isCombinePay,
+      // cfItemN:props.payInfoObj.cfItemN,
+      // times: props.payInfoObj.times
     }
     if(checked.value == 'WECHAT_PAY'){
       // let payStartTime = moment().format("YYYY-MM-DD HH:mm:ss.SSS")

yarn.lock

@@ -276,6 +276,11 @@ axios@^0.27.2:
     follow-redirects "^1.14.9"
     form-data "^4.0.0"
 
+big.js@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.npmmirror.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f"
+  integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==
+
 braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"