hwq 1 year ago
parent
commit
73cbb022b0

+ 4 - 1
pages/category/category.vue

@@ -305,10 +305,13 @@ page,
 				}
 				this.loadingType = 'loading'
 				getProducts({
-					cid: index
+					cid: index,
+					page: this.page,
+					limit: this.limit
 				}).then(res => {
 					this.list = this.list.concat(res.data)
 					if (this.limit == res.data.length) {
+						this.page++
 						this.loadingType = 'more'
 					} else {
 						this.loadingType = 'noMore'

+ 9 - 20
pages/index/index.vue

@@ -53,8 +53,9 @@
 					<image class="image-left" src="../../static/img/tong.png" mode=""></image>
 					<view class="tongz-title">系统公告</view>
 				</view>
-				<u-notice-bar style="width: 100%;" mode="vertical" type="none" :volume-icon="false" :more-icon="true"
-					:list="text1" @click="goDetails" @getMore="navTo('/pages/index/artlist?type=1')"></u-notice-bar>
+				<u-notice-bar style="width: 100%;" mode="vertical" fontSize="32" type="none" :volume-icon="false"
+					:more-icon="true" :list="text1" @click="goDetails"
+					@getMore="navTo('/pages/index/artlist?type=1')"></u-notice-bar>
 
 			</view>
 		</view>
@@ -588,14 +589,14 @@
 	}
 
 	.tongz {
-		width: 690rpx;
+		width: 730rpx;
 		margin: 32rpx auto 0;
 		padding: 0 30rpx 0 24rpx;
 		background: #f8f8fa;
 		position: relative;
 
 		.tongz-left {
-			width: 640rpx;
+			width: 100%;
 
 			.left {
 				flex-shrink: 0;
@@ -605,37 +606,25 @@
 
 			.tongz-title {
 				margin-left: 10rpx;
-				font-size: 26rpx;
+				font-size: 32rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #ff1a1a;
 			}
 
 			.image-left {
-				width: 28rpx;
-				height: 28rpx;
+				width: 40rpx;
+				height: 40rpx;
 			}
 
 			.tongz-font {
 				margin-left: 22rpx;
-				font-size: 28rpx;
+				font-size: 32rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #0f253a;
 			}
 		}
-
-		.tongz-right {
-			position: relative;
-			z-index: 11;
-			width: 12rpx;
-			height: 26rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
 	}
 
 	.hotgoods {

+ 13 - 0
pages/user/team.vue

@@ -14,8 +14,12 @@
 			<view class="money-box">
 				<view class="money">{{ all || '0' }}</view>
 				<view>我的推广人数</view>
+				<view class="tip">
+					*三个月不推广,绿色积分停止发放。自己复投或推广后重新激活*
+				</view>
 			</view>
 		</view>
+
 		<!-- <view class="yeji">
 			<view class="yeji-a">
 				<view class="yeji-buttom">{{ userInfo.self_achievement * 1 || 0 }}</view>
@@ -282,6 +286,15 @@
 		.text {
 			font-size: 30rpx;
 		}
+
+
+	}
+
+	.tip {
+		padding: 20rpx;
+		text-align: center;
+		// color: #db1935;
+		font-size: 36rpx;
 	}
 
 	.order-item {

BIN
unpackage/dist/build/h5/5-25-1.rar → unpackage/dist/build/h5/7-6-1.rar


+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>挺酒</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3e31b09f.js></script><script src=/index/static/js/index.d44a92ef.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.67030921.js></script><script src=/index/static/js/index.027fec9e.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/index.63b34199.css


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/index.97465e7b.css


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.3e31b09f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.67030921.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.027fec9e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.d44a92ef.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.5c5026e2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.d6578ac1.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.eed039a4.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-team.582b4258.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-team.d61e0870.js


+ 3 - 1
utils/newRequest.js

@@ -47,6 +47,7 @@ let service = {
 			//console.log(data);
 			// 请求前数据处理
 			requestData = service.request.success(data);
+			console.log(requestData, '123456');
 			// #ifdef H5
 
 			if (process.env.NODE_ENV === 'development') {
@@ -60,6 +61,7 @@ let service = {
 			// #ifndef H5
 			url = service.baseURL + requestData.url;
 			// #endif
+			console.log(url, '123456');
 			// 数据复制用于请求
 			uni.request({
 				url: url,
@@ -194,4 +196,4 @@ let service = {
 };
 
 
-export default service
+export default service

Some files were not shown because too many files changed in this diff