Commit ccb960b8 authored by 和慭琛's avatar 和慭琛

所有接口调通 但未做页面赋值

parent 9893a974
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
workOrderDetail:'', workOrderDetail:'',
//预约 V2 //预约 V2
orderReserve:'', orderReserve:'',
///wxh-worker-rest/rest/project/order/reserve/{token} //工单完工
configCompletion:'',
}, },
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
// //
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502 //RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0' //this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
this.initAPIneedToken() this.initAPIneedToken()
console.log('当前token',this.token) console.log('当前token',this.token)
...@@ -115,6 +116,9 @@ ...@@ -115,6 +116,9 @@
this.globalData.orderReserve = '/wxh-worker-rest/rest/project/order/reserve/' this.globalData.orderReserve = '/wxh-worker-rest/rest/project/order/reserve/'
+ this.globalData.token, + this.globalData.token,
console.log('预约 V2'+this.globalData.orderReserve) console.log('预约 V2'+this.globalData.orderReserve)
//工单完工
this.globalData.configCompletion = ''
///wxh-worker-rest/rest/config/RTOKEN222bdab78b0d2a74f159b640df53180772813250/completion/11885887?inGuaranteePeriod=true
} }
......
...@@ -7,21 +7,23 @@ ...@@ -7,21 +7,23 @@
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/take/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "接单" "navigationBarTitleText": "下单"
} }
}, },
{ {
"path": "pages/index/index", "path": "pages/take/index",
"style": { "style": {
"navigationBarTitleText": "下单" "navigationBarTitleText": "接单"
} }
}, },
{ {
"path": "pages/take/finish", "path": "pages/take/finish",
"style": { "style": {
...@@ -29,6 +31,13 @@ ...@@ -29,6 +31,13 @@
} }
}, },
{
"path": "pages/take/measure",
"style": {
"navigationBarTitleText": "服务措施"
}
},
{ {
......
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
<view class="bottomLeftView" @click="recordClick()"> <view class="bottomLeftView" @click="recordClick()">
<text class="bottomTitle">下单记录</text> <text class="bottomTitle">下单记录</text>
</view> </view>
<view class="bottomRightView" @click="confirmClick()"> <!--@click="confirmClick()"-->
<view class="bottomRightView" @click='confirmClick()' >
<text class="bottomTitle">立即下单</text> <text class="bottomTitle">立即下单</text>
</view> </view>
</view> </view>
...@@ -91,7 +92,8 @@ ...@@ -91,7 +92,8 @@
activeService:'', activeService:'',
demandContent:'', demandContent:'',
isAgree:false, isAgree:false,
isClean:false, isClean:false,
isRefresh:false
} }
}, },
...@@ -157,48 +159,20 @@ ...@@ -157,48 +159,20 @@
confirmClick: function () { confirmClick: function () {
console.log('立即下单') console.log('立即下单')
console.log(getApp().globalData.token) console.log(getApp().globalData.token)
// if(!getApp().globalData.token){ if(!getApp().globalData.token){
// uni.navigateTo({ uni.navigateTo({
// url:'/pages/login/wxlogin' url:'/pages/login/wxlogin'
// }) })
// return return
// }
this.createAppletsOrder()
},
checkClean: function (){
// uni.getStorage({
// key: 'token',
// success: function (res) {
// console.log('本地获取token成功')
// console.log(res.data);
// getApp().globalData.token = res.data
// }
// })
let pages = getCurrentPages();
let currPage = pages[pages.length-1];
console.log('是否清除:')
console.log(currPage.data.isClean)
if (currPage.data.isClean == true){//这就是传递的参数
this.name = '',
this.phone = '',
this.location = '',
this.address = '',
this.activeProduct = '',
this.activeService = '',
this.demandContent= '',
this.isAgree = false,
this.isClean = false
} }
this.showSubscribeModal()
//this.createAppletsOrder()
}, },
//客户报单接口 //客户报单接口
createAppletsOrder: async function() { createAppletsOrder: async function() {
console.log('联系人:'+this.name) console.log('联系人:'+this.name)
...@@ -236,9 +210,11 @@ ...@@ -236,9 +210,11 @@
uni.showToast({ uni.showToast({
title:'下单成功' title:'下单成功'
}) })
uni.navigateTo({
url: '/pages/index/success' this.showSubscribeModal()
}) // uni.navigateTo({
// url: '/pages/index/success'
// })
} }
...@@ -252,6 +228,107 @@ ...@@ -252,6 +228,107 @@
console.log(e) console.log(e)
} }
}) })
},
showSubscribeModal: function (){
let that = this
uni.showModal({
title:'提示',
content:'为更好的追踪工单实时状态,服务号需要在您的下单时向您发送消息',
confirmText:'同意',
cancelText:'拒绝',
success(res) {
if (res.confirm) {
//调用订阅消息
console.log('用户点击 确定');
//调用订阅
that.getSubSubscribeMessage();
}else if (res.cancel) {
console.log('用户点击 拒绝');
uni.navigateTo({
url: '/pages/index/success'
})
}
}
})
},
//获取消息订阅信息
getSubSubscribeMessage: function (){
uni.requestSubscribeMessage({
tmplIds: ['3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'],
success (res) {
console.log('请求订阅信息 成功:')
console.log(res)
uni.navigateTo({
url: '/pages/index/success'
})
//this.createAppletsOrder()
},
fail (res){
console.log('请求订阅信息 失败:')
console.log(res)
uni.navigateTo({
url: '/pages/index/success'
})
}
})
},
checkClean: function (){
// uni.getStorage({
// key: 'token',
// success: function (res) {
// console.log('本地获取token成功')
// console.log(res.data);
// getApp().globalData.token = res.data
// }
// })
let pages = getCurrentPages();
let currPage = pages[pages.length-1];
console.log('是否清除:')
console.log(currPage.data.isClean)
if (currPage.data.isClean == true){//这就是传递的参数
this.name = '',
this.phone = '',
this.location = '',
this.address = '',
this.activeProduct = '',
this.activeService = '',
this.demandContent= '',
this.isAgree = false,
this.isClean = false
}
if (currPage.data.isRefresh == true){//这就是传递的参数
uni.getStorage({
key: 'token',
success: function (res) {
console.log('本地获取token成功')
console.log(res.data);
getApp().globalData.token = res.data
}
})
}
}, },
/* /*
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
onLoad() { onLoad() {
//this.domain_name = getApp().globalData.domain_Name //this.domain_name = getApp().globalData.domain_Name
console.log('当前域名:'+this.domain_name) console.log('当前域名:'+this.domain_name)
}, },
methods: { methods: {
...@@ -78,6 +79,9 @@ ...@@ -78,6 +79,9 @@
//小程序获取code //小程序获取code
getCode: async function() { getCode: async function() {
let that = this let that = this
uni.showLoading({
title:'加载中'
})
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.login({ uni.login({
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
...@@ -97,6 +101,9 @@ ...@@ -97,6 +101,9 @@
}, },
fail: function(res) { fail: function(res) {
reject('用户授权失败wx.login'); reject('用户授权失败wx.login');
},
complete() {
uni.hideLoading()
} }
}); });
}); });
...@@ -109,6 +116,9 @@ ...@@ -109,6 +116,9 @@
console.log('通过code获取用户信息 请求接口:') console.log('通过code获取用户信息 请求接口:')
console.log(getApp().globalData.domain_Name console.log(getApp().globalData.domain_Name
+getApp().globalData.getUsersByCode) +getApp().globalData.getUsersByCode)
uni.showLoading({
title:'加载中'
})
uni.request({ uni.request({
url: this.domain_name url: this.domain_name
+getApp().globalData.getUsersByCode, +getApp().globalData.getUsersByCode,
...@@ -152,21 +162,31 @@ ...@@ -152,21 +162,31 @@
fail: (e) => { fail: (e) => {
console.log('通过code获取用户信息(新接口) 失败') console.log('通过code获取用户信息(新接口) 失败')
console.log(e) console.log(e)
},
complete() {
uni.hideLoading()
} }
}) })
}, },
//用户信息存本地 //用户信息存本地
saveUserInfo: async function(res) { saveUserInfo: async function(res) {
console.log('用户信息存本地 token:' +res.data.token); console.log('用户信息存本地 token:' +res.data.data.token);
uni.setStorage({ uni.setStorage({
key: 'token', key: 'token',
data: res.data.token, data: res.data.data.token,
success: function (res) { success: function (e) {
console.log('保存token 成功'+res); console.log('保存token 成功'+e);
} }
}); });
let pages = getCurrentPages();
let prevPage = pages[pages.length - 2]; //上一个页面
if(prevPage.route=='pages/index/index'){
prevPage.$vm.isRefresh = true;
}
uni.navigateBack({ uni.navigateBack({
}) })
...@@ -195,6 +215,9 @@ ...@@ -195,6 +215,9 @@
//通过手机号获取用户信息 //通过手机号获取用户信息
findByMobile: async function(e) { findByMobile: async function(e) {
uni.showLoading({
title:'加载中'
})
uni.request({ uni.request({
url: this.domain_name url: this.domain_name
+getApp().globalData.findByMobile, +getApp().globalData.findByMobile,
...@@ -231,6 +254,9 @@ ...@@ -231,6 +254,9 @@
fail: (e) => { fail: (e) => {
console.log('通过code获取用户信息(新接口) 失败') console.log('通过code获取用户信息(新接口) 失败')
console.log(e) console.log(e)
},
complete() {
uni.hideLoading()
} }
}) })
}, },
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
guard:'保内', guard:'保内',
type:'维修-调试', type:'维修-调试',
product:'小米 新风机', product:'小米 新风机',
status:'已完工',//待接单 待完工 已完工 status:'待完工',//待接单 待完工 已完工
description:'空调不冷', description:'空调不冷',
create_time:'2020-09-24 10:32:12', create_time:'2020-09-24 10:32:12',
book_time:'10-25 10:00', book_time:'10-25 10:00',
...@@ -183,21 +183,21 @@ ...@@ -183,21 +183,21 @@
} }
.willTakeView{ .willTakeView{
background-color: #007AFF; background-color: #FFFFFF;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.willFinishView{ .willFinishView{
background-color: #4CD964; background-color: #FFFFFF;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.finishView{ .finishView{
background-color: #F0AD4E; background-color: #FFFFFF;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
</view> </view>
</template> </template>
<view class="bottomView"> <view class="bottomView" @click="confirmClick()">
<text class="bottomTitle">完工</text> <text class="bottomTitle">确认完工</text>
</view> </view>
</view> </view>
</template> </template>
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
export default { export default {
data() { data() {
return { return {
orderId:'',
inGuaranteePeriod:false,
orderInfo:{ orderInfo:{
name:'梵护博', name:'梵护博',
phone:'15811112222', phone:'15811112222',
...@@ -64,11 +66,93 @@ ...@@ -64,11 +66,93 @@
}, },
} }
}, },
onLoad() { onLoad(e) {
this.orderId = '10704466'
this.inGuaranteePeriod = false
this.getConfig()
this.getCompletionConfigInfo()
}, },
methods: { methods: {
getConfig: function () {
console.log('获取 完工配置项')
uni.request({
url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/config/'
+'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
+'/completion/'+this.orderId
+'?inGuaranteePeriod='+this.inGuaranteePeriod,
method: 'GET',
data: {
},
header:{
'Content-Type': 'application/x-www-form-urlencoded',
},
success: (res) => {
console.log('获取 完工配置项 成功')
console.log(res)
if(res.data.code==200){
}else{
uni.showToast({
title:res.errMsg
})
}
},
fail: (e) => {
console.log('获取 完工配置项 失败')
console.log(e)
}
})
},
//获取完工页详情
getCompletionConfigInfo: function () {
//http://system.banshouhui.com/wxh-sts-rest/rest/worker/RTOKEN222bdab78b0d2a74f159b640df53180772813250/order/11885887?withMaintainDetailInfo=true&completionConfigInfo=true
uni.request({
url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/config/'
+'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
+'/completion/'+this.orderId
+'?inGuaranteePeriod='+this.inGuaranteePeriod,
method: 'GET',
data: {
},
header:{
'Content-Type': 'application/x-www-form-urlencoded',
},
success: (res) => {
console.log('获取完工页详情 成功')
console.log(res)
if(res.data.code==200){
}else{
uni.showToast({
title:res.errMsg
})
}
},
fail: (e) => {
console.log('获取完工页详情 失败')
console.log(e)
}
})
},
clickTypeClick: function (item) { clickTypeClick: function (item) {
console.log('点击类 点击') console.log('点击类 点击')
console.log(item.title) console.log(item.title)
...@@ -95,6 +179,136 @@ ...@@ -95,6 +179,136 @@
//console.log(key) //console.log(key)
}, },
confirmClick: function () {
console.log('确认完工 点击')
this.saveInfo()
},
//保存完工信息
/*
//http://system.banshouhui.com/wxh-worker-rest/rest/RTOKEN0ec239b327a6967c7de32ad014c894422df9706d/order/11885888/maintain
POST
参数处理:
//第一步:模型数组 转 字典
//照片单独判断
#pragma mark -- 配件重构:配件的fieldsValue只需要传 part_id(配件ID)和 quantity(申请数量)两个字段。
//配件单独判断
#pragma mark -- 机身条码 单独判断
//第三步:数组 转 JSON
//第四步:放入key为maintainFields的字典中
//第五步:字典 转 JSON
*/
saveInfo: function () {
console.log('保存完工信息 点击')
uni.request({
url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/'
+'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
+'/order/'+this.orderId
+'/maintain',
method: 'POST',
data: {
maintainFields:''
},
header:{
'Content-Type': 'application/x-www-form-urlencoded',
},
success: (res) => {
console.log('获取完工页详情 成功')
console.log(res)
console.log(res.statusCode)
if(res.statusCode==200){
this.finishConfirm()
}else{
uni.showToast({
title:res.data
})
}
},
fail: (e) => {
console.log('获取完工页详情 失败')
console.log(e)
uni.showToast({
title:'完工失败'
})
}
})
},
//确认完工
/*
//http://system.banshouhui.com/wxh-worker-rest/rest/RTOKEN08f9c2c9561e580ebf4de168b56a72a35d2a28e2/order/11885887/finishedAndConfirm
request.HTTPMethod=@"POST";//设置请求方法.
[request setValue:@"gzip" forHTTPHeaderField:@"Content-Encoding"];
[request setValue: @"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
*/
finishConfirm: function () {
console.log('确认完工 点击')
uni.request({
url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/'
+'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
+'/order/'+this.orderId
+'/finishedAndConfirm',
method: 'POST',
data: {
},
header:{
'Content-Type': 'application/x-www-form-urlencoded',
'Content-Encoding': 'gzip'
},
success: (res) => {
console.log('确认完工 成功')
console.log(res)
console.log(res.statusCode)
if(res.statusCode==200){
}else{
uni.showToast({
title:res.data
})
}
},
fail: (e) => {
console.log('确认完工 失败')
console.log(e)
uni.showToast({
title:'完工失败'
})
}
})
},
} }
} }
......
...@@ -344,10 +344,9 @@ ...@@ -344,10 +344,9 @@
///wxh-worker-rest/rest/order/traceAndAppointment/traceOrder/RTOKEN16ccb9588e63340a6993b3144423131e2c1e0694/order/11889179 ///wxh-worker-rest/rest/order/traceAndAppointment/traceOrder/RTOKEN16ccb9588e63340a6993b3144423131e2c1e0694/order/11889179
//appointmentDatetime=2020-12-05 11:28&orderDelayReason=&orderTraceRemark=&accessoryApply=false //appointmentDatetime=2020-12-05 11:28&orderDelayReason=&orderTraceRemark=&accessoryApply=false
bookPost: function (dateTime) { bookPost: function (dateTime) {
//dateTime.split("0,16"); dateTime = dateTime.substr(0,16);
//2020/12/25 15:00:12 //2020/12/25 15:00:12
dateTime = '2020/12/25 15:00' console.log('预约请求 dateTime'+dateTime)
console.log('预约请求')
uni.request({ uni.request({
url: getApp().globalData.domain_Name url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/order/traceAndAppointment/traceOrder/' +'/wxh-worker-rest/rest/order/traceAndAppointment/traceOrder/'
......
<template>
<view class="">
服务措施
</view>
</template>
<script>
export default {
data() {
return {
orderInfo:'',
}
},
onLoad() {
},
onShow(){
},
methods: {
finishClick: function () {
uni.navigateTo({
url: '/pages/take/finish'
})
},
}
}
</script>
<style>
</style>
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
}, },
onLoad(e) { onLoad(e) {
//
//10704467 //10704467
this.orderId = '10704466' this.orderId = '10704466'
...@@ -164,12 +163,14 @@ ...@@ -164,12 +163,14 @@
//立即入驻 //立即入驻
enterNow: function () { enterNow: function () {
console.log('立即入驻') console.log('立即入驻')
//https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40
}, },
//立即完善 //立即完善
completeNow: function () { completeNow: function () {
console.log('立即完善') console.log('立即完善')
//https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40
}, },
//联系客服 //联系客服
......
{"version":3,"sources":["uni-app:///main.js",null,"webpack:////Users/liyifan/Desktop/take-order/take-order/pages/take/measure.vue?15fe","webpack:////Users/liyifan/Desktop/take-order/take-order/pages/take/measure.vue?f4dc","webpack:////Users/liyifan/Desktop/take-order/take-order/pages/take/measure.vue?bd5d","uni-app:///pages/take/measure.vue"],"names":["createPage","Page"],"mappings":";;;;;;;;;;kDAAA;AACA;AACA,gG;AACAA,UAAU,CAACC,gBAAD,CAAV,C;;;;;;;;;;;;;ACHA;AAAA;AAAA;AAAA;AAAA;AAAoH;AACpH;AAC2D;AACL;;;AAGtD;AACgN;AAChN,gBAAgB,iNAAU;AAC1B,EAAE,6EAAM;AACR,EAAE,kFAAM;AACR,EAAE,2FAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,sFAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACtBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;ACRA;AAAA;AAAA;AAAA;AAAq0B,CAAgB,qyBAAG,EAAC,C;;;;;;;;;;;;;;;;;;;ACOz1B;AACA,MADA,kBACA;AACA;AACA,mBADA;;AAGA,GALA;AAMA,QANA,oBAMA;;AAEA,GARA;AASA,QATA,oBASA;;AAEA,GAXA;AAYA;;AAEA;AACA;AACA,iCADA;;AAGA,KANA,EAZA,E","file":"pages/take/measure.js","sourcesContent":["import 'uni-pages';\nimport Vue from 'vue'\nimport Page from './pages/take/measure.vue'\ncreatePage(Page)","import { render, staticRenderFns, recyclableRender, components } from \"./measure.vue?vue&type=template&id=2cc24c62&\"\nvar renderjs\nimport script from \"./measure.vue?vue&type=script&lang=js&\"\nexport * from \"./measure.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null,\n false,\n components,\n renderjs\n)\n\ncomponent.options.__file = \"pages/take/measure.vue\"\nexport default component.exports","export * from \"-!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--16-0!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./measure.vue?vue&type=template&id=2cc24c62&\"","var components\nvar render = function() {\n var _vm = this\n var _h = _vm.$createElement\n var _c = _vm._self._c || _h\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./measure.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./measure.vue?vue&type=script&lang=js&\"","<template>\n\t<view class=\"\">\n\t\t服务措施\n\t</view>\n</template>\n\n<script>\n\texport default {\n\t\tdata() {\n\t\t\treturn {\n\t\t\t\torderInfo:'',\n\t\t\t}\n\t\t},\n\t\tonLoad() {\n\t\t\t\n\t\t},\n\t\tonShow(){\n\t\t\t\n\t\t},\n\t\tmethods: {\n\t\t\t\n\t\t\tfinishClick: function () {\n\t\t\t\tuni.navigateTo({\n\t\t\t\t\turl: '/pages/take/finish'\n\t\t\t\t})\n\t\t\t},\n\t\t\t\n\t\t}\n\t}\n</script>\n\n<style>\n</style>\n"],"sourceRoot":""}
\ No newline at end of file
{ {
"pages": [ "pages": [
"pages/take/index",
"pages/index/index", "pages/index/index",
"pages/take/index",
"pages/take/finish", "pages/take/finish",
"pages/take/measure",
"pages/take/rob", "pages/take/rob",
"pages/take/detail", "pages/take/detail",
"pages/index/record", "pages/index/record",
......
...@@ -140,9 +140,10 @@ var _default = ...@@ -140,9 +140,10 @@ var _default =
//工单详情 //工单详情
workOrderDetail: '', workOrderDetail: '',
//预约 V2 //预约 V2
orderReserve: '' orderReserve: '',
///wxh-worker-rest/rest/project/order/reserve/{token} //工单完工
}, configCompletion: '' },
...@@ -166,7 +167,7 @@ var _default = ...@@ -166,7 +167,7 @@ var _default =
// //
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502 //RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'; //this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
this.initAPIneedToken(); this.initAPIneedToken();
console.log('当前token', this.token); console.log('当前token', this.token);
...@@ -218,6 +219,9 @@ var _default = ...@@ -218,6 +219,9 @@ var _default =
this.globalData.orderReserve = '/wxh-worker-rest/rest/project/order/reserve/' + this.globalData.orderReserve = '/wxh-worker-rest/rest/project/order/reserve/' +
this.globalData.token, this.globalData.token,
console.log('预约 V2' + this.globalData.orderReserve); console.log('预约 V2' + this.globalData.orderReserve);
//工单完工
this.globalData.configCompletion = '';
///wxh-worker-rest/rest/config/RTOKEN222bdab78b0d2a74f159b640df53180772813250/completion/11885887?inGuaranteePeriod=true
} }
......
...@@ -3460,6 +3460,10 @@ u-dropdown { ...@@ -3460,6 +3460,10 @@ u-dropdown {
......
{
"usingComponents": {},
"component": true
}
\ No newline at end of file
<view><picker mode="multiSelector" range="{{dates}}" value="{{value}}" disabled="{{disabled}}" data-event-opts="{{[['change',[['confirm',['$event']]]],['columnchange',[['scroll',['$event']]]],['cancel',[['cancel',['$event']]]]]}}" bindchange="__e" bindcolumnchange="__e" bindcancel="__e"><slot></slot></picker></view>
\ No newline at end of file
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
justify-content: space-between; justify-content: space-between;
} }
.willTakeView{ .willTakeView{
background-color: #007AFF; background-color: #FFFFFF;
width: 100%; width: 100%;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
flex-direction: column; flex-direction: column;
} }
.willFinishView{ .willFinishView{
background-color: #4CD964; background-color: #FFFFFF;
width: 100%; width: 100%;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
flex-direction: column; flex-direction: column;
} }
.finishView{ .finishView{
background-color: #F0AD4E; background-color: #FFFFFF;
width: 100%; width: 100%;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
......
<view><view class="topView"><view class="nameView"><text class="u-font-24 u-m-l-24">{{"联系人:"+orderInfo.name}}</text><text data-event-opts="{{[['tap',[['phoneCallClick',['$0'],['orderInfo.phone']]]]]}}" class="u-font-24 u-m-l-24 underLine" bindtap="__e">{{orderInfo.phone}}</text></view><text class="u-font-24 u-m-l-24 u-m-t-24">{{"地址:"+orderInfo.address}}</text><view class="typeView"><text class="u-font-24 u-m-l-24">{{"类型:("+orderInfo.guard+") "+orderInfo.type}}</text><text class="u-font-24 u-m-r-24">{{"产品:"+orderInfo.product}}</text></view></view><block wx:for="{{orderInfo.typeList}}" wx:for-item="item" wx:for-index="ikey"><block wx:if="{{item.type=='click'||item.type=='scan'}}"><view data-event-opts="{{[['tap',[['clickTypeClick',['$0'],[[['orderInfo.typeList','',ikey]]]]]]]}}" class="clickTypeView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.title}}</text><image class="arrowIcon u-m-r-24" src mode></image></view></block><block wx:if="{{item.type=='photo'}}"><view class="inputTypeView"><text class="u-font-24 u-m-l-24">{{item.title}}</text><input class="input u-m-r-24" type="text" value="" placeholder="请输入内容"/></view></block><block wx:if="{{item.type=='photo'}}"><view class="photoTypeView"><text class="u-font-24 u-m-l-24 u-m-t-24">{{item.title}}</text><block wx:if="{{item.images.length>0}}"><view class="photoBackView u-p-b-24"><block wx:for="{{item.images}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><view data-event-opts="{{[['tap',[['photoClick',['$0'],[[['orderInfo.typeList','',ikey],['images','',ikey]]]]]]]}}" class="photoItemView" bindtap="__e"><image class="photoImage" src="{{item.image}}" mode="aspectFill"></image></view></block></view></block></view></block><block wx:if="{{item.type=='textArea'}}"><view class="textAreaTypeView bottomPadding"><text class="u-font-24 u-m-l-24 u-m-t-24">{{item.title}}</text><view class="textAreaView"><textarea class="textArea u-m-l-24 u-m-r-24 u-m-t-24 u-m-b-24" value="" placeholder="请输入备注"></textarea></view></view></block></block><view class="bottomView"><text class="bottomTitle">完工</text></view></view> <view><view class="topView"><view class="nameView"><text class="u-font-24 u-m-l-24">{{"联系人:"+orderInfo.name}}</text><text data-event-opts="{{[['tap',[['phoneCallClick',['$0'],['orderInfo.phone']]]]]}}" class="u-font-24 u-m-l-24 underLine" bindtap="__e">{{orderInfo.phone}}</text></view><text class="u-font-24 u-m-l-24 u-m-t-24">{{"地址:"+orderInfo.address}}</text><view class="typeView"><text class="u-font-24 u-m-l-24">{{"类型:("+orderInfo.guard+") "+orderInfo.type}}</text><text class="u-font-24 u-m-r-24">{{"产品:"+orderInfo.product}}</text></view></view><block wx:for="{{orderInfo.typeList}}" wx:for-item="item" wx:for-index="ikey"><block wx:if="{{item.type=='click'||item.type=='scan'}}"><view data-event-opts="{{[['tap',[['clickTypeClick',['$0'],[[['orderInfo.typeList','',ikey]]]]]]]}}" class="clickTypeView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.title}}</text><image class="arrowIcon u-m-r-24" src mode></image></view></block><block wx:if="{{item.type=='photo'}}"><view class="inputTypeView"><text class="u-font-24 u-m-l-24">{{item.title}}</text><input class="input u-m-r-24" type="text" value="" placeholder="请输入内容"/></view></block><block wx:if="{{item.type=='photo'}}"><view class="photoTypeView"><text class="u-font-24 u-m-l-24 u-m-t-24">{{item.title}}</text><block wx:if="{{item.images.length>0}}"><view class="photoBackView u-p-b-24"><block wx:for="{{item.images}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><view data-event-opts="{{[['tap',[['photoClick',['$0'],[[['orderInfo.typeList','',ikey],['images','',ikey]]]]]]]}}" class="photoItemView" bindtap="__e"><image class="photoImage" src="{{item.image}}" mode="aspectFill"></image></view></block></view></block></view></block><block wx:if="{{item.type=='textArea'}}"><view class="textAreaTypeView bottomPadding"><text class="u-font-24 u-m-l-24 u-m-t-24">{{item.title}}</text><view class="textAreaView"><textarea class="textArea u-m-l-24 u-m-r-24 u-m-t-24 u-m-b-24" value="" placeholder="请输入备注"></textarea></view></view></block></block><view data-event-opts="{{[['tap',[['confirmClick']]]]}}" class="bottomView" bindtap="__e"><text class="bottomTitle">确认完工</text></view></view>
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
{
"navigationBarTitleText": "服务措施",
"usingComponents": {}
}
\ No newline at end of file
<view>服务措施</view>
\ No newline at end of file
/* pages/take/measure.wxss */
\ No newline at end of file
...@@ -4,42 +4,14 @@ ...@@ -4,42 +4,14 @@
"ignore": [] "ignore": []
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": false
"es6": true,
"enhance": false,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": false,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"enableEngineNative": false,
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "", "libVersion": "",
"appid": "touristappid", "appid": "touristappid",
"projectname": "take-order", "projectname": "take-order",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": { "condition": {
"search": { "search": {
"list": [] "list": []
......
{
"desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
{
"desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
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