diff --git a/manifest.json b/manifest.json index 1d57abaffe5166eb7ec00410b7dc1df6da13e7b5..abdbda3f47ea62c48c431e25ec41c07018681784 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 bfa2f6687ebf747553067866c12898f87e283da4..283f21eb7177918375294d8954aad42d054377a5 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 e3a74ca25af54f80e4ee12e02b582537984e6d4c..95eb30c241c4d67052de82d205aeed7d22db9653 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 91081f1e1a4b1237972ec250960128c34464ea37..f77ab3acc85a06f87d14b039b313325f16d5404e 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 bfacb0f7168563be6d0c792438e7b01fbc2fcfea..923d824dc8b8e9c1be23e8480a7911d78144c271 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 90a727331de410e05278a97ccc275705206a15e6..4e1caa29e1ea373d1b6198658b184453b96cfe87 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 }) } }