chuangte/CarRental_back
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
tx 2024-10-23 18:02:47 +08:00
parent 1b6c3f250c
commit 9e91716712
7 changed files with 98 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/http.interceptor.js
View File

@ -11,9 +11,9 @@ const install = (Vue, vm) => {
// 俞山岛 // 俞山岛
// baseUrl: 'https://zc.chuangtewl.com/prod-api', // baseUrl: 'https://zc.chuangtewl.com/prod-api',
// baseUrl: 'https://testzc.chuangtewl.com/prod-api', // baseUrl: 'https://testzc.chuangtewl.com/prod-api',
// baseUrl: 'https://zc.chuangtewl.com/prod-api', baseUrl: 'https://zc.chuangtewl.com/prod-api',
// baseUrl: 'http://47.120.68.19:8090', // baseUrl: 'http://47.120.68.19:8090',
baseUrl: 'http://192.168.2.21:8090', // baseUrl: 'http://192.168.2.21:8090',
// 创特 // 创特
loadingText: '努力加载中~', loadingText: '努力加载中~',
loadingTime: 10000, loadingTime: 10000,

9
page_Merchant/addStore.vue
View File

@ -245,7 +245,12 @@
if (res.code == 200) { if (res.code == 200) {
this.list = res.data this.list = res.data
uni.showToast({
title: '添加成功',
icon: 'none',
duration: 2000
});
uni.navigateBack()
} else { } else {
@ -260,7 +265,7 @@
btn() { btn() {
let _this = this let _this = this
let math = 'static/' + _this.$u.guid(20) let math = 'static/' + _this.$u.guid(20)
uni.chooseMessageFile({ uni.chooseImage({
count: 1, count: 1,
type: 'all', type: 'all',
success(res) { success(res) {

23
page_Merchant/device_Detail.vue
View File

@ -31,7 +31,11 @@
</view> --> </view> -->
</view> </view>
<view class="btn" @click="btn(3)">
<view class="btn" @click="btn(4)" v-if="deviceInfos.status==0">
上架
</view>
<view class="btn" @click="btn(3)" v-else>
下架 下架
</view> </view>
</view> </view>
@ -456,7 +460,22 @@
} }
}) })
} else if (num == 4) { } else if (num == 4) {
uni.showLoading({
title: '加载中...'
})
this.$u.post('/appAdmin/device/online?sn=' + this.sn).then((res) => {
if (res.code == 200) {
this.deviceInfo()
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
});
} else {
// uni.hideLoading()
// this.bulebtn(4)
}
})
} else if (num == 5) { } else if (num == 5) {

37
page_Merchant/order.vue
View File

@ -35,7 +35,7 @@
</view> </view>
</view> </view>
<view class="order_cont"> <view class="order_cont">
<view class="order_card" v-for="(item,index) in orderList" :key="index" @click="todetal(item)"> <view class="order_card" v-for="(item,index) in orderList" :key="index" @click.stop="todetal(item)">
<view class="order_li"> <view class="order_li">
<view class="txt"> <view class="txt">
{{item.model}} {{item.model}}
@ -98,7 +98,7 @@
<view class="price"> <view class="price">
{{item.payFee}}元 {{item.payFee}}元
</view> </view>
<view class="btn" v-if="item.status==7"> <view class="btn" v-if="item.status==7" @click.stop="backcar(item)">
确认还车 确认还车
</view> </view>
</view> </view>
@ -183,6 +183,24 @@
}, },
methods: { methods: {
backcar(item){
this.$u.post(`appVerify/merchantReturn?orderNo=` + item.orderNo).then((res) => {
if (res.code === 200) {
this.getList()
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
});
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
});
},
todetal(item){ todetal(item){
uni.navigateTo({ uni.navigateTo({
url:'/page_Merchant/order_Detail?orderNo='+item.orderNo url:'/page_Merchant/order_Detail?orderNo='+item.orderNo
@ -208,6 +226,7 @@
}) })
}, },
getList() { getList() {
let data = { let data = {
@ -219,7 +238,19 @@
this.$u.get("appAdmin/orderList?", data).then((res) => { this.$u.get("appAdmin/orderList?", data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
// res.data.forEach((newItem) => {
// // 假设每一条数据有一个唯一标识符，比如 id
// const existingIndex = this.orderList.findIndex(item => item.orderId == newItem
// .orderId);
// if (existingIndex !== -1) {
// // 如果找到相同 id 的数据，更新旧数据
// this.$set(this.orderList, existingIndex, newItem);
// } else {
// // 如果没有找到，则追加新数据
// this.orderList.push(newItem);
// }
// });
this.orderList = res.data this.orderList = res.data
} else { } else {

31
page_Merchant/order_Detail.vue
View File

@ -382,7 +382,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="bot_btn" v-if="orderInfo.deliveryOrder.status!=3"> <view class="bot_btn" v-if="orderInfo.deliveryOrder.status!=3&&orderInfo.deliveryOrder">
<view class="btn" @click="getOrder()" v-if="orderInfo.deliveryOrder.status==0"> <view class="btn" @click="getOrder()" v-if="orderInfo.deliveryOrder.status==0">
立即接单 立即接单
</view> </view>
@ -393,7 +393,12 @@
配送完成 配送完成
</view> </view>
</view> </view>
<view class="bot_btn" v-if="orderInfo.status==7">
<view class="btn" @click="backcar()">
确认还车
</view>
</view>
</view> </view>
</template> </template>
@ -428,6 +433,24 @@
}, },
methods: { methods: {
backcar(){
this.$u.post(`appVerify/merchantReturn?orderNo=` + this.orderInfo.orderNo).then((res) => {
if (res.code === 200) {
this.getOrderInfo()
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
});
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
});
},
typeReturns(num) { typeReturns(num) {
console.log(num,'aaaaaaaaaaaa'); console.log(num,'aaaaaaaaaaaa');
let result = { let result = {
@ -668,7 +691,7 @@
} }
}, },
timetype(time) { timetype(time) {
if (time == 'hour') { if (time == 'hours') {
return '小时' return '小时'
} else if (time == 'day') { } else if (time == 'day') {
return '天' return '天'
@ -718,6 +741,8 @@
return '超时取消' return '超时取消'
} else if (num == 6) { } else if (num == 6) {
return '已取消' return '已取消'
}else if (num == 7) {
return '待审核'
} else if (num == 8) { } else if (num == 8) {
return '订单已结束' return '订单已结束'
} }

2
pages/index/index.vue
View File

@ -233,7 +233,7 @@
topage(num){ topage(num){
if(num==0){ if(num==0){
uni.navigateTo({ uni.navigateTo({
url:'/page_Merchant/order' url:'/page_Merchant/deviceMgmt'
}) })
}else if(num==1){ }else if(num==1){
uni.navigateTo({ uni.navigateTo({

10
pages/login/login.vue
View File

@ -344,7 +344,7 @@
}); });
return; return;
} }
this.$u.put("/app/forgetAppPwd?phone="+this.phone2+'&newPassword='+this.password2+'&phoneCode='+this.phoneCode2+'&uuid='+this.uuid).then((res) => { this.$u.put("/appAdmin/forgetAppPwd?phone="+this.phone2+'&newPassword='+this.password2+'&phoneCode='+this.phoneCode2+'&uuid='+this.uuid).then((res) => {
if (res.code == 200) { if (res.code == 200) {
// 登录成功后的操作 // 登录成功后的操作
this.pageindex=2 this.pageindex=2
@ -389,7 +389,7 @@
} }
this.$u.post("/appCodeLogin", data).then((res) => { this.$u.post("/appAdmin/appCodeLogin", data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
// 登录成功后的操作 // 登录成功后的操作
wx.setStorageSync('token', res.token); wx.setStorageSync('token', res.token);
@ -448,7 +448,7 @@
return; return;
} }
this.isCodeButtonDisabled = true; this.isCodeButtonDisabled = true;
this.$u.get("/appCaptcha?type=1&phone=" + this.phone).then((res) => { this.$u.get("/appAdmin/appCaptcha?type=1&phone=" + this.phone).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.uuid = res.uuid this.uuid = res.uuid
this.startCountdown(); this.startCountdown();
@ -481,7 +481,7 @@
return; return;
} }
this.isCodeButtonDisabled2 = true; this.isCodeButtonDisabled2 = true;
this.$u.get("/appCaptcha?type=1&phone=" + this.phone2).then((res) => { this.$u.get("appAdmin/appCaptcha?type=1&phone=" + this.phone2).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.uuid = res.uuid this.uuid = res.uuid
this.startCountdown2(); this.startCountdown2();
@ -550,7 +550,7 @@
uuid: this.uuid, uuid: this.uuid,
openid:this.openCode openid:this.openCode
} }
this.$u.post("/appCodeLogin", data).then((res) => { this.$u.post("appAdmin/appCodeLogin", data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
// 登录成功后的操作 // 登录成功后的操作
wx.setStorageSync('token', res.token); wx.setStorageSync('token', res.token);