commit -m 商品详情

pages/goods/product.vue

@@ -98,7 +98,7 @@
 						<text class="name">品牌  起订量  分类...</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
-					<view class="product-parameter" @click="showPopup(1)">
+					<view class="product-parameter" @click="showPopup(1)" v-if='product.commodityType == 2'>
 						<text class="title">培训方案：</text>
 						<text class="name">线上培训</text>
 						<text class="iconfont icon-xiayibu"></text>
@@ -201,12 +201,12 @@
 						<div class="tui-popup-main">
 							<scroll-view class="tui-popup-scroll train"  scroll-y="true">
 								<view class="content-tr">
-									<view class="content-td">培训方式</view>
-									<view class="content-th">线上培训</view>
+									<view class="content-td">培训方式：</view>
+									<view class="content-th">{{ product.trainingMethod == 1 ? '线上培训' : '线下培训' }}</view>
 								</view>
 								<view class="content-tr">
-									<view class="content-td">培训费用</view>
-									<view class="content-th">￥100.00</view>
+									<view class="content-td">培训费用：</view>
+									<view class="content-th">{{ product.trainingType == 1 ? '￥'+product.trainingFee : '售价已包含' }}</view>
 								</view>
 							</scroll-view>
 						</div>

pages/user/order/order-pay.vue

@@ -176,13 +176,13 @@
 			GetPayOrderInfo(){//初始化支付信息
 				this.PayService.PayOrderCheckoutCounter({orderId:this.orderID}).then(response =>{
 					this.isRepuest = true
-					this.discernReceipt = response.data.discernReceipt 		//支付记录
-					this.payTotalFee = response.data.order.payTotalFee  //订单总额
-					this.receiptAmount = response.data.order.receiptAmount  //已付金额
-					this.payableAmount = response.data.order.payableAmount - this.receiptAmount//已付金额
-					this.payAmount = this.toFixedFn(this.payableAmount)	//自定义金额
+					this.discernReceipt = response.data.discernReceipt 			// 支付记录
+					this.payTotalFee = response.data.order.payTotalFee  		// 订单总额
+					this.receiptAmount = response.data.order.receiptAmount  	// 已付金额
+					this.payableAmount = response.data.order.payableAmount - this.receiptAmount// 已付金额
+					this.payAmount = this.toFixedFn(this.payableAmount)			// 自定义金额
 					console.log('this.payAmount',this.payAmount)
-					this.balanceAmount = this.payableAmount - this.payAmount// 计算剩余支付金额
+					this.balanceAmount = this.payableAmount - this.payAmount	// 计算剩余支付金额
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})

services/ajax.env.js

@@ -2,10 +2,10 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	URL_CONFIG = 'https://core-b.caimei365.com'
+	URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
+	// URL_CONFIG = 'https://core-b.caimei365.com'
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境