采美线上支付

common/config/config.js

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

components/cm-module/orderDetails/orderButton.vue

@@ -2,7 +2,9 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay')">付款</view>
+			<view class="" v-if="onlinePayFlag == 0">
+				<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay')">付款</view>
+			</view>		
 			<view class="btn btn-share" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 				分享订单
@@ -25,6 +27,9 @@
 			},
 			shareCode:{
 				type:String
+			},
+			onlinePayFlag : {
+				type:Number
 			}
 		},
 		watch:{

components/cm-module/orderDetails/orderListButton.vue

@@ -2,7 +2,9 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',orderID)">付款</view>
+			<view class="" v-if="onlinePayFlag == 0">
+				<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',orderID)">付款</view>
+			</view>
 			<view class="btn btn-share"  @click.stop="onShareCode(orderID)">分享订单</view>	
 			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',orderID)">确认订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
@@ -22,6 +24,9 @@
 			},
 			orderID: {
 				type:Number
+			},
+			onlinePayFlag : {
+				type:Number
 			}
 		},
 		data() {

pages/login/apply.vue

@@ -62,7 +62,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">

pages/login/information.vue

@@ -65,7 +65,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">

pages/login/register.vue

@@ -112,7 +112,7 @@
 			<view class="register-row clearfix" >
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">

pages/user/order/order-details.vue

@@ -22,6 +22,7 @@
 						  v-if= "isRequest" 
 						  :status= "btnStatus" 
 						  :shareCode= "shareCode"
+						  :onlinePayFlag="onlinePayFlag"
 						   @buttonConfirm="handButtonConfirm">
 			</order-button>
 		</view>
@@ -67,6 +68,7 @@
 				cellPhone:'',				//客服电话
 				payStatus:0,
 				btnStatus:0,				//按钮组件状态
+				onlinePayFlag:'',
 				isRequest:false,			//是否加载完成渲染子组件
 				isOrderShare:false,
 				isShareModal:false,
@@ -117,6 +119,7 @@
 					this.payStatus = resData.order.payStatus
 					this.shopOrderData = resData.shopOrderList
 					this.orderInvoice = resData.orderInvoice
+					this.onlinePayFlag = resData.order.onlinePayFlag
 					this.returnedPurchaseList = resData.returnedPurchaseList
 					this.discernReceiptList = resData.discernReceiptList
 					this.receiptAmount = resData.order.receiptAmount

pages/user/order/order-list.vue

@@ -61,6 +61,7 @@
 								<order-button ref="orderButton" 
 											  :status="order.status" 
 											  :orderID="order.orderID" 
+											  :onlinePayFlag = "order.onlinePayFlag"
 											  @buttonConfirm="handButtonConfirm">
 								</order-button>
 							</view>

pages/user/order/order-pay.vue

@@ -190,7 +190,7 @@
 							'paySign': PayInfo.paySign,
 							'success':function(res){
 								console.log('支付成功');
-								self.$api.redirectTo('/pages/user/order/order-details?orderID='+this.orderID)
+								wx.reLaunch({url: '/pages/tabBar/user/user'});
 							},
 							'fail':function(res){
 								self.$util.msg('订单支付已取消')
@@ -238,10 +238,10 @@
 			payTypeText (state){//处理支付记录文字
 				let stateText = '',
 					stateTextObject={
-						12:'PC-B2B网银',
-						13:'PC-微信支付',
-						14:'PC-支付宝',
-						15:'小程序-微信支付',
+						12:'网银支付',
+						13:'微信支付',
+						14:'支付宝支付',
+						15:'微信支付',
 						16:'余额抵扣',
 					}
 				Object.keys(stateTextObject).forEach(key => {

seller/pages/login/apply.vue

@@ -127,7 +127,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">

seller/pages/login/information.vue

@@ -107,7 +107,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">

seller/pages/login/register.vue

@@ -94,7 +94,7 @@
 			<view class="register-row clearfix" >
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">