Merge branch 'dev'

pages/user/historyDetail.vue

@@ -115,7 +115,11 @@
 				</view>
 				<view class="informationLine">
 					<view class="informationTxt">技师</view>
-					<view class="informationNum" v-if="orderData.billsheet.workNames">{{orderData.billsheet.workNames}}</view>
+					<view class="informationNum" v-if="orderData.billsheet.workNames">
+						<span v-if="orderData.billsheet.workNames==null||orderData.billsheet.workNames=='null'"></span>
+						<span v-else>{{orderData.billsheet.workNames}}</span>
+					  
+					</view>
 				</view>
 				<!-- <view class="informationLine">
 					<view class="informationTxt">手机号：</view>
@@ -371,6 +375,17 @@
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.userInfo = this.$store.state.userInfo;
 			this.ext = this.$common.getExtStoreId();
+			if(opt.scene&&opt.scene!='undefined'){
+				var scene=opt.scene
+				var id1=scene.slice(0,8)
+				var id2=scene.slice(8,12)
+				var id3=scene.slice(12,16)
+				var id4=scene.slice(16,20)
+				var id5=scene.slice(20,32)
+				var ids=id1+'-'+id2+'-'+id3+'-'+id4+'-'+id5
+				console.log(ids)
+				this.id = ids
+			}
 			if (this.userInfo) {
 				this.getData()
 				this.myPower();