供货商、零售端语音播报、员工列表头像修改成圆形，平台门店做分页，供货商调拨出库返回优化、库存不限制

ghsApp/src/admin/staff/list.vue

@@ -8,7 +8,7 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<div class="list" v-for="(item, index) in list.data" :key="index">
 						<div>
-							<image :src="item.avatar" mode="aspectFit" style="width:100rpx;height:100rpx;"></image>
+							<image :src="item.avatar" mode="aspectFit" style="width:100rpx;height:100rpx;border-radius: 50%"></image>
 						</div>
 						<div class="list-det">
 							<div class="list-det-left">

ghsApp/src/common/pageSuccess.vue

@@ -18,9 +18,12 @@ export default {
 	onLoad(e){
   	this.title = e.title
 	},
-  methods: {
+	onUnload(){
+		uni.navigateBack({delta:2})
+	},
+		methods: {
     closeLayer() {
-					uni.navigateBack({delta: 2});
+					uni.navigateBack({delta: 3});
     },
   },
 };

ghsApp/src/mixins/priceSocket.js

@@ -34,8 +34,13 @@ export default {
 							case "money":
 								//到账消息    data:  {type: "money", msg: "微信到账1.2", money: 1.2}
 								console.log(data);
-
-								this.playPriceAudio(data.money);
+								// this.playPriceAudio(data.money);
+								this.createPlayHandlerFun(data.url);
+								break;
+							case "new_order":
+								//新订单    data:  {type: "money", msg: "微信到账1.2", money: 1.2}
+								console.log(data);
+								this.createPlayHandlerFun(data.url);
 								break;
 							default:
 								console.log("default");
@@ -46,5 +51,21 @@ export default {
 				});
 			}
 		},
+		createPlayHandlerFun(url) {
+			const innerAudioContext = uni.createInnerAudioContext();
+			innerAudioContext.autoplay = true;
+			innerAudioContext.src = url;
+			innerAudioContext.onPlay(() => {
+				console.log("开始播放");
+			});
+			innerAudioContext.onError(res => {
+				console.log(res.errMsg);
+				console.log(res.errCode);
+			});
+			innerAudioContext.onEnded(err => {
+				console.log("开始结束");
+				innerAudioContext.destroy();
+			});
+		}
 	}
 };

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -159,6 +159,7 @@ export default {
 				// },
 			],
 			isModel: false,
+			offVerifyRepertory: true,
 			isSmallCount:false,//是否是小单位（支）
 			customData: {
 				bigCount: 0,
@@ -199,33 +200,29 @@ export default {
 				if (val.index === 0) {
 					this.modalCancel();
 				} else {
-					const {
-						bigCount,
-						smallCount,
-						bigNum,
-						bigUnit,
-						smallNum,
-						smallUnit,
-						ratio
-					} = this.customData;
-					const ratioNum = Number(ratio);
-
-					//超过库存时 设置为库存最大值
-					if (
-						Number(bigCount) * ratioNum + Number(smallCount) >
-						Number(bigNum) * ratioNum + Number(smallNum)
-					) {
-						uni.showToast({
-							title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,
-							icon: "none"
-						});
-						this.customData.bigCount = 0;
-						this.customData.smallCount = 0;
-						this.delAllEvent(this.customData)
-					} else {
-						this.updateItemEvent(this.customData);
-						this.modalCancel();
-					}
+					this.updateItemEvent(this.customData);
+					this.modalCancel();
+					// const {
+					// 	bigCount,
+					// 	smallCount,
+					// 	bigNum,
+					// 	bigUnit,
+					// 	smallNum,
+					// 	smallUnit,
+					// 	ratio
+					// } = this.customData;
+					// const ratioNum = Number(ratio);
+					//
+					// //超过库存时 设置为库存最大值
+					// if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
+					// 	uni.showToast({title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,icon: "none"});
+					// 	this.customData.bigCount = 0;
+					// 	this.customData.smallCount = 0;
+					// 	this.delAllEvent(this.customData)
+					// } else {
+					// 	this.updateItemEvent(this.customData);
+					// 	this.modalCancel();
+					// }
 				}
 			})
 

hdApp/src/admin/staff/list.vue

@@ -8,7 +8,7 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<div class="list" v-for="(item, index) in list.data" :key="index">
 						<div>
-							<image :src="item.avatar" mode="aspectFit" style="width:100rpx;height:100rpx;"></image>
+							<image :src="item.avatar" mode="aspectFit" style="width:100rpx;height:100rpx;border-radius: 50%"></image>
 						</div>
 						<div class="list-det">
 							<div class="list-det-left">

hdApp/src/mixins/priceSocket.js

@@ -35,7 +35,13 @@ export default {
 								//到账消息    data:  {type: "money", msg: "微信到账1.2", money: 1.2}
 								console.log(data);
 
-								this.playPriceAudio(data.money);
+								// this.playPriceAudio(data.money);
+								this.createPlayHandlerFun(data.url);
+								break;
+							case "new_order":
+								//新订单
+								console.log(data);
+								this.createPlayHandlerFun(data.url);
 								break;
 							default:
 								console.log("default");
@@ -46,5 +52,21 @@ export default {
 				});
 			}
 		},
+		createPlayHandlerFun(url) {
+			const innerAudioContext = uni.createInnerAudioContext();
+			innerAudioContext.autoplay = true;
+			innerAudioContext.src = url;
+			innerAudioContext.onPlay(() => {
+				console.log("开始播放");
+			});
+			innerAudioContext.onError(res => {
+				console.log(res.errMsg);
+				console.log(res.errCode);
+			});
+			innerAudioContext.onEnded(err => {
+				console.log("开始结束");
+				innerAudioContext.destroy();
+			});
+		}
 	}
 };

pt/src/saas/shop/shop.vue

@@ -43,12 +43,7 @@
         methods: {
             onLoad({ctx, app}) {
                 this.app = app;
-                let applyHost = () => {
-                    return this.$service.saasShop.shopList();
-                };
-                ctx.service({
-                    page: applyHost
-                })
+                ctx.service(this.$service.shop)
                     .set('table', {
                         columns: [
                             {