Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/js/user-center/order/list.js

@@ -35,7 +35,6 @@ var orderPage = new Vue({
         orderIdentificationId:0,
         payModelData:{},
         hanldOrderData:{},//监听点击的单个订单项的按钮
-        confirmFlag:false,
         confrimsBtn:true,
     },
     filters: {
@@ -102,12 +101,10 @@ var orderPage = new Vue({
                  OrderApi.confirmpayment({orderID:orderId,userId:userId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('确认成功',true,function () {
-                            _self.confirmFlag = true;
                             _self.GetQueryOrderListData();
                         });
 
                     }else{
-                        _self.confrimsBtn = false;
                         CAIMEI.Alert(response.msg, '确定', false);
                     }
                 })

src/main/resources/templates/supplier-center/setting/information.html

@@ -207,7 +207,7 @@
                              <div class="formLine clear" >
                                 <div class="form-upload" id="businessImage">
                                     <p><em>*</em>营业执照图片：</p>
-                                    <div class="form-upload-image" v-if="params3.businessLicenseImage!=''">
+                                    <div class="form-upload-image" v-if="params3.businessLicenseImage!=''&&params3.businessLicenseImage!=null">
                                         <img class="upload-img" :src="params3.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
                                         <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                                     </div>
@@ -219,7 +219,7 @@
                                 </div>
                                 <div class="form-upload" id="logoImage">
                                     <p><em>*</em>公司LOGO：</p>
-                                    <div class="form-upload-image" v-if="params3.logo!=''">
+                                    <div class="form-upload-image" v-if="params3.logo!=''&&params3.logo!=null">
                                         <img class="upload-img" :src="params3.logo" alt="" id="logo" @click="showViewerImageFn1()">
                                         <i class="icon mIcon" @click="deletelogoImage()"></i>
                                     </div>
@@ -233,7 +233,7 @@
                             <div class="formLine clear">
                                 <p><em>*</em>资质认证：</p>
                                 <div class="form-upload" id="zizhiImage">
-                                    <div class="form-upload-image" v-if="params3.productionLicence!=''">
+                                    <div class="form-upload-image" v-if="params3.productionLicence!='' && params3.productionLicence!=null">
                                         <img class="upload-img" :src="params3.productionLicence" alt="" id="productionLicence" @click="showViewerImageFn2()">
                                         <i class="icon mIcon" @click="deleteproducImage()"></i>
                                     </div>
@@ -244,7 +244,7 @@
                                     <span class="errTips icon mIcon"></span>
                                 </div>
                                 <div class="form-upload" id="hygienicImage">
-                                    <div class="form-upload-image" v-if="params3.hygienicLicense!=''">
+                                    <div class="form-upload-image" v-if="params3.hygienicLicense!='' && params3.hygienicLicense!=null">
                                         <img class="upload-img" :src="params3.hygienicLicense" alt="" id="hygienicLicense" @click="showViewerImageFn3()">
                                         <i class="icon mIcon" @click="deletehygienicImage()"></i>
                                     </div>
@@ -255,7 +255,7 @@
                                     <span class="errTips icon mIcon"></span>
                                 </div>
                                 <div class="form-upload" id="taxImage">
-                                    <div class="form-upload-image" v-if="params3.taxLicense!=''">
+                                    <div class="form-upload-image" v-if="params3.taxLicense!='' && params3.taxLicense!=null">
                                         <img class="upload-img" :src="params3.taxLicense" alt="" id="taxLicense" @click="showViewerImageFn4()">
                                         <i class="icon mIcon" @click="deletaxImage()"></i>
                                     </div>

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

@@ -88,7 +88,7 @@
                                     <p v-if="order.discountFee!=0">经理折扣：<span>￥{{order.discountFee | NumFormat}}</span> </p>
                                     <p>促销满减：<span>￥{{order.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>赠品数：<span>{{order.presentCount + order.promotionalGiftsCount}}</span></p>
-                                    <p class="confirm-text" v-if="confirmFlag">已确认打款供应商</p>
+                                    <p class="confirm-text" v-if="order.affirmPaymentFlag==1">已确认打款供应商</p>
                                 </div>
                                 <div class="order-item">
                                     <p>订单总额：<span class="red">￥{{order.payTotalFee | NumFormat}}</span> </p>