Merge remote-tracking branch 'remotes/origin/developer' into developerA

pages/seller/club/list.vue

@@ -147,7 +147,9 @@
                                 </view>
                                 <view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
                                     <text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
-                                    <text class="list-texl">{{ club.contractMobile ? club.contractMobile : '' }}</text>
+                                    <text class="list-texl" @click="handlePhone(club.contractMobile)">
+									{{ club.contractMobile ? club.contractMobile : '' }}
+									</text>
                                 </view>
                                 <view class="list-ntel" v-if="listQuery.type === 6">
                                     <text class="list-link">分配时间：{{ club.providerTime | dateConversion }}</text>
@@ -544,6 +546,12 @@ export default {
                 this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubId}&listType=0`)
             }
         },
+		// 拨打电话
+		handlePhone(phoneNumber){
+			uni.makePhoneCall({
+				phoneNumber: phoneNumber //拨打电话
+			});
+		},
         onShowClose() {
             //输入框失去焦点时触发
             if (this.listQuery.name != '') {
@@ -874,6 +882,7 @@ page,
                     .list-texl {
                         display: inline-block;
                         float: left;
+						text-decoration: underline;
                     }
                 }
             }

pages/seller/order/components/details/cm-order-temp.vue

@@ -5,7 +5,12 @@
 			<view class="information-view title">
 				<view class="view-num">
 					<view class="bage-text">
-						订单编号：<label class="label">{{ orderData.shopOrderNo ? orderData.shopOrderNo : '' }}</label>
+						订单编号：
+						<label class="label">
+							{{ orderData.shopOrderNo ? orderData.shopOrderNo : '' }}
+							({{ orderData.shopOrderId }})
+						</label>
+						<text class="clipboard" @click="clipboard(orderData.shopOrderId)">复制ID</text>
 					</view>
 				</view>
 			</view>
@@ -71,14 +76,17 @@ export default {
 		initData(data) {
 			this.orderData = data
 		},
-		clipboard(data) {
+		clipboard(shopOrderId) {
+			const data = shopOrderId + ''
 			thorui.getClipboardData(data, res => {
 				if (res) {
+					uni.hideToast()
 					this.$util.msg('复制成功', 2000, true, 'success')
 				} else {
+					uni.hideToast()
 					this.$util.msg('复制失败', 2000, true, 'none')
 				}
-			})
+			}) 
 		}
 	}
 }
@@ -100,17 +108,12 @@ export default {
 			font-size: $font-size-24;
 			margin: 4rpx 0;
 			// display: flex;
-			width: 55%;
+			width: 100%;
 			display: inline-block;
 			&.same {
 				width: 45%;
 				text-align: right;
 			}
-			// &.title{
-			// 	height: 68rpx;
-			// 	line-height: 68rpx;
-			// 	margin-bottom: 5rpx;
-			// }
 			view {
 				// flex: 1;
 				color: $text-color;
@@ -187,16 +190,18 @@ export default {
 				flex: 4;
 			}
 			.clipboard {
-				width: 84rpx;
-				height: 36rpx;
-				background: linear-gradient(34deg, rgba(255, 41, 41, 1) 0%, rgba(255, 109, 27, 1) 100%);
+				height: 44rpx;
+				background: #e2e2e2;
 				text-align: center;
 				font-size: $font-size-24;
-				color: #ffffff;
-				border-radius: 6rpx;
-				line-height: 36rpx;
+				color: #999999;
+				border-radius: 22rpx;
+				line-height: 40rpx;
 				display: inline-block;
-				margin-left: 42rpx;
+				margin-left: 24rpx;
+				border: 1px solid #f7f7f7;
+				box-sizing: border-box;
+				padding: 0 10px;
 			}
 		}
 	}

pages/seller/order/order-historylist.vue

@@ -95,6 +95,16 @@
 										>
 										</image>
 									</view>
+									<view class="order-title-b">
+										<view class="order-title-btxt num tui-skeleton-fillet">
+											订单编号：{{ order.shopOrderNo }}({{ order.shopOrderId }})
+										</view>
+									</view>
+									<view class="order-title-b">
+										<view class="order-title-btxt tui-skeleton-fillet">
+											下单时间：{{ order.orderTime }}
+										</view>
+									</view>
 								</view>
 								<view class="goods-title">
 									<view v-if="order.shopPromotion" class="floor-item-act">
@@ -722,6 +732,9 @@ page {
 			line-height: 40rpx;
 			color: #999999;
 			text-align: lef;
+			&.num{
+				color: #333333;
+			}
 		}
 		.order-title-tip {
 			float: right;

pages/seller/order/order-list.vue

@@ -122,6 +122,16 @@
 											>
 											</image>
 										</view>
+										<view class="order-title-b">
+											<view class="order-title-btxt num tui-skeleton-fillet">
+												订单编号：{{ order.shopOrderNo }}({{ order.shopOrderId }})
+											</view>
+										</view>
+										<view class="order-title-b">
+											<view class="order-title-btxt tui-skeleton-fillet">
+												下单时间：{{ order.orderTime }}
+											</view>
+										</view>
 									</view>
 									<view class="goods-title">
 										<view v-if="order.shopPromotion" class="floor-item-act">
@@ -818,6 +828,22 @@ page {
 			color: #ff2a2a;
 		}
 	}
+	.order-title-b {
+		width: 100%;
+		height: 40rpx;
+		float: left;
+		margin-top: 8rpx;
+		.order-title-btxt {
+			float: left;
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #999999;
+			text-align: left;
+			&.num{
+				color: #333333;
+			}
+		}
+	}
 }
 .goods-title {
 	width: 100%;

pages/seller/remarks/details.vue

@@ -29,10 +29,15 @@
 			<view class="list-view-title">
 				<view class="list-view-h1">
 					沟通情况：
-					<text> {{ remarksParams.communicationSituation === 0 ? '已沟通' : '联系不上' }} </text>
-					<text v-if="remarksParams.communicationMethods === 1"> （电话） </text>
-					<text v-if="remarksParams.communicationMethods === 2"> （微信） </text>
-					<text v-if="remarksParams.communicationMethods ==='1,2' || remarksParams.communicationMethods ==='2,1'"> (电话,微信) </text>
+					<template v-if="remarksParams.communicationSituation === 0">
+						<text>已沟通</text>
+						<text v-if="remarksParams.communicationMethods === 1"> （电话） </text>
+						<text v-if="remarksParams.communicationMethods === 2"> （微信） </text>
+						<text v-if="remarksParams.communicationMethods ==='1,2' || remarksParams.communicationMethods ==='2,1'"> (电话,微信) </text>
+					</template>
+					<template v-else>
+						<text> 联系不上 </text>
+					</template>	
 				</view>
 			</view>
 			<view class="list-view-title">

pages/seller/remarks/mixins/addMixins.js

@@ -81,15 +81,20 @@ const addMixins = {
     methods: {
         // 切换沟通情况
         radioChange(evt) {
-            console.log('evnt',evt.detail.value)
             for (let i = 0; i < this.items.length; i++) {
                 if (this.items[i].value === evt.detail.value) {
                     this.current = i
                     this.remarksParams.communicationSituation = evt.detail.value*1
-                    console.log('communicationMethods',this.remarksParams.communicationSituation)
+                    console.log('communicationSituation',this.remarksParams.communicationSituation)
+                    if(this.remarksParams.communicationSituation === 1){
+					    this.remarksParams.communicationMethods = ''
+						 console.log('communicationMethods',this.remarksParams.communicationMethods)
+                    }
                     break
                 }
             }
+            
+			
         },
         // 选择联系方式
         checkboxChange(evnt){

pages/seller/remarks/record-details.vue

@@ -4,10 +4,15 @@
 			<view class="list-view-title">
 				<view class="list-view-h1">
 					沟通情况：
-					<text> {{ remarksParams.communicationSituation === 0 ? '已沟通' : '联系不上' }} </text>
-					<text v-if="remarksParams.communicationMethods === 1"> （电话） </text>
-					<text v-if="remarksParams.communicationMethods === 2"> （微信） </text>
-					<text v-if="remarksParams.communicationMethods ==='1,2' || remarksParams.communicationMethods ==='2,1'"> (电话,微信) </text>
+					<template v-if="remarksParams.communicationSituation === 0">
+						<text>已沟通</text>
+						<text v-if="remarksParams.communicationMethods === 1"> （电话） </text>
+						<text v-if="remarksParams.communicationMethods === 2"> （微信） </text>
+						<text v-if="remarksParams.communicationMethods ==='1,2' || remarksParams.communicationMethods ==='2,1'"> (电话,微信) </text>
+					</template>
+					<template v-else>
+						<text> 联系不上 </text>
+					</template>	
 				</view>
 			</view>
 			<view class="list-view-title">

pages/user/pay/card-order.vue

@@ -300,7 +300,7 @@ export default {
 					this.balanceAmount = this.obligation - this.payAmount // 计算剩余支付金额
 					// 支付方式配置
 					if(data.onlinePayWays){
-						this.checkPayMode(data.onlinePayWays)
+						this.checkPayMode(data.onlinePayWays,data.weChatFlag)
 					}
 					setTimeout(() => {
 						this.skeletonShow = false

pages/user/pay/mixins/cardMixins.js

@@ -72,11 +72,15 @@ const cardMixins = {
                 break
             }
         },
-        checkPayMode(range) {
+        checkPayMode(range,weChatFlag) {
             // 校验支付模式
             // test range = '4'
             // 1微信 2支付宝 3个人网银 4企业网银 5快捷支付
-            this.weChatFlag = range.indexOf('1') > -1
+            if(weChatFlag === '2'){
+                this.weChatFlag =  false
+            }else{
+                this.weChatFlag = range.indexOf('1') > -1
+            }
             this.B2BpayFlag = range.indexOf('4') > -1
             this.QuickPayFlag = range.indexOf('5') > -1
             // 设置默认支付方式
@@ -85,7 +89,6 @@ const cardMixins = {
             }else{
                 this.tabCurrentIndex = this.weChatFlag ? 0 : this.B2BpayFlag ? 1 : 2
             }
-            
             this.tabClick(this.tabCurrentIndex)
         }
     }

services/config.env.js

@@ -6,7 +6,7 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002'    //陈凯联调地址
     URL_CONFIG = 'https://core-b.caimei365.com'
-    // URL_CONFIG = 'https://core.caimei365.com'  
+    // URL_CONFIG = 'https://core.caimei365.com'   
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'