diff --git a/components/GetHivePupop.vue b/components/GetHivePupop.vue deleted file mode 100644 index 8b49d48..0000000 --- a/components/GetHivePupop.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - diff --git a/components/Introduction.vue b/components/Introduction.vue deleted file mode 100644 index a99f39c..0000000 --- a/components/Introduction.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - - diff --git a/pages.json b/pages.json index 082d200..15c7323 100644 --- a/pages.json +++ b/pages.json @@ -112,7 +112,7 @@ } }, { - "path": "pages/shoppingMall/shopDetails", + "path": "pages/shopDetails/shopDetails", "style": { "navigationBarTitleText": "", "navigationStyle": "custom" diff --git a/pages/adoptionRecords/adoptionRecords.vue b/pages/adoptionRecords/adoptionRecords.vue index 4a7f390..4b13446 100644 --- a/pages/adoptionRecords/adoptionRecords.vue +++ b/pages/adoptionRecords/adoptionRecords.vue @@ -69,7 +69,7 @@ const getStatusText = (status) => { // 待支付的状态可以继续支付 const payBtn = async (item) => { if (item.status === 3) { - const options = { orderId: item.payOrderI, } + const options = { orderId: item.payOrderId, } processPayment(options) } } diff --git a/pages/beeFarmerJion/addFarm.vue b/pages/beeFarmerJion/addFarm.vue index 8ceeda1..89bc162 100644 --- a/pages/beeFarmerJion/addFarm.vue +++ b/pages/beeFarmerJion/addFarm.vue @@ -22,6 +22,8 @@ class="form-item form-input" /> + @@ -41,6 +43,26 @@ 蜂场图片,仅支持上传1张 + + + + + + + + + × + + + + + + + 上传视频 + + + 蜂场视频,仅支持上传1个 + + @@ -50,7 +72,7 @@ + + \ No newline at end of file diff --git a/pages/beeGame/beeGame.vue b/pages/beeGame/beeGame.vue index 29f002a..f13e538 100644 --- a/pages/beeGame/beeGame.vue +++ b/pages/beeGame/beeGame.vue @@ -1,223 +1,53 @@ - - - - + display: flex; + flex-direction: column; + overflow: hidden; + } + + .bg-image { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; // 让图片在最底层 + } + + .content { + position: relative; + z-index: 1; // 内容在图片上方 + padding: 20rpx; // 根据需要调整内边距 + height: 100%; + } + .beeFarm{ + position: absolute; + bottom: 40%; + left: 40%; + z-index: 99; + height: 200rpx; + width: 200rpx; + } + \ No newline at end of file diff --git a/pages/beeHiveData/beeHiveData.vue b/pages/beeHiveData/beeHiveData.vue index a93c6e1..2079ba5 100644 --- a/pages/beeHiveData/beeHiveData.vue +++ b/pages/beeHiveData/beeHiveData.vue @@ -69,7 +69,7 @@ const userLocation = ref({ }); const dataMap = ref({ countryNumber: { - text: '国家', + text: '蜂场', icon: '/static/images/homePage/countryIcon.png', unit: '/个' }, diff --git a/pages/homePage/homePage.vue b/pages/homePage/homePage.vue index ead5378..7f03332 100644 --- a/pages/homePage/homePage.vue +++ b/pages/homePage/homePage.vue @@ -84,10 +84,10 @@ - {{item.beehiveName}} + {{ item.adoptType === 1 ? `认养一箱蜂-${item.beehiveName}` : `拼团认养一箱蜂-${item.beehiveName}` }} - {{ item.region }} - {{ item.honeySeeds }} + {{ item.region }} + {{ item.honeySeeds }} @@ -189,7 +189,7 @@ const activeBtn = (item) => { uni.navigateTo({ url: '/pages/couponPage/couponPage' }) } else{ uni.navigateTo({ - url:`/pages/shoppingMall/shopDetails?id=${item.productId}` + url:`/pages/shopDetails/shopDetails?id=${item.productId}` }) } } @@ -558,6 +558,7 @@ const scanCode = () => { text-overflow: ellipsis; } + .exclusive{ margin-top: 20rpx; font-size: 26rpx; diff --git a/pages/orderList/orderDetail.vue b/pages/orderList/orderDetail.vue index 4177953..578929d 100644 --- a/pages/orderList/orderDetail.vue +++ b/pages/orderList/orderDetail.vue @@ -3,46 +3,66 @@ - - 订单信息 - - - 商品名称 - {{ orderDetail.productName }} - - - 价格 - {{ orderDetail.amount }} - - - 源蜜场地 - {{ orderDetail.address }} - - - 产品规格 - {{ orderDetail.productName }} - - - 购买数量 - {{ orderDetail.productNumber }} - - - 下单时间 - {{formatDateTime(orderDetail.createTime) }} - - - 订单号 - {{ orderDetail.orderId }} - - + 物流信息 + 等待卖家发货 + 商品正在仓库打包,请耐心等待 + + + + + 商品信息 + + + + + + {{ item.productName }} + x{{ item.productNumber }} + + + ￥{{ item.productPrice }} + + + + + + + 支付金额 + ￥{{ orderDetail.amount }} + + + + + + + + + 订单信息 + + 下单时间 + {{ formatDateTime(orderDetail.createTime) }} + + + 订单号 + {{ orderDetail.orderId }} + + + 商户号 + {{ orderDetail.merchantId }} + + + 支付方式 + 微信支付 + + + 配送方式 + 快递运输 + + + - - 物流信息 - - - @@ -53,35 +73,35 @@ import { ref } from "vue"; import { request } from "@/utils/request"; import TransNavVue from "../../components/TransNav.vue"; import { onShow } from "@dcloudio/uni-app"; -import {formatDateTime} from '../../utils/system' +import { formatDateTime } from '../../utils/system' -const orderDetail=ref({}) +const orderDetail = ref({}) onShow(() => { const pages = getCurrentPages() - const currentPage = pages[pages.length - 1] - const options = currentPage.$page.options || currentPage.options - if (options.id) { + const currentPage = pages[pages.length - 1] + const options = currentPage.$page.options || currentPage.options + if (options.id) { getOrderDetail(options.id) - } else { - console.error('订单id失效') - } + } else { + console.error('订单id失效') + } }); //获取订单详情 -const getOrderDetail= async (id) => { +const getOrderDetail = async (id) => { try { const res = await request({ url: `/app-api/weixin/order/get/info?id=${id}`, showLoading: true, }); - if (res.code === 0 ) { - orderDetail.value=res.data||{} + if (res.code === 0) { + orderDetail.value = res.data || {} } else { throw new Error(res.msg || "获取订单详情失败"); } } catch (err) { console.error("获取订单详情失败:", err); - + } }; @@ -93,33 +113,79 @@ const getOrderDetail= async (id) => { .container { background-color: #f7f7f7; height: 100vh; - - .item-box{ - background-color: #fff; - height: 500rpx; - margin-top: 20rpx; - padding: 20rpx; - .first-title{ - margin-bottom: 20rpx; - font-weight: bold; - font-size: 42rpx; - - } - .info-item { + + .item-box { + background-color: #fff; + margin-top: 20rpx; + padding: 20rpx; + + .first-title { + margin-bottom: 20rpx; + font-weight: bold; + font-size: 42rpx; + + } + + .productBox { + border-bottom: 1rpx dashed #999 ; + border-top: 1rpx dashed #999; + padding: 20rpx; + margin-bottom: 20rpx; + .product-item { + padding: 10rpx 0rpx; display: flex; justify-content: space-between; align-items: center; - font-size: 26rpx; - color: #000; - margin-bottom: 20rpx; - .item-left{ - color: #999999; + + .product-img { + width: 100rpx; + height: 100rpx; } + .product-name { + width: 50%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 22rpx; + } + + + } + + } + + .product-price { + font-size: 32rpx; + color: #ff6f0e; + } + .info-item { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 26rpx; + color: #000; + margin-bottom: 20rpx; + padding: 0 20rpx; + + .item-left { + color: #999999; + } + + .item-detail { + max-width: 80%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + } + + } - + } \ No newline at end of file diff --git a/pages/orderList/orderList.vue b/pages/orderList/orderList.vue index d807b0e..d212910 100644 --- a/pages/orderList/orderList.vue +++ b/pages/orderList/orderList.vue @@ -18,14 +18,18 @@ > - {{ item.productName }} + {{ item.productName }} {{ formatDateTime(item.createTime) ||'2025-05-25'}} ¥{{ item.amount||0 }} + borderColor: getStatusColor(item.status)}" + @click.stop="payBtn(item)" + + + > + {{ getStatusText(item.status) }} @@ -42,7 +46,7 @@ diff --git a/static/images/game/activity.png b/static/images/game/activity.png deleted file mode 100644 index b59f01a..0000000 Binary files a/static/images/game/activity.png and /dev/null differ diff --git a/static/images/game/beeFarm.png b/static/images/game/beeFarm.png new file mode 100644 index 0000000..7acdf89 Binary files /dev/null and b/static/images/game/beeFarm.png differ diff --git a/static/images/game/beeGame.png b/static/images/game/beeGame.png new file mode 100644 index 0000000..db13037 Binary files /dev/null and b/static/images/game/beeGame.png differ diff --git a/static/images/game/beeHive.png b/static/images/game/beeHive.png deleted file mode 100644 index 6da1d50..0000000 Binary files a/static/images/game/beeHive.png and /dev/null differ diff --git a/static/images/game/broadcast.png b/static/images/game/broadcast.png deleted file mode 100644 index d54735e..0000000 Binary files a/static/images/game/broadcast.png and /dev/null differ diff --git a/static/images/game/caifen1.png b/static/images/game/caifen1.png new file mode 100644 index 0000000..dcd4289 Binary files /dev/null and b/static/images/game/caifen1.png differ diff --git a/static/images/game/caifen2.png b/static/images/game/caifen2.png new file mode 100644 index 0000000..27b2d38 Binary files /dev/null and b/static/images/game/caifen2.png differ diff --git a/static/images/game/caifen3.png b/static/images/game/caifen3.png new file mode 100644 index 0000000..5a87275 Binary files /dev/null and b/static/images/game/caifen3.png differ diff --git a/static/images/game/cooperation.png b/static/images/game/cooperation.png deleted file mode 100644 index 2337cd7..0000000 Binary files a/static/images/game/cooperation.png and /dev/null differ diff --git a/static/images/game/exchange.png b/static/images/game/exchange.png deleted file mode 100644 index 88d7055..0000000 Binary files a/static/images/game/exchange.png and /dev/null differ diff --git a/static/images/game/gameBg.png b/static/images/game/gameBg.png deleted file mode 100644 index 4d61e4a..0000000 Binary files a/static/images/game/gameBg.png and /dev/null differ diff --git a/static/images/game/guidepost.png b/static/images/game/guidepost.png deleted file mode 100644 index ebd8e36..0000000 Binary files a/static/images/game/guidepost.png and /dev/null differ diff --git a/static/images/game/strategy.png b/static/images/game/strategy.png deleted file mode 100644 index bb882f9..0000000 Binary files a/static/images/game/strategy.png and /dev/null differ diff --git a/static/images/game/task.png b/static/images/game/task.png deleted file mode 100644 index ef5ec6c..0000000 Binary files a/static/images/game/task.png and /dev/null differ diff --git a/utils/request.js b/utils/request.js index f5c8522..4cb75dd 100644 --- a/utils/request.js +++ b/utils/request.js @@ -293,6 +293,81 @@ export const uploadImage=(count)=> { }); }); } +export const uploadVideo=()=> { + + return new Promise((resolve, reject) => { + uni.chooseVideo({ + sourceType: ['album', 'camera'], + maxDuration: 60, + camera: 'back', + success: async (res) => { + if (!res || !res.tempFilePath ) { + uni.showToast({ + title: '未选择视频', + icon: 'none' + }); + reject(new Error('未选择视频')); + return; + } + const tempFilePath = res.tempFilePath; + + uni.showLoading({ + title: '上传中...' + }); + + try { + // 上传文件 + const uploadRes = await new Promise((resolveUpload, rejectUpload) => { + uni.uploadFile({ + url: BASE_URL + '/app-api/infra/file/upload', + filePath: tempFilePath, + name : 'file', + + success: (response) => { + try { + const data = JSON.parse(response.data); + resolveUpload(data); + } catch (err) { + rejectUpload(new Error('解析响应失败')); + } + }, + fail: (err) => { + rejectUpload(err); + } + }); + }); + + if (uploadRes.code === 0) { + const result = { tempFilePath, data: uploadRes.data } + uni.showToast({ + title: '上传成功', + icon: 'success' + }); + resolve(result); + } else { + throw new Error(uploadRes.msg || '视频上传失败'); + } + } catch (err) { + uni.showToast({ + title: '上传失败', + icon: 'none' + }); + console.error('视频上传失败:', err); + reject(err); + } + }, + fail: (err) => { + console.error('选择视频失败:', err); + uni.showToast({ + title: '选择视频失败', + icon: 'none' + }); + reject(err); + } + }); + }); +} +