|
|
@@ -118,8 +118,10 @@
|
|
|
</view> -->
|
|
|
</view>
|
|
|
<view class="row5 flex flex-end">
|
|
|
- <view class="stop active" @click.stop="stop(good)"
|
|
|
+ <view class="stop active" @click.stop="toggle(good)"
|
|
|
v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'">终止</view>
|
|
|
+ <!-- <view class="stop active" @click.stop="stop(good)"
|
|
|
+ v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'">终止</view> -->
|
|
|
<!-- <view class="start normal" @click.stop="confirmLoading(good)"
|
|
|
v-if="good.orderStatus=='未装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='平台驳回装车信息'">
|
|
|
确认装车</view> -->
|
|
|
@@ -166,6 +168,7 @@
|
|
|
<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
|
|
|
:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
|
|
|
@cancel="cancelClick">
|
|
|
+
|
|
|
<view style="margin: 0 auto;">
|
|
|
<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' >
|
|
|
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
|
|
|
@@ -178,7 +181,28 @@
|
|
|
v-if='isShowTerminationReason'>
|
|
|
</u--textarea>
|
|
|
</u-modal>
|
|
|
-
|
|
|
+ <!-- 普通弹窗 -->
|
|
|
+ <u-popup :show="show" mode="bottom" @close="close" @open="open">
|
|
|
+ <view class="">
|
|
|
+ <view ><u-icon @click="closepopup" class='close' name="close" size="20"></u-icon></view>
|
|
|
+
|
|
|
+ <view style='fon-size:34rpx;margin-bottom:20px;text-align:center;font-weight: 600;'>确认终止订单</view>
|
|
|
+ <view style="margin: 0 auto;">
|
|
|
+ <u-radio-group iconPlacement="right" v-model="radiovalue1" placement="" v-if='isShowTerminationReason' >
|
|
|
+ <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
|
|
|
+ :label="item.name" :name="item.name" @change="radioChange" >
|
|
|
+ </u-radio>
|
|
|
+ </u-radio-group>
|
|
|
+ </view>
|
|
|
+ <view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
|
|
|
+ <view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
|
|
|
+ <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
|
|
|
+ v-if='isShowTerminationReason'>
|
|
|
+ </u--textarea>
|
|
|
+ <view class='termination' :class="{'active':value2.length>0}" @click='confirmClick'>终止</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </u-popup>
|
|
|
<u-toast ref="uToast"></u-toast>
|
|
|
</view>
|
|
|
</template>
|
|
|
@@ -192,13 +216,19 @@
|
|
|
import {
|
|
|
apiGoods
|
|
|
} from "@/api/mock.js"
|
|
|
+ import uniPopup from '@/components/uni-popup/uni-popup.vue'
|
|
|
export default {
|
|
|
+ components:{
|
|
|
+ uniPopup
|
|
|
+ },
|
|
|
mixins: [MescrollMixin], // 使用mixin
|
|
|
data() {
|
|
|
return {
|
|
|
confirmText: '确定',
|
|
|
showCancelButton: true,
|
|
|
showMenu: false,
|
|
|
+ show:false,
|
|
|
+ type:'bottom',
|
|
|
searchStyle: {
|
|
|
background: "#317AFE",
|
|
|
color: 'white',
|
|
|
@@ -333,6 +363,7 @@
|
|
|
num: 1
|
|
|
})
|
|
|
},
|
|
|
+
|
|
|
onPageScroll(res) {
|
|
|
this.scrollTop = res.scrollTop
|
|
|
console.log("页面滚动了", res.scrollTop)
|
|
|
@@ -354,6 +385,25 @@
|
|
|
|
|
|
},
|
|
|
methods: {
|
|
|
+ closepopup(){
|
|
|
+ this.show=false
|
|
|
+ },
|
|
|
+ toggle(item){
|
|
|
+ if (item.orderStatusKey == 1) {
|
|
|
+ this.isShowTerminationReason = false
|
|
|
+ } else {
|
|
|
+ this.isShowTerminationReason = true
|
|
|
+ }
|
|
|
+ this.id = item.id
|
|
|
+ this.show = true
|
|
|
+ },
|
|
|
+ open() {
|
|
|
+ // console.log('open');
|
|
|
+ },
|
|
|
+ close() {
|
|
|
+ this.show = false
|
|
|
+ // console.log('close');
|
|
|
+ },
|
|
|
addevaluation(good) {
|
|
|
uni.$u.route('/pages/order/addEvaluation', {
|
|
|
val: JSON.stringify(good)
|
|
|
@@ -602,7 +652,10 @@
|
|
|
z-index: 999;
|
|
|
width: 100%;
|
|
|
}
|
|
|
-
|
|
|
+ /deep/.u-popup__content{
|
|
|
+ border-radius: 10px;
|
|
|
+ padding:20px;
|
|
|
+ }
|
|
|
.fixed {
|
|
|
.title {
|
|
|
background: white;
|
|
|
@@ -901,4 +954,23 @@
|
|
|
padding: 20rpx;
|
|
|
border-radius: 20rpx;
|
|
|
}
|
|
|
+ /deep/.u-radio{
|
|
|
+ margin:40rpx 0;
|
|
|
+ }
|
|
|
+ .close{
|
|
|
+ position:absolute;
|
|
|
+ right:20px;
|
|
|
+ }
|
|
|
+ .termination{
|
|
|
+ background:#F1F3F6;
|
|
|
+ color:#C5CAD4;
|
|
|
+ padding:10px;
|
|
|
+ border-radius:30px;
|
|
|
+ text-align: center;
|
|
|
+ margin-top:30rpx;
|
|
|
+ }
|
|
|
+ .termination.active{
|
|
|
+ background: #2772FB;
|
|
|
+ color: white;
|
|
|
+ }
|
|
|
</style>
|
