no message

common/config.js

@@ -1,12 +1,18 @@
-const ROOTPATH =
-"https://mxys.chuanghai-tech.com/sqx_fast"; //https://mxys.chuanghai-tech.com/sqx_fast/swagger/index.html
-// const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
-const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast"; //tcwm.xianmaxiong.com
-// const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast"; //tcwm.xianmaxiong.com
-const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/" //联系客服
-// const ROOTPATH2 = "wss://www.daweilinli.com/wss/websocket/" //联系客服
-const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/" //聊天
-// const ROOTPATH3 = "wss://www.daweilinli.com/wss/ordersChat/" //聊天
+const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROOTPATH = "http://172.16.20.108/wm-api/sqx_fast";
+
+const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROOTPATH1 = "http://172.16.20.108/wm-api/sqx_fast";
+
+//联系客服
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
+//联系客服
+// const ROOTPATH2 = "wss://172.16.20.108/wm-api/wss/websocket/"
+
+//聊天
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
+//聊天
+// const ROOTPATH3 = "wss://172.16.20.108/wm-api/wss/ordersChat/"
 
 // const ROOTPATH = "http://192.168.0.121:8176/sqx_fast";
 // const ROOTPATH1 = "http://192.168.0.121:8176/sqx_fast";

pages/index/shop/confirmOrder.vue

@@ -171,7 +171,7 @@
 		<view style="height: 120rpx"></view>
 		<!-- 结算 -->
 		<view class="goorder">
-			<view class="goorder_but" :class="isTrue && orderType == 2 ? 'goorder_but_' : ''" @click="toSettlement">立即结算</view>
+			<view class="goorder_but" :class="isTrue && orderType == 2 ? 'goorder_but_' : ''" @click="toSettlement_throttle">立即结算</view>
 		</view>
 
 		<view class="hintPopul" v-if="shopDet && shopDet.putawayFlag == 1">
@@ -287,6 +287,7 @@ function getDate(date, AddDayCount = 0) {
 		eWeek: '周' + a[week2]
 	}
 }
+import { throttle } from '@/utils/throttle.js'
 export default {
 	data() {
 		return {
@@ -1037,6 +1038,9 @@ export default {
 				}
 			})
 		},
