|
@@ -126,8 +126,6 @@
|
|
|
<v-select :showSelete="false" :showBtn="true" code="CANCEL_REASON" @itemChange="chooseReason" ></v-select>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
-
|
|
|
</view>
|
|
|
<!-- 取消订单弹窗 -->
|
|
|
<uni-popup ref="openModal" type="center">
|
|
@@ -141,10 +139,9 @@
|
|
|
import {geRubbishType} from '@/api/index'
|
|
|
import {orderInfoSave,searchRider} from '@/api/data.js'
|
|
|
import { checkLogin } from '@/api/login.js'
|
|
|
- import {saomaOrder,hasOrder} from '@/api/order.js'
|
|
|
import uniPopup from '@/components/uni-popup/uni-popup.vue'
|
|
|
import uniPopupDialog from '@/components/uni-popup/uni-popup-dialog.vue'
|
|
|
- import {cancelOrder} from '@/api/order.js'
|
|
|
+ import {cancelOrder,saomaOrder,hasOrder} from '@/api/order.js'
|
|
|
import vSelect from '@/components/select/v-select.vue'
|
|
|
export default{
|
|
|
components: {uniPopup,uniPopupDialog,vSelect,uniNavBar},
|
|
@@ -239,7 +236,6 @@
|
|
|
icon: 'none'
|
|
|
})
|
|
|
}
|
|
|
- console.log(res,'===========')
|
|
|
})
|
|
|
},
|
|
|
// 查看订单详情
|
|
@@ -290,7 +286,6 @@
|
|
|
},
|
|
|
// 选择通信地址
|
|
|
selectAddress(){
|
|
|
- // console.log(this.form.receiveAddress.receiveAreasName,'==========')
|
|
|
wx.chooseLocation({
|
|
|
success:(res)=>{
|
|
|
if(res){
|