Merge branch 'master' into master-pro

# Conflicts:
#	common/service/config.service.js
#	manifest.json

pages/order/arriveUpload.vue

@@ -111,7 +111,7 @@
 								merchantId :uni.getStorageSync('login_user_info').merchantId,
 								merchantName: uni.getStorageSync('login_user_info').merchantName,
 								merchantUserId: uni.getStorageSync('login_user_info').id,
-								businessType: this.type,
+								businessType: this.uptype,
 								taskId : this.taskId,
 								imgUrl:this.imageHttp + item.message
 							})

pages/order/serviceOrder/orderDetail.vue

@@ -96,7 +96,7 @@
 					</view>
 					<view class="product_name">
 						{{form.productName}}
-						<span><text>￥</text>{{rightsId?0:form.price}}</span>
+						<span><text>￥</text>{{!rightsId?0:form.price}}</span>
 					</view>
 				</view>
 				<view class="sun_product">
@@ -719,6 +719,8 @@
 			this.taskId = options.taskId
 			this.checkType = options.checkType
 			this.rightsId = options.rightsId
+      console.log(this.rightsId)
+      console.log(this.rightsId?"0":"1")
 		}
 	}
 </script>