diff --git a/config/api.js b/config/api.js
index 66f015b..1675734 100644
--- a/config/api.js
+++ b/config/api.js
@@ -191,4 +191,6 @@ export const cityarealist = (data, callback) => post('api/recover/area/cityareal
export const createRecharge = (data, callback) => post('api/recover/recharge/createRecharge', data, callback);
export const statistics = (data, callback) => post('api/recover/personmoney/statistics', data, callback);
export const createPayment = (data, callback) => post('api/recover/person/createPayment', data, callback);
+export const reassignOrder = (data, callback) => post('api/recover/order/reassignOrder', data, callback);
+export const smsCode = (data, callback) => post('api/recover/person/send', data, callback);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b7e0038..94a29e3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -101,7 +101,7 @@
{{item.name}}
- 改派订单
+
@@ -145,9 +145,9 @@
- {{item.accept_name}}
+ {{item.person_name}}
-
+
联系TA
@@ -157,13 +157,13 @@
期望时间:{{item.order_time_text}}
-
+
更多操作
取消订单
- 改派订单
+ 改派订单
@@ -330,7 +330,7 @@
取消改派
- 确认改派
+ 确认改派
@@ -385,10 +385,10 @@
// id: 0,
// name: '全部'
// },
- {
- id: 1,
- name: '待接单'
- },
+ // {
+ // id: 1,
+ // name: '待接单'
+ // },
{
id: 7,
name: '已接单'
@@ -470,6 +470,7 @@
uni.hideTabBar({
fail: () => {},
});
+ this.initFun()
// this.getdata()
// this.config()
// this.qiangdanlist()
@@ -478,16 +479,16 @@
},
onLoad() {
this.getauth()
- let _this = this;
- util.getAddress(function(res){
- _this.cityText = res.city;
- _this.longitude = res.longitude;
- _this.latitude = res.latitude;
- console.log(res,'kkkkkkkkk+++')
- _this.qiangdanlist()
- // uni.setStorageSync('city_name',res.city)
- })
- this.recycleOrderList()
+ // let _this = this;
+ // util.getAddress(function(res){
+ // _this.cityText = res.city;
+ // _this.longitude = res.longitude;
+ // _this.latitude = res.latitude;
+ // console.log(res,'kkkkkkkkk+++')
+ // _this.qiangdanlist()
+ // // uni.setStorageSync('city_name',res.city)
+ // })
+ // this.recycleOrderList()
// this.getdata()
// this.getquestion()
// this.recycleOrderList()
@@ -531,6 +532,46 @@
}
},
methods: {
+ callPhone(phoneNumber) {
+ uni.makePhoneCall({
+ phoneNumber: phoneNumber, // 必需,电话号码字符串
+ success: (res) => {
+ console.log("拨号成功", res);
+ },
+ fail: (err) => {
+ console.error("拨号失败", err);
+ }
+ });
+ },
+ initFun(){
+ let _this = this;
+ if(this.longitude){
+ util.getAddress(function(res){
+ _this.cityText = res.city;
+ _this.longitude = res.longitude;
+ _this.latitude = res.latitude;
+ console.log(res,'kkkkkkkkk+++')
+ _this.qiangdanlist()
+ // uni.setStorageSync('city_name',res.city)
+ })
+ this.recycleOrderList()
+ }else{
+ _this.qiangdanlist()
+ this.recycleOrderList()
+ }
+ },
+ conformChangeOrder(){
+ // var _this = this;
+ // _this.$api.reassignOrder({},res=>{
+ // if(res.code == '1'){
+ // uni.showToast({ title: res.msg, icon: 'success' })
+
+
+ // }else{
+ // uni.showToast({ title: res.msg, icon: 'none' })
+ // }
+ // })
+ },
toPay(item){
uni.setStorageSync('orderDetail', item);
uni.navigateTo({
@@ -723,9 +764,10 @@
this.cancleShow = true
this.moreShow = false
},
- changeClickOrder(){
+ changeClickOrder(id){
this.pop4Show = true
this.moreShow = false
+ this.orderId = id
},
selectTab(id){
this.page=1
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 76bc30e..e2678df 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -18,7 +18,7 @@
- 发送验证码
+ 发送验证码
@@ -62,6 +62,22 @@ export default {
},
methods: {
+ smsCode(){
+ this.$api.smsCode({
+ mobile: this.mobile
+ }, res => {
+ if (res.code == "1") {
+ console.log(res,'登录成功')
+ uni.setStorageSync('userToken', res.data.token);
+ uni.setStorageSync('userInfo', res.data.userInfo);
+ uni.switchTab({
+ url:'/pages/index/index'
+ })
+ }else{
+ uni.showToast({ title: res.msg , icon: 'none'})
+ }
+ })
+ },
getAddress(){
let _this = this;
console.log('dddddd333d')
diff --git a/pages/mine/priceRecord.vue b/pages/mine/priceRecord.vue
index f4e4edd..443086f 100644
--- a/pages/mine/priceRecord.vue
+++ b/pages/mine/priceRecord.vue
@@ -100,6 +100,7 @@
this.nowYear = date.getFullYear();
this.nowMonth = date.getMonth() + 1; // 月份是从0开始的,所以要加1
this.showDate = false
+ this.getPriceList();
},
getPriceList(){
var _this = this;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 91909b0..e82754b 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -9,7 +9,7 @@
货物信息
-
+
回收品类
{{orderInfo.type_name}}
@@ -33,10 +33,10 @@
- 规格:
+ 规格:{{deelData(orderInfo.spec_value)}}
- 更改
+
@@ -60,7 +60,7 @@
{{orderInfo.person_name}}
{{orderInfo.person_mobile}}
平台已认证师傅资质,上门请校核是否本人上门
-
+
联系师傅
@@ -78,13 +78,13 @@
-
+
联系用户
- 联系用户
+ 导航地址
@@ -112,10 +112,10 @@
-->
-
+
今日
- 09:00-11:00
+ {{order_person_time}}
@@ -233,22 +233,69 @@
上门签到
+