Commit 3bcfb5c5 authored by Damon's avatar Damon

Merge branch 'dev-1.4.3' of git.banshouhui.com:lijundan/self-support into dev-1.4.3

parents 1f8f83d7 00deb534
;(function() {
let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null
let VERSION_NUMBER = '1.3.19' //版本号
let VERSION_NUMBER = '1.4.0' //版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if (process.env.NODE_ENV === 'development') {
if (NODE_ENV === 'dev') {
......
......@@ -196,7 +196,8 @@ let orderApiFun = function(vm){
let receiveParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/' + partOrderId +'/receive',{}, formType);
// 配件申请单-取消申请
let cancelParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/'+ partOrderId +'/cancel',{}, formType);
// 点击了异常单去处理
let workerDealWithError = async (params = {}, orderId) => await vm.$u.get( prefix + vm.vuex_token + '/order/' + orderId + '/workerDealWithError', params)
const orderApi = {
listByRecommendOrder,
listOrderCount,
......@@ -247,7 +248,8 @@ let orderApiFun = function(vm){
getLogistics,
getOrderPartsSum,
receiveParts,
cancelParts
cancelParts,
workerDealWithError
}
return orderApi
}
......
/** 自定义组件 共同逻辑 */
export default {
data() {
return {
dataValue: ''
}
data() {
return {
dataValue: '',
}
},
watch: {
value: function(val) {
this.dataValue = val
},
watch: {
value: function(val) {
this.dataValue = val
}
},
props: {
value: {
type: [String, Number],
default: '',
},
props: {
value: {
type: [String, Number],
default: ''
},
/** 索引值 用于更新数据 */
itemIndex:Number,
groupIndex:Number,
/** 包含数据源 */
item: Object,
disabled: {
type: Boolean,
default: false
}
/** 索引值 用于更新数据 */
itemIndex: Number,
groupIndex: Number,
/** 包含数据源 */
item: Object,
disabled: {
type: Boolean,
default: false,
},
},
mounted() {
mounted() {
/** 如果有值以传入值为主 如果无值 已默认值为主 */
this.dataValue = this.value
},
this.dataValue = this.value
},
methods: {
methods: {
// 输入的值
valueChange(val) {
const data = {
groupIndex: this.groupIndex,// 左侧菜单下标
itemIndex:this.itemIndex,//右侧某一项下标
value: val
}
this.$emit('value-change', data)
}
}
valueChange(val) {
if (this.type == 'digit') {
// 防止粘贴非数字
val = val.replace(/[^\d.]/gi, '')
this.$nextTick(() => {
this.dataValue = val
})
}
const data = {
groupIndex: this.groupIndex, // 左侧菜单下标
itemIndex: this.itemIndex, //右侧某一项下标
value: val,
}
this.$emit('value-change', data)
},
},
}
......@@ -300,7 +300,10 @@ export default {
}
})
},
handleClickCellButton(item) {
handleClickCellButton(item, type) {
if (type == 'exception') {
this.$u.api.workerDealWithError(item.orderId).then(() => {})
}
// 去完工
uni.navigateTo({
url:
......
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