Merge remote-tracking branch 'origin/dev' into dev

pages/quanyi/quanyi.vue

@@ -14,15 +14,13 @@
 					{{item.patientName}}
 				</view>
 				<view class="text">
-					{{item.content}}
+					{{Number(item.messageType)==2?'[图片]':item.content}}
 				</view>
 				<view class="count" v-if="item.messageCount>0">
 					{{item.messageCount}}
 				</view>
 			</view>
 		</view>
-
-
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -86,7 +84,7 @@
 				console.log(newvalue, oldvalue, '55')
 				this.info();
 			},
-		
+
 		},
 		methods: {
 			//前往聊天

pages/seekadvicefrom/seekadvicefrom.vue

@@ -29,7 +29,6 @@
 
 				<view class="placeholder" id="placeholder"></view>
 			</view>
-
 		</scroll-view>
 		<view class="background" @tap="information">
 			<image src="/static/huanzhe.png" mode=""></image>
@@ -57,8 +56,8 @@
 			<!-- 弹出拍照-->
 			<view class="fun-box" :class="{'show-fun-box':showFunBtn}">
 				<u-grid :col="4" hover-class="contentType2-hover-class" :border="false">
-					<u-grid-item v-for="(item, index) in funList" @tap.stop="tapGrid(index)" :index="index" :key="index"
+					<u-grid-item v-for="(item, index) in funList" @click.native.stop="tapGrid(index)" :index="index"
-						bg-color="#f3f3f3">
+						:key="index" bg-color="#f3f3f3">
 						<u-icon :name="item.icon" :size="52"></u-icon>
 						<uni-icons style="opacity: 0.7;width: 52rpx;height: 52rpx; " v-if="index==2"
 							:type="index==2?'folder-add-filled':''" size="26"></uni-icons>
@@ -122,10 +121,10 @@
 						title: "拍摄",
 						uploadType: ["camera"]
 					},
-					{
+					// {
-						icon: "",
+					// 	icon: "",
-						title: "文件",
+					// 	title: "文件",
-					},
+					// },
 				],
 				emojisList: [
 					'😄', '😃', '😀', '😊', '😉', '😍', '😘', '😚', '😗',
@@ -368,6 +367,7 @@
 			// },
 			//点击宫格时触发
 			tapGrid(index) {
+				console.log(index)
 				if (index == 0) {
 					this.chooseImage(["album"]);
 				} else if (index == 1) {
@@ -381,11 +381,11 @@
 							// console.log(JSON.stringify(res.tempFilePaths));
 						}
 					});
-
 				}
 			},
 			//发送图片
 			chooseImage(sourceType) {
+				console.log(sourceType)
 				var that = this
 				if (this.socketOpen == false) {
 					return