chore：重新合并了dev

pages_tool/contact/contact.vue

@@ -14,6 +14,7 @@
                             </view>
                         </view>
                     </view>
+                    <!-- <view @click="test()">Test</view> -->
                     <!-- #endif -->
                     <!-- #ifdef MP-WEIXIN -->
                     <view class="view_ul view_ul_one clearfix">
@@ -32,7 +33,6 @@
                         </view>
                     </view>
                     <!-- #endif -->
-
                     <view class="view_ul_100" v-for="(item, index) in dataList" :key="index"
                         style="margin-bottom: 20rpx;">
 
@@ -43,6 +43,7 @@
                                 <view class="text" style="font-size: 40rpx;font-weight: 600;color:#333">
                                     {{ item.realname }}</view>
                                 <view class="text">{{ item.position }}</view>
+                                <!--   <view class="text">{{item.mobile_text}}：{{item.mobile}}</view> -->
                                 <view class="text" style="padding-bottom:20rpx;color:#0054a5">{{ item.address }}</view>
                                 <view class="contact_name" v-if="item.mobile"
                                     style="padding-top:30rpx;padding-bottom:0rpx;border-top: solid 1px #eee;font-size:28rpx;display: flex;">
@@ -63,6 +64,20 @@
                             </view>
                         </view>
                     </view>
+                   <!--   <view class="view_ul view_ul_two clearfix " v-if="dataList.length > 3" >
+		                <view @click="Tel(item.mobile)" class="view_li w50_li" v-for="(item,index)  in dataList" >
+		                    <view class="bl bor" hoverClass="none" url="" style="box-shadow: 5rpx 5rpx 10rpx #dcdcdc;height: 230rpx;position: relative;">
+		                        <view class="contact_name"  v-if="item.position">{{item.position_text}}：{{item.position}}</view>
+		                        <view class="contact_name">{{item.title_text}}：{{item.realname}}</view>
+		                        <view class="contact_name">{{item.mobile_text}}：{{item.mobile}}</view>
+		                        <view class="contact_name" style="padding-bottom:10rpx;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">{{item.address_text}}：{{item.address}}</view>
+		                        <view class="contact_name" style="padding-top:10rpx;padding-bottom:0rpx;border-top: solid 1px #eee;position: absolute;bottom: 0;display: flex">
+                                    <image mode="widthFix":src="$util.img('public/static/img/boda.png')"></image>
+									<view style="margin-top: -6rpx;margin-left: 10rpx;font-size: 24rpx;color:rgba(71,71,71,.79)">点击拨打电话</view>
+								</view>
+		                    </view>
+		                </view>
+		            </view> -->
                     <map v-if="shop.longitude > 0 && shop.latitude > 0 && ismessage == 0" id="map"
                         style="width: 100%; height:400rpx" scale="12" :markers="markers" bindupdated="bindupdated"
                         :longitude="shop.longitude" :latitude="shop.latitude" show-location>
@@ -73,7 +88,19 @@
                     </map>
                 </view>
 
+
+
+
+
+
             </view>
+        <!--  <view wx:if="landline !=0">
+		        <button bindtap="contact">
+		            <view class="message">
+		                <image mode="widthFix" src="{{contactbg}}"></image>
+		            </view>
+		        </button>
+		    </view> -->
 		</view>
         <!--留言弹窗-->
         <view class="goods-sku">
@@ -117,6 +144,7 @@
                                 <view class="fui-cell ">
                                     <view class="fui-cell-label" style="position: absolute;top:10px">{{ $lang('messageContent') }}</view>
                                     <view class="fui-cell-info" style="margin-left: 160rpx;border: solid 2rpx #eee;">
+                                    <!-- <input v-model="Form.mailbox"  class="fui-input" placeholder="请输入您的邮箱" type="text" ></input> -->
                                        <textarea 
                                          id="textarea-remark"
                                          :value="Form.remark"
@@ -160,8 +188,16 @@ export default {
             markers: [
                 {
                     id: 1,
+                   /*	width:20, //宽度
+						height:20, //高度*/
+					//	iconPath: '../../static/goal_weizhi.png', //目标位置图标路径
+					//这里的经纬度是 目的地 的经纬度
                     latitude: 0,
                     longitude: 0,
+                    callout: {
+						/* 	title:123,
+							content:'123' */
+					}
                 }
             ],
             landline: 0,
@@ -192,6 +228,23 @@ export default {
         });
     },
     methods: {
+           test() {
+			//     channelReady(function(bAvailable) {
+			//         alert('是否存在框架服务：' + bAvailable)
+			//       })
+			// window.location.href = 'https://hapjs.org/app//[path][?key=value] hap://app//[path][?key=value] '
+			//参数说明： package: 应用包名，必选 path: 应用内页面的 path，可选，默认为首页 key-value: 希望传给页面的参数，可选，可以有多个
+
+			// const isQuickAppEnv = navigator.userAgent.includes('HuaweiQuickApp');
+			// let quickAppBridge;
+			// console.log(window.quickapp)
+			// if (isQuickAppEnv) {
+			//   quickAppBridge = window.quickapp;
+			// }
+			// quickAppBridge.invoke('startQuickAppPage', { page: '/NativePage' });
+			// window.postMessage({ action: 'someAction', data: 'some data' }, '*');
+			// window.open('https://xcx10.5g-quickapp.com/test.php')
+		},
         save() {
             if (!this.Form.realname.trim()) {
                 uni.showToast({ title: '请填写姓名', icon: 'none' });
@@ -205,13 +258,13 @@ export default {
                 uni.showToast({ title: '请填写留言内容', icon: 'none' });
                 return;
             }
-
             this.$api.sendRequest({
                 url: '/api/member/message',
                 data: this.Form,
                 success: res => {
                     uni.showToast({ title: res.message || '提交成功', icon: 'success' });
 
+
                     // 重置表单数据
                     this.Form = { realname: '', mobile: '', remark: '' };
                     this.formKey = Date.now();
@@ -466,6 +519,13 @@ image {
     position: relative;
     z-index: 0;
 }
+image {
+	max-width: 100%;
+}
+
+.bl {
+	display: block;
+}
 
 .line1 {
     overflow: hidden;
@@ -503,13 +563,18 @@ image {
     line-height: 20rpx;
     border-radius: 10rpx;
 }
+.view_ul_100 .fl {
+	width: 10%;
+}
 
 .view_ul_100 .fr {
+/*  padding-left: 30rpx;*/
     width: 100%;
 }
 
 .view_ul_100>view {
     background: #fff;
+    // box-shadow: 5rpx 5rpx 10rpx #dcdcdc;
 }
 
 .view_ul_100 .text {
@@ -525,7 +590,25 @@ image {
 .list_cotact .view_ul_100>view {
     padding: 20rpx 30rpx 0rpx 30rpx;
 }
+.list_cotact .view_ul_two .view_li>view {
+	background-color: #fff;
+	padding: 20rpx 30rpx 0rpx 30rpx;
+}
 
+.list_cotact .view_ul_two .view_li>view .address {
+	background-color: #5dc2d0;
+	color: #fff;
+	display: inline-block;
+	font-size: 28rpx;
+	line-height: 48rpx;
+	margin-bottom: 30rpx;
+	padding: 0 30rpx;
+	width: auto;
+}
+
+.view_ul_two {
+	margin-top: 20rpx;
+}
 .contact_name {
     color: rgba(71, 71, 71, .79);
     font-size: 24rpx;