瀏覽代碼

修改发货按钮不能展示问题

yinxiangke 3 周之前
父節點
當前提交
aae39e39b2
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 2 2
      .env.development
  2. 3 2
      src/pages/Personal/Orders.vue

+ 2 - 2
.env.development

@@ -1,10 +1,10 @@
 # 乔功
 # VITE_API_BASE_URL=http://192.168.100.134:8080/api
-# VITE_API_BASE_URL=http://47.104.167.40/prod-api/api
+VITE_API_BASE_URL=http://47.104.167.40/prod-api/api
 # VITE_API_BASE_URL=http://192.168.100.134:8080/api
 # VITE_API_BASE_URL=http://192.168.101.12:8080/api
 # 高运甲
-VITE_API_BASE_URL=http://192.168.100.89:8080/api
+# VITE_API_BASE_URL=http://192.168.100.89:8080/api
 # VITE_API_BASE_URL=http://192.168.101.12:8080/api
 
 

+ 3 - 2
src/pages/Personal/Orders.vue

@@ -41,8 +41,9 @@
                   </div>
 
                   <div class="flex-center-flex-end" style="width: 300px;">
+                     <el-tag style="margin-right: 16px;" :type=" item.shipStatus == 0 ? 'primary' : 'shipStatus'" v-if="item.orderType == 'mi_mall'">{{ item.shipStatusName }}</el-tag>
                     <template v-if="item.invoiceStatus == 0 && item.orderStatus == 1">
-                      <el-tag style="margin-right: 16px;" :type=" item.shipStatus == 0 ? 'primary' : 'shipStatus'" v-if="item.orderType == 'mi_mall'">{{ item.shipStatusName }}</el-tag>
+                     
                       <div @click.stop="applyInvoices(item, index)" class="blue btn">
                         <img src="/src/assets/imgs/my/order3@2x.png" alt="">
                         <div class="">{{ $t('common.applyInvoice') }}</div>
@@ -61,7 +62,7 @@
                         item.transferSug
                         }}</el-text>
                     </div>
-                    <div class="btn_kong" v-else></div>
+                    <!-- <div class="btn_kong" v-else></div> -->
                     <template v-if="false">
                       <template v-if="index == 0">
                         <div class="gradient btn">