diff --git a/components/guide-pages/guide-pages.vue b/components/guide-pages/guide-pages.vue index 1e4442f..c9a2311 100644 --- a/components/guide-pages/guide-pages.vue +++ b/components/guide-pages/guide-pages.vue @@ -12,14 +12,14 @@ 疯子读书，
- 让阅读无处不在 + 古今一统，中西互参 疯子读书，
- 让阅读无处不在 + 和光同尘，普惠人间 diff --git a/config/baseUrl.js b/config/baseUrl.js index 2516a4f..50a42ff 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -5,12 +5,15 @@ if (process.env.NODE_ENV === 'development') { // baseUrl = "http://localhost:7001/"; // socketUrl = "ws://localhost:6001/"; // baseUrl = "https://twin-ui.com/demo/"; - // baseUrl = "http://59.110.212.44:9100/pb/"; - baseUrl = "http://192.168.110.100:9100/pb/"; + // baseUrl = "http://59.110.212.44:9200/pb/"; + // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 + // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 + baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1 // socketUrl = "ws://8.129.186.35:6001/"; } else if (process.env.NODE_ENV === 'production') { // 生产环境11 - baseUrl = "http://59.110.212.44:9100/pb/"; + // baseUrl = "http://59.110.212.44:9100/pb/"; + baseUrl = "https://api.nuttyreading.com/"; //1 // baseUrl = "ws://twin-ui.com:6001/"; // socketUrl = "ws://twin-ui.com:6001/"; } diff --git a/config/utils.js b/config/utils.js index 982d5a3..2aaf13d 100644 --- a/config/utils.js +++ b/config/utils.js @@ -235,10 +235,10 @@ export const getLatLon = function(tip) { }); } -// 单独重新微信支付 +// 单独微信支付 export const setWXPay = function(payInfo, callback) { $http.request({ - url: "/pay/placeAnOrder/shoppingpay", + url: "/pay/placeAnOrder/shoppingPay", method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 data:payInfo, header: { //默认 无 说明：请求头1 diff --git a/main.js b/main.js index 3bc6a5b..48b3651 100644 --- a/main.js +++ b/main.js @@ -8,7 +8,8 @@ Vue.prototype.$bgm = bgm // 地址 // Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/" - Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/" + // Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/" + Vue.prototype.$baseUrl = "https://api.nuttyreading.com/" diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue index f2989d2..b60d818 100644 --- a/pages/bookShop/orderList.vue +++ b/pages/bookShop/orderList.vue @@ -5,17 +5,20 @@ - + {{item.name}} - 待支付 - 待发货 - 待收货 - 已完成 + 待支付 + 待发货 + 待收货 + 已完成 + + 订单编号: {{ifex.orderSn}} + @@ -24,7 +27,7 @@ {{item.productName}} - ￥{{item.productPrice}}
+ ￥{{item.productPrice}}
X {{item.quantity}} @@ -36,10 +39,10 @@ - 花生币充值 + 天医币充值 - ￥{{ifex.realMoney}} + ￥{{ifex.realMoney}}
@@ -52,16 +55,16 @@ 会员充值 - ￥{{ifex.realMoney}} + ￥{{ifex.realMoney}}

- 下单时间：{{ifex.createTime}} - 实付款 : - ￥{{ifex.realMoney}} + 下单时间：{{ifex.createTime}} + 实付款 : + ￥{{ifex.realMoney}} 取消订单 @@ -174,7 +177,7 @@ import { }, // 订单详情 - goOrdiCont(e) { + goOrdiCont(e) { uni.navigateTo({ url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus + '&orderSn=' + e.orderSn }); @@ -507,27 +510,34 @@ import { \ No newline at end of file diff --git a/pages/clock/clock.vue b/pages/clock/clock.vue index 20a4089..6368ee1 100644 --- a/pages/clock/clock.vue +++ b/pages/clock/clock.vue @@ -134,6 +134,11 @@ 今日签到随想 + + @@ -166,7 +171,7 @@ + @click="addTextShow = true">说点什么 @@ -186,6 +191,7 @@ export default { data() { return { + placeholder: '开始输入...', dayCurrent: 0, // 载入页面时的显示页数 showBack: false, currentIndex: 0, @@ -264,6 +270,17 @@ ...mapState(['userInfo']) }, methods: { + onEditorReady() { + // #ifdef MP-BAIDU + this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor'); + // #endif + + // #ifdef APP-PLUS || H5 ||MP-WEIXIN + uni.createSelectorQuery().select('#editor').context((res) => { + this.editorCtx = res.context + }).exec() + // #endif + }, // 获取书籍信息 getBookInfo() { this.$http @@ -513,7 +530,7 @@ }, // 快捷签到 kuickSign() { - + if (!this.taskInfo.id) { uni.showToast({ title: '当天未发布打卡任务,不可签到哦', @@ -521,36 +538,35 @@ }) return false } - let data = { - "bookId": this.bookid, - "userId": this.userInfo.id, - "tid": this.taskInfo.id, - "days": this.currentDay + let data = { + "bookId": this.bookid, + "userId": this.userInfo.id, + "tid": this.taskInfo.id, + "days": this.currentDay + } + $http.request({ + url: 'book/clockinPunch/save', + method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + data, + header: { //默认 无 说明：请求头 + 'Content-Type': 'application/json' + }, + }).then(res => { + if (res.code == 0) { + //console.log(res, '快捷签到') + uni.showToast({ + title: '签到成功', + icon: 'success' + }) + this.addTextShow = false + this.formData.content = '' + this.formData.images = [] + this.getmySign() + this.getAllSign(this.taskInfo) } - $http.request({ - url: 'book/clockinPunch/save', - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - data, - header: { //默认 无 说明：请求头 - 'Content-Type': 'application/json' - }, - }).then(res => { - if (res.code == 0) { - //console.log(res, '快捷签到') - uni.showToast({ - title: '签到成功', - icon: 'success' - }) - return false - this.addTextShow = false - this.formData.content = '' - this.formData.images = [] - this.getmySign() - this.getAllSign(this.taskInfo) - } - }); - + }); + }, // 说点什么 goToSign() { @@ -715,6 +731,18 @@ diff --git a/pages/library/library.vue b/pages/library/library.vue index 42792e5..021cf76 100644 --- a/pages/library/library.vue +++ b/pages/library/library.vue @@ -14,7 +14,7 @@ - 请输入想要搜索的书名 + 请输入书名 + + + + 已购图书 + + + 推荐图书 + + - + @@ -44,7 +54,7 @@ - + @@ -89,7 +99,7 @@ bookList: [], freeTotalPage:0, freeStatus:3, // 已购买图书状态 - contentShow: 0, + contentShow: 1, page: 1, // 页码 status: 3, ygtotalPage: 1, @@ -97,13 +107,13 @@ tjTotalPage: 1, tjPageSize:9, tjBookLIst: [], - contentButtonList: [{ - name: '已购图书' - }, - { - name: '推荐图书' - } - ], + // contentButtonList: [{ + // name: '已购图书' + // }, + // { + // name: '推荐图书' + // } + // ], } }, onLoad() { @@ -130,7 +140,7 @@ this.loadingNow = true console.log('到底了') - if(this.contentShow == 0){ + if(this.contentShow == 1){ //console.log(this.page , this.ygtotalPage) if(this.page+1 <= this.freeTotalPage){ this.page++ @@ -146,7 +156,7 @@ } - if (this.contentShow == 1) { + if (this.contentShow == 2) { if (this.tjPage+1 <= this.tjTotalPage) { this.tjPage++ console.log('加载', this.tjPage) @@ -167,6 +177,9 @@ ...mapState(['userInfo']) }, methods: { + setData(e) { + this.contentShow = e + }, // 未购买图书，评书跳转 wgGoPingshu(item) { console.log('未购买评书', item) @@ -316,7 +329,31 @@ diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue new file mode 100644 index 0000000..91370a8 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue @@ -0,0 +1,143 @@ + + + + diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue new file mode 100644 index 0000000..01b34d6 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue @@ -0,0 +1,189 @@ + + + + diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json new file mode 100644 index 0000000..7f1bd06 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json @@ -0,0 +1,7 @@ +{ + "uni-popup.cancel": "cancel", + "uni-popup.ok": "ok", + "uni-popup.placeholder": "pleace enter", + "uni-popup.title": "Hint", + "uni-popup.shareTitle": "Share to" +} diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js new file mode 100644 index 0000000..de7509c --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js @@ -0,0 +1,8 @@ +import en from './en.json' +import zhHans from './zh-Hans.json' +import zhHant from './zh-Hant.json' +export default { + en, + 'zh-Hans': zhHans, + 'zh-Hant': zhHant +} diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json new file mode 100644 index 0000000..5e3003c --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json @@ -0,0 +1,7 @@ +{ + "uni-popup.cancel": "取消", + "uni-popup.ok": "确定", + "uni-popup.placeholder": "请输入", + "uni-popup.title": "提示", + "uni-popup.shareTitle": "分享到" +} diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json new file mode 100644 index 0000000..13e39eb --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json @@ -0,0 +1,7 @@ +{ + "uni-popup.cancel": "取消", + "uni-popup.ok": "確定", + "uni-popup.placeholder": "請輸入", + "uni-popup.title": "提示", + "uni-popup.shareTitle": "分享到" +} diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js new file mode 100644 index 0000000..62dda46 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/keypress.js @@ -0,0 +1,45 @@ +// #ifdef H5 +export default { + name: 'Keypress', + props: { + disable: { + type: Boolean, + default: false + } + }, + mounted () { + const keyNames = { + esc: ['Esc', 'Escape'], + tab: 'Tab', + enter: 'Enter', + space: [' ', 'Spacebar'], + up: ['Up', 'ArrowUp'], + left: ['Left', 'ArrowLeft'], + right: ['Right', 'ArrowRight'], + down: ['Down', 'ArrowDown'], + delete: ['Backspace', 'Delete', 'Del'] + } + const listener = ($event) => { + if (this.disable) { + return + } + const keyName = Object.keys(keyNames).find(key => { + const keyName = $event.key + const value = keyNames[key] + return value === keyName || (Array.isArray(value) && value.includes(keyName)) + }) + if (keyName) { + // 避免和其他按键事件冲突 + setTimeout(() => { + this.$emit(keyName, {}) + }, 0) + } + } + document.addEventListener('keyup', listener) + // this.$once('hook:beforeDestroy', () => { + // document.removeEventListener('keyup', listener) + // }) + }, + render: () => {} +} +// #endif diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js new file mode 100644 index 0000000..c4e5781 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/popup.js @@ -0,0 +1,26 @@ + +export default { + data() { + return { + + } + }, + created(){ + this.popup = this.getParent() + }, + methods:{ + /** + * 获取父元素实例 + */ + getParent(name = 'uniPopup') { + let parent = this.$parent; + let parentName = parent.$options.name; + while (parentName !== name) { + parent = parent.$parent; + if (!parent) return false + parentName = parent.$options.name; + } + return parent; + }, + } +} diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue new file mode 100644 index 0000000..54afee2 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue @@ -0,0 +1,473 @@ + + + + diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json new file mode 100644 index 0000000..f40556b --- /dev/null +++ b/uni_modules/uni-popup/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-popup", + "displayName": "uni-popup 弹出层", + "version": "1.8.3", + "description": " Popup 组件，提供常用的弹层", + "keywords": [ + "uni-ui", + "弹出层", + "弹窗", + "popup", + "弹框" + ], + "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", + "uni-transition" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "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-popup/readme.md b/uni_modules/uni-popup/readme.md new file mode 100644 index 0000000..fdad4b3 --- /dev/null +++ b/uni_modules/uni-popup/readme.md @@ -0,0 +1,17 @@ + + +## Popup 弹出层 +> **组件名：uni-popup** +> 代码块： `uPopup` +> 关联组件：`uni-transition` + + +弹出层组件，在应用中弹出一个消息提示窗口、提示框等 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 + + + + + diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md index b1a824b..70c1cd4 100644 --- a/uni_modules/uni-transition/changelog.md +++ b/uni_modules/uni-transition/changelog.md @@ -1,3 +1,5 @@ +## 1.3.2（2023-05-04） +- 修复 NVUE 平台报错的问题 ## 1.3.1（2021-11-23） - 修复 init 方法初始化问题 ## 1.3.0（2021-11-19） diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js index 5f54365..8f89b18 100644 --- a/uni_modules/uni-transition/components/uni-transition/createAnimation.js +++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js @@ -10,7 +10,10 @@ const nvueAnimation = uni.requireNativePlugin('animation') class MPAnimation { constructor(options, _this) { this.options = options - this.animation = uni.createAnimation(options) + // 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误 + this.animation = uni.createAnimation({ + ...options + }) this.currentStepAnimates = {} this.next = 0 this.$ = _this diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue index 0d739bd..bfbba93 100644 --- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue +++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue @@ -1,5 +1,10 @@