11

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 = {

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({

package1/other/logistics.vue

@@ -10,7 +10,11 @@
 					<!-- <text @tap="toggle" style="color:red;text-decoration-line: underline;padding-left:30rpx;">（{{waitUpDoorNum}}个待上门取货）</text> -->
 					<!-- <view class="btn" @tap="gotoSearchData">
 						历史订单 >
-					</view> -->
+					</view> -->
+					<view style="text-align: right;width: 44%;float: right;font-size: 26rpx;padding-right: 20rpx;">
+						<text v-if="type == 0">您现在是“<text>离线</text>”状态</text>
+						<text v-if="type == 1">您现在是“<text style="color: chartreuse;">在线</text>”状态</text>
+					</view>
 				</i>
 			</view>
 		</view>
@@ -20,6 +24,12 @@
 				<ul>
 					<li v-for="(item,index ) in bList" :key="index">
 						<uni-card :title="'店铺名称:'+item.shopName" :sub-title="item.getOrderAddress+'（'+item.mobile+'）'">
+							<view v-if="this.current != 3 && item.workerMobile" @tap="daCall(item.workerMobile)" style="width: 150rpx;font-size: 26rpx;text-decoration-line: underline;color: blue;position: absolute;top: 20rpx;right: 10rpx;">
+								联系拉包工
+							</view>
+							<view v-if="this.current == 3 && item.createByPhone"  @tap="daCall(item.createByPhone)" style="width: 125rpx;font-size: 26rpx;text-decoration-line: underline;color: blue;position: absolute;top: 20rpx;right: 0;">
+								联系店铺
+							</view>
 							<view class="uni-body">
 								<text class="cardText">{{item.orderAddress}}</text>
 							</view>
@@ -75,6 +85,42 @@
 						</ul>
 					</view>
 			</view>
+		</uni-popup>
+		<!-- 复制地址选择弹窗 -->
+		<uni-popup ref="copyPopup" background-color="#fff" :is-mask-click="true">
+			<view class="type-popup" style="height:600rpx;margin-bottom: 0;border-radius: 0;">
+				<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
+					长按以下内容复制
+				</view>
+				<view class="copy-box" v-if="copyType == 'fa'">
+					<view @longpress="copyText(copyItem.shopName)" style="margin-top:40rpx;">
+						<view>店铺名：{{copyItem.shopName}}</view>
+					</view>
+					<view @longpress="copyText(copyItem.createBy || copyItem.createByPhone)">
+						<view>电话：{{copyItem.createBy || copyItem.createByPhone}}</view>
+					</view>
+					<view @longpress="copyText('河北省沧州市运河区')">
+						<view>地区：河北省沧州市运河区</view>
+					</view>
+					<view @longpress="copyText(copyItem.getOrderAddress)">
+						<view>详细地址：{{copyItem.getOrderAddress}}</view>
+					</view>
+				</view>
+				<view class="copy-box" v-if="copyType == 'shou'">
+					<view @longpress="copyText(copyItem.userName)" style="margin-top:40rpx;">
+						<view>客户名：{{copyItem.userName}}</view>
+					</view>
+					<view @longpress="copyText(copyItem.userPhone || copyItem.userMobile)">
+						<view>电话：{{copyItem.userPhone || copyItem.userMobile}}</view>
+					</view>
+					<view @longpress="copyText(copyItem.province + copyItem.city + copyItem.area,'orderAddress')">
+						<view>地区：{{copyItem.province + copyItem.city + copyItem.area}}</view>
+					</view>
+					<view @longpress="copyText(copyItem.receiveAddress || copyItem.orderAddress,'orderAddress')">
+						<view>详细地址：{{copyItem.receiveAddress || (copyItem.orderAddress.indexOf("-") == -1?copyItem.orderAddress:copyItem.orderAddress.split(' ')[3])}}</view>
+					</view>
+				</view>
+			</view>
 		</uni-popup>
 	</view>
 </template>
@@ -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;
+		}
 	}
 </style>

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