联合丽格V1.0.2

src/main/resources/static/css/base/base.pc.css

@@ -146,7 +146,7 @@ iframe{width:320px !important;height: 280px !important}
     color: #FF5B00 !important;
     background-position: -78px 185px;
 }
-.baseHeadCenter .wechat_qrcode .newCarLink:hover .headCart a {
+.baseHeadCenter .wechat_qrcode .newCarLink:hover .addBtn {
     color: #FF5B00 !important;
 }
 .baseHeadCenter .wechat_qrcode .newMsgLink:hover .headmsg a {

src/main/resources/static/js/shopping/mixins/conMixins.js

@@ -165,7 +165,8 @@ var conMixins = function () {
                 this.totalDiscountAmount =  this.reducedPrice + this.couponAmount;
                 if(data.invoice){
                     data.invoice.type = 0;
-                    this.orderInvoice =  data.invoice;
+                    this.orderInvoice = { ...this.orderInvoice , ...data.invoice } ;
+                    this.orderInvoice.headingType = 0
                 }
             },
         }

src/main/resources/static/js/supplier-center/order/detail.js

@@ -8,6 +8,7 @@ const seeDetail = new Vue({
             userInfo: {},
             order: {},
             orderProductList: [],
+            orderInvoice:{},//发票信息
             voucher:[], //支付凭证
             payShopRecord: [],
             isFiexd: true,
@@ -196,6 +197,7 @@ const seeDetail = new Vue({
                 if (response.code === 0) {
                     const data = response.data;
                     _self.order = data.shopOrder;
+                    _self.orderInvoice = data.shopOrder.invoice;
                     _self.userInfo = data.shopOrder.userInfo;
                     _self.orderProductList = data.shopOrder.orderProductList;
                     _self.voucher = data.shopOrder.voucher;

src/main/resources/static/js/supplier-center/shop/mixins/checkeMixins.js

@@ -118,7 +118,7 @@ var checkeMixins = function () {
                     },2000);
                     return;
                 }
-                if(_this.classificationTwoList!==''&& _this.classificationTwoList!=null){
+                if(_this.classificationTwoList.length >0){
                     if(_this.releaseParams.smallTypeId === ''){
                         _this.vShow_TinyTypeID = true;
                         _this.fromMessage = '请选择二级分类';
@@ -129,7 +129,7 @@ var checkeMixins = function () {
                         return;
                     }
                 }
-                if(_this.classificationThreeList!=='' && _this.classificationThreeList!=null){
+                if(_this.classificationThreeList.length >0){
                     if(_this.releaseParams.tinyTypeId === ''){
                         _this.vShow_TinyTypeID = true;
                         _this.fromMessage = '请选择三级分类';

src/main/resources/static/js/supplier-center/shop/mixins/getInfoMixins.js

@@ -166,14 +166,14 @@ var getInfoMixins = function () {
                 }
             },
             EchoGoodsImagesListFn(arr){//处理商品主图回显
-                var newArray =[];
+                const newArray = [];
                 arr.forEach( function(el){ newArray.push(el.image) });
                 return newArray;
             },
             GetFistClassFn(val){//获取一级分类菜单
-                var _this = this;
+                const _this = this;
                 PublicApi.GetFirstClassFication({typeSort:val},function (response) {
-                    if(response.code == 0){
+                    if(response.code === 0){
                         _this.classificationFirstList = response.data;
                     }else{
                         CAIMEI.Alert(response.msg, '确定', false);
@@ -181,9 +181,9 @@ var getInfoMixins = function () {
                 })
             },
             GetTwoClassFn(value){//获取二级分类菜单
-                var _this = this;
+                const _this = this;
                 PublicApi.GetTwoClassFication({bigTypeId:value},function (response) {
-                    if(response.code == 0){
+                    if(response.code === 0){
                         if(response.data.length>0){
                             _this.classificationTwoList = response.data;
                         }else {
@@ -191,6 +191,7 @@ var getInfoMixins = function () {
                             _this.releaseParams.twoClassifyName = '';
                             _this.releaseParams.smallTypeId = ''
                         }
+                        console.log('新发布商品12121921',_this.classificationTwoList)
                     }else{
                         CAIMEI.Alert(response.msg, '确定', false);
                     }

src/main/resources/templates/components/header.html

@@ -113,7 +113,7 @@
                 <div class="q_item newCarLink" v-if="userIdentity!=3" @click="goCartsLinkFn" >
                     <div class="headCart">
                         <div class="bg_car"></div>
-                        <a v-if="userIdentity!=3" href="javascript:void(0)" class="addBtn icon" onclick="_czc.push(['_trackEvent','顶部导航','购物车','点击','','Um_Event_Cart'])">购物车<span style="color: #FF5B00;" v-text="'('+headCart.cartCount+')'"></span></a>
+                        <a  v-if="userIdentity!=3" href="javascript:void(0)" class="addBtn icon" onclick="_czc.push(['_trackEvent','顶部导航','购物车','点击','','Um_Event_Cart'])">购物车<span style="color: #FF5B00;" v-text="'('+headCart.cartCount+')'"></span></a>
                         <div class="cartData">
                             <div v-if="headCart.cartCount>0">
                                 <div class="cartMain">

src/main/resources/templates/shopping/confirm.html

@@ -311,8 +311,8 @@
             <div class="invoiceForm" v-show="orderInvoice.type==1">
                 <div class="formLine">
                     <p class="label"><em>*</em>发票类型：</p>
-                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.headingType" :value="0"><i class="icon mIcon">个人</i></label>
-                    <label class="diyBox"><input type="radio" name="invoiceTit" v-model="orderInvoice.headingType" :value="1"><i class="icon mIcon">单位</i></label>
+                    <label class="diyBox"><input type="radio" name="headingType" v-model="orderInvoice.headingType" :value="0"><i class="icon mIcon">个人</i></label>
+                    <label class="diyBox"><input type="radio" name="headingType" v-model="orderInvoice.headingType" :value="1"><i class="icon mIcon">单位</i></label>
                     <span class="errTips icon mIcon"></span>
                 </div>
                 <div class="formLine">

src/main/resources/templates/supplier-center/order/delivery-record.html

@@ -14,7 +14,7 @@
 
 <!-- 我的采美 -->
 <div id="deliveryRecode">
-    <div class="navLayout" v-cloak="">
+    <div class="navLayout" v-cloak>
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
             <span>&gt;</span>

src/main/resources/templates/supplier-center/order/delivery.html

@@ -14,7 +14,7 @@
 
 <!-- 我的采美 -->
 <div id="delivergoods">
-    <div class="navLayout" v-cloak="">
+    <div class="navLayout" v-cloak>
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
             <span>&gt;</span>

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

@@ -97,18 +97,18 @@
                         <div class="info-title">发票信息</div>
                         <div class="content">
                             <div class="title-name">
-                                <p>{{  order.invoice | setInvoiceText }}</p>
+                                <p>{{  orderInvoice | setInvoiceText }}</p>
                             </div>
-                            <template v-if="order.invoice">
+                            <template v-if="orderInvoice && (orderInvoice.type === 2 || orderInvoice.headingType === 1)">
                                 <div class="order-item">
-                                    <p>发票抬头：<span class="none">{{ order.invoice.invoiceTitle ? order.invoice.invoiceTitle : '无' }}</span></p>
-                                    <p>单位税号：<span class="none">{{ order.invoice.corporationTaxNum ? order.invoice.corporationTaxNum : '无' }}</span> </p>
-                                    <p>注册地址：<span class="none">{{ order.invoice.registeredAddress ? order.invoice.registeredAddress : '无' }}</span> </p>
+                                    <p>发票抬头：<span class="none">{{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : '无' }}</span></p>
+                                    <p>单位税号：<span class="none">{{ orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : '无' }}</span> </p>
+                                    <p>注册地址：<span class="none">{{ orderInvoice.registeredAddress ? orderInvoice.registeredAddress : '无' }}</span> </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>注册电话：<span class="none">{{ order.invoice.registeredPhone ? order.invoice.registeredPhone : '无' }}</span></p>
-                                    <p>开户银行：<span class="none">{{ order.invoice.openBank ? order.invoice.openBank : '无' }}</span></p>
-                                    <p>银行账号：<span class="none">{{ order.invoice.bankAccountNo ? order.invoice.bankAccountNo : '无' }}</span></p>
+                                    <p>注册电话：<span class="none">{{ orderInvoice.registeredPhone ? orderInvoice.registeredPhone : '无' }}</span></p>
+                                    <p>开户银行：<span class="none">{{ orderInvoice.openBank ? orderInvoice.openBank : '无' }}</span></p>
+                                    <p>银行账号：<span class="none">{{ orderInvoice.bankAccountNo ? orderInvoice.bankAccountNo : '无' }}</span></p>
                                 </div>
                             </template>
                         </div>
@@ -170,7 +170,7 @@
                                     <el-dropdown-item v-if="order.receiptStatus === 1 || order.accountAmount>0">
                                         <div @click="handeleDropdown(7,order.shopOrderId)"> 修改订单</div>
                                     </el-dropdown-item>
-                                    <el-dropdown-item v-if="order.receiptStatus === 2 || order.receiptStatus === 3">
+                                    <el-dropdown-item v-if="[12,13,21,22,23,31,32,33].indexOf(order.status)!=-1">
                                         <div @click="handeleDropdown(3,order.shopOrderId)">发起退款</div>
                                     </el-dropdown-item>
                                     <el-dropdown-item>

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

@@ -175,7 +175,7 @@
                                        <el-dropdown-item v-if="[2,3].indexOf(order.sendOutStatus) !== -1">
                                            <div @click="handeleDropdown(2,order.shopOrderId)">发货记录</div>
                                        </el-dropdown-item>
-                                       <el-dropdown-item v-if="order.receiptStatus === 2 || order.receiptStatus === 3">
+                                       <el-dropdown-item v-if="[12,13,21,22,23,31,32,33].indexOf(order.status)!=-1">
                                            <div @click="handeleDropdown(3,order.shopOrderId)">发起退款</div>
                                        </el-dropdown-item>
                                        <el-dropdown-item>

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -13,7 +13,7 @@
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div id="addlogistics">
+<div id="addlogistics" v-cloak>
     <div class="navLayout">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>

src/main/resources/templates/supplier-center/order/logistics-detail.html

@@ -13,7 +13,7 @@
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div id="logisticsDetail">
+<div id="logisticsDetail" v-cloak>
     <div class="navLayout" v-cloak="">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>

src/main/resources/templates/supplier-center/order/logistics.html

@@ -12,7 +12,7 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 我的采美 -->
-<div id="logistics">
+<div id="logistics" v-cloak>
     <div class="navLayout">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>

src/main/resources/templates/supplier-center/order/order-edit.html

@@ -16,7 +16,7 @@
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div id="seeDetail">
+<div id="seeDetail" v-cloak>
     <div class="navLayout" v-cloak>
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>

src/main/resources/templates/supplier-center/order/order-return.html

@@ -17,7 +17,7 @@
 
 <!-- 我的采美 -->
 <div id="seeDetail">
-    <div class="navLayout" v-cloak="">
+    <div class="navLayout" v-cloak>
             <div class="crumbs" v-if="isPC">
                 <span>我的交易</span>
                 <span>&gt;</span>

src/main/resources/templates/supplier-center/order/sales-list.html

@@ -15,7 +15,7 @@
     <input type="hidden" th:value="${agent}" id="userAgent">
 </div>
 <!-- 我的采美 -->
-<div id="saleslist">
+<div id="saleslist" v-cloak>
     <div class="sales-list">
             <div class="sales-list-title">售货清单</div>
                 <div class="sales-list-cantent" >