工作代码提交

jiuyi2/common/js/config.js

@@ -8,7 +8,7 @@ const config = {
 	// #ifndef H5
 	// host: 'http://91f.xyz:8080',
 	host: 'http://liuyd.cpolar.top',
-	// host: 'http://liuyd.cpolar.top',
+	// host: 'http://hpedc3.natappfree.cc',
 	// #endif
 	// 是否vivo显示
 	showVivo: true,

jiuyi2/components/index/appVerUpdate.vue

@@ -60,11 +60,9 @@
 		})
 	}
 
-	// 取消
+	// 关闭
-	function handleCancel() {
+	function handleQuit() {
-		// 判断是否强制更新
+		plus.runtime.quit()
-		if (versionCloud.value.isForce == 1) plus.runtime.quit()
-		else close()
 	}
 
 	defineExpose({
@@ -97,8 +95,12 @@
 					<text class="tac cfff f28" @click="handleConfirm">更新</text>
 				</view>
 
-				<view class="btn cancel bar f1">
+				<view class="btn cancel bar f1" v-if="versionCloud.isForce == 1">
-					<text class="tac c333 f28" @click="handleCancel">取消</text>
+					<text class="tac c333 f28" @click="handleQuit">关闭</text>
+				</view>
+
+				<view class="btn cancel bar f1" v-else>
+					<text class="tac c333 f28" @click="close">取消</text>
 				</view>
 			</view>
 		</view>

jiuyi2/pages.json

@@ -793,6 +793,13 @@
 			{
 				"navigationBarTitleText" : "聊天信息"
 			}
+		},
+		{
+			"path" : "pages/shop/gift",
+			"style" : 
+			{
+				"navigationBarTitleText" : "礼包专区"
+			}
 		}
 	],
 

jiuyi2/pages/index/wallet/get.vue

@@ -147,6 +147,9 @@
 			if (rs.code == 200) {
 				// 提现回调
 				getToWalletCallback()
+
+				// 
+				uni.navigateBack()
 				return
 			}
 			util.alert({

jiuyi2/pages/index/wallet/topUp.vue

@@ -30,14 +30,14 @@
 				return handleAlipayPay(event)
 			}
 		},
-		{
+		// {
-			img: '/static/shop-weixin-pay.png',
+		// 	img: '/static/shop-weixin-pay.png',
-			name: '微信支付',
+		// 	name: '微信支付',
-			provider: 'wxpay',
+		// 	provider: 'wxpay',
-			apiRequest: (event) => {
+		// 	apiRequest: (event) => {
-				return handleWeChat(event)
+		// 		return handleWeChat(event)
-			}
+		// 	}
-		},
+		// },
 	])
 	// 支付列表下标
 	const paymentIndex = ref(0)
@@ -136,7 +136,6 @@
 			content: params.response.msg,
 			showCancel: false,
 		})
-
 	}
 </script>
 

jiuyi2/pages/shop/gift.vue

