Skip to content

飞
飞鹤小程序
Commit c6754a16 authored by spc's avatar spc
Browse files
Options

fixed

parent 5f8d638e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 363 additions and 229 deletions
.DS_Store
View file @ c6754a16
No preview for this file type
api/request.js
View file @ c6754a16
......@@ -16,8 +16,8 @@ const {
// request.js
// 通常可以吧 baseUrl 单独放在一个 js 文件了
// export const baseUrl = "http://172.16.230.108:7777/pmall";
// export const baseUrl = "https://momclub-uat.feihe.com/pmall";//测试环境
export const baseUrl = "https://momclub-test.feihe.com/pmall";
export const baseUrl = "https://momclub-uat.feihe.com/pmall";//测试环境
// export const baseUrl = "https://momclub-test.feihe.com/pmall";
// export const baseUrl = "https://momclub.feihe.com/pmall";//生产环境
// export const baseUrl = "https://docs.dui88.com/mock/1956/api";//mock
// export const baseUrl = "https://feihe.m.duibatest.com.cn/pmall"
......
package-lock.json
View file @ c6754a16
{
"name": "20250528_FHQ1",
"name": "FH",
"lockfileVersion": 3,
"requires": true,
"packages": {
......@@ -314,6 +314,53 @@
"integrity": "sha512-2JXjom6R7ZwrISpUphLhf4htUq1aKRCennTJ6u9kFfr3sLmC9+I4CxxVi+McoFnIg+p1HnVrfLT/iCt4Dlz//Q==",
"license": "MIT"
},
"node_modules/async-function": {
"version": "1.0.0",
"resolved": "http://npm.dui88.com:80/async-function/-/async-function-1.0.0.tgz",
"integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
}
},
"node_modules/async-generator-function": {
"version": "1.0.0",
"resolved": "http://npm.dui88.com:80/async-generator-function/-/async-generator-function-1.0.0.tgz",
"integrity": "sha512-+NAXNqgCrB95ya4Sr66i1CL2hqLVckAk7xwRYWdcm39/ELQ6YNn1aw5r0bdQtqNZgQpEWzc5yc/igXc7aL5SLA==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
}
},
"node_modules/call-bind-apply-helpers": {
"version": "1.0.2",
"resolved": "http://npm.dui88.com:80/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
"license": "MIT",
"dependencies": {
"es-errors": "^1.3.0",
"function-bind": "^1.1.2"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/call-bound": {
"version": "1.0.4",
"resolved": "http://npm.dui88.com:80/call-bound/-/call-bound-1.0.4.tgz",
"integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.2",
"get-intrinsic": "^1.3.0"
},
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/character-parser": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
......@@ -327,6 +374,20 @@
"resolved": "http://npm.dui88.com:80/crypto-js/-/crypto-js-4.2.0.tgz",
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
},
"node_modules/dunder-proto": {
"version": "1.0.1",
"resolved": "http://npm.dui88.com:80/dunder-proto/-/dunder-proto-1.0.1.tgz",
"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.1",
"es-errors": "^1.3.0",
"gopd": "^1.2.0"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/emmet": {
"version": "2.4.11",
"resolved": "http://npm.dui88.com:80/emmet/-/emmet-2.4.11.tgz",
......@@ -355,12 +416,151 @@
"url": "https://github.com/fb55/entities?sponsor=1"
}
},
"node_modules/es-define-property": {
"version": "1.0.1",
"resolved": "http://npm.dui88.com:80/es-define-property/-/es-define-property-1.0.1.tgz",
"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
}
},
"node_modules/es-errors": {
"version": "1.3.0",
"resolved": "http://npm.dui88.com:80/es-errors/-/es-errors-1.3.0.tgz",
"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
}
},
"node_modules/es-object-atoms": {
"version": "1.1.1",
"resolved": "http://npm.dui88.com:80/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
"license": "MIT",
"dependencies": {
"es-errors": "^1.3.0"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/estree-walker": {
"version": "2.0.2",
"resolved": "http://npm.dui88.com:80/estree-walker/-/estree-walker-2.0.2.tgz",
"integrity": "sha1-UvAQF4wqTBF6d1fP6UKtt9LaTKw=",
"license": "MIT"
},
"node_modules/function-bind": {
"version": "1.1.2",
"resolved": "http://npm.dui88.com:80/function-bind/-/function-bind-1.1.2.tgz",
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/generator-function": {
"version": "2.0.1",
"resolved": "http://npm.dui88.com:80/generator-function/-/generator-function-2.0.1.tgz",
"integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
}
},
"node_modules/get-intrinsic": {
"version": "1.3.1",
"resolved": "http://npm.dui88.com:80/get-intrinsic/-/get-intrinsic-1.3.1.tgz",
"integrity": "sha512-fk1ZVEeOX9hVZ6QzoBNEC55+Ucqg4sTVwrVuigZhuRPESVFpMyXnd3sbXvPOwp7Y9riVyANiqhEuRF0G1aVSeQ==",
"license": "MIT",
"dependencies": {
"async-function": "^1.0.0",
"async-generator-function": "^1.0.0",
"call-bind-apply-helpers": "^1.0.2",
"es-define-property": "^1.0.1",
"es-errors": "^1.3.0",
"es-object-atoms": "^1.1.1",
"function-bind": "^1.1.2",
"generator-function": "^2.0.0",
"get-proto": "^1.0.1",
"gopd": "^1.2.0",
"has-symbols": "^1.1.0",
"hasown": "^2.0.2",
"math-intrinsics": "^1.1.0"
},
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/get-proto": {
"version": "1.0.1",
"resolved": "http://npm.dui88.com:80/get-proto/-/get-proto-1.0.1.tgz",
"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
"license": "MIT",
"dependencies": {
"dunder-proto": "^1.0.1",
"es-object-atoms": "^1.0.0"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/gopd": {
"version": "1.2.0",
"resolved": "http://npm.dui88.com:80/gopd/-/gopd-1.2.0.tgz",
"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/has-symbols": {
"version": "1.1.0",
"resolved": "http://npm.dui88.com:80/has-symbols/-/has-symbols-1.1.0.tgz",
"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/has-tostringtag": {
"version": "1.0.2",
"resolved": "http://npm.dui88.com:80/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
"license": "MIT",
"dependencies": {
"has-symbols": "^1.0.3"
},
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/hasown": {
"version": "2.0.2",
"resolved": "http://npm.dui88.com:80/hasown/-/hasown-2.0.2.tgz",
"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
"license": "MIT",
"dependencies": {
"function-bind": "^1.1.2"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/is-expression": {
"version": "4.0.0",
"resolved": "http://npm.dui88.com:80/is-expression/-/is-expression-4.0.0.tgz",
......@@ -371,12 +571,39 @@
"object-assign": "^4.1.1"
}
},
"node_modules/is-regex": {
"version": "1.2.1",
"resolved": "http://npm.dui88.com:80/is-regex/-/is-regex-1.2.1.tgz",
"integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
"license": "MIT",
"dependencies": {
"call-bound": "^1.0.2",
"gopd": "^1.2.0",
"has-tostringtag": "^1.0.2",
"hasown": "^2.0.2"
},
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/jsonc-parser": {
"version": "3.3.1",
"resolved": "http://npm.dui88.com:80/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
"license": "MIT"
},
"node_modules/math-intrinsics": {
"version": "1.1.0",
"resolved": "http://npm.dui88.com:80/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
}
},
"node_modules/muggle-string": {
"version": "0.4.1",
"resolved": "http://npm.dui88.com:80/muggle-string/-/muggle-string-0.4.1.tgz",
......
subPackages/momclub/actList.vue
View file @ c6754a16
......@@ -69,16 +69,18 @@
<script setup>
import { ref, nextTick, computed } from 'vue'
import { onLoad, onReachBottom } from '@dcloudio/uni-app'
import { onLoad,onShow, onReachBottom } from '@dcloudio/uni-app'
import { activityListApi, signupListApi } from '@/api/momclub/index.js';
import md from "../../md.js";
import { useUserStore } from "@/stores/user";
const userStore = useUserStore();
const isShare = ref('')
const currentPage = ref(1)
const pageSize = ref(10)
const loadMore = ref(false)
const loadMoreFlag = ref(true) //是否加载
const activityList = ref()
const searchType = ref() //搜索类型
const searchType = ref('') //搜索类型
const searchList = ref([
{name: "全部", total: 0, type: ''},
{name: "已报名", total: 0, type: 1},
......@@ -109,7 +111,6 @@ const formatActivityTime = (startTime, endTime) => {
const getParts = (date) => [date.getMonth() + 1, date.getDate(), date.getHours().toString().padStart(2, '0'), date.getMinutes().toString().padStart(2, '0')];
const [sMonth, sDate, sHours, sMinutes] = getParts(start);
const [eMonth, eDate, eHours, eMinutes] = getParts(end);
console.log(sMonth, eMonth, sDate, eDate, '23123dawsaws')
if (sMonth === eMonth && sDate === eDate) {
//不跨日
return `${sMonth}/${sDate},${sHours}:${sMinutes}-${eHours}:${eMinutes}`;
......@@ -207,7 +208,7 @@ onReachBottom(() => {
})
})
onLoad((options) => {
onLoad(async(options) => {
md.sensorSignTake({
hdjhPage: "true",
page_name: "星妈会活动集合页",
......@@ -216,6 +217,20 @@ onLoad((options) => {
});
loadMoreFlag.value = true
searchType.value = options.type ? options.type : ''
isShare.value = options.share ? options.share : ''
})
onShow(async()=> {
console.log(isShare.value,'onShow')
if(isShare.value == 'true'){
await userStore.loadUserInfo()
if (userStore.userInfo?.memberId !== "not_login") {
//非会员 未登录，跳转到登录注册页面
uni.navigateTo({
url: `/pages/activity/register`
})
return
}
}
getInfo(searchType.value)
})
</script>
......
subPackages/momclub/component/FormTree.vue
View file @ c6754a16
......@@ -304,7 +304,7 @@ const hasFilledOutList = (list)=>{
}
.custom-radio {
margin: -40rpx 50rpx 0rpx 0rpx;
margin: -40rpx 45rpx 0rpx 0rpx;
image {
width: 18rpx;
......@@ -336,7 +336,7 @@ const hasFilledOutList = (list)=>{
.custom-check {
width: 213rpx;
height: 68rpx;
margin: -70rpx 20rpx 0rpx 0rpx;
margin: -70rpx 16rpx 0rpx 0rpx;
line-height: 68rpx;
text-align: center;
font-size: 24rpx;
......@@ -465,12 +465,12 @@ const hasFilledOutList = (list)=>{
}
.line-dash {
border-bottom: 1px dashed #A8A8A8;
border-width: 1px;
border-bottom: 1rpx dashed #A8A8A8;
margin: 40rpx 0rpx;
}
.sub-box {
margin-bottom: 20rpx;
.sub-warp-one{
display: flex;
justify-content: center;
......@@ -497,7 +497,7 @@ const hasFilledOutList = (list)=>{
width: calc(100vw - 59rpx);
.sub-item-three {
width: 208rpx;
margin-right: 21rpx;
margin-right: 17rpx;
.sub-title{
padding: 0 20rpx;
white-space: nowrap; /* 禁止文本换行 */
......@@ -516,7 +516,6 @@ const hasFilledOutList = (list)=>{
border: 1px solid #B27C1E;
background: rgba(211, 164, 88, 0.1);
margin-top: 20rpx;
margin-bottom: 20rpx;
}
.gray {
opacity: 0.2;
......@@ -524,9 +523,9 @@ const hasFilledOutList = (list)=>{
.white-bg{
position: relative;
width: 100%;
height: 2rpx;
height: 4rpx;
background-color: #fff;
top: 41rpx;
top: 43rpx;
}
}
}
......
subPackages/momclub/error.vue
View file @ c6754a16
......@@ -13,7 +13,7 @@
<view class="error-text">
系统繁忙，
<br />
请您刷新后重新进入
请您重新进入页面
</view>
</view>
</view>
......
subPackages/momclub/index.vue
View file @ c6754a16
......@@ -295,17 +295,10 @@ const datePart = computed(() => {
})
const errorTip = () => {
uni.showModal({
title: '',
content: '活动未配置',
confirmText: '已知晓',
success: (res) => {
if (res.confirm) {
console.log('活动未配置')
}
}
})
return
return uni.showToast({
title: '缺少地址栏参数',
icon: "none",
});
}
const textValue = ref('')
const btnValue = ref('')
......@@ -369,13 +362,12 @@ const getInfo = async () => {
const init = () => {
console.log(query.value.activityId,'query.value.activityId----')
if (query.value.activityId) {
getInfo()
} else {
errorTip()
}
}
onLoad(async(options) => {
onLoad((options) => {
md.sensorSignTake({
bmhdPage: "true",
page_name: activityInfo.value?.activityTitle || '',
......@@ -389,7 +381,15 @@ onLoad(async(options) => {
menus: ['shareAppMessage'] // 微信小程序支持分享到朋友圈
});
query.value = options
if(options.share == 'true'){
})
onShow(async()=> {
console.log(query.value,'onShow')
if (uni.getStorageSync('needRefresh')) {
uni.removeStorageSync('needRefresh');
isShowSignUp.value = true
}
if(query.value.share == 'true'){
await userStore.loadUserInfo()
if (userStore.userInfo?.memberId !== "not_login") {
//非会员 未登录，跳转到登录注册页面
......@@ -399,16 +399,7 @@ onLoad(async(options) => {
return
}
}
init()
})
onShow(()=> {
console.log('onShow')
if (uni.getStorageSync('needRefresh')) {
uni.removeStorageSync('needRefresh');
isShowSignUp.value = true
init();
}
init();
})
// 自定义分享内容
onShareAppMessage(() => {
......
subPackages/momclub/sign.vue
View file @ c6754a16
......@@ -570,7 +570,8 @@ onLoad(async (options) => {
.tips-text {
display: flex;
font-size: 24rpx;
max-height: 100rpx;
max-height: 99rpx;
line-height: 33rpx;
.content {
flex: 1;
......
views/My.vue
View file @ c6754a16
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment