修改

assets/http/tabbar.js

@@ -1,9 +1,9 @@
 export const tabbar = {
-	inactiveColor: "#828387",
+	inactiveColor: "#ababab",
 	activeColor: "#222222",
 	bgColor: "#ffffff",
 	midButton: false,
-	iconSize: 44,
+	iconSize: 43,
 	MinButtonSize: 70,
 	borderTop: true,
 	list: [{

components/login.vue

@@ -76,7 +76,7 @@
 					<view class="btn-content setBtnCss "
 						style="background-color: #FFFFFF;border-radius: 20rpx;border-top: 1rpx solid #f4f4f4;">
 						<button @click="hide" style="padding: 5rpx 0;border-right: 1rpx solid #f4f4f4;">暂不验证</button>
-						<button @click="h5Login" style="padding: 5rpx 0;">去验证</button>
+						<button @click="h5Login" style="padding: 5rpx 0;">立即验证</button>
 					</view>
 				</view>
 			</view>

pages/apply/apply.vue

@@ -144,19 +144,15 @@
 			 * 上传图文作品
 			 */
 			async uploadImageWork() {
+				let res = await this.$mpi.chooseImage()
+				this.compressParams.src = res[0]
 				this.$dialog.showLoading('作品上传中..')
-				let resp = await this.$mpi.chooseImage()
-				this.compressParams.src = resp[0]
-				this.$refs.compress.compress(this.compressParams).then(async src => {
-					let res = await this.$api.uploadFile(src)
-					this.applyInfo.imgUrl = res.data.data.link
-					//显示的是图文链接
-					this.showUrl = this.applyInfo.imgUrl
-					uni.hideLoading()
-				}).catch((err) => {
-					uni.hideLoading()
-					this.$u.toast('图片压缩失败')
-				})
+				let src= await this.$refs.compress.compress(this.compressParams)
+				let resp = await this.$api.uploadFile(src)
+				this.applyInfo.imgUrl = resp.data.data.link
+				//显示的是图文链接
+				this.showUrl = this.applyInfo.imgUrl
+				uni.hideLoading()
 			},
 			/**
 			 * 上传视频作品

pages/index/home.vue

@@ -84,7 +84,7 @@
 		<login ref="login" @signIn="signIn" @phoneSuccess="phoneSuccess"></login>
 		<toast ref="toast"></toast>
 
-		<u-tabbar :bg-color="tabbar.bgColor" :height="100" :border-top="tabbar.borderTop"
+		<u-tabbar :bg-color="tabbar.bgColor" :icon-size="tabbar.iconSize" :height="100" :border-top="tabbar.borderTop"
 			:inactive-color="tabbar.inactiveColor" :active-color="tabbar.activeColor" :list="tabbar.list">
 		</u-tabbar>
 	</view>

pages/mine/mine.vue

@@ -94,8 +94,8 @@
 		<toast ref="toast"></toast>
 		<login ref="login" @signIn="signIn" @phoneSuccess="phoneSuccess"></login>
 
-		<u-tabbar :bg-color="tabbar.bgColor" :height="100" :border-top="tabbar.borderTop"
-			:active-color="tabbar.activeColor" :list="tabbar.list">
+		<u-tabbar :bg-color="tabbar.bgColor" :icon-size="tabbar.iconSize" :height="100" :border-top="tabbar.borderTop"
+			:inactive-color="tabbar.inactiveColor" :active-color="tabbar.activeColor" :list="tabbar.list">
 		</u-tabbar>
 	</view>
 </template>
@@ -183,7 +183,9 @@
 		},
 		onLoad() {
 			this.fetchTabbar()
+			// #ifdef MP-WEIXIN
 			uni.hideShareMenu()
+			// #endif
 		},
 		methods: {
 			/**

pages/mine/setting/setting.vue

@@ -57,7 +57,9 @@
 				}
 				let params = {
 					title: item.name,
-					isGlobal: true
+				}
+				if (item.name=='用户隐私协议') {
+					params.isGlobal=true
 				}
 				uni.navigateTo({
 					url: item.path + this.$u.queryParams(params)

pages/shop/detail.vue

@@ -10,7 +10,7 @@
 				<view class="title">
 					<view class="text-bold" style="color: #353535;font-family: PingFang-SC-Bold;font-size: 34rpx;">
 						<text>{{detail.name}}</text>
-						<text class="red" v-if="detail.isLimit">（每人限购兑换{{detail.limitBuy}}次）</text>
+						<text class="red" v-if="detail.isLimit">（每人仅限兑换{{detail.limitBuy}}次）</text>
 					</view>
 					<view class=" text-base" style="padding: 20rpx 0;">
 						<view class="text-bold text-lg">

pages/shop/shop.vue

@@ -4,7 +4,7 @@
 		<u-navbar title-color="#fff" z-index="90" :border-bottom="false" :is-back="false" title="积分换礼"
 			:background="{'backgroundColor': vuex_theme.shopBg}"></u-navbar>
 		<!-- #endif -->
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" :up="upOption" @down="downCallback" @up="upCallback">
 			<view class="bg-card">
 				<view class="info" style="display: flex;justify-content: space-between;">
 					<view class="flex" v-if="vuex_userId">
@@ -24,7 +24,7 @@
 					</view>
 					<view class="center" style="margin-right: -30rpx;">
 						<view class="cu-btn round sm rule"
-							@click="$jump('/pages/introduce/notice?title=积分规则&isGlobal=true')">
+							@click="$jump('/pages/introduce/notice?title=积分规则')">
 							积分兑换规则
 						</view>
 					</view>
@@ -59,8 +59,8 @@
 		</mescroll-body>
 		<login ref="login" @signIn="signIn" @phoneSuccess="phoneSuccess"></login>
 
-		<u-tabbar :bg-color="tabbar.bgColor" :height="100" :border-top="tabbar.borderTop"
-			:active-color="tabbar.activeColor" :list="tabbar.list">
+		<u-tabbar :bg-color="tabbar.bgColor" :icon-size="tabbar.iconSize" :height="100" :border-top="tabbar.borderTop"
+			:inactive-color="tabbar.inactiveColor" :active-color="tabbar.activeColor" :list="tabbar.list">
 		</u-tabbar>
 	</view>
 </template>
@@ -79,6 +79,9 @@
 				downOption: {
 					auto: false
 				},
+				upOption:{
+					auto:false
+				},
 				avatar: '',
 				userData: {},
 				list: []
@@ -87,11 +90,26 @@
 		onShow() {
 			this.init()
 		},
-		onLoad() {
+		async onLoad() {
+			//加载底部导航栏
 			this.fetchTabbar()
+			//获取轮播图
 			this.fetchSwiperList()
+			//加载积分商城
+			this.fetchGoods()
 		},
 		methods: {
+			fetchGoods(){
+				// #ifdef MP-WEIXIN
+				this.mescroll.resetUpScroll();
+				// #endif
+				
+				// #ifdef H5
+				setTimeout(()=>{
+					this.mescroll.resetUpScroll();
+				},50)
+				// #endif
+			},
 			async fetchTabbar() {
 				this.tabbar = tabbar
 				if (this.vuex_theme.bgColor) {