Merge branch 'developerC' into developer

# Conflicts:
#	src/main/resources/static/js/pay/caimei-pay.js
#	src/main/resources/static/js/pay/caimei-paycash.js

src/main/resources/config/dev/application-dev.yml

@@ -55,7 +55,7 @@ caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   #spiServer: http://192.168.2.68:8008
   coreServer: https://core-b.caimei365.com
-  #coreServer: http://192.168.2.68:18002
+#  coreServer: http://192.168.2.67:18002
   #coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009

src/main/resources/static/js/pay/caimei-pay.js

@@ -16,7 +16,7 @@ var payContainer = new Vue({
             payUserType:'',//网银支付类型
             payLinkTypeText:'',//文案
         },
-        bankListData:[],
+        bankListData:[],// 银行列表
         userName :'',
         goodList:'',
         freight :'',       //运费
@@ -245,9 +245,9 @@ var payContainer = new Vue({
         changeTab:function(index,item){// 选择银行
             this.tabIndex = index;
             if( this.payInfo.payLinkType == 1){
-                this.payInfo.payBankNum = item.B2bNum;
+                this.payInfo.payBankNum = item.b2B;
             }else{
-                this.payInfo.payBankNum = item.B2cNum;
+                this.payInfo.payBankNum = item.b2C;
             }
         },
         slideToggleContent:function(){

src/main/resources/static/js/pay/caimei-paycash.js

@@ -6,7 +6,7 @@ var payContainer = new Vue({
     data: {
         isSubMitStatus:false,
         payInfo:{
-            payBankNum: '', //支付类型
+            payBankNum: 'ICBC_B2B', //支付类型
             payOrderId: '',  //订单ID
             payUnpaidaMount: '', //待支付金额
             payAmount: 0,//本次支付金额
@@ -44,9 +44,10 @@ var payContainer = new Vue({
         bankPayLink_url:'',
         orderIdentificationId:'',//订单标识
         receiptStatus:'',
+        invoiceStatus:false,
         isReceiptStatus:false,
-        onlinePay:1,
-        payStatusText:'使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
+        onlinePay:'',
+        payStatusText:'使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
         productID:'',//发布商品的ID
         is_Wechat_bowcr:false,
         comboInfo: null, //选中的svip套餐信息
@@ -88,7 +89,7 @@ var payContainer = new Vue({
                     _self.payAmount =  (_self.payableAmount - _self.receiptAmount).toFixed(2);//本次支付金额
                     _self.paySuccessCounter = data.order.paySuccessCounter;
                     _self.receiptStatus =  data.order.receiptStatus;
-                    _self.onlinePay  = data.onlinePay ;
+                    _self.onlinePay = data.onlinePay;
                     if(_self.receiptAmount>0){
                         _self.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。';
                         _self.isReceiptStatus = false;
@@ -425,9 +426,9 @@ var payContainer = new Vue({
             var _self = this;
             _self.bankTabIndex = index;
             if( _self.mobileTabIndex == 2 ){
-                _self.payInfo.payBankNum = item.B2bNum;
+                _self.payInfo.payBankNum = item.b2B;
             }else if( _self.mobileTabIndex ==3 ){
-                _self.payInfo.payBankNum = item.B2cNum;
+                _self.payInfo.payBankNum = item.b2C;
             }
         },
         copyLinkPaySubmitFn:function(){//复制网银支付链接
@@ -543,7 +544,7 @@ var payContainer = new Vue({
         payTypeText:function(state){//处理支付记录文字
             var stateText = '',
                 stateTextObject={
-                    12:'企业网银',
+                    12:'网银',
                     13:'微信支付',
                     14:'支付宝',
                     15:'微信支付',
@@ -665,7 +666,8 @@ var payContainer = new Vue({
             // CAIMEI.Storage.removeItem('comboInfo');
             // 设置支付金额
             this.payAmount = _self.toFixedFn(this.comboInfo.price);
-            this.getBankList(); // 获取银行列表
+            // 获取银行列表
+            this.getBankList();
         } else {
             var HrefType = CAIMEI.getUrlParam('type');
             if (HrefType == 'payfirm') {
@@ -676,8 +678,10 @@ var payContainer = new Vue({
                 _self.payInfo.payOrderId = data.data.orderId;
                 _self.orderIdentificationId = '#' + _self.payInfo.payOrderId + '#';
             }
-            this.getBankList(); // 获取银行列表
-            this.infoPayOrderCheckoutCounter();//正常订单初始化
+            // 获取银行列表
+            this.getBankList();
+            //正常订单初始化
+            this.infoPayOrderCheckoutCounter();
         }
         var viewer = window.navigator.userAgent.toLowerCase();
         if(viewer.match(/MicroMessenger/i) == 'micromessenger'){

src/main/resources/templates/user-center/order/detail.html

@@ -239,7 +239,7 @@
                         <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
                             <div class="inner">
                                 <a class="btn primary confirm" href="javascript: void(0);" v-if="orderInfo.affirmPaymentFlag==10" @click="hanldConfirmFn()"><p>确认</p>打款供应商</a>
-                                <a class="btn primary" href="javascript: void(0);" v-if="!orderInfo.payButton && [11,12,13,21,22,23,111].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
+                                <a class="btn primary" href="javascript: void(0);" v-if="[11,12,13,21,22,23,111].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
                                 <a class="btn cancel" href="javascript: void(0);" v-if="[0,111].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
                                 <a class="btn primary" href="javascript: void(0);" v-if="[0].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
 <!--                                <a class="btn cancel" href="javascript: void(0);" v-if="[6].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>-->

src/main/resources/templates/user-center/order/list.html

@@ -101,7 +101,7 @@
                                 </div>
                                 <div class="order-botton">
                                     <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag== 10 " @click="hanldConfirmFn(order.userId,order.orderId)"><p>确认</p>打款供应商</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="!order.payButton && [11,12,13,21,22,23,111].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderId)">支付订单</a>
+                                    <a class="btn primary" href="javascript: void(0);" v-if="[11,12,13,21,22,23,111].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderId)">支付订单</a>
                                     <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderId)">订单详情</a>
                                     <a class="btn cancel" href="javascript: void(0);" v-if="[0,111].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderId)">取消订单</a>
                                     <a class="btn primary" href="javascript: void(0);" v-if="[0].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderId)">确认订单</a>