From 1958e9f3a762d8ece1d94fc9d7c429fd0f6bbefe Mon Sep 17 00:00:00 2001 From: wangjw <wangjw@dbc-healthcare.com> Date: Mon, 31 Aug 2020 14:25:40 +0800 Subject: [PATCH] bug fix --- manifest.json | 2 +- pages/apply/applypage1.vue | 2 +- pages/checkstand/checkstand.vue | 4 ++-- pages/financial/financialstage.vue | 2 +- pages/installment/installmentinfo.vue | 25 ++++++++++++++++++++++++- pages/signcontract/signcontract.vue | 9 ++++++--- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/manifest.json b/manifest.json index 1d57aba..abdbda3 100755 --- a/manifest.json +++ b/manifest.json @@ -51,7 +51,7 @@ "mode": "history", "base": "/uni" }, - "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.26/", + "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.26/", "optimization": { "treeShaking": { "enable": true diff --git a/pages/apply/applypage1.vue b/pages/apply/applypage1.vue index bfa2f66..283f21e 100755 --- a/pages/apply/applypage1.vue +++ b/pages/apply/applypage1.vue @@ -275,7 +275,7 @@ title: '鎻愪氦涓�', icon: 'none', duration: 90000 - }) + }); uni.request({ url: url, method: methond, diff --git a/pages/checkstand/checkstand.vue b/pages/checkstand/checkstand.vue index e3a74ca..95eb30c 100755 --- a/pages/checkstand/checkstand.vue +++ b/pages/checkstand/checkstand.vue @@ -22,11 +22,11 @@ <view class="poupp_nper_detail"> <view> <text>绗�1鏈� 鏀粯</text> - <text>楼 {{data.first_payment}}</text> + <text>楼 {{Number(data.first_payment)+(Number(data.equipment_price)-Number(data.advance_payment))*Number(data.count)}}</text> </view> <view> <text>鍓╀綑{{data.periods_num-1}}鏈� 姣忔湡鏀粯</text> - <text>楼 {{data.remaining_payment}}</text> + <text>楼 {{Number(data.remaining_payment)+(Number(data.equipment_price)-Number(data.advance_payment))*Number(data.count)}}</text> </view> </view> <view class="pay_btn" @click="open()">纭鏀粯</view> diff --git a/pages/financial/financialstage.vue b/pages/financial/financialstage.vue index 91081f1..f77ab3a 100755 --- a/pages/financial/financialstage.vue +++ b/pages/financial/financialstage.vue @@ -46,7 +46,7 @@ <view class="fin_recommended" v-if="EquipmentHotList"> <view class="fin_recommended_label"> <!-- <i class="fin_icon"></i> --> - <text class="fin_recommended_title">涓烘偍鎺ㄨ崘</text> + <text class="fin_recommended_title">鍏ㄩ儴鍟嗗搧</text> </view> <view class="fin_rec_desc"> <i></i> diff --git a/pages/installment/installmentinfo.vue b/pages/installment/installmentinfo.vue index bfacb0f..923d824 100755 --- a/pages/installment/installmentinfo.vue +++ b/pages/installment/installmentinfo.vue @@ -153,6 +153,10 @@ </view> </view> <view class="profile">鍒╂伅姣忔湡(鍏�)锛毬{((Number(e_info.equipment_price)-Number(e_info.advance_payment))*Number(e_info.count)).toFixed(2)}}</view> + <view class="sales_box"> + <text class="sales_name">閿€鍞汉鍛�:</text> + <input class="sales_input" type="text" placeholder="閿€鍞汉鍛樺鍚�,閫夊~" v-model="sales"> + </view> </view> <view class="poupp_tips">閲戣瀺鍒嗘湡闇€瑕佷笂浼犻噾铻嶈祫璐�, 鍖呭惈娉曚汉淇℃伅/浼佷笟鎵х収/閾惰娴佹按绛夆€�</view> <view class="poupp_btn" @click="buy_now()">绔嬪嵆鍒嗘湡</view> @@ -187,7 +191,8 @@ isLogin: 0, equipment_id: '', is_auth: '0', - type: 2 + type: 2, + sales: '' } }, onPageScroll(e){ @@ -267,6 +272,13 @@ equipment_id: this.equipment_id, property_id: this.e_info.property_id } + if(this.sales) { + + } + uni.setStorage({ + key: 'sales', + data: this.sales + }); uni.setStorage({ key: 'advance_payment', data: this.e_info.advance_payment @@ -940,4 +952,15 @@ font-size: 32rpx; padding: 24rpx; } + .sales_box { + display: flex; + align-items: center; + margin-top: 20rpx; + .sales_name, .sales_input { + font-size: 26rpx; + } + .sales_input { + padding-left: 16rpx; + } + } </style> diff --git a/pages/signcontract/signcontract.vue b/pages/signcontract/signcontract.vue index 90a7273..4e1caa2 100755 --- a/pages/signcontract/signcontract.vue +++ b/pages/signcontract/signcontract.vue @@ -144,6 +144,7 @@ const install = uni.getStorageSync('installment'); const {contract_no, equipment_id, property_id} = install; const url = this.is_eidt ? '/uni/api/signcontract/EditContract' : '/uni/api/signcontract/AddContract'; + const sales = uni.getStorageSync('sales') || ''; uni.showLoading({ title: '鎻愪氦涓�...' }) @@ -154,12 +155,14 @@ contract_no: contract_no, equipment_id: equipment_id, property_id: property_id, - contract_content: data + contract_content: data, + sales: sales }, dataType: 'json', success: (res) => { - const {data} = res; + const {data, message} = res; if(data.code == 0){ + uni.removeStorageSync('sales'); if(this.advance_payment === 0) { uni.request({ url: '/uni/api/repayment/GoPay', @@ -198,7 +201,7 @@ }else{ uni.showToast({ icon: 'none', - title: '鎻愪氦澶辫触锛岃閲嶈瘯' + title: message }) } } -- 2.18.1