From 984a4daf333abe397b15ef4c903470380e92511c Mon Sep 17 00:00:00 2001
From: sxq <853623962@qq.com>
Date: Sat, 17 Feb 2024 16:23:09 +0800
Subject: [PATCH] =?UTF-8?q?'=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/newFun.js               |  10 +++
 pages.json                  |   5 ++
 pages/activity/newGoods.vue |   2 +-
 pages/invite/index.vue      |  45 +++++++----
 pages/invite/list.vue       | 151 +++++++++++++++++++-----------------
 pages/login/index.vue       |   5 +-
 pages/news/user/invite.vue  |  29 +++++--
 pages/news3/updatePrice.vue |   3 +-
 project.config.json         |   2 +-
 9 files changed, 155 insertions(+), 97 deletions(-)

diff --git a/api/newFun.js b/api/newFun.js
index c7a7e2c..da18d97 100644
--- a/api/newFun.js
+++ b/api/newFun.js
@@ -1,5 +1,15 @@
 import request from '@/utils/request'
 
+// 邀请有礼 记录
+export const inviteGetList = (param) => {
+  return request.post('invite/getList', param)
+} 
+
+// 邀请有礼
+export const inviteInit = (param) => {
+  return request.post('invite/index', param)
+} 
+
 // 足迹列表 删除
 export const goodsBrowseDel = (param) => {
   return request.get('goods/browseDel', param)
diff --git a/pages.json b/pages.json
index 8621520..c783f9d 100644
--- a/pages.json
+++ b/pages.json
@@ -94,6 +94,11 @@
 				"navigationBarBackgroundColor": "#FF5554",
 				"navigationBarTextStyle": "white"
 			}
