Merge branch 'test' into dev

src/common/http.interceptor.js

@@ -74,7 +74,7 @@ const install = (Vue, vm) => {
 		return msg || '请求错误'
 	}
 	// 响应拦截，判断状态码是否通过
-	Vue.prototype.$u.http.interceptor.response = (res) => {		
+	Vue.prototype.$u.http.interceptor.response = (res) => {
 		let result = res.data || res;
 		let msg = getMsg(res)
 		//返回__token__,设置
@@ -88,7 +88,7 @@ const install = (Vue, vm) => {
 				// return result;
 			case 200:
 				return {
-					data:result.data || result,
+					data:result.data == null  ? result : result.data, // result.data的值为0， false, ''的时候也要算有值
 					code:code,
 					message:msg
 				};

src/pages/order/complete.vue

@@ -3,9 +3,9 @@
         <complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
         <view class="u-wrap">
             <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar>
-            <u-tabs class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list"  @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
-            <view class="u-menu-wrap">
-                <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" v-if="list[tabIndex].items.length > 1">
+            <u-tabs v-show="showTab" class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list"  @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
+            <view :class="['u-menu-wrap', {'one': !showTab}]">
+                <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" v-if="list[tabIndex].items.length > 1 && showTab">
                     <view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item"
                         :class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
                         <text class="u-line-1">{{item.name}}</text>
@@ -173,7 +173,8 @@
                 maskShow: false,
                 takeStatus: false,
 				currentItemDate:{},
-                photoItem: {}
+                photoItem: {},
+				showTab: true
             }
         },
         components: {
@@ -205,6 +206,7 @@
 				this.inGuaranteePeriod = option.inGuaranteePeriod
 				this.partnerCompanyId = option.partnerCompanyId
 				this.auditResultsId = option.auditResultsId
+				this.showTab =option.partnerCompanyName == '挚达充电桩'
             } else {
                 this.orderId = 11880091
 				this.categoryId = 1100000214
@@ -361,6 +363,7 @@
 					}
 				}
 				this.list = res.data.config
+				this.showTab = this.list.length > 1
 				this.form = res.data.value || {}
 				// 异常单处理
 				if (this.auditResultsId) this.checkCompleteError()
@@ -858,6 +861,9 @@
         display: flex;
         overflow: hidden;
 		border-radius: 12rpx 12rpx 0 0;
+		&.one {
+			border-radius: 0;
+		}
 
     }
 

src/pages/order/detail.vue

@@ -647,7 +647,7 @@
 				if (this.submitType == 'orderAccept' || this.submitType == 'orderGan') {
 					this.$u.api.checkAddCustomer().then((res) => {
 						if (res.code == 200) {
-							if(res.data.data === true){
+							if(res.data === true){
 								this.handleBtn()
 							} else {
 								this.visible = true
@@ -785,6 +785,7 @@
 						+ "&orderServiceType=" + this.order.orderServiceType
 						+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
 						+ "&partnerCompanyId=" + this.order.partnerCompanyId
+						+ '&partnerCompanyName=' + this.order.partnerCompanyName
 				})
 			},
 			rejectOrder() { // 拒单