diff --git a/App.vue b/App.vue index 84d203e..01d4e00 100644 --- a/App.vue +++ b/App.vue @@ -15,7 +15,7 @@ \ No newline at end of file diff --git a/components/signPopup/signPopup.vue b/components/signPopup/signPopup.vue index b656c9a..49c2f1b 100644 --- a/components/signPopup/signPopup.vue +++ b/components/signPopup/signPopup.vue @@ -6,7 +6,7 @@ 已连续签到0天 - + 签到立即获得10积分 @@ -56,21 +56,29 @@ const signPopupRef = ref(null) watch(() => props.isOpen, (newVal, oldVal) => { - if (!signPopupRef.value) { // 确保组件实例已存在(避免null错误) - console.warn('弹窗组件尚未初始化完成'); - return; - } - if (newVal) { // 根据新值控制弹窗 - signPopupRef.value.open(); // 显示弹窗 - } else { - signPopupRef.value.close(); // 隐藏弹窗 - } - }, // 3. 初始化时立即执行一次(处理初始isOpen值) - { - immediate: true - }) + if (!signPopupRef.value) { // 确保组件实例已存在(避免null错误) + console.warn('弹窗组件尚未初始化完成'); + return; + } + if (newVal) { // 根据新值控制弹窗 + signPopupRef.value.open(); // 显示弹窗 + } else { + signPopupRef.value.close(); // 隐藏弹窗 + } + }, // 3. 初始化时立即执行一次(处理初始isOpen值) + { + immediate: true + }) + + const isSigned = ref(false) + const goSign = ()=>{ + isSigned.value = true + } + + + diff --git a/integralMall/pages/pro/detail.vue b/integralMall/pages/pro/detail.vue new file mode 100644 index 0000000..f6984a4 --- /dev/null +++ b/integralMall/pages/pro/detail.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/integralMall/static/coin.png b/integralMall/static/coin.png new file mode 100644 index 0000000..0b75a33 Binary files /dev/null and b/integralMall/static/coin.png differ diff --git a/integralMall/static/indexBG.png b/integralMall/static/indexBG.png new file mode 100644 index 0000000..d3e1ff0 Binary files /dev/null and b/integralMall/static/indexBG.png differ diff --git a/integralMall/static/miao.png b/integralMall/static/miao.png new file mode 100644 index 0000000..bf58879 Binary files /dev/null and b/integralMall/static/miao.png differ diff --git a/integralMall/static/miaoshaBG.png b/integralMall/static/miaoshaBG.png new file mode 100644 index 0000000..a5158d8 Binary files /dev/null and b/integralMall/static/miaoshaBG.png differ diff --git a/integralMall/static/miaoshaImg.png b/integralMall/static/miaoshaImg.png new file mode 100644 index 0000000..ae01e54 Binary files /dev/null and b/integralMall/static/miaoshaImg.png differ diff --git a/integralMall/static/qiang.png b/integralMall/static/qiang.png new file mode 100644 index 0000000..7d9b531 Binary files /dev/null and b/integralMall/static/qiang.png differ diff --git a/integralMall/static/qiangtag.png b/integralMall/static/qiangtag.png new file mode 100644 index 0000000..64e730a Binary files /dev/null and b/integralMall/static/qiangtag.png differ diff --git a/integralMall/static/test/test.png b/integralMall/static/test/test.png new file mode 100644 index 0000000..c356f77 Binary files /dev/null and b/integralMall/static/test/test.png differ diff --git a/integralMall/static/test/test2.png b/integralMall/static/test/test2.png new file mode 100644 index 0000000..fb5e1f8 Binary files /dev/null and b/integralMall/static/test/test2.png differ diff --git a/integralMall/static/test/test3.png b/integralMall/static/test/test3.png new file mode 100644 index 0000000..e049a2c Binary files /dev/null and b/integralMall/static/test/test3.png differ diff --git a/integralMall/static/test/test4.png b/integralMall/static/test/test4.png new file mode 100644 index 0000000..916b212 Binary files /dev/null and b/integralMall/static/test/test4.png differ diff --git a/integralMall/static/test/test5.png b/integralMall/static/test/test5.png new file mode 100644 index 0000000..897c660 Binary files /dev/null and b/integralMall/static/test/test5.png differ diff --git a/main.js b/main.js index 219510c..659aaf4 100644 --- a/main.js +++ b/main.js @@ -1,7 +1,6 @@ import App from './App' // 公共导入(Vue2 和 Vue3 共用的模块) -import './uni.promisify.adaptor' import http from './common/js/http.js' import util from './common/js/util.js' import siteConfig from './common/js/siteConfig.js' @@ -32,9 +31,8 @@ app.$mount() // #endif // #ifdef VUE3 -import { - createSSRApp -} from 'vue' +import {createSSRApp} from 'vue' +import './uni.promisify.adaptor' import tabbar from './components/tabbar/tabbar.vue' import store from './store' diff --git a/pages.json b/pages.json index c0167f2..50c92b2 100644 --- a/pages.json +++ b/pages.json @@ -38,6 +38,28 @@ } } ], + "subPackages": [ + { + "root": "integralMall", + "pages": [{ + "path" : "pages/index", + "style" : + { + "navigationBarTitleText" : "", + "navigationStyle": "custom" + } + }, + { + "path" : "pages/pro/detail", + "style" : + { + "navigationBarTitleText" : "商品详情" + } + } + + ] + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "", diff --git a/pages/index/index.vue b/pages/index/index.vue index f44cd85..22a711f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -35,7 +35,7 @@ 每日签到即可获得积分 - + 积分商城 @@ -314,6 +314,7 @@ import { ref, nextTick, onMounted } from 'vue'; import diamondLine from '../../components/diamondLine/diamondLine.vue'; import DIYScrollView from '../../components/DIYScrollView/DIYScrollView.vue'; import signPopup from '../../components/signPopup/signPopup.vue'; +import util from '../../common/js/util.js'; const activeOne = ref(0) const changeBar = (index)=>{ @@ -326,6 +327,20 @@ const handleTouchMove = (e)=> { e.preventDefault(); // 强制阻止默认滚动行为 return false; // 增强阻止效果 } +const goIntegral = ()=>{ + uni.showModal({ + title:'温馨提示', + content: '即将打开“力仁GO积分商城”小程序', + success: (res) => { + if(res.confirm){ + util.redirectTo('/integralMall/pages/index') + } + } + }) +} + + + const signOpen = ref(false) onMounted(()=>{ nextTick(()=>{ diff --git a/pages/shop/index.vue b/pages/shop/index.vue index 92947b1..c7dd91f 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -148,20 +148,17 @@ + + diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json new file mode 100644 index 0000000..73c35f5 --- /dev/null +++ b/uni_modules/uni-countdown/package.json @@ -0,0 +1,86 @@ +{ + "id": "uni-countdown", + "displayName": "uni-countdown 倒计时", + "version": "1.2.5", + "description": "CountDown 倒计时组件", + "keywords": [ + "uni-ui", + "uniui", + "countdown", + "倒计时" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y", + "app-harmony": "u", + "app-uvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-countdown/readme.md b/uni_modules/uni-countdown/readme.md new file mode 100644 index 0000000..4bcb1aa --- /dev/null +++ b/uni_modules/uni-countdown/readme.md @@ -0,0 +1,10 @@ + + +## CountDown 倒计时 +> **组件名:uni-countdown** +> 代码块: `uCountDown` + +倒计时组件。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-countdown) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 \ No newline at end of file