yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

This commit is contained in:
kbing1981 2024-07-16 16:10:46 +08:00
parent 957b6c3153 bfabf81bce
commit ac5fa0d82c
12 changed files with 288 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
my/order/pay.vue
View File

@ -2139,41 +2139,49 @@
}
});
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
cancelOrders(data){//取消订单
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
that.page = 1;
uni.showToast({
title:'操作成功！'
})
that.getOrder();
that.getOrder()
} else {
that.$queue.showToast(res.msg);
}
})
},
// 取消订单待确认
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
if (resa.code == 0) {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
that.$queue.showLoading('取消中...')
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
that.$queue.showToast(res.msg);
}
})
},
// 完成订单
cancel(e) {
@ -2190,6 +2198,10 @@
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
uni.showToast({
title:'操作成功！'
})
that.getOrder()
uni.navigateBack()
} else {
that.$queue.showToast(res.msg);

46
my/order/payJaZ.vue
View File

@ -1691,37 +1691,49 @@
}
});
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
cancelOrders(data){//取消订单
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
that.page = 1;
uni.showToast({
title:'操作成功！'
})
that.getOrder()
} else {
that.$queue.showToast(res.msg);
}
})
},
// 取消订单待确认
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
if (resa.code == 0) {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
that.$queue.showLoading('取消中...')
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
that.$queue.showToast(res.msg);
}
})
},
// 完成订单
cancel(e) {

21
my/order/payModify.vue
View File

@ -23,9 +23,12 @@
<span>￥</span>
<span>{{orderXm.price}}</span>
</view>
<view>
<view v-if="orderXm.qyType!='1'">
<uni-number-box :width='27' :min="1" @change="changeValue" />
</view>
<view v-else>
<uni-number-box :width='27' v-model="orderXm.qyMinNum" :min="qyMinNum" @change="changeValue" />
</view>
</view>
</view>
</view>
@ -296,6 +299,7 @@
couponDataList:'',
orderXm:[],
number:1,
qyMinNum:''
}
},
onLoad(e) {
@ -326,7 +330,10 @@
this.ordersId = this.$queue.getData('ordersId');
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
// this.getOrder()
if(this.orderXm.qyType=='1'){
this.qyMinNum=this.orderXm.qyMinNum;
this.number=this.orderXm.qyMinNum;
}
},
onShow() {
@ -1244,12 +1251,6 @@
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
@ -1263,7 +1264,9 @@
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
// that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
} else {
that.$queue.showToast(res.msg);
}

39
my/order/payModifyTcMyDaiB.vue
View File

@ -1265,35 +1265,38 @@
}
});
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
cancelOrders(data){//取消订单
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
that.getOrder()
that.page = 1;
uni.showToast({
title:'操作成功！'
})
uni.switchTab({
url:'/pages/order/index'
})
that.getOrder()
} else {
that.$queue.showToast(res.msg);
}
})
},
// 取消订单待确认
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
that.$queue.showLoading('取消中...')
} else if (res.cancel) {
console.log('用户点击取消');
}

45
my/order/payShengji.vue
View File

@ -1980,40 +1980,49 @@
}
});
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
cancelOrders(data){//取消订单
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
that.getOrder()
that.page = 1;
uni.showToast({
title:'操作成功！'
})
that.getOrder()
} else {
that.$queue.showToast(res.msg);
}
})
},
// 取消订单待确认
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
if (resa.code == 0) {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
that.$queue.showLoading('取消中...')
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
that.$queue.showToast(res.msg);
}
})
},
// 完成订单
cancel(e) {

34
my/order/payding.vue
View File

@ -1263,24 +1263,8 @@
}
});
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
cancelOrders(data){//取消订单
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
@ -1295,6 +1279,22 @@
that.$queue.showToast(res.msg);
}
})
},
// 取消订单待确认
cancelOrder(e) {
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？',
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId
}
that.$queue.showLoading('提交中...')
that.cancelOrders(data)
} else if (res.cancel) {
console.log('用户点击取消');
}

8
my/order/paydingTCX.vue
View File