+		toSettlement_throttle: throttle(function () {
+			this.toSettlement()
+		}, 1000),
 		// 立即结算
 		toSettlement() {
 			if (this.isThrottle == false) {
@@ -1702,4 +1706,4 @@ export default {
 		top: -20rpx; */
 	z-index: 9;
 }
-</style>
+</style>

pages/index/shop/index.vue

@@ -370,7 +370,8 @@
 						{{ totalPrice }}
 						<text v-if="shopDet.minimumDelivery" style="margin-left: 10rpx">{{ shopDet.minimumDelivery }}元起送</text>
 					</view>
-					<view v-if="totalPrice >= shopDet.minimumDelivery" class="settlement_ri" @click.stop="goConfirm()">去结算</view>
+					<view v-if="totalPrice >= shopDet.minimumDelivery" class="settlement_ri" @click.stop="goConfirm_throttle()">去结算</view>
+
 					<view v-else class="settlement_ri1">去结算</view>
 				</view>
 				<!-- 购物车弹窗 -->
@@ -420,7 +421,7 @@
 							{{ totalPrice }}
 							<text v-if="shopDet.minimumDelivery" style="margin-left: 10rpx">{{ shopDet.minimumDelivery }}元起送</text>
 						</view>
-						<view v-if="totalPrice >= shopDet.minimumDelivery" class="settlement_ri" @click.stop="goConfirm()">去结算</view>
+						<view v-if="totalPrice >= shopDet.minimumDelivery" class="settlement_ri" @click.stop="goConfirm_throttle()">去结算</view>
 						<view v-else class="settlement_ri1">去结算</view>
 					</view>
 				</u-popup>
@@ -580,6 +581,7 @@
 
 <script>
 import empty from '@/components/empty.vue'
+import { throttle } from '@/utils/throttle.js'
 export default {
 	components: {
 		empty
@@ -1287,6 +1289,10 @@ export default {
 				url: '/pages/index/shop/goodsDet?goodsId=' + id + '&shopId=' + this.shopId + '&orderType=' + this.orderType
 			})
 		},
+
+		goConfirm_throttle: throttle(function () {
+			this.goConfirm()
+		}, 1000),
 		// 去结算
 		goConfirm() {
 			if (!this.userId) {
@@ -2198,4 +2204,4 @@ page {
 	width: 180rpx; /* 三张图片平分宽度 */
 	height: 135rpx;
 }
-</style>
+</style>

pages/index/shop/payOrder.vue

@@ -149,7 +149,7 @@
 					<view class="flex-sub text-xl margin-left">
 						{{ item.text }}
 						<text style="font-size: 30rpx; margin-left: 10rpx" v-if="userMoney && userMoney > 0">(余额：{{ userMoney }})</text>
-						<text v-else style="font-size: 30rpx; margin-left: 10rpx; text-decoration: underline; color: #ea0000" @tap="goCash()">去充值</text>
+						<!-- <text v-else style="font-size: 30rpx; margin-left: 10rpx; text-decoration: underline; color: #ea0000" @tap="goCash()">去充值</text> -->
 					</view>
 					<radio-group name="openWay" style="margin-left: 20upx" @change="selectWay(item)">
 						<label class="tui-radio">
@@ -1630,4 +1630,4 @@ export default {
 		top: -20rpx; */
 	z-index: 9;
 }
-</style>
+</style>

pages/order/index.vue

@@ -89,11 +89,15 @@
 						<view class="text-lg text-bold text-black flex align-center">
 							<image :src="item.shopCover" style="width: 80rpx; height: 80rpx; border-radius: 80rpx" mode=""></image>
 							<view class="margin-left-xs">{{ item.shopName }}</view>
+							<view class="margin-left-xs" @click.stop="bindphone(item.shopPhone)">{{ item.shopPhone }}</view>
 						</view>
 					</view>
 					<view style="padding: 0 30rpx; font-size: 20px" v-if="item.orderSequence">#{{ item.orderSequence }}</view>
-					<view style="padding: 0 30rpx; font-size: 20px">{{ item.orderType == 1 ? '商家配送' : '骑手配送' }}</view>
-					<view v-if="item.riderPhone" style="padding: 0 30rpx; font-size: 20px">骑手电话：{{ item.riderPhone }}</view>
+					<view style="padding: 0 30rpx; font-size: 20px">
+						{{ item.orderTypeExtra == 1 ? '到店取餐' : item.orderTypeExtra == 2 ? '骑手配送' : item.orderTypeExtra == 3 ? '商家配送' : '' }}
+					</view>
+					<view v-if="item.riderNickName" style="padding: 0 30rpx; font-size: 20px">骑手姓名：{{ item.riderNickName }}</view>
+					<view v-if="item.riderPhone" style="padding: 0 30rpx; font-size: 20px" @click.stop="bindphone(item.riderPhone)">骑手电话：{{ item.riderPhone }}</view>
 					<view class="">
 						<view class="padding-lr margin-tb-sm" v-for="(ite, ind) in item.orderGoodsList" :key="ind">
 							<view class="flex">
@@ -897,6 +901,13 @@ export default {
 			uni.navigateTo({
 				url: '/running/order/pay/pay?indentNumber=' + e.indentNumber
 			})
+		},
+		// 拨打电话
+		bindphone(e) {
+			console.log(e)
+			uni.makePhoneCall({
+				phoneNumber: e
+			})
 		}
 	},
 	onReachBottom: function () {

pages/order/takefood.vue

@@ -10,7 +10,9 @@
 			<view class="tosend_text" v-if="dataDet.status == 7">待接单</view>
 			<view class="tosend_text" v-if="dataDet.status == 8">已取消</view>
 			<view style="padding: 0 30rpx; font-size: 20px" v-if="dataDet.orderSequence">#{{ dataDet.orderSequence }}</view>
-			<view style="padding: 0 30rpx; font-size: 20px">{{ dataDet.orderType == 1 ? '商家配送' : '骑手配送' }}</view>
+			<view style="padding: 0 30rpx; font-size: 20px">
+				{{ dataDet.orderTypeExtra == 1 ? '到店取餐' : dataDet.orderTypeExtra == 2 ? '骑手配送' : dataDet.orderTypeExtra == 3 ? '商家配送' : '' }}
+			</view>
 			<view class="flex justify-center" v-if="dataDet.orderType == 1" style="width: 100%; height: 140rpx; margin-bottom: 30rpx">
 				<view class="flex justify-center" style="width: 94%; height: 100%; border-radius: 18rpx; background-color: #ffffff; padding: 3%">
 					<view class="flex justify-between align-center" style="width: 100%; height: 100%">
@@ -120,14 +122,14 @@
 						</view>
 						<view style="margin-left: 10rpx; color: #333333">
 							<view>{{ dataDet.riderUserName }}</view>
-							<view>{{ dataDet.riderPhone1 }}</view>
+							<view>{{ dataDet.riderPhone }}</view>
 						</view>
 					</view>
 					<view class="phone" @click="bindphone(dataDet.riderPhone)">联系TA</view>
 				</view>
 			</view>
 			<!-- 商家信息 -->
-			<view class="rider_box" v-if="dataDet && (dataDet.status == 3 || dataDet.status == 4) && dataDet.orderType == 1">
+			<view class="rider_box" v-if="dataDet && (dataDet.status == 3 || dataDet.status == 4)">
 				<view class="flex justify-between align-center padding">
 					<view style="font-size: 31rpx; color: black">联系商家</view>
 				</view>
@@ -141,7 +143,7 @@
 							<view>{{ dataDet.shopPhone }}</view>
 						</view>
 					</view>
-					<view class="phone" @click="bindphone(dataDet.riderPhone)">联系TA</view>
+					<view class="phone" @click="bindphone(dataDet.shopPhone)">联系TA</view>
 				</view>
 			</view>
 			<!-- 其他信息 -->
@@ -155,7 +157,6 @@
 				</view>
 				<view class="tosend_cont_infor">
 					<view class="tosend_cont_infor_le">订单编号</view>
-					<!-- <view class="tosend_cont_infor_le">订单编号</view> -->
 					<view class="tosend_cont_infor_ri">
 						{{ dataDet.orderNumber }}
 						<u-icon @click="copy(dataDet.orderNumber)" name="order" style="margin-left: 6rpx" size="32"></u-icon>
@@ -301,6 +302,7 @@ export default {
 			this.$Request.get('/app/shop/selectShopMessage', data).then((res) => {
 				if (res.code == 0 && res.data) {
 					this.shopInfo = res.data
+					console.log(this.shopInfo, 999)
 					let phoneNumber = this.shopInfo.phone.toString() //先强制转换成字符串类型
 					this.shopInfo.phones = phoneNumber.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2')
 				}
@@ -658,4 +660,4 @@ export default {
 	top: -4rpx;
 	right: -4rpx;
 }
-</style>
+</style>