|
|
@@ -56,7 +56,7 @@
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
|
|
|
<view class="tui-title ">包装费</view>
|
|
|
- <input type="number" placeholder="请填写人工和材料费" @input="countAllPrices()" v-model="packingMoney" placeholder-class="tui-placeholder">
|
|
|
+ <input type="number" placeholder="人工和材料费，选填" @input="countAllPrices()" v-model="packingMoney" placeholder-class="tui-placeholder">
|
|
|
</tui-list-cell>
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
|
|
|
@@ -224,14 +224,15 @@ export default {
|
|
|
})
|
|
|
let packingFee = Number(this.packingMoney) > 0 ? Number(this.packingMoney) : 0
|
|
|
let options = {
|
|
|
- orderType:2,// 开单类型，1商品开单 2花材开单
|
|
|
- packingFee:packingFee,// 包装费
|
|
|
- sendCost:this.freight,// 运费
|
|
|
- customId:this.clientInfo.id,// 客户
|
|
|
- payWay:this.payType,//付款方式
|
|
|
+ orderType:2,//开单类型，1商品开单 2花材开单
|
|
|
+ packingFee:packingFee,
|
|
|
+ sendCost:this.freight,
|
|
|
+ customId:this.clientInfo.id,
|
|
|
+ payWay:this.payType,
|
|
|
sendType:this.sendType,
|
|
|
modifyPrice: this.modifyPrice,
|
|
|
- product:JSON.stringify(product),//下单商品
|
|
|
+ product:JSON.stringify(product),
|
|
|
+ hasPay:1
|
|
|
};
|
|
|
let that = this;
|
|
|
uni.showModal({
|
|
|
@@ -240,11 +241,9 @@ export default {
|
|
|
success: function (res) {
|
|
|
if (res.confirm) {
|
|
|
createOrder(options).then(res => {
|
|
|
-
|
|
|
that.removeFromSaveDirect()
|
|
|
-
|
|
|
- const { data: { orderId, orderSn } } = res
|
|
|
- let url = `/admin/billing/result?orderId=${orderId}&orderSn=${orderSn}&type=zuhe`;
|
|
|
+ const { data: { id } } = res
|
|
|
+ let url = `/admin/billing/result?orderId=${id}`;
|
|
|
uni.redirectTo({url: url})
|
|
|
});
|
|
|
}
|
shish