@ -1394,16 +1394,10 @@
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认取消订单？',
success: function(res) {
if (res.confirm) {
let data = {

17
my/order/paydingTc.vue
View File

@ -76,12 +76,16 @@
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<!-- <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
>
取消订单
</u-button> -->
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
</view>
@ -938,16 +942,13 @@
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
let that = this
let data = {
ordersId: e.ordersId
}
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
content: '是否确认取消订单？',
success: function(res) {
if (res.confirm) {
let data = {

11
pages.json
View File

@ -42,17 +42,6 @@
}
}
},
{
"path": "pages/index/searchAddress",
"style": {
"navigationBarTitleText": "搜索地址",
"enablePullDownRefresh": true,
"navigationStyle": "custom",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "pages/videoCircle/index",
"style": {

112
pages/index/index.vue
View File

@ -427,8 +427,6 @@
}
}
})
// 116.481488,39.990464
// 125.424295,43.878294
uni.getLocation({
type: 'wgs84',
geocode: true, //设置该参数为true可直接获取经纬度及城市信息
@ -447,27 +445,28 @@
// that.getorderlist('')
that.getKTCityList();
// #endif
var dizhi={
key:'4f23770b6e53b96e7d0661a7ccfb9c21',
location:that.longitude+','+res.latitude,
radius:'1000',
extensions:'all',
output:'JSON'
}
uni.request({
url: 'https://restapi.amap.com/v3/geocode/regeo',
data:dizhi,
method:'GET',
success(rea) {
console.log("获取城市名称成功", rea)
if (rea.statusCode ==200) {
that.city = rea.data.regeocode.addressComponent.township;
// uni.setStorageSync('citySou',rea.data.regeocode.addressComponent.city)
} else {
console.log("获取信息失败，请重试！")
}
}
});
that.selectCity(that.longitude,that.latitude)
// var dizhi={
// key:'4f23770b6e53b96e7d0661a7ccfb9c21',
// location:that.longitude+','+res.latitude,
// radius:'1000',
// extensions:'all',
// output:'JSON'
// }
// uni.request({
// url: 'https://restapi.amap.com/v3/geocode/regeo',
// data:dizhi,
// method:'GET',
// success(rea) {
// console.log("获取城市名称成功", rea)
// if (rea.statusCode ==200) {
// that.city = rea.data.regeocode.addressComponent.township;
// // uni.setStorageSync('citySou',rea.data.regeocode.addressComponent.city)
// } else {
// console.log("获取信息失败，请重试！")
// }
// }
// });
// #ifdef H5
// that.city = that.latitude+','+that.longitude
@ -530,39 +529,34 @@
})
}
that.token = uni.getStorageSync('token');
// that.getKTCityList();
// if (uni.getStorageSync('token')) {
// console.log(22)
// if (that.latitude && that.longitude) {
// that.page = 1
// that.getHomeArtificerList()
// } else {
// console.log(33)
// uni.getLocation({
// type: 'wgs84',
// // highAccuracyExpireTime: 500,
// geocode: true, //设置该参数为true可直接获取经纬度及城市信息
// success: function(res) {
// console.log(44)
// console.log( '------>地理位置',res)
// that.latitude = res.latitude
// that.longitude = res.longitude
// that.page = 1
// that.getHomeArtificerList()
// },
// fail: function() {
// console.log(55)
// console.log('获取地址失败2')
// }
// })
// }
// }
},
methods: {
goCity(){
uni.navigateTo({
url:'/pages/index/searchAddress'
})
var that = this
uni.chooseLocation({
success: function(res) {
console.log('位置名称：' + res.name);
console.log('详细地址：' + res.address);
console.log('纬度：' + res.latitude);
console.log('经度：' + res.longitude);
that.detailaddress = res.name
that.latitude = res.latitude
that.longitude = res.longitude
that.selectCity(res.longitude, res.latitude)
}
});
},
selectCity(longitude, latitude) {
this.$Request.get('/app/Login/selectCity?lat=' + latitude + '&lng=' + longitude).then(res => {
if (res.code == 0) {
this.city = res.data.address ? res.data.address : '未知'
// uni.setStorageSync('city', res.data.province)
this.page = 1
// this.getorderlist('')
this.getKTCityList();
}
});
},
searchBtn(){//搜索按钮
uni.navigateTo({
@ -747,17 +741,7 @@
}
});
},
selectCity(longitude, latitude) {
this.$Request.get('/app/Login/selectCity?lat=' + latitude + '&lng=' + longitude).then(res => {
if (res.code == 0) {
this.city = res.data.city ? res.data.city : '未知'
uni.setStorageSync('city', res.data.city)
this.page = 1
this.getorderlist('')
this.getKTCityList();
}
});
},
chaoji(){//超级满减
uni.navigateTo({
url:'/my/wallet/index'

65
pages/index/searchAddress.vue
View File

@ -1,65 +0,0 @@
<template>
<view>
<input type="text" v-model="keywords"/>
<view @click="inpuCity">搜索</view>
</view>
</template>
<script>
export default{
data(){
return{
keywords:''
}
},
onLoad() {
var that=this;
},
methods:{
inpuCity(){
var that=this;
that.$nextTick(() =>{
that.getCity()
},100)
},
getCity(e){
// this.keywords=e.detail.value;
var that=this;
const value = uni.getStorageSync('citySou');
var dizhi={
// a90dccd8b55793bb939c38c7a4be3e15
key:'4f23770b6e53b96e7d0661a7ccfb9c21',
keywords:that.keywords,
city:'城市中文'+'|'+'citycode'+'|'+'中文全拼'+'|'+'adcode',
citylimit:true,
datatype:'all',
location:'125.424295,43.878294',
output:'JSON',
// type:'010000'+'|'+'020000'+'|'+'030000'+'|'+'040000'+'|'+'050000'+'|'+'060000'
// +'|'+'070000'+'|'+'080000'+'|'+'090000'+'|'+'100000'+'|'+'110000'+'|'+'120000'
// +'|'+'130000'+'|'+'140000'+'|'+'150000'+'|'+'160000'+'|'+'170000'+'|'+'180000'
// +'|'+'190000'+'|'+'200000'+'|'+'220000'+'|'+'970000'+'|'+'990000'+'|'+'991000'+'|'+'991001'
// +'|'+'991400'+'|'+'991401'+'|'+'991500'+'|'+'991600'+'|'+'991601'
// ,
// type:'010000|020000|030000|040000|050000|060000|080000|090000|100000|110000|120000|130000|140000|150000|160000|170000|180000|190000|200000',
}
uni.request({
url: 'https://restapi.amap.com/v3/assistant/inputtips',
data:dizhi,
method:'GET',
success(res) {
if (res.statusCode ==200) {
// that.city = res.data.regeocode.formatted_address
} else {
console.log("获取信息失败，请重试！")
}
}
});
}
}
}
</script>
<style>
</style>

43
pages/order/index.vue
View File

@ -704,24 +704,8 @@
this.page = 1
this.getOrderList()
},
// 取消订单
cancelOrder(e) {
let contentName = '';
let closeKC = this.$queue.getData('closeKC');
if (e.status == 7 || e.status == 8 && closeKC) {
let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
}
cancelOrders(data){//取消订单
let that = this
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + contentName,
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId
}
that.$queue.showLoading('取消中...')
that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
@ -734,11 +718,36 @@
that.$queue.showToast(res.msg);
}
})
},
// 取消订单待确认
cancelOrder(e) {
let that = this
let data = {
ordersId: e.ordersId
}
//取消订单扣费
that.$Request.post('/app/artificer/cancelOrdersMoney', data).then(resa => {
uni.hideLoading();
if (resa.code == 0) {
that.page = 1;
uni.showModal({
title: '温馨提示',
content: '是否确认取消订单？' + resa.data,
success: function(res) {
if (res.confirm) {
that.cancelOrders(data)
that.$queue.showLoading('取消中...')
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
that.$queue.showToast(res.msg);
}
})
},
/*下拉刷新的回调 */
downCallback() {