Skip to content

J
jz_Travel
Commit 26718e28 authored by youjie's avatar youjie
Browse files
Options

修复bug

parent 3a3e3875
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 25 deletions
components/cancelPrompt/cancelPrompt.vue
View file @ 26718e28
......@@ -74,6 +74,9 @@
margin-bottom: 50rpx;
text-align: center;
}
.showModalTime.active{
color: #000;
}
.showModalBott{
width: 300rpx;
height: 98rpx;
......@@ -156,7 +159,8 @@
<Text>按旅游费用总额的60%</Text>
</view>
</view>
<view class="showModalTime">请仔细阅读条款<template v-if="submitCancel">{{remainingTime}}s</template>后确认</view>
<view class="showModalTime"
:class="[!submitCancel?'active':'']">请仔细阅读条款<template v-if="submitCancel">{{remainingTime}}s</template>后确认</view>
<view class="row-sb-n showModalBottom">
<view class="showModalBott" @click="cancel">
<Text>关闭</Text>
......
pages/AggregateOrders/components/header.vue
View file @ 26718e28
......@@ -200,7 +200,7 @@ export default {
padding-top: 85rpx;
}
.carrHeader-right{
padding-right: 180rpx;
padding-right: 200rpx;
display: flex;
}
.carrHeader-right img{
......
pages/AggregateOrders/components/searchHeader.vue
View file @ 26718e28
......@@ -116,7 +116,7 @@ export default {
flex: 1;
display: flex;
padding-left: 60rpx;
padding-right: 200rpx;
padding-right: 210rpx;
}
.carrHeader-right view{
width: 1px;
......
pages/jiuzhai/jz_SureOrder.vue
View file @ 26718e28
......@@ -770,9 +770,10 @@
title: "操作成功",
icon: "success",
});
uni.navigateTo({
url: "/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=2",
});
this.initOrderInfo();
// uni.navigateTo({
// url: "/pages/AggregateOrders/AggregateOrdersList",
// });
}
},
......@@ -801,9 +802,10 @@
title: "操作成功",
icon: "success",
});
uni.navigateTo({
url: "/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=2",
});
this.initOrderInfo();
// uni.navigateTo({
// url: "/pages/AggregateOrders/AggregateOrdersList",
// });
}
},
(err) => {
......@@ -838,9 +840,10 @@
title: "操作成功",
icon: "success",
});
uni.navigateTo({
url: "/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=2",
});
this.getOrderInfoHandler(this.OrderNo)
// uni.navigateTo({
// url: "/pages/AggregateOrders/AggregateOrdersList",
// });
}
that.submitCancel = false
},
......
pages/user-center/userVip-center.vue
View file @ 26718e28
......@@ -9,8 +9,8 @@
<view class="title">{{ pageTitle }}</view>
</view>
<view class="userBox">
<userHeader :user_info="user_info" :b2b_user_info="b2b_user_info" @login="openAuth"></userHeader>
<!-- <vipUserHeader :user_info="user_info" :b2b_user_info="b2b_user_info" @login="openAuth"></vipUserHeader> -->
<vipUserHeader v-if="user_info.isVip==1" :user_info="user_info" :b2b_user_info="b2b_user_info" @login="openAuth"></vipUserHeader>
<userHeader v-else :user_info="user_info" :b2b_user_info="b2b_user_info" @login="openAuth"></userHeader>
<view class="userMyOrderBox">
<view style="position: relative;top:-13rpx">
<view class="userMyOrder">
......@@ -27,12 +27,12 @@
<view class="order_bar_item" @click="goUrl('/pages/AggregateOrders/AggregateOrdersList?OrderStatus=1')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963970628311.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">待付款</Text>
<view class="badge"></view>
<view class="badge" v-if="user_info.waitPayOrderNum>0">{{ user_info.waitPayOrderNum }}</view>
</view>
<view class="order_bar_item" @click="goUrl('/pages/AggregateOrders/AggregateOrdersList?OrderStatus=2')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963971941398.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">待出行</Text>
<view class="badge"></view>
<view class="badge">{{ user_info.waitPayOrderNum }}</view>
</view>
<view class="order_bar_item" @click="goUrl('/pages/AggregateOrders/AggregateOrdersList?OrderStatus=3')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963971902348.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
......@@ -42,7 +42,7 @@
<view class="order_bar_item" @click="goUrl('/pages/AggregateOrders/AggregateOrdersList?OrderStatus=5')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748964440207840.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">售后</Text>
<view class="badge"></view>
<view class="badge" v-if="user_info.afterSalesOrderNum>0">{{ user_info.afterSalesOrderNum }}</view>
</view>
</view>
<view class="orderProductBox">
......@@ -121,7 +121,8 @@
this.showAuth = !this.mall_UserInfo || !this.b2b_user_info;
},
onShow() {
this.userCenterinfo(2);
// this.userCenterinfo(2);
// this.GetAppletUserPointDetail()
},
methods: {
goDetails(item) {
......@@ -224,6 +225,24 @@
}
);
},
GetAppletUserPointDetail(){
uni.showLoading({
title: '加载中...'
})
this.apipost('/api/AppletPoint/GetAppletUserPointDetailPageList',
{},
(res) => {
uni.hideLoaging()
this.user_info = res.data
},err=>{
uni.hideLoaging()
uni.showToast({
title: err.message,
icon: "none",
});
}
);
},
}
};
</script>
......
pages/visa/visa_SureOrder.vue
View file @ 26718e28
......@@ -748,9 +748,10 @@
title: "操作成功",
icon: "success",
});
uni.navigateTo({
url: "/pages/visa/visa_MyOrder",
});
this.initOrderInfo(this.orderId)
// uni.navigateTo({
// url: "/pages/AggregateOrders/AggregateOrdersList",
// });
}
uni.hideLoading()
this.submitCancel = false
......@@ -786,9 +787,11 @@
title: "操作成功",
icon: "success",
});
uni.navigateTo({
url: "/pages/visa/visa_MyOrder",
});
this.getOrderInfoHandler()
this.initOrderInfo(this.orderId)
// uni.navigateTo({
// url: "/pages/AggregateOrders/AggregateOrdersList",
// });
}
that.submitCancel = false
},
......
plugin/api.js
View file @ 26718e28
......@@ -22,7 +22,7 @@ const getRVHandler = (payload, token) => {
export default {
install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// "http://192.168.5.204:8030"
Vue.prototype.host2 = process.env.NODE_ENV=="development"?"http://192.168.5.214:8033":"https://erpmallapi.oytour.com"
Vue.prototype.host3 = process.env.NODE_ENV=="development"?"http://192.168.5.214":"https://reborn.oytour.com"
//Vue.prototype.host2 = "https://erpmallapi.oytour.com"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment