From 2cd4335c908a55dee5c584fa1947e920f3246a0c Mon Sep 17 00:00:00 2001
From: Sliverber <2622874537@qq.com>
Date: Thu, 1 Feb 2024 22:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production           |  2 +-
 src/views/order/index.vue | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.env.production b/.env.production
index 1ab8f94..aab6e76 100644
--- a/.env.production
+++ b/.env.production
@@ -3,5 +3,5 @@ ENV = 'production'
 
 # base api
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://106.75.49.247:20400'
+VUE_APP_BASE_API = 'http://117.50.215.20:20400'
 
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 3271af6..2de9652 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -287,7 +287,7 @@
                 checkPermi(['admin:order:send'])
               ">发货</el-button>
             <el-button size="small"
-                       style="margin-top: 10px;" @click="showht()" v-show="scope.row.statusStr.value!='待审核'&&scope.row.statusStr.value!='待签约'">查看合同</el-button>
+                       style="margin-top: 10px;" @click="showht(scope.row.contractUrl)" v-show="scope.row.statusStr.value!='待审核'&&scope.row.statusStr.value!='待签约'&&scope.row.contractUrl!=null">查看合同</el-button>
             <el-button size="small"
                        style="margin-top: 10px;"  @click.native="handleDelete(scope.row, scope.$index)">取消订单</el-button>
             <!-- <el-button
@@ -613,11 +613,11 @@
           <div class="tit">
             IP记录
           </div>
-          <div class="info">
+          <div class="info" v-for="(item,index) in userinfo.detailinfo.ips" :key="index">
 
-            <div class="infoli">2022年10月1日 22:11:22</div>
-            <div class="infoli">192.168.2.36</div>
-            <div class="infoli">福建省 福鼎市</div>
+            <div class="infoli">{{ item.loginTime }}</div>
+            <div class="infoli">{{ item.ipaddr }}</div>
+            <!-- <div class="infoli">福建省 福鼎市</div> -->
           </div>
         </div>
         <div class="fkbox"
@@ -774,7 +774,7 @@ export default {
       ],
       pdfDoc: null, // pdfjs 生成的对象
         pdfHTML: 0, // pdfjs 生成的对象
-       pdfUrl: 'http://api.yruibao.com/222.pdf?e=1706691788&token=MI4PDg9LYWXJyahzx5ec6-Ih0YNwQhew_BQUhttS:L2jIdMZLGukvrXLGP-iXImrHy80=',
+       pdfUrl: '',
       detaillist: [
         { tit: '用户基础信息 ' },
         { tit: ' 订单记录  ' },
@@ -918,7 +918,8 @@ export default {
         });
       });
     },
-    showht(){
+    showht(url){
+      this.pdfUrl=url
       const CMAP_URL = "https://cdn.jsdelivr.net/npm/pdfjs-dist@2.0.943/cmaps/";
         let obj = {};
         obj.url = this.pdfUrl; //pdf文件地址，根据情景自行修改