|
@@ -48,13 +48,7 @@
|
|
|
<view class="price" v-else>¥{{ totalPrice | priceFilter }}</view>
|
|
|
</view>
|
|
|
<view class="btn">
|
|
|
- <u-button
|
|
|
- type="primary"
|
|
|
- text="确认订单"
|
|
|
- @click="submitData(1)"
|
|
|
- v-if="!wbId || (wbId && wbIsAllFee == 'NO' && wbPayType == 'SITE')"
|
|
|
- ></u-button>
|
|
|
- <u-button type="primary" text="提交申请" @click="submitData(2)" v-else></u-button>
|
|
|
+ <u-button type="primary" text="确认订单" @click="submitData(1)"></u-button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</template>
|
|
@@ -132,7 +126,6 @@ export default {
|
|
|
this.categoryName = data.categoryName;
|
|
|
this.websitId = data.websitId;
|
|
|
this.websitName = data.websitName;
|
|
|
- this.wbId = data.wbId;
|
|
|
this.wbIsAllFee = data.wbIsAllFee;
|
|
|
this.wbPayType = data.wbPayType;
|
|
|
if(this.type == 'P') {
|
|
@@ -175,22 +168,10 @@ export default {
|
|
|
];
|
|
|
|
|
|
let url = '', params = {};
|
|
|
- if(type == 1) {
|
|
|
- if(this.wbId) {
|
|
|
- url = '/engin/material/buy';
|
|
|
- params.rpMaterialOrderItemList = goodsList;
|
|
|
- }else {
|
|
|
- url = '/pay/buy';
|
|
|
- params.workerOrderItems = goodsList;
|
|
|
- }
|
|
|
- }
|
|
|
- else {
|
|
|
- url = '/engin/material/apply';
|
|
|
- params.rpMaterialOrderItemList = goodsList;
|
|
|
- }
|
|
|
+ url = '/pay/buy';
|
|
|
+ params.workerOrderItems = goodsList;
|
|
|
|
|
|
this.$api.postJson(url, {
|
|
|
- // brand: this.brandName,
|
|
|
settlementType: this.salesType,
|
|
|
goodsType: this.type,
|
|
|
remark: this.remark,
|
|
@@ -202,18 +183,9 @@ export default {
|
|
|
websitName: this.websitName,
|
|
|
...params,
|
|
|
}).then(res => {
|
|
|
- if(type == 1) {
|
|
|
- this.$navToPage({
|
|
|
- url: `/packageMaterial/pages/sale/pay?handleOrderId=${res.data}&wbId=${this.wbId}`
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.$successToast();
|
|
|
- setTimeout(() => {
|
|
|
- this.$navToPage({
|
|
|
- url: `/packageHome/pages/maintenance/applyList`
|
|
|
- }, 'reLaunch')
|
|
|
- }, 500)
|
|
|
- }
|
|
|
+ this.$navToPage({
|
|
|
+ url: `/packageMaterial/pages/sale/pay?handleOrderId=${res.data}&wbId=`
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
},
|