+		},{
+			"path": "pages/invite/list",
+			"style": {
+				"navigationBarTitleText": "邀请记录"
+			}
 		},
 		{
 			"path": "pages/custom/index",
diff --git a/pages/activity/newGoods.vue b/pages/activity/newGoods.vue
index 0b2f861..624ac82 100644
--- a/pages/activity/newGoods.vue
+++ b/pages/activity/newGoods.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-	import img from "@/static/member/head.png"
+	import img from "https://www.saas.njrenzhou.com/static/member/head.png"
 	import * as Api from '@/api/activity'
 	import {
 		getEmptyPaginateObj,
diff --git a/pages/invite/index.vue b/pages/invite/index.vue
index 17e1a09..09423f6 100644
--- a/pages/invite/index.vue
+++ b/pages/invite/index.vue
@@ -4,7 +4,7 @@
 			<u-notice-bar mode="horizontal" :list="list" color="#fff" bg-color="rgba(255,255,255,0.22)"></u-notice-bar>
 		</view>
 		<view class="invite-hd">
-			<image src="@/static/news/invite-bg.png"></image>
+			<image src="https://www.saas.njrenzhou.com/static/news/invite-bg.png"></image>
 			<view class="btn"></view>
 			<view class="rule"></view>
 		</view>
@@ -13,11 +13,11 @@
 				<view class="a">
 					<view class="l">
 						累计邀请好友(人）
-						<view class="p">224</view>
+						<view class="p">{{info.count_people}}</view>
 					</view>
 					<view class="l">
 						累计现金奖励(元）
-						<view class="p">224</view>
+						<view class="p">{{info.money}}</view>
 					</view>
 				</view>
 				<view class="b" @click="openPage(1)">
@@ -28,35 +28,35 @@
 				</view>
 			</view>
 			<view class="invite-bd-b">
-				<image src="@/static/news/invite-bg2.png"></image>
+				<image src="https://www.saas.njrenzhou.com/static/news/invite-bg2.png"></image>
 				<view class="a">
 					<view class="l">
-						可得288积分<br />188元优惠券
+						可得{{info.integral}}积分<br />{{info.coupon_name}}
 					</view>
 					<view class="l">
-						可返现3%
+						可返现{{info.one_order_rate}}%
 					</view>
 					<view class="l">
-						188元优惠券
+						{{info.one_order_rate}}元{{info.coupon_name}}
 					</view>
 				</view>
 			</view>
 			<view class="invite-bd-c">
-				<image src="@/static/news/invite-bg3.png"></image>
+				<image src="https://www.saas.njrenzhou.com/static/news/invite-bg3.png"></image>
 				<view class="a">
 					<view class="l">
-						188优惠券
+						{{info.one_order_rate}}元{{info.coupon_name}}
 					</view>
 					<view class="l">
-						288积分
+						{{info.integral}}积分
 					</view>
 					<view class="l">
-						首单返3%
+						首单返{{info.one_order_rate}}%
 					</view>
 				</view>
 			</view>
 			<view class="invite-bd-d">
-				<image src="@/static/news/invite-bg4.png"></image>
+				<image src="https://www.saas.njrenzhou.com/static/news/invite-bg4.png"></image>
 				<view class="p">立即邀请</view>
 			</view>
 		</view>
@@ -64,12 +64,14 @@
 </template>
 
 <script>
+	import * as newFunApi from '@/api/newFun'
 	export default{
 		data(){
 			return{
 				backgroundBg: {
 					"background": "rgba(255,255,255,0.22)"
 				},
+				info: {},
 				list: [
 					'寒雨连江夜入吴',
 					'平明送客楚山孤',
@@ -78,7 +80,21 @@
 				]
 			}
 		},
+		onReady() {
+			this.getList();
+		},
 		methods: {
+			async getList() {
+				uni.showLoading({
+					title:"加载中"
+				})
+				const {status, data} = await newFunApi.inviteInit({});
+				if(status == 200){
+					uni.hideLoading();
+					this.info = data;
+					console.log(this.info)
+				}
+			},
 			openPage(index){
 				if(index == 1){
 					uni.navigateTo({
@@ -188,7 +204,7 @@
 			}
 			.a{
 				width: 100%;
-				bottom: 50rpx;
+				bottom: 40rpx;
 				padding: 0 25rpx;
 				box-sizing: border-box;
 				z-index: 1;
@@ -217,7 +233,7 @@
 			}
 			.a{
 				width: 260rpx;
-				bottom: 0;
+				bottom: -60rpx;
 				box-sizing: border-box;
 				z-index: 1;
 				right: 0;
@@ -230,7 +246,6 @@
 					text-align: center;
 					font-size: 22rpx;
 					font-weight: 500;
-					line-height: 150rpx;
 					color: #414141;
 				}
 			}
diff --git a/pages/invite/list.vue b/pages/invite/list.vue
index 3bde328..491e4ba 100644
--- a/pages/invite/list.vue
+++ b/pages/invite/list.vue
@@ -1,90 +1,101 @@
 <template>
-	<view class="member">
-		<view >
-			<u-navbar title="邀请记录" back-icon-color="#fff" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
-		</view>
-		<view class="tab">
-			<view class="tabList">
-				<view v-for="(item,index) in tabList" :key="index" class="tabItem">
-					<view class="name" :style="{'color':item.value==chosed?'#FF4C4B':'#7A7A7A'}">
-						{{item.name}}
-					</view>
-					<view class="line" v-if="item.value==chosed">
-						
-					</view>
+	<view class="user">
+		<view class="user-bd">
+			<view class="li" v-for="(a,i) in list" :key="i">
+				<view class="l">
+					<image src="@/static/news/avater.png"></image>
+				</view>
+				<view class="m">
+					<view class="n">AUIIO</view>
+					<view class="t">2023-02-12 10:00</view>
+				</view>
+				<view class="r">
+					+<text>18元</text>
 				</view>
 			</view>
-			
 		</view>
+		<u-empty text="暂无信息" v-if="total == 0" mode="list"></u-empty>
 	</view>
 </template>
 
 <script>
-	import img from "@/static/member/top.png"
-	export default{
-		data(){
-			return{
-				background: {
-					background: 'url('+	img+') center top no-repeat',
-					backgroundSize: '100% auto',
-				},
-				chosed:'0',
-				tabList:[
-					{
-						name:'待完成',
-						value:'0'
-					},{
-						name:'已完成',
-						value:'1'
-					},{
-						name:'已完成',
-						value:'2'
-					}
-				]
-			}
+	import * as newFunApi from '@/api/newFun'
+	export default {
+		data() {
+			return {
+				list: [],
+				total: 1
+			};
+		},
+		onLoad() {
+			this.getList();
+		},
+		methods: {
+			async getList() {
+				uni.showLoading({
+					title:"加载中"
+				})
+				const {status, data} = await newFunApi.inviteGetList({});
+				if(status == 200){
+					uni.hideLoading();
+					this.list = data.list.data;
+					this.total = data.list.total
+					console.log(this.total)
+				}
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.member{
-		width: 100%;
-		background: url('../../static/member/merBack.png') 100% no-repeat;
-		background-size: 100% 100%;
-		position:relative;
-	}
-	.tab{
-		width: 682rpx;
-		height: 692rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 48rpx 0 0 42rpx;
-		padding-top: 20rpx;
-		.tabList{
+.user{
+	padding: 0 0 130rpx;
+	overflow: hidden;
+	&-bd{
+		padding: 0 20rpx 0 60rpx;;
+		background-color: #FFFFFF;
+		overflow: hidden;
+		margin-top: 20rpx;
+		.li{
 			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			.tabItem{
-				.name{
-					width: 96rpx;
-					height: 60rpx;
-					font-size: 32rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 600;
-					line-height: 44rpx;	
+			align-items: flex-start;
+			justify-content: space-between;
+			padding: 35rpx 0;
+			border-bottom: 1px solid #F2F2F2;
+			.l{
+				width: 86rpx;
+				height: 86rpx;
+				margin-right: 25rpx;
+				image{
+					width: 100%;
+					height: 100%;
+					border-radius: 50%;
+				}
+			}
+			.m{
+				flex: 1;
+				max-width: 400rpx;
+				margin-right: 20rpx;
+				.n{
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #545454;
 				}
-				
-				.line{
-					width: 48rpx;
-					height: 6rpx;
-					background: #FF4C4B;
-					border-radius: 56rpx 56rpx 56rpx 56rpx;
-					opacity: 1;
+				.t{
 					margin-top: 10rpx;
-					margin-left: 24rpx;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #A7A7A7;
+				}
+			}
+			.r{
+				font-size: 28rpx;
+				color: #FF4C4B;
+				text{
+					font-size: 36rpx;
 				}
 			}
 		}
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 897f9c6..3969b3f 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -27,7 +27,6 @@
 
 <script>
 	import * as UserApi from '@/api/user'
-	import img from "@/static/news/login-bg.png";
 	import * as CaptchaApi from '@/api/captcha';
 	import mpWeiXinMobile from './components/mp-weixin-mobile.vue'
 	import store from '@/store';
@@ -43,7 +42,7 @@
 				showCountDown: false,
 				currentIndex: 0,
 				background: {
-					background: 'url(' + img + ') center top no-repeat',
+					background: 'url(https://www.saas.njrenzhou.com/static/news/login-bg.png) center top no-repeat',
 					backgroundSize: '100%',
 				},
 				phoneNum: '',
@@ -152,7 +151,7 @@
 <style lang="scss" scoped>
 	.login {
 		width: 100%;
-		background: #fffafb url(@/static/news/login-bg.png) center top no-repeat;
+		background: #fffafb url(https://www.saas.njrenzhou.com/static/news/login-bg.png) center top no-repeat;
 		background-size: 100% 100%;
 		background-size: 100% auto;
 		min-height: 100vh;
diff --git a/pages/news/user/invite.vue b/pages/news/user/invite.vue
index a721020..33c54a5 100644
--- a/pages/news/user/invite.vue
+++ b/pages/news/user/invite.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="user">
 		<view class="user-bd">
-			<view class="li" v-for="i in 2" :key="i">
+			<view class="li" v-for="(a,i) in list" :key="i">
 				<view class="l">
 					<image src="@/static/news/avater.png"></image>
 				</view>
@@ -13,19 +13,36 @@
 					+<text>18元</text>
 				</view>
 			</view>
-		</view>
+		</view>
+		<u-empty text="暂无信息" v-if="total == 0" mode="list"></u-empty>
 	</view>
 </template>
 
-<script>
+<script>
+	import * as newFunApi from '@/api/newFun'
 	export default {
 		data() {
 			return {
-				
+				list: [],
+				total: 1
 			};
 		},
+		onLoad() {
+			this.getList();
+		},
 		methods: {
-			
+			async getList() {
+				uni.showLoading({
+					title:"加载中"
+				})
+				const {status, data} = await newFunApi.inviteGetList({});
+				if(status == 200){
+					uni.hideLoading();
+					this.list = data.list.data;
+					this.total = data.list.total
+					console.log(this.total)
+				}
+			},
 		}
 	}
 </script>
@@ -35,7 +52,7 @@
 	padding: 0 0 130rpx;
 	overflow: hidden;
 	&-bd{
-		padding: 0 0 0 60rpx;;
+		padding: 0 20rpx 0 60rpx;;
 		background-color: #FFFFFF;
 		overflow: hidden;
 		margin-top: 20rpx;
diff --git a/pages/news3/updatePrice.vue b/pages/news3/updatePrice.vue
index 4305714..5aa5aca 100644
--- a/pages/news3/updatePrice.vue
+++ b/pages/news3/updatePrice.vue
@@ -117,8 +117,9 @@ export default{
 				}
 			}
 			let {status, message, data} = await newFunApi.updatePrice({
-				uni.navigateBack({delta:1})
+				
 			});
+			uni.navigateBack({delta:1})
 		}
 	},
 	onLoad(option){
diff --git a/project.config.json b/project.config.json
index 8a72c2a..0f6f023 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-    "appid": "wxdcf7d5820d7530cd",
+    "appid": "wx68d198de972a9e9d",
     "compileType": "miniprogram",
     "libVersion": "3.3.3",
     "packOptions": {