diff --git a/.gitignore b/.gitignore index 1ad26e5..a43dfe5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ yarn-error.log* /test/unit/coverage/ /test/e2e/reports/ selenium-debug.log +nodePath.txt # Editor directories and files .idea diff --git a/init.bat b/init.bat index c27bfd8..bb2a34e 100644 --- a/init.bat +++ b/init.bat @@ -1,7 +1,7 @@ set /P nodePath= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 小时 + 小时 + 元 + + + + + +
+ + +
@@ -580,6 +668,7 @@ export default { id: '', min: '', value: '', + value2: '', type: '', }, dividedDetailsForm: { @@ -651,7 +740,18 @@ export default { } }, methods: { - + log(...d) { + console.log('log ->',...d); + }, + getSplitValue(index = 0, defTxt = '', splitTxt = ',') { + return this.getSplitOtherValue(null,index,defTxt,splitTxt); + }, + getSplitOtherValue(v, index = 0, defTxt = '', splitTxt = ',') { + let value = v; + if(!value) value = this.form.value || ''; + let txts = value.split(splitTxt); + return txts[index] || defTxt; + }, changeServerType() { console.log(this.serverValue); this.getDividedDetailsList(); @@ -687,70 +787,61 @@ export default { if (tab._props.label == '全局系统配置') { this.condition = 'xitong' this.dataSelect() - } - if (tab._props.label == '首页配置') { + } else if (tab._props.label == '首页配置') { this.condition = 'shouye' this.dataSelect() - } - if (tab._props.label == '微信配置') { + } else if (tab._props.label == '微信配置') { this.condition = 'weixin' this.dataSelect() - } - if (tab._props.label == '支付宝配置') { + } else if (tab._props.label == '支付宝配置') { this.condition = 'zhifubao' this.dataSelect() - } - if (tab._props.label == '短信配置') { + } else if (tab._props.label == '短信配置') { this.condition = 'duanxin' this.dataSelect() - } - if (tab._props.label == '任务系统配置') { + } else if (tab._props.label == '任务系统配置') { this.condition = 'renwu' this.dataSelect() - } - if (tab._props.label == '协议配置') { + } else if (tab._props.label == '协议配置') { this.condition = 'xieyi' this.dataSelect() - } - if (tab._props.label == 'APP消息推送配置') { + } else if (tab._props.label == 'APP消息推送配置') { this.condition = 'push' this.dataSelect() - } - if (tab._props.label == '文件上传配置') { + } else if (tab._props.label == '文件上传配置') { this.condition = 'oss' this.dataSelect() - } - if (tab._props.label == '开关配置') { + } else if (tab._props.label == '开关配置') { this.condition = 'kaiguan' this.dataSelect() - } - if (tab._props.label == '图片配置') { + } else if (tab._props.label == '图片配置') { this.condition = 'image' this.dataSelect() - } if (tab._props.label == '分成明细配置') { + } else if (tab._props.label == '分成明细配置') { this.condition = 'fcmx'; this.getDividedDetailsList(); this.getServer(); - } - if (tab._props.label == '出行配置') { + } else if (tab._props.label == '出行配置-') { this.condition = 'chuxing' this.dataSelect() - } - if (tab._props.label == '语音配置') { + } else if (tab._props.label == '语音配置') { this.condition = 'yuyin' this.dataSelect() - } - if (tab._props.label == '服务费配置') { + } else if (tab._props.label == '服务费配置') { this.condition = 'fuwufei' this.dataSelect() - } - if (tab._props.label == '客服配置') { + } else if (tab._props.label == '客服配置') { this.condition = 'kefu' this.dataSelect() - } - if (tab._props.label == '商家配置') { + } else if (tab._props.label == '商家配置') { this.condition = 'shop' this.dataSelect() + } else if (tab._props.label == '修改与取消服务配置') { + this.condition = 'v3_order_form' + this.dataSelect() + } else if (tab._props.label == '出行配置') { + this.condition = 'v3_travel_conf' + this.dataSelect() } }, getDividedDetailsList() { @@ -794,6 +885,8 @@ export default { if (this.form.type == 330) { this.address = rows.value this.select() + } else if(this.form.type == 443 || this.form.type == 444 || this.form.type == 445 || this.form.type == 446) { + this.form.value2 = [ this.getSplitOtherValue(rows.value,0), this.getSplitOtherValue(rows.value,1) ]; } }, openDividedDialog(index, rows) { @@ -812,17 +905,22 @@ export default { amendNoticeTo() { if (this.form.type == 330) { this.form.value = this.address - } - if (this.form.conditionFrom == "xitong" && this.form.type == 433) { + } else if (this.form.conditionFrom == "xitong" && this.form.type == 433) { if (this.form.value) window.localStorage.setItem("ringOrderId", this.form.value); - } - if (this.form.conditionFrom == "xitong" && this.form.type == 100000) { + } else if (this.form.conditionFrom == "xitong" && this.form.type == 100000) { let regRule = new RegExp("^[0-9]*[1-9][0-9]*$"); if (!regRule.test(this.form.value)) { this.form.value = "10"; this.$message.error('当前值只能输入正整数'); return; } + } else if(this.form.type == 443) { + //判断不能为空 + if(!this.form.value || this.form.value == ','){ + this.$message.error('请选择日期'); + return; + } + } console.log(this.form); this.$http({ diff --git a/src/views/travelConf/index.vue b/src/views/travelConf/index.vue new file mode 100644 index 0000000..85cf0f8 --- /dev/null +++ b/src/views/travelConf/index.vue @@ -0,0 +1,4560 @@ + + + + +