From c1156037edfe6116a01a0018c6ae716e5fde6a27 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Thu, 25 Apr 2024 17:27:03 +0800 Subject: [PATCH] 11 --- package1/AI/addAiList.vue | 43 +++++++-- package1/inventory/inventoryConfirm.vue | 6 ++ package1/other/logistics.vue | 114 ++++++++++++++++++------ package1/staff/addStaff.vue | 6 +- 4 files changed, 132 insertions(+), 37 deletions(-) diff --git a/package1/AI/addAiList.vue b/package1/AI/addAiList.vue index 229ca8c..6e51f0b 100644 --- a/package1/AI/addAiList.vue +++ b/package1/AI/addAiList.vue @@ -28,15 +28,42 @@ }, methods: { submit(){ - this.tui.request("/app/problemFeedback/getProblemFeedbackList", "POST", { - problemContent:'', - pageNum:1, - pageSize:10 - }, false, false).then((res1) => { - - }).catch((res) => { - this.tui.toast(res) + uni.request({ + url: this.tui.interfaceUrl() + '/app/logitics/edit', + data: { + id: "1782981706819702784", + password: "888888", + companyName: "测试勿选", + companyTel: "18888888888", + mobile: "18888888888", + username: "18888888888", + contacts: "测试" + }, + header: { + 'content-type': 'application/json', + 'Accesstoken': "22f5698ef97c422ba1c81570b1370a54" + }, + method: 'PUT', //'GET','POST' + dataType: 'json', + success: (res) => { + if (res.data.code == 200){ + this.upDoorList = res.data.result.records + this.waitUpDoorNum = res.data.result.total + } + }, + fail: (res) => { + this.tui.toast("网络不给力，请稍后再试~") + } }) + // this.tui.request("/app/logitics/edit", "POST", { + // problemContent:'', + // pageNum:1, + // pageSize:10 + // }, false, false).then((res1) => { + + // }).catch((res) => { + // this.tui.toast(res) + // }) }, convertChineseToArabic(str) { const chineseNumToArabic = { diff --git a/package1/inventory/inventoryConfirm.vue b/package1/inventory/inventoryConfirm.vue index 6f7516d..d7596ab 100644 --- a/package1/inventory/inventoryConfirm.vue +++ b/package1/inventory/inventoryConfirm.vue @@ -100,6 +100,9 @@ methods: { inventorySubmit() { let url; + uni.showLoading({ + title: '加载中...' + }) if(this.aiinventory == 1){ url = '/app/stock/putInPriceOfAi' }else{ @@ -126,6 +129,9 @@ }) } }) + setTimeout(res => { + uni.hideLoading(); + }, 2000) }, batchPrint(){ uni.navigateTo({ diff --git a/package1/other/logistics.vue b/package1/other/logistics.vue index 7c9ad95..e15b9d6 100644 --- a/package1/other/logistics.vue +++ b/package1/other/logistics.vue @@ -10,7 +10,11 @@ + --> + + 您现在是“离线”状态 + 您现在是“在线”状态 + @@ -20,6 +24,12 @@ + + + + + + 长按以下内容复制 + + + + 店铺名：{{copyItem.shopName}} + + + 电话：{{copyItem.createBy || copyItem.createByPhone}} + + + 地区：河北省沧州市运河区 + + + 详细地址：{{copyItem.getOrderAddress}} + + + + + 客户名：{{copyItem.userName}} + + + 电话：{{copyItem.userPhone || copyItem.userMobile}} + + + 地区：{{copyItem.province + copyItem.city + copyItem.area}} + + + 详细地址：{{copyItem.receiveAddress || (copyItem.orderAddress.indexOf("-") == -1?copyItem.orderAddress:copyItem.orderAddress.split(' ')[3])}} + + + @@ -123,7 +169,9 @@ companyName:'', current:0, waitUpDoorNum:0, - upDoorList:[] + upDoorList:[], + copyType:'', + copyItem:[] } }, created() { @@ -255,11 +303,15 @@ } }) }, - //复制地址 - copyAddress(item,type){ - console.log(item); - if(type=='fa'){ - var data = item.shopName + (item.createBy || item.createByPhone)+'河北省沧州市运河区明珠商贸城' + item.getOrderAddress + copyText(text,type){ + console.log('这里',text) + if(type == 'orderAddress'){ + let data = "" + if(text.indexOf("-") == -1){ + data = text + }else{ + data = text.split(" ")[3] + } uni.setClipboardData({ data: data, success: function () { @@ -267,36 +319,33 @@ } }); }else{ - var aaa = item.orderAddress.substr(item.orderAddress.indexOf('-')) - var data = item.userName +(item.userPhone || item.userMobile) + item.province+item.city+item.area+aaa uni.setClipboardData({ - data: data, + data: text, success: function () { console.log('复制成功'); } }); } + + }, + //复制地址 + copyAddress(item,type){ + console.log(item); + this.copyType = type + this.copyItem = item + this.$refs.copyPopup.open() }, //复制地址 upDoorCopyAddress(item,type){ console.log(item); - if(type=='fa'){ - var data = item.shopName + item.createByPhone +'河北省沧州市运河区明珠商贸城' + item.shopAddress - uni.setClipboardData({ - data: data, - success: function () { - console.log('复制成功'); - } - }); - }else{ - var data = item.userName +item.userPhone + item.province+item.city+item.area + item.receiveAddress - uni.setClipboardData({ - data: data, - success: function () { - console.log('复制成功'); - } - }); - } + this.copeType = type + this.copeItem = item + this.$refs.copyPopup.open() + }, + daCall(phone){ + uni.makePhoneCall({ + phoneNumber: phone + }); }, sectionChange(index) { this.current = index @@ -398,6 +447,7 @@ } this.totalPages = res.data.result.totalPages } + console.log('bList',this.bList) }, fail: (res) => { this.tui.toast("网络不给力，请稍后再试~") @@ -559,5 +609,15 @@ background: linear-gradient(90deg, #60F3FF, #088FEB); float: right; margin: 0 10rpx 20rpx 0; + } + .copy-box{ + width: 95%; + margin:0 auto; + view{ + height: 100rpx; + line-height: 100rpx; + font-size: 30rpx; + text-align: center; + } } \ No newline at end of file diff --git a/package1/staff/addStaff.vue b/package1/staff/addStaff.vue index 630104b..16b07be 100644 --- a/package1/staff/addStaff.vue +++ b/package1/staff/addStaff.vue @@ -23,7 +23,8 @@ data() { return { addForm: { - nickname: '', + nickname: '', + username:'', mobile: '', type: '', password:'123456' @@ -65,7 +66,8 @@ const item = JSON.parse(options.item) this.type = options.type if (type === 'edit') { - this.addForm.nickname = item.nickname + this.addForm.nickname = item.nickname + this.addForm.username = item.mobile this.addForm.mobile = item.mobile this.addForm.type = Number(item.type) this.id = item.id