Merge branch 'dev' into test

src/common/api/order.js

@@ -170,6 +170,8 @@ let orderApiFun = function(vm){
 	let allowLogin = async (params = {}) => await vm.$u.get(prefix + 'other/auth/' + vm.vuex_token + '/allow/login', params);
 	// 特殊登录切换师傅
 	let otherUser = async (params = {}) => await vm.$u.get(prefix + 'other/auth/' + vm.vuex_token + '/other/user', params);
+	// 是否添加客服
+	let checkAddCustomer = async (params = {}) => await vm.$u.get(prefix + 'order/revision/' + vm.vuex_token + '/checkAddCustomer', params);
 	
 	const orderApi = {
 		listByRecommendOrder,
@@ -209,7 +211,8 @@ let orderApiFun = function(vm){
 		payableRecord,
 		workerApplyPay,
 		allowLogin,
-		otherUser
+		otherUser,
+		checkAddCustomer
 	}
 	return orderApi
 }

src/components/mine/customer.vue

@@ -11,11 +11,11 @@
 				<u-loading slot="loading"></u-loading>
 				<view slot="error" style="font-size: 24rpx;">加载失败</view>
 			</u-image>
-			<u-button class="settle-button" type="primary" :open-type="openTypes[typeIndex]" show-message-card
+			<button :class="['settle-button', {'is-mine': isMine}]" type="primary" :open-type="openTypes[typeIndex]" show-message-card
 				send-message-title="点击下方客服会话添加订单助手" shape="circle" @click="download" :send-message-img="kefuzxiaoxiImage"
-				send-message-path="/pages/index/index" :custom-style="buttonStyle">
+				send-message-path="/pages/index/index">
 				{{buttonText[typeIndex]}}
-			</u-button>
+			</button>
 			<view class="bottom-view" v-if="isMine">
 				<view class="line-view"></view>
 				<view class="phone-view">
@@ -44,7 +44,7 @@
 		},
 		computed: {
 			cusQrcode() {
-				return process.uniEnv.qn_base_url + (this.isMine ? 'erweima-rk.png' : 'dingdanzhushou.png')
+				return process.uniEnv.qn_base_url + (this.isMine ? 'erweima-rk.png' : 'dingdanzhushou-n.png')
 			},
 			kefuzxiaoxiImage() {
 				return process.uniEnv.qn_base_url + 'kefuzxiaoxi.png'
@@ -67,19 +67,6 @@
 			phoneIcon() {
 				return process.uniEnv.qn_base_url + 'dianhua.png'
 			},
-			buttonStyle() {
-				return this.isMine ? {
-					'width': "300rpx",
-					'height': "80rpx",
-					"font-size": "32rpx",
-					"font-weight": "bold",
-				} : {
-					'width': "400rpx",
-					'height': "100rpx",
-					"font-size": "32rpx",
-					"font-weight": "bold",
-				};
-			},
 			types() {
 				return ['exclusive', 'pop', 'mine']
 			},
@@ -93,7 +80,7 @@
 				return ['contact', 'contact', '']
 			},
 			buttonText() {
-				return ['追加', '追加', '点击下载']
+				return ['添加', '添加', '点击下载']
 			},
 			titleText() {
 				return ['添加订单助手', '添加订单助手', '客服微信']
@@ -265,7 +252,20 @@
 			}
 
 			.settle-button {
-				margin-bottom: 14rpx;
+				margin-bottom: 14rpx;
+				width: 400rpx;
+				height: 104rpx;
+				font-size: 32rpx;
+				background-color: #2272FF;
+				border-radius: 52rpx;
+				line-height: 104rpx;
+				font-weight: bold;
+				&.is-mine {
+					width: 300rpx;
+					height: 80rpx;
+					border-radius: 40rpx;
+					line-height: 80rpx;
+				}
 			}
 
 			.pop-tip-view {

src/components/mine/statement.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="right-view">
 				<view :class="['statement-status-view', statementTypeClass]">{{data.status}}</view>
-				<view class="statement-amount-view">+{{data.amount}}</view>
+				<view class="statement-amount-view">{{ fmtAmount }}</view>
 			</view>
 		</view>
 		<view class="line-view"></view>
@@ -52,6 +52,13 @@
 						return 'statement-type-h'
 				}
 			},
+			fmtAmount() {
+				if(this.data.amount > 0) {
+					return (`+${this.data.amount}`)
+				} else {
+					return this.data.amount
+				}
+			},
 			isWarranty() {
 				return this.data.inGuaranteePeriod ? '保内' : '保外'
 			},

src/pages/order/detail.vue

@@ -149,7 +149,7 @@
 					<view>
 						<u-toast ref="uToast" />
 					</view>
-					<view v-if="showCenterBtn" @click="$u.throttle(handleBtn, 500)"   class="button" :class="['center-button-view', btnClass]">
+					<view v-if="showCenterBtn" @click="$u.throttle(handleClickSure, 500)"   class="button" :class="['center-button-view', btnClass]">
 						<text>{{ centerButtonText }}</text>
 						<view v-if="order.currentOverTime && showTimeOut"  class="time-view">
 							<text style="padding-right: 8rpx;">{{order.currentOverTime > new Date().getTime()?'剩':'超'}}</text>
@@ -448,9 +448,9 @@
 						if(this.showTimeOut && this.order.currentOverTime && nowTime.getTime() > this.order.currentOverTime){
 							this.btnClass='timeOut-btn'
 						}
-						if(self.order.isFirstOrder){
-							this.visible = true
-						}
+						// if(self.order.isFirstOrder){
+						// 	this.visible = true
+						// }
 						// 格式化时间
 						this.settlementInfo.formatTime = this.order.settleCenterSyncDatetime ? this.$u.timeFormat(this.order.settleCenterSyncDatetime, 'yyyy.mm.dd hh:MM:ss') : '-'
 					} else {
@@ -640,6 +640,21 @@
 					this.isAllowDianhuaAndDaohang = true
 				}
 			},
+			handleClickSure() {
+				if (this.submitType == 'orderAccept' || this.submitType == 'orderGan') {
+					this.$u.api.checkAddCustomer().then((res) => {
+						if (res.code == 200) {
+							if(res.data.data === true){
+								this.handleBtn()
+							} else {
+								this.visible = true
+							}
+						} else {}
+					})
+				} else {
+					this.handleBtn()
+				}
+			},
 			handleBtn() {
 				console.log('click button')
 				if(!this.submitType){