Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

pages/indexs/center/center.vue

@@ -110,14 +110,15 @@
 							常用信息
 						</view>
 					</view>
-					<view class="middle3-list" @click="goMyServe()">
+					<view class="middle3-list" @click="goTravelList()">
 						<view>
-							<image src="@/static/img/my/center/customer.png"></image>
+							<image src="@/static/img/my/center/schedule.png"></image>
 						</view>
 						<view>
-							我的客服
+							行程单
 						</view>
 					</view>
+					
 					<view class="middle3-list" @click="goCodeResult()" >
 						<view>
 							<image src="@/static/img/my/center/code.png"></image>
@@ -142,12 +143,12 @@
 							购物车
 						</view>
 					</view> -->
-					<view class="middle3-list" @click="goTravelList()">
+					<view class="middle3-list" @click="online()">
 						<view>
-							<image src="@/static/img/my/center/schedule.png"></image>
+							<image src="@/static/img/my/center/customer.png"></image>
 						</view>
 						<view>
-							行程单
+							在线客服
 						</view>
 					</view>
 					<view class="middle3-list" @click="goTravelNotes()">
@@ -158,9 +159,14 @@
 							我的行记
 						</view>
 					</view>
-					<!-- <view class="middle3-list">
-						<button @click="xxx()">客服</button>
-					</view> -->
+					<view class="middle3-list" @click="goMyServe()">
+						<view>
+							<image src="@/static/img/my/center/customer.png"></image>
+						</view>
+						<view>
+							咨询电话
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -175,12 +181,13 @@ export default {
     }
   },
   methods: {
-    xxx(){
+    //---在线客服
+    online(){
       wx.openCustomerServiceChat({
-			  extInfo: {url: 'https://work.weixin.qq.com/kfid/kfcbaf30d15641d16b0'},
-			  corpId: 'ww2e9053ddd733ff39',
+			  extInfo: {url: 'https://work.weixin.qq.com/kfid/kfcbaf30d15641d16b0'},//客服链接
+			  corpId: 'ww2e9053ddd733ff39',//企业Id
 			  success(res) {
-          console.log(222)
+          
         }
       })
     },

pages/my/customerService/enterpriseWechat/enterpriseWechat - 副本.vue

+<template>
+	<view>
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      outUrl:'',//跳出地址
+    }
+  },
+  onLoad(option) {
+    let companyId=this.$commonjs.getCompanyId(option)
+    let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+    let pdToken=uni.getStorageSync('token')||''
+    let pdCreateUserId=uni.getStorageSync('createUserId')||''
+    let pdUserId=uni.getStorageSync('userId')||''
+    let baseUrl=this.$wxurl+'enterpriseWechat?companyId='
+    this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+  },
+  methods: {
+			
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

pages/my/customerService/enterpriseWechat/enterpriseWechat.vue

+<!-- 客服 -->
 <template>
-	<view>
-		<web-view :src="outUrl"></web-view>
+	<view class="wrap">
+		<view class="title">
+			 咨询电话
+		</view>
+		<view class="list" v-for="(item, index) in scenicList" :key="index" @click="makePhone(item.phone)">
+			<text> {{ item.name }}: </text>
+			<text>
+				{{ item.phone }}
+			</text>
+		</view>
 	</view>
 </template>
 
@@ -8,24 +17,53 @@
 export default {
   data() {
     return {
-      outUrl:'',//跳出地址
+      scenicList:[//景区列表
+        {name:'长江索道',phone:'023-68816888'},
+        {name:'皇冠大扶梯',phone:'023-68485623'},
+        {name:'云端之眼.高空观景台',phone:'023-60339688'},
+        {name:'两江夜游',phone:'13883372702'},
+        {name:'礼嘉时光缆车（渝北区）',phone:'023-67687141'},
+        {name:'清明上河图',phone:'17783002411'},
+        {name:'重庆湖广会馆',phone:'023-63914697'},
+        {name:'重庆抗战遗址博物馆',phone:'023-62462447'},
+        {name:'重庆杜莎夫人蜡像馆',phone:'023-63492828'},
+        {name:'红岩文旅',phone:'023-81037996'},
+        {name:'胖丁旅行',phone:'4000720368'},
+      ]
     }
   },
-  onLoad(option) {
-    let companyId=this.$commonjs.getCompanyId(option)
-    let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-    let pdToken=uni.getStorageSync('token')||''
-    let pdCreateUserId=uni.getStorageSync('createUserId')||''
-    let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl=this.$wxurl+'enterpriseWechat?companyId='
-    this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+  onLoad() {
+    
   },
   methods: {
-			
+    //---拨打电话
+    makePhone(phoneNumber) {
+      uni.makePhoneCall({
+        phoneNumber
+      })
+    }
   }
 }
 </script>
 
-<style>
-
+<style scoped lang="scss">
+.wrap{
+	height: 100%;
+	background: #ffffff;
+}
+.title {
+	text-align: center;
+	font-size: 32rpx;
+	font-weight: bold;
+	padding: 30rpx;
+	border-bottom: 1px solid #e6e6e6;
+}
+.list {
+	height: 100rpx;
+	border-bottom: 1px solid #e6e6e6;
+	padding: 0 24rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
 </style>
\ No newline at end of file

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -1144,7 +1144,7 @@ export default {
         return
       }
       if (!this.sortStatus) {
-			  //获取排号是否上下架失败时，点击无效
+        //防止排号上下架接口调用失败时，游客下单之后，未上传站点信息给后端
 			  uni.showToast({
 				  title: '获取排号信息失败，请尝试退出并重新进入小程序',
 				  icon: 'none'

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -1205,7 +1205,7 @@ export default {
 			  return
       }
       if (!this.sortStatus) {
-			  //获取排号是否上下架失败时，点击无效
+			  //防止排号上下架接口调用失败时，游客下单之后，未上传站点信息给后端
         uni.showToast({
 				  title: '获取排号信息失败，请尝试退出并重新进入小程序',
 				  icon: 'none'