@@ -0,0 +1,107 @@
+<script setup>
+	// 礼包专区
+	import {
+		ref,
+		reactive,
+		getCurrentInstance,
+	} from 'vue'
+	import {
+		onReachBottom,
+		onPullDownRefresh,
+		onShow,
+		onLoad,
+		onReady,
+	} from '@dcloudio/uni-app';
+	// 工具库
+	import util from '@/common/js/util.js'
+	// 
+	import api from '@/api/index.js'
+	// 商品列表
+	import productList from '@/components/shop/productList/productList'
+
+	// tab
+	const tab = reactive([{
+			name: '礼包专区',
+		},
+		{
+			name: '超值礼包',
+		},
+		{
+			name: '大礼包',
+		},
+		{
+			name: '小礼包',
+		},
+	])
+	// 下标
+	const tabIndex = ref(0)
+
+	// 切换tab
+	function handleTab(index) {
+		if (tabIndex.value === index) return
+		tabIndex.value = index
+	}
+</script>
+
+<template>
+	<view class="app">
+
+		<!-- 公告 -->
+		<swiper class="notice c333 f28" vertical="true">
+			<swiper-item class="item bsb rows plr20" v-for="(item, index) in 2" :key="index">
+				<image class="icon" src="/static/notice.png" mode="aspectFit" />
+				<view class="f1 mlr20">九亿商城上线啦~</view>
+			</swiper-item>
+		</swiper>
+
+		<!-- 礼包专区 -->
+		<view class="tab bfff">
+			<view class="item ver ptb10" v-for="(item,index) in tab" :key="index" @click="handleTab(index)"
+				:class="{'active': index === tabIndex}">
+				<view class="mtb20">{{item.name}}</view>
+				<view class="line"></view>
+			</view>
+		</view>
+
+		<!-- 商品卡片组 加载更多 -->
+		<view class="product oh ptb30 plr30">
+			<productList ref="product" />
+		</view>
+	</view>
+</template>
+
+<style lang="scss" scoped>
+	// 公告
+	.notice {
+		height: 80rpx;
+		background-color: #e8e8e8;
+
+		.icon {
+			width: 84rpx;
+			height: 36rpx;
+		}
+	}
+
+	// 导航
+	.tab {
+		display: grid;
+		grid-template-columns: repeat(4, 1fr);
+
+		// 
+		.item {
+			.line {
+				width: 40rpx;
+				height: 6rpx;
+				background-color: #DD4B5B;
+				opacity: 0;
+				transition: .3s;
+			}
+
+			&.active {
+				.line {
+					opacity: 1;
+				}
+			}
+		}
+	}
+</style>

jiuyi2/pages/shop/shop.vue

@@ -2,7 +2,6 @@
 	/**
 	 * 商城
 	 */
-	// 底部菜单
 	import {
 		ref,
 		reactive,
@@ -106,7 +105,7 @@
 <template>
 	<view class="appbw">
 		<!-- 轮播图 -->
-		<swiper class="banner oh mtb30 mlr30 br20" autoplay="true" v-if="0">
+		<swiper class="banner oh" autoplay="true">
 			<swiper-item v-for="(item, index) in 3" :key="index">
 				<view class="item">
 					<image class="poster"
@@ -116,14 +115,12 @@
 			</swiper-item>
 		</swiper>
 
-		<!-- 公告 -->
+		<view class="gift mtb30">
-		<swiper class="notice mtb30 mlr30 c333 f28 br20" vertical="true" v-if="0">
+			<view class="item fdc fmid" v-for="(item,index) in 4" :key="index">
-			<swiper-item class="item bsb rows plr20" v-for="(item, index) in 2" :key="index">
+				<image class="icon" src="/static/logo.png" mode="aspectFill" />
-				<image class="wh30" src="/static/notice.png" mode="aspectFit" />
+				<view class="mt10 c333 f28">礼包专区</view>
-				<view class="f1 mlr20">九亿商城上线啦~</view>
+			</view>
-				<uni-icons type="right" />
+		</view>
-			</swiper-item>
-		</swiper>
 
 		<!-- 功能区 -->
 		<view class="fn rows mtb30 mlr30">
@@ -158,8 +155,7 @@
 <style lang="scss" scoped>
 	// 轮播图
 	.banner {
-		height: 300rpx;
+		height: 180rpx;
-		box-shadow: 0 0 20rpx #00000066;
 
 		.item {
 			height: 100%;
@@ -171,10 +167,15 @@
 		}
 	}
 
-	// 公告
+	// 礼包专区
-	.notice {
+	.gift {
-		height: 80rpx;
+		display: grid;
-		background-color: #f8f8f8;
+		grid-template-columns: repeat(4, 1fr);
+
+		.icon {
+			width: 110rpx;
+			height: 90rpx;
+		}
 	}
 
 	// 功能区

jiuyi2/vite.config.js

@@ -3,9 +3,9 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-// let target = 'http://91f.xyz:8080'
+let target = 'http://91f.xyz:8080'
-let target = 'http://liuyd.cpolar.top '
+// let target = 'http://liuyd.cpolar.top'
-// let target = 'http://3qkcs4.natappfree.cc'
+// let target = 'http://hpedc3.natappfree.cc'
 
 export default defineConfig({
 	plugins: [uni()],