订单详情,收银台

common/config/config.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //本地IP联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.68:8008'	 //本地IP联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'

components/cm-module/orderDetails/goodsList.vue

@@ -21,7 +21,12 @@
 							<view class="producttitle">{{pros.name}}</view>
 							<view class="productspec" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
 							<view class="product-view">
-								<view class="view-num">单价：￥{{pros.price | NumFormat}}</view>
+								<view class="view-num">
+									单价：￥{{pros.price | NumFormat}}
+									<text class="red" v-show="pros.includedTaxFlag ==' 1' || pros.includedTaxFlag == '2'">({{ pros.includedTaxFlag | formatIncludedTax }})</text>
+								</view>
+							</view>
+							<view class="product-view">
 								<view class="view-num">数量：{{pros.num}}</view>
 							</view>
 							<view class="product-view" v-if="pros.returnedNum>0 || pros.actualCancelNum>0">
@@ -93,6 +98,15 @@
 			NumFormat(value) {//处理金额
 				return Number(value).toFixed(2);
 			},
+			formatIncludedTax(value) {
+				if (value === '1') {
+				  return '不含税 ';
+				} else if (value === '2') {
+				  return '含税';
+				} else {
+				  return '';
+				}
+			},
 		},	
 		computed: {
 		
@@ -233,6 +247,9 @@
 						font-size: $font-size-26;
 						color: #666666;
 						line-height: 44rpx;
+						.red{
+							color: #FF2000;
+						}
 					}
 				}
 				.producttitle{

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -46,6 +46,7 @@
 			return{
 				btnState:this.initStatus(),
 				isIphoneX:this.$store.state.isIphoneX,
+				invoiceStatus:false,
 				mapStateArr:[
 					{label:'isDelete',val:[6],status: true},
 					{label:'isCancel',val:[0,111],status: true},
@@ -96,8 +97,25 @@
 				this.shareCode = code
 			},
 			onShareCode(){
-				this.$parent.isShareModal = true
-				this.$emit('shareConfirm')
+				if(this.order.onlinePayFlag!= '1'){
+					this.PayService.PayOrderCheckoutCounter({orderId:this.order.orderID}).then(response =>{
+						let data = response.data.order
+						this.invoiceStatus =  data.invoiceStatus
+						//判断线上线下显示
+						if(this.invoiceStatus){
+							this.$util.modal('提示','由于商品发票属性的限制，本订单不能进行线上支付，请让客户选择线下转账方式付款','继续分享','知道了',true,() =>{
+								this.$parent.isShareModal = true
+							})		
+						}else{
+							this.$parent.isShareModal = true
+						}
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				}else{
+					this.$parent.isShareModal = true
+				}
+				// this.$emit('shareConfirm')
 			},
 			btnConfirm(type,order){
 				let data = {

pages/user/order/order-details.vue

@@ -35,7 +35,7 @@
 		<!-- 分享弹窗 -->			
 		<share-alert  :orderID="orderID" 
 					  v-if="isShareModal"  
-					  @shareConfirm ='onShareAppMessage'>
+					  @btnConfirm ='onShareAppMessage'>
 		</share-alert>		
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>

pages/user/order/orderShareLogin.vue

@@ -1,11 +1,11 @@
-<template>
+ <template>
 	<view class="container login">
 		<view class="login-main">
 			<image class="logo" :src="imagePath" mode=""></image>
 		</view>
 		<view class="login-input">
 			<input type="number" 
-				   v-model="shareCode"  
+				   v-model="shareCode"
 				   maxlength="4" 
 				   class="input" 
 				   placeholder="请输入分享码"

services/ajax.env.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //本地IP联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.68:8008'	 //本地IP联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'