Merge branch 'master' into yun

components/uniapp-zaudio/zaudio.vue

@@ -199,6 +199,7 @@
 					this.loading = loading;
 				});
 				this.$zaudio.syncRender()
+				console.log(this.$zaudio)
 			});
 		},
 		methods: {

pages/index/customer.vue

@@ -46,7 +46,7 @@
 			<!-- checkAuthority('顾问指派顾问') -->
 			<view class="footer-button" v-if="item.status!=0">
 				<view class="footer1" @click.stop="addTime(item)">接待延时</view>
-				<template v-if="checkAuthority('顾问指派顾问')">
+				<template v-if="zhipai">
 					<view class="footer1" @click.stop="assign(item)">重新指派</view>
 				</template>
 				<template v-if="endReception">
@@ -58,7 +58,7 @@
 				<view class="centerbox-che">手机号码：<text class="shizai">{{item.phone || "--"}}</text></view>
 			</view>
 			<view class="footer-button" v-if="item.status==0">
-				<template v-if="checkAuthority('顾问指派顾问')">
+				<template v-if="zhipai">
 					<view class="footer3" @click.stop="assign(item)">指派顾问</view>
 				</template>
 			</view>
@@ -98,6 +98,15 @@
 				fdFlag: null
 			};
 		},
+		computed: {
+			zhipai() {
+				if (this.dataCode == 6) {
+					return this.checkAuthority('顾问指派顾问')
+				} else {
+					return true
+				}
+			}
+		},
 		components: {},
 		onShow() {
 			this.LOADING = true