From 296b852dce643aab2c8affd41d6826ca0b5b13e2 Mon Sep 17 00:00:00 2001
From: penny <2500338766@qq.com>
Date: Sun, 7 Aug 2022 17:14:55 +0800
Subject: [PATCH] =?UTF-8?q?feature-hub-1.0:=E4=BF=AE=E5=A4=8D=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=E7=95=8C=E9=9D=A2=E6=97=B6=E9=97=B4=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84bug;=E5=8A=A0=E5=85=A5=E7=AE=97=E5=91=BD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                      | 11 +++++++++++
 main.js                           |  6 +++---
 pages/profit/profit.vue           |  2 +-
 pages/profit/profitEndDetails.vue |  8 ++++----
 pages/profit/profitEndOrder.vue   |  2 +-
 pages/profit/profitInDetails.vue  |  2 +-
 pages/profit/profitInOrder.vue    |  2 +-
 pages/profit/profitPreDetails.vue |  2 +-
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/api/index.js b/api/index.js
index c030a03..53c0358 100644
--- a/api/index.js
+++ b/api/index.js
@@ -107,3 +107,14 @@ export function onlineOrOfflineImg(data) {
 	})
 }
 
+
+// 八字算命
+export function getYs(data) {
+	return request({
+		url: `${serviceTitle}${prefix}/getYs`,
+		method: 'post',
+		data
+	})
+}
+
+
diff --git a/main.js b/main.js
index 3b34024..961fc4e 100644
--- a/main.js
+++ b/main.js
@@ -2,9 +2,9 @@ import App from './App'
 import store from './store/'
 
 // const baseURL = 'http://localhost:7010'
-const baseURL = 'http://81.69.47.31:7010'
+//const baseURL = 'http://81.69.47.31:7010'
 // const baseURL = 'http://bnyer.vaiwan.com'
-// const baseURL = 'http://rnjbgm.natappfree.cc'
+const baseURL = 'http://av9r46.natappfree.cc'
 
 
 Vue.prototype.$baseURL = baseURL;
@@ -13,7 +13,7 @@ Vue.prototype.$baseURL = baseURL;
 import Vue from 'vue'
 Vue.config.productionTip = false
 App.mpType = 'app'
-const app = new Vue({
+const app = new Vue({ 
     ...App
 })
 app.$mount()
diff --git a/pages/profit/profit.vue b/pages/profit/profit.vue
index d92cbdc..186321f 100644
--- a/pages/profit/profit.vue
+++ b/pages/profit/profit.vue
@@ -93,7 +93,7 @@
                   <view class="adver-top-text"> 广告: </view>
                 </view>
                 <view class="adver-mid">
-                  抖音/快手均为次日结算前日ECPM价格
+                  抖音/快手/微信均为次日结算前日ECPM价格
                 </view>
               </view>
               <uni-list>
diff --git a/pages/profit/profitEndDetails.vue b/pages/profit/profitEndDetails.vue
index 43843a5..da9915c 100644
--- a/pages/profit/profitEndDetails.vue
+++ b/pages/profit/profitEndDetails.vue
@@ -20,7 +20,7 @@
             showArrow
             clickable
             :title="item.walletTime + '@' + item.scanCode"
-            :note="item.appType + '&' + item.platform + '&' + item.type"
+            :note="item.appType + '&' + item.platform + '&' + item.appType"
             :thumb="item.url"
             thumb-size="lg"
             :rightText="'￥' + item.profit"
@@ -29,7 +29,7 @@
             <template v-slot:body>
               <view class="box">
                 <view class="uni-list-item__content-title">{{
-                  item.createTime + "@" + item.scanCode
+                  item.walletTime + "@" + item.scanCode
                 }}</view>
                 <view class="box-bot">
                   <view>
@@ -67,7 +67,7 @@
             <template v-slot:body>
               <view class="box">
                 <view class="uni-list-item__content-title">{{
-                  item.createTime + "@" + item.scanCode
+                  item.walletTime + "@" + item.scanCode
                 }}</view>
                 <view class="box-bot">
                   <view>
@@ -242,7 +242,7 @@ export default {
     },
     setAppType(data) {
       if (data == "0") {
-        return "次元壁纸";
+        return "节点壁纸";
       }
     },
     setType(data) {
diff --git a/pages/profit/profitEndOrder.vue b/pages/profit/profitEndOrder.vue
index 05354fd..7fc87a8 100644
--- a/pages/profit/profitEndOrder.vue
+++ b/pages/profit/profitEndOrder.vue
@@ -93,7 +93,7 @@ export default {
     },
     setAppType(data) {
       if (data == "0") {
-        return "次元壁纸";
+        return "节点壁纸";
       }
     },
     setType(data) {
diff --git a/pages/profit/profitInDetails.vue b/pages/profit/profitInDetails.vue
index a877e5d..d8f4e72 100644
--- a/pages/profit/profitInDetails.vue
+++ b/pages/profit/profitInDetails.vue
@@ -241,7 +241,7 @@ export default {
     },
     setAppType(data) {
       if (data == "0") {
-        return "次元壁纸";
+        return "节点壁纸";
       }
     },
     setType(data) {
diff --git a/pages/profit/profitInOrder.vue b/pages/profit/profitInOrder.vue
index d44afbe..99fe79d 100644
--- a/pages/profit/profitInOrder.vue
+++ b/pages/profit/profitInOrder.vue
@@ -156,7 +156,7 @@ export default {
     },
     setAppType(data) {
       if (data == "0") {
-        return "次元壁纸";
+        return "节点壁纸";
       }
     },
     setType(data) {
diff --git a/pages/profit/profitPreDetails.vue b/pages/profit/profitPreDetails.vue
index f7070f2..5628c88 100644
--- a/pages/profit/profitPreDetails.vue
+++ b/pages/profit/profitPreDetails.vue
@@ -226,7 +226,7 @@ export default {
     },
     setAppType(data) {
       if (data == "0") {
-        return "次元壁纸";
+        return "节点壁纸";
       }
     },
     setType(data) {