zc订单

src/views/order/order/index.vue

@@ -111,7 +111,7 @@
                     <div class="orderSet">{{item.distributionMode}}</div>
                   </div>
                   <div class="order_price_text">
-                    <span v-if="item.orderPayment">￥{{item.orderPayment.toFixed(2)}}</span>
+                    <span v-if="item.payment">￥{{item.payment.toFixed(2)}}</span>
                   </div>
                   <div class="orderlist_center">
                     <div class="orderstatus_text" :class="item.status==0?'orderstatus_wait':''" v-if="item.orderType=='实体订单'">

src/views/order/order/order_processing.vue

@@ -55,11 +55,13 @@
             </div> -->
             <div class="newDetailCell" v-if="logisticsDetail && order.orderType=='5'">
               <span>配送方式：</span>
-              <el-input v-model="logisticsDetail.logisticsName" placeholder="请输入配送方式" style="width:240px;"></el-input>
+              <span>{{logisticsDetail.logisticsName}}</span>
+              <!-- <el-input v-model="logisticsDetail.logisticsName" placeholder="请输入配送方式" style="width:240px;"></el-input> -->
             </div>
             <div class="newDetailCell" v-if="logisticsDetail && order.orderType=='5'">
               <span>快递单号：</span>
-              <el-input v-model="logisticsDetail.expressNo" placeholder="请输入快递单号" style="width:240px;"></el-input>
+              <span>{{logisticsDetail.expressNo}}</span>
+              <!-- <el-input v-model="logisticsDetail.expressNo" placeholder="请输入快递单号" style="width:240px;"></el-input> -->
             </div>
             <div class="newDetailCell" style="width:50%;">
               <span>订单状态：</span>
@@ -165,7 +167,7 @@
                 <div class="confirm_goods">
                   <div class="confirm_outside">
                     共{{showNum}}件商品，商品总金额：
-                    <span v-if="order.orderPayment">￥{{order.orderPayment.toFixed(2)}}</span>
+                    <span v-if="order.orderPayment">￥{{(Number(order.payment) - Number(order.carriage)).toFixed(2)}}</span>
                   </div>
                 </div>
                 <!-- <div class="confirm_goods">
@@ -567,6 +569,7 @@ export default {
       orderDetAPI(id).then(res =>{
         if (res.data.code == 0) {
           this.order = res.data.data
+          this.order.carriage = this.order.carriage?Number(this.order.carriage):0
           this.order.invoiceContext = this.order.invoiceContext?this.order.invoiceContext:'1'
           this.returnOfGoods = res.data.data.returnOfGoods
           this.orderinfoList = []

src/views/order/returnGoods/index.vue

@@ -21,12 +21,12 @@
               <el-form-item style="margin-bottom:0">
                 <el-input v-model="listQuery.province" placeholder="请输入收货省份" style="width:140px;"></el-input>
               </el-form-item>
-              <el-form-item style="margin-bottom:0">
+              <!-- <el-form-item style="margin-bottom:0">
                 <el-select v-model="listQuery.invoiceStatus" placeholder="发票状态" clearable @clear="listQuery.invoiceStatus=null" style="width:103px">
                   <el-option :value="null" label="发票状态"></el-option>
                   <el-option v-for="(key,val) in invoiceList" :key="'invoice'+val" :label="key" :value="val"></el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item style="margin-bottom:0">
                 <el-select v-model="listQuery.status" placeholder="退货状态" clearable @clear="listQuery.status=null" style="width:103px">
                   <el-option :value="null" label="全部"></el-option>
@@ -39,7 +39,7 @@
               </el-form-item>
             </template>
             <el-form-item style="margin-bottom:0">
-              <el-input v-model="listQuery.orderId" @keyup.enter.native="getList()"
+              <el-input v-model="listQuery.orderCode" @keyup.enter.native="getList()"
                 placeholder="请输入订单编号" clearable></el-input>
             </el-form-item>
             <div class="search_btn" @click="getList()">
@@ -55,8 +55,8 @@
             <el-table-column type="selection"  width="50" align="center"></el-table-column>
             <el-table-column prop="refundId" align="center" label="退货单号" min-width="10%"></el-table-column>
             <el-table-column prop="orderid" align="center" label="所属订单" min-width="10%"></el-table-column>
-            <el-table-column prop="orderid" align="center" label="订单编号" min-width="10%"></el-table-column>
-            <el-table-column prop="code" align="center" label="订单类型" min-width="10%"></el-table-column>
+            <el-table-column prop="orderCode" align="center" label="订单编号" min-width="10%"></el-table-column>
+            <!-- <el-table-column prop="code" align="center" label="订单类型" min-width="10%"></el-table-column> -->
             <el-table-column prop="refundInfo" align="center" label="退货原因" min-width="10%"></el-table-column>
             <el-table-column prop="price" align="center" label="退货金额" min-width="10%"></el-table-column>
             <el-table-column prop="createTime" align="center" label="申请时间" min-width="10%"></el-table-column>
@@ -145,7 +145,8 @@ export default {
         nickname: null,
         province: null,
         status:null,
-        invoiceStatus:null,
+        orderCode:null,
+        // invoiceStatus:null,
       },
       value:null,
       total:null,

src/views/resource_manage/recommendedContent/content.vue

@@ -177,6 +177,9 @@ export default {
               }
             })
           }
+          if(this.$route.query.type != 1){
+            this.topBtn = this.topBtn.filter((item) => item.url != 'createCatalogueBtn')
+          }
         }else if(item.type == 9 ){
           this.lineBtn.push(item)
         }