From b4385cc5f2671e2fbd5822064470c8f9eef39e08 Mon Sep 17 00:00:00 2001
From: LiLingxiao <lilingxiao@haichuang.pro>
Date: Mon, 25 Jul 2022 16:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                     |  6 ++++--
 pages/profit/profit.vue     | 26 +++++++++++++-------------
 pages/register/register.vue |  2 +-
 utils/request.js            |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/main.js b/main.js
index 8f9827b..ec53c4f 100644
--- a/main.js
+++ b/main.js
@@ -3,9 +3,11 @@ import store from './store/'
 
 // const baseURL = 'http://localhost:7010'
 // const baseURL = 'http://81.69.47.31:7010'
-const baseURL = 'http://bnyer.vaiwan.com'
+// const baseURL = 'http://bnyer.vaiwan.com'
+const baseURL = 'http://rnjbgm.natappfree.cc'
 
-Vue.prototype.baseURL = baseURL;
+
+Vue.prototype.$baseURL = baseURL;
 
 // #ifndef VUE3
 import Vue from 'vue'
diff --git a/pages/profit/profit.vue b/pages/profit/profit.vue
index dbf622a..38e7ac3 100644
--- a/pages/profit/profit.vue
+++ b/pages/profit/profit.vue
@@ -99,12 +99,12 @@
               <uni-list>
                 <uni-list-item title="曝光" link>
                   <template v-slot:footer>
-                    <view class="blue"> 0次 </view>
+                    <view class="blue"> {{downloadAndInviteCountInfo.creatorProfitDownloadCount[0].downloadNum || 0}}次 </view>
                   </template>
                 </uni-list-item>
                 <uni-list-item title="邀请" link>
                   <template v-slot:footer>
-                    <view class="blue"> [07月08日] 0次 </view>
+                    <view class="blue"> [{{downloadAndInviteCountInfo.creatorProfitInviteCount[0].createTime || ''}}] {{downloadAndInviteCountInfo.creatorProfitInviteCount[0].inviteDownloadNum || 0}}次 </view>
                   </template>
                 </uni-list-item>
               </uni-list>
@@ -116,21 +116,21 @@
                   <view class="circular"></view>
                   <view class="adver-top-text"> 广告: </view>
                 </view>
-                <view class="adver-mid"> 2022.06.05 至 2022.07.20 </view>
+                <!-- <view class="adver-mid"> 2022.06.05 至 2022.07.20 </view> -->
               </view>
               <uni-list>
                 <uni-list-item title="曝光" link>
                   <template v-slot:footer>
-                    <view class="blue"> ¥ 2.376 </view>
+                    <view class="blue"> ¥{{inProfitInfo.profit || 0}} </view>
                   </template>
                 </uni-list-item>
                 <uni-list-item title="邀请" link>
                   <template v-slot:footer>
-                    <view class="blue"> ¥ 0.23 </view>
+                    <view class="blue"> ¥{{inProfitInfo.inviteProfit || 0}} </view>
                   </template>
                 </uni-list-item>
               </uni-list>
-              <view class="adver">
+              <!-- <view class="adver">
                 <view class="adver-top">
                   <view class="circular"></view>
                   <view class="adver-top-text"> 订单: </view>
@@ -148,7 +148,7 @@
                     <view class="blue"> ¥ 0 </view>
                   </template>
                 </uni-list-item>
-              </uni-list>
+              </uni-list> -->
             </view>
             <!-- 已转入钱包 -->
             <view v-show="active == 4">
@@ -161,16 +161,16 @@
               <uni-list>
                 <uni-list-item title="曝光" link>
                   <template v-slot:footer>
-                    <view class="blue"> ¥ 0 </view>
+                    <view class="blue"> ¥{{endProfitInfo.profit || 0}} </view>
                   </template>
                 </uni-list-item>
                 <uni-list-item title="邀请" link>
                   <template v-slot:footer>
-                    <view class="blue"> ¥ 0 </view>
+                    <view class="blue"> ¥{{endProfitInfo.inviteProfit || 0}} </view>
                   </template>
                 </uni-list-item>
               </uni-list>
-              <view class="adver">
+              <!-- <view class="adver">
                 <view class="adver-top">
                   <view class="circular"></view>
                   <view class="adver-top-text"> 订单: </view>
@@ -187,7 +187,7 @@
                     <view class="blue"> ¥ 0 </view>
                   </template>
                 </uni-list-item>
-              </uni-list>
+              </uni-list> -->
             </view>
             <!-- <view class="back-con-mid">
             <view class="back-con-mid-left">
@@ -526,11 +526,11 @@ export default {
   padding: 0 16px;
   box-sizing: border-box;
   left: 50%;
-  top: 515px;
+  top: 460px;
   transform: translate(-50%, -50%);
   background-color: white;
   position: absolute;
-  height: 415px;
+  height: 290px;
   display: flex;
   flex-direction: column;
   align-items: center;
diff --git a/pages/register/register.vue b/pages/register/register.vue
index ee36524..3620abf 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -211,7 +211,7 @@
 						for (var i = 0; i < tempFilePaths.length; i++) {
 							const tempFile = e.tempFiles[i];
 							uni.uploadFile({
-								url: 'http://bnyer.vaiwan.com/file/uploadBatch', 
+								url: `${Vue.prototype.$baseURL}/file/uploadBatch`, 
 								filePath: tempFilePaths[i],
 								name: 'files',
 								success: (uploadFileRes) => {
diff --git a/utils/request.js b/utils/request.js
index 5e9abee..c3aaf79 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,7 +5,7 @@ import Vue from "vue"
 const service = axios.create({
 	withCredentials: true,
 	crossDomain: true,
-	baseURL: Vue.prototype.baseURL, //这个baseURL是我在main.js下配置的请求url
+	baseURL: Vue.prototype.$baseURL, //这个baseURL是我在main.js下配置的请求url
 	timeout: 10000
 })