diff --git a/README.md b/README.md index 73e2455..d7273e7 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ unescapeHTML(temp){} * @param { String } url 服务器 url * @param { String } filePath 要上传文件资源的路径 * @param { String } type 上传文件验证类型 默认: img 可选: video -* @return { object } promise 对象 resolve 为文件服务器地址 reject 为错误信息 +* @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息 */ uploadFile({ url, filePath, type = 'img' } = {}) {} ``` \ No newline at end of file diff --git a/common/api/user.js b/common/api/user.js index eea1a1c..a2bf0a0 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -218,13 +218,13 @@ export default { }, // 意见反馈列表 getFeedbackList({ page }) { - return vm.$u.post('Feedback/feedbackList', { + return vm.$u.post('Member/feedbackList', { page: page, }); }, // 意见反馈-写意见 writeFeedback({ fb_content, fb_images }) { - return vm.$u.post('Feedback/writeFeedback', { + return vm.$u.post('Member/writeFeedback', { fb_content: fb_content, fb_images: fb_images, }); diff --git a/components/mine/coupon/index.vue b/components/mine/coupon/index.vue new file mode 100644 index 0000000..3448072 --- /dev/null +++ b/components/mine/coupon/index.vue @@ -0,0 +1,131 @@ + + + \ No newline at end of file diff --git a/components/uni-swipe-action-item/bindingx.js b/components/uni-swipe-action-item/bindingx.js deleted file mode 100644 index 59c592e..0000000 --- a/components/uni-swipe-action-item/bindingx.js +++ /dev/null @@ -1,245 +0,0 @@ -const BindingX = uni.requireNativePlugin('bindingx'); -const dom = uni.requireNativePlugin('dom'); -const animation = uni.requireNativePlugin('animation'); - -export default { - data() { - return { - right: 0, - button: [], - preventGesture: false - } - }, - - watch: { - show(newVal) { - if (!this.position || JSON.stringify(this.position) === '{}') return; - if (this.autoClose) return - if (this.isInAnimation) return - if (newVal) { - this.open() - } else { - this.close() - } - }, - }, - created() { - if (this.swipeaction.children !== undefined) { - this.swipeaction.children.push(this) - } - }, - mounted() { - this.boxSelector = this.getEl(this.$refs['selector-box-hock']); - this.selector = this.getEl(this.$refs['selector-content-hock']); - this.buttonSelector = this.getEl(this.$refs['selector-button-hock']); - this.position = {} - this.x = 0 - setTimeout(() => { - this.getSelectorQuery() - }, 200) - }, - beforeDestroy() { - if (this.timing) { - BindingX.unbind({ - token: this.timing.token, - eventType: 'timing' - }) - } - if (this.eventpan) { - BindingX.unbind({ - token: this.eventpan.token, - eventType: 'pan' - }) - } - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) - }, - methods: { - onClick(index, item) { - this.$emit('click', { - content: item, - index - }) - }, - touchstart(e) { - if (this.isInAnimation) return - if (this.stop) return - this.stop = true - if (this.autoClose) { - this.swipeaction.closeOther(this) - } - let endWidth = this.right - let boxStep = `(x+${this.x})` - let pageX = `${boxStep}> ${-endWidth} && ${boxStep} < 0?${boxStep}:(x+${this.x} < 0? ${-endWidth}:0)` - - let props = [{ - element: this.selector, - property: 'transform.translateX', - expression: pageX - }] - - let left = 0 - for (let i = 0; i < this.options.length; i++) { - let buttonSelectors = this.getEl(this.$refs['button-hock'][i]); - if (this.button.length === 0 || !this.button[i] || !this.button[i].width) return - let moveMix = endWidth - left - left += this.button[i].width - let step = `(${this.x}+x)/${endWidth}` - let moveX = `(${step}) * ${moveMix}` - let pageButtonX = `${moveX}&& (x+${this.x} > ${-endWidth})?${moveX}:${-moveMix}` - props.push({ - element: buttonSelectors, - property: 'transform.translateX', - expression: pageButtonX - }) - } - - this.eventpan = this._bind(this.boxSelector, props, 'pan', (e) => { - if (e.state === 'end') { - this.x = e.deltaX + this.x; - if (this.x < -endWidth) { - this.x = -endWidth - } - if (this.x > 0) { - this.x = 0 - } - this.stop = false - this.bindTiming(); - } - }) - }, - touchend(e) { - this.$nextTick(() => { - if (this.isopen && !this.isDrag && !this.isInAnimation) { - this.close() - } - }) - }, - bindTiming() { - if (this.isopen) { - this.move(this.x, -this.right) - } else { - this.move(this.x, -40) - } - }, - move(left, value) { - if (left >= value) { - this.close() - } else { - this.open() - } - }, - /** - * 开启swipe - */ - open() { - this.animation(true) - }, - /** - * 关闭swipe - */ - close() { - this.animation(false) - }, - /** - * 开启关闭动画 - * @param {Object} type - */ - animation(type) { - this.isDrag = true - let endWidth = this.right - let time = 200 - this.isInAnimation = true; - - let exit = `t>${time}`; - let translate_x_expression = `easeOutExpo(t,${this.x},${type?(-endWidth-this.x):(-this.x)},${time})` - let props = [{ - element: this.selector, - property: 'transform.translateX', - expression: translate_x_expression - }] - - let left = 0 - for (let i = 0; i < this.options.length; i++) { - let buttonSelectors = this.getEl(this.$refs['button-hock'][i]); - if (this.button.length === 0 || !this.button[i] || !this.button[i].width) return - let moveMix = endWidth - left - left += this.button[i].width - let step = `${this.x}/${endWidth}` - let moveX = `(${step}) * ${moveMix}` - let pageButtonX = `easeOutExpo(t,${moveX},${type ? -moveMix + '-' + moveX: 0 + '-' + moveX},${time})` - props.push({ - element: buttonSelectors, - property: 'transform.translateX', - expression: pageButtonX - }) - } - - this.timing = BindingX.bind({ - eventType: 'timing', - exitExpression: exit, - props: props - }, (e) => { - if (e.state === 'end' || e.state === 'exit') { - this.x = type ? -endWidth : 0 - this.isInAnimation = false; - - this.isopen = this.isopen || false - if (this.isopen !== type) { - this.$emit('change', type) - } - this.isopen = type - this.isDrag = false - } - }); - }, - /** - * 绑定 BindingX - * @param {Object} anchor - * @param {Object} props - * @param {Object} fn - */ - _bind(anchor, props, eventType, fn) { - return BindingX.bind({ - anchor, - eventType, - props - }, (e) => { - typeof(fn) === 'function' && fn(e) - }); - }, - /** - * 获取ref - * @param {Object} el - */ - getEl(el) { - return el.ref - }, - /** - * 获取节点信息 - */ - getSelectorQuery() { - dom.getComponentRect(this.$refs['selector-content-hock'], (data) => { - if (this.position.content) return - this.position.content = data.size - }) - for (let i = 0; i < this.options.length; i++) { - dom.getComponentRect(this.$refs['button-hock'][i], (data) => { - if (!this.button) { - this.button = [] - } - if (this.options.length === this.button.length) return - this.button.push(data.size) - this.right += data.size.width - if (this.autoClose) return - if (this.show) { - this.open() - } - }) - } - } - } -} diff --git a/components/uni-swipe-action-item/index.wxs b/components/uni-swipe-action-item/index.wxs deleted file mode 100644 index 79c6f9e..0000000 --- a/components/uni-swipe-action-item/index.wxs +++ /dev/null @@ -1,204 +0,0 @@ -/** - * 监听页面内值的变化,主要用于动态开关swipe-action - * @param {Object} newValue - * @param {Object} oldValue - * @param {Object} ownerInstance - * @param {Object} instance - */ -function sizeReady(newValue, oldValue, ownerInstance, instance) { - var state = instance.getState() - state.position = JSON.parse(newValue) - if (!state.position || state.position.length === 0) return - var show = state.position[0].show - state.left = state.left || state.position[0].left; - // 通过用户变量,开启或关闭 - if (show) { - openState(true, instance, ownerInstance) - } else { - openState(false, instance, ownerInstance) - } -} - -/** - * 开始触摸操作 - * @param {Object} e - * @param {Object} ins - */ -function touchstart(e, ins) { - var instance = e.instance; - var state = instance.getState(); - var pageX = e.touches[0].pageX; - // 开始触摸时移除动画类 - instance.removeClass('ani'); - var owner = ins.selectAllComponents('.button-hock') - for (var i = 0; i < owner.length; i++) { - owner[i].removeClass('ani'); - } - // state.position = JSON.parse(instance.getDataset().position); - state.left = state.left || state.position[0].left; - // 获取最终按钮组的宽度 - state.width = pageX - state.left; - ins.callMethod('closeSwipe') -} - -/** - * 开始滑动操作 - * @param {Object} e - * @param {Object} ownerInstance - */ -function touchmove(e, ownerInstance) { - var instance = e.instance; - var disabled = instance.getDataset().disabled - var state = instance.getState() - // fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复 - disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false; - - if (disabled) return - var pageX = e.touches[0].pageX; - move(pageX - state.width, instance, ownerInstance) -} - -/** - * 结束触摸操作 - * @param {Object} e - * @param {Object} ownerInstance - */ -function touchend(e, ownerInstance) { - var instance = e.instance; - var disabled = instance.getDataset().disabled - var state = instance.getState() - - // fix by mehaotian, TODO 兼容 app-vue 获取dataset为字符串 , h5 获取 为 undefined 的问题,待框架修复 - disabled = (typeof(disabled) === 'string' ? JSON.parse(disabled) : disabled) || false; - - if (disabled) return - // 滑动过程中触摸结束,通过阙值判断是开启还是关闭 - // fixed by mehaotian 定时器解决点击按钮，touchend 触发比 click 事件时机早的问题 ，主要是 ios13 - moveDirection(state.left, -40, instance, ownerInstance) -} - -/** - * 设置移动距离 - * @param {Object} value - * @param {Object} instance - * @param {Object} ownerInstance - */ -function move(value, instance, ownerInstance) { - var state = instance.getState() - // 获取可滑动范围 - var x = Math.max(-state.position[1].width, Math.min((value), 0)); - state.left = x; - instance.setStyle({ - transform: 'translateX(' + x + 'px)', - '-webkit-transform': 'translateX(' + x + 'px)' - }) - // 折叠按钮动画 - buttonFold(x, instance, ownerInstance) -} - -/** - * 移动方向判断 - * @param {Object} left - * @param {Object} value - * @param {Object} ownerInstance - * @param {Object} ins - */ -function moveDirection(left, value, ins, ownerInstance) { - var state = ins.getState() - var position = state.position - var isopen = state.isopen - if (!position[1].width) { - openState(false, ins, ownerInstance) - return - } - // 如果已经是打开状态,进行判断是否关闭,还是保留打开状态 - if (isopen) { - if (-left <= position[1].width) { - openState(false, ins, ownerInstance) - } else { - openState(true, ins, ownerInstance) - } - return - } - // 如果是关闭状态,进行判断是否打开,还是保留关闭状态 - if (left <= value) { - openState(true, ins, ownerInstance) - } else { - openState(false, ins, ownerInstance) - } -} - -/** - * 设置按钮移动距离 - * @param {Object} value - * @param {Object} instance - * @param {Object} ownerInstance - */ -function buttonFold(value, instance, ownerInstance) { - var ins = ownerInstance.selectAllComponents('.button-hock'); - var state = instance.getState(); - var position = state.position; - var arr = []; - var w = 0; - for (var i = 0; i < ins.length; i++) { - if (!ins[i].getDataset().button) return - var btnData = JSON.parse(ins[i].getDataset().button) - - // fix by mehaotian TODO 在 app-vue 中,字符串转对象,需要转两次,这里先这么兼容 - if (typeof(btnData) === 'string') { - btnData = JSON.parse(btnData) - } - - var button = btnData[i] && btnData[i].width || 0 - w += button - arr.push(-w) - // 动态计算按钮组每个按钮的折叠动画移动距离 - var distance = arr[i - 1] + value * (arr[i - 1] / position[1].width) - if (i != 0) { - ins[i].setStyle({ - transform: 'translateX(' + distance + 'px)', - }) - } - } -} - -/** - * 开启状态 - * @param {Boolean} type - * @param {Object} ins - * @param {Object} ownerInstance - */ -function openState(type, ins, ownerInstance) { - var state = ins.getState() - var position = state.position - if (state.isopen === undefined) { - state.isopen = false - } - // 只有状态有改变才会通知页面改变状态 - if (state.isopen !== type) { - // 通知页面,已经打开 - ownerInstance.callMethod('change', { - open: type - }) - } - // 设置打开和移动状态 - state.isopen = type - - - // 添加动画类 - ins.addClass('ani'); - var owner = ownerInstance.selectAllComponents('.button-hock') - for (var i = 0; i < owner.length; i++) { - owner[i].addClass('ani'); - } - // 设置最终移动位置 - move(type ? -position[1].width : 0, ins, ownerInstance) - -} - -module.exports = { - sizeReady: sizeReady, - touchstart: touchstart, - touchmove: touchmove, - touchend: touchend -} diff --git a/components/uni-swipe-action-item/mpalipay.js b/components/uni-swipe-action-item/mpalipay.js deleted file mode 100644 index 8537b24..0000000 --- a/components/uni-swipe-action-item/mpalipay.js +++ /dev/null @@ -1,160 +0,0 @@ -export default { - data() { - return { - isshow: false, - viewWidth: 0, - buttonWidth: 0, - disabledView: false, - x: 0, - transition: false - } - }, - watch: { - show(newVal) { - if (this.autoClose) return - if (newVal) { - this.open() - } else { - this.close() - } - }, - }, - created() { - if (this.swipeaction.children !== undefined) { - this.swipeaction.children.push(this) - } - }, - beforeDestroy() { - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) - }, - mounted() { - this.isopen = false - this.transition = true - setTimeout(() => { - this.getQuerySelect() - }, 50) - - }, - methods: { - onClick(index, item) { - this.$emit('click', { - content: item, - index - }) - }, - touchstart(e) { - let { - pageX, - pageY - } = e.changedTouches[0] - this.transition = false - this.startX = pageX - if (this.autoClose) { - this.swipeaction.closeOther(this) - } - }, - touchmove(e) { - let { - pageX, - } = e.changedTouches[0] - this.slide = this.getSlide(pageX) - if (this.slide === 0) { - this.disabledView = false - } - - }, - touchend(e) { - this.stop = false - this.transition = true - if (this.isopen) { - if (this.moveX === -this.buttonWidth) { - this.close() - return - } - this.move() - } else { - if (this.moveX === 0) { - this.close() - return - } - this.move() - } - }, - open() { - this.x = this.moveX - this.$nextTick(() => { - this.x = -this.buttonWidth - this.moveX = this.x - - if(!this.isopen){ - this.isopen = true - this.$emit('change', true) - } - }) - }, - close() { - this.x = this.moveX - this.$nextTick(() => { - this.x = 0 - this.moveX = this.x - if(this.isopen){ - this.isopen = false - this.$emit('change', false) - } - }) - }, - move() { - if (this.slide === 0) { - this.open() - } else { - this.close() - } - }, - onChange(e) { - let x = e.detail.x - this.moveX = x - if (x >= this.buttonWidth) { - this.disabledView = true - this.$nextTick(() => { - this.x = this.buttonWidth - }) - } - }, - getSlide(x) { - if (x >= this.startX) { - this.startX = x - return 1 - } else { - this.startX = x - return 0 - } - - }, - getQuerySelect() { - const query = uni.createSelectorQuery().in(this); - query.selectAll('.viewWidth-hook').boundingClientRect(data => { - - this.viewWidth = data[0].width - this.buttonWidth = data[1].width - this.transition = false - this.$nextTick(() => { - this.transition = true - }) - - if (!this.buttonWidth) { - this.disabledView = true - } - - if (this.autoClose) return - if (this.show) { - this.open() - } - }).exec(); - - } - } -} diff --git a/components/uni-swipe-action-item/mpother.js b/components/uni-swipe-action-item/mpother.js deleted file mode 100644 index ae97ba6..0000000 --- a/components/uni-swipe-action-item/mpother.js +++ /dev/null @@ -1,158 +0,0 @@ -// #ifdef APP-NVUE -const dom = weex.requireModule('dom'); -// #endif -export default { - data() { - return { - uniShow: false, - left: 0 - } - }, - computed: { - moveLeft() { - return `translateX(${this.left}px)` - } - }, - watch: { - show(newVal) { - if (!this.position || JSON.stringify(this.position) === '{}') return; - if (this.autoClose) return - if (newVal) { - this.$emit('change', true) - this.open() - } else { - this.$emit('change', false) - this.close() - } - } - }, - mounted() { - this.position = {} - if (this.swipeaction.children !== undefined) { - this.swipeaction.children.push(this) - } - setTimeout(() => { - this.getSelectorQuery() - }, 100) - }, - beforeDestoy() { - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) - }, - methods: { - onClick(index, item) { - this.$emit('click', { - content: item, - index - }) - this.close() - }, - touchstart(e) { - const { - pageX - } = e.touches[0] - if (this.disabled) return - const left = this.position.content.left - if (this.autoClose) { - this.swipeaction.closeOther(this) - } - this.width = pageX - left - if (this.isopen) return - if (this.uniShow) { - this.uniShow = false - this.isopen = true - this.openleft = this.left + this.position.button.width - } - }, - touchmove(e, index) { - if (this.disabled) return - const { - pageX - } = e.touches[0] - this.setPosition(pageX) - }, - touchend() { - if (this.disabled) return - if (this.isopen) { - this.move(this.openleft, 0) - return - } - this.move(this.left, -40) - }, - setPosition(x, y) { - if (!this.position.button.width) { - return - } - // this.left = x - this.width - this.setValue(x - this.width) - }, - setValue(value) { - // 设置最大最小值 - this.left = Math.max(-this.position.button.width, Math.min(parseInt(value), 0)) - this.position.content.left = this.left - if (this.isopen) { - this.openleft = this.left + this.position.button.width - } - }, - move(left, value) { - if (left >= value) { - this.$emit('change', false) - this.close() - } else { - this.$emit('change', true) - this.open() - } - }, - open() { - this.uniShow = true - this.left = -this.position.button.width - this.setValue(-this.position.button.width) - }, - close() { - this.uniShow = true - this.setValue(0) - setTimeout(() => { - this.uniShow = false - this.isopen = false - }, 300) - }, - getSelectorQuery() { - // #ifndef APP-NVUE - const views = uni.createSelectorQuery() - .in(this) - views - .selectAll('.selector-query-hock') - .boundingClientRect(data => { - this.position.content = data[1] - this.position.button = data[0] - if (this.autoClose) return - if (this.show) { - this.open() - } else { - this.close() - } - }) - .exec() - // #endif - // #ifdef APP-NVUE - dom.getComponentRect(this.$refs['selector-content-hock'], (data) => { - if (this.position.content) return - this.position.content = data.size - }) - dom.getComponentRect(this.$refs['selector-button-hock'], (data) => { - if (this.position.button) return - this.position.button = data.size - if (this.autoClose) return - if (this.show) { - this.open() - } else { - this.close() - } - }) - // #endif - } - } -} diff --git a/components/uni-swipe-action-item/mpwxs.js b/components/uni-swipe-action-item/mpwxs.js deleted file mode 100644 index 3073ff8..0000000 --- a/components/uni-swipe-action-item/mpwxs.js +++ /dev/null @@ -1,97 +0,0 @@ -export default { - data() { - return { - position: [], - button: [] - } - }, - computed: { - pos() { - return JSON.stringify(this.position) - }, - btn() { - return JSON.stringify(this.button) - } - }, - watch: { - show(newVal) { - if (this.autoClose) return - let valueObj = this.position[0] - if (!valueObj) { - this.init() - return - } - valueObj.show = newVal - this.$set(this.position, 0, valueObj) - } - }, - created() { - if (this.swipeaction.children !== undefined) { - this.swipeaction.children.push(this) - } - }, - mounted() { - this.init() - - }, - beforeDestroy() { - this.swipeaction.children.forEach((item, index) => { - if (item === this) { - this.swipeaction.children.splice(index, 1) - } - }) - }, - methods: { - init() { - - setTimeout(() => { - this.getSize() - this.getButtonSize() - }, 50) - }, - closeSwipe(e) { - if (!this.autoClose) return - this.swipeaction.closeOther(this) - }, - - change(e) { - this.$emit('change', e.open) - let valueObj = this.position[0] - if (valueObj.show !== e.open) { - valueObj.show = e.open - this.$set(this.position, 0, valueObj) - } - }, - onClick(index, item) { - this.$emit('click', { - content: item, - index - }) - }, - appTouchStart(){}, - appTouchEnd(){}, - getSize() { - const views = uni.createSelectorQuery().in(this) - views - .selectAll('.selector-query-hock') - .boundingClientRect(data => { - if (this.autoClose) { - data[0].show = false - } else { - data[0].show = this.show - } - this.position = data - }) - .exec() - }, - getButtonSize() { - const views = uni.createSelectorQuery().in(this) - views - .selectAll('.button-hock') - .boundingClientRect(data => { - this.button = data - }) - .exec() - } - } -} diff --git a/components/uni-swipe-action-item/uni-swipe-action-item.vue b/components/uni-swipe-action-item/uni-swipe-action-item.vue deleted file mode 100644 index 9a0f8f2..0000000 --- a/components/uni-swipe-action-item/uni-swipe-action-item.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - - diff --git a/components/uni-swipe-action/uni-swipe-action.vue b/components/uni-swipe-action/uni-swipe-action.vue deleted file mode 100644 index 9ad5c5e..0000000 --- a/components/uni-swipe-action/uni-swipe-action.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue index 182127c..91fc9c1 100644 --- a/pageE/mine/EditUserInfo.vue +++ b/pageE/mine/EditUserInfo.vue @@ -66,6 +66,9 @@ export default { onLoad() { this.getUserInfo(); }, + onNavigationBarButtonTap(e) { + if( e.index == 0 ) uni.navigateBack(); + }, methods: { changeAvatar() { const url = this.$u.http.config.baseUrl + '/Upload/uploadfile'; diff --git a/pageE/mine/Integral.vue b/pageE/mine/Integral.vue index 3fd33e8..17d828d 100644 --- a/pageE/mine/Integral.vue +++ b/pageE/mine/Integral.vue @@ -9,9 +9,12 @@ 经验值 {{ memberInfo.member_exppoints }} - + 预计进度 - {{ memberInfo.next_grade_exppoints_diff }} + + + + @@ -47,6 +50,11 @@ export default { } }) }, + viewProgress() { + this.$u.route({ + url: '/pageE/mine/MineProgress' + }) + }, }, }; @@ -74,6 +82,10 @@ export default { font-size: 48rpx; font-weight: 500; color: rgba(255,255,255,1); + > image { + width: 52rpx; + height: 35rpx; + } } } } diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue index 24f2c59..575dfa1 100644 --- a/pageE/mine/MemberServe.vue +++ b/pageE/mine/MemberServe.vue @@ -1,8 +1,8 @@ @@ -171,55 +167,6 @@ export default { } .coupon { height: 100%; - .coupon-item { - padding: 30rpx; - background-color: #ffffff; - display: flex; - align-items: flex-end; - margin-bottom: 2rpx; - > img { - width: 180rpx; - height: 160rpx; - border-radius: 10rpx; - margin-right: 30rpx; - } - .coupon-main { - .coupon-title { - font-size: 30rpx; - color: rgba(51,51,51,1); - } - .coupon-date { - display: flex; - align-items: center; - margin: 29rpx 0 20rpx; - > img { - width: 24rpx; - height: 24rpx; - margin-right: 15rpx; - } - > view { - font-size: 24rpx; - color: rgba(153,153,153,1); - } - } - .coupon-integral { - font-size: 30rpx; - font-weight: 500; - color: rgba(255,120,15,1); - } - } - .coupon-btn { - margin-left: auto; - width: 85rpx; - // height: 42rpx; - border: 2rpx solid rgba(255,120,15,1); - border-radius: 10rpx; - font-size: 26rpx; - color: rgba(255,120,15,1); - line-height: 42rpx; - text-align: center; - } - } } .details { height: 100%; diff --git a/pageE/mine/MemberServeCoupon.vue b/pageE/mine/MemberServeCoupon.vue new file mode 100644 index 0000000..796aad4 --- /dev/null +++ b/pageE/mine/MemberServeCoupon.vue @@ -0,0 +1,161 @@ + + + \ No newline at end of file diff --git a/pageE/mine/MineInfo.vue b/pageE/mine/MineInfo.vue index 574cf6a..a5ee6f0 100644 --- a/pageE/mine/MineInfo.vue +++ b/pageE/mine/MineInfo.vue @@ -41,7 +41,7 @@ export default { userInfo: {} } }, - onLoad() { + onShow() { this.getUserInfo(); }, onNavigationBarButtonTap() { diff --git a/pageE/mine/MineProgress.vue b/pageE/mine/MineProgress.vue new file mode 100644 index 0000000..fa87ee8 --- /dev/null +++ b/pageE/mine/MineProgress.vue @@ -0,0 +1,172 @@ + + + \ No newline at end of file diff --git a/pageE/tool/MineCoupon.vue b/pageE/tool/MineCoupon.vue new file mode 100644 index 0000000..724cd48 --- /dev/null +++ b/pageE/tool/MineCoupon.vue @@ -0,0 +1,105 @@ + + + \ No newline at end of file diff --git a/pages.json b/pages.json index e723fd0..d7ac6c5 100644 --- a/pages.json +++ b/pages.json @@ -329,6 +329,19 @@ } } }, + { + "path": "tool/MineCoupon", + "style": { + "navigationBarTitleText": "优惠券", + "app-plus": { + "titleSize": "36px", + "titleNView": { + "titleColor": "#333333", + "backgroundColor": "#FFFFFF" + } + } + } + }, { "path": "more/MineHelp", "style": { @@ -474,6 +487,19 @@ } } }, + { + "path": "mine/MineProgress", + "style": { + "navigationBarTitleText": "预计进度", + "app-plus": { + "titleSize": "36px", + "titleNView": { + "titleColor": "#333333", + "backgroundColor": "#FFFFFF" + } + } + } + }, { "path": "tool/Manicure", "style": { diff --git a/pages/mine/index.vue b/pages/mine/index.vue index d95d286..d870fd4 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -92,6 +92,10 @@ 足迹 + + + 优惠券 + @@ -131,7 +135,7 @@ export default { return value ? value.replace(/^(\d{3})\d*(\d{4})$/, '$1****$2') : ''; } }, - onLoad() { + onShow() { this.getUserInfo(); }, onNavigationBarButtonTap() { diff --git a/static/image/mine/25.png b/static/image/mine/25.png new file mode 100644 index 0000000..4702a8e Binary files /dev/null and b/static/image/mine/25.png differ diff --git a/static/image/mine/26.png b/static/image/mine/26.png new file mode 100644 index 0000000..31a6de6 Binary files /dev/null and b/static/image/mine/26.png differ diff --git a/static/image/mine/27.png b/static/image/mine/27.png new file mode 100644 index 0000000..22bde9b Binary files /dev/null and b/static/image/mine/27.png differ diff --git a/static/image/mine/28.png b/static/image/mine/28.png new file mode 100644 index 0000000..ba0b54d Binary files /dev/null and b/static/image/mine/28.png differ diff --git a/static/image/mine/29.png b/static/image/mine/29.png new file mode 100644 index 0000000..45c080e Binary files /dev/null and b/static/image/mine/29.png differ diff --git a/static/image/mine/30.png b/static/image/mine/30.png new file mode 100644 index 0000000..4cd589b Binary files /dev/null and b/static/image/mine/30.png differ diff --git a/static/image/mine/31.png b/static/image/mine/31.png new file mode 100644 index 0000000..1d00a85 Binary files /dev/null and b/static/image/mine/31.png differ diff --git a/static/image/mine/32.png b/static/image/mine/32.png new file mode 100644 index 0000000..25cf25c Binary files /dev/null and b/static/image/mine/32.png differ diff --git a/static/image/mine/33.png b/static/image/mine/33.png new file mode 100644 index 0000000..8581d03 Binary files /dev/null and b/static/image/mine/33.png differ diff --git a/static/image/mine/34.png b/static/image/mine/34.png new file mode 100644 index 0000000..d87fd41 Binary files /dev/null and b/static/image/mine/34.png differ diff --git a/static/js/common.js b/static/js/common.js index e1a3e8e..dc9b353 100644 --- a/static/js/common.js +++ b/static/js/common.js @@ -14,7 +14,7 @@ const common = { * @param { String } url 服务器 url * @param { String } filePath 要上传文件资源的路径 * @param { String } type 上传文件验证类型 默认: img 可选: video - * @return { object } promise 对象 resolve 为文件服务器地址 reject 为错误信息 + * @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息 */ uploadFile({ url, filePath, type = 'img' } = {}) { const token = uni.getStorageSync('token'); @@ -27,10 +27,10 @@ const common = { formData: { type: type }, success: uploadFileRes => { const data = JSON.parse(uploadFileRes.data); - if(data.errCode.code == 0) { - resolve(data.errCode.url); + if(data.errCode == 0) { + resolve(data.data.url); } else { - reject(data.errCode.msg); + reject(data.message); } }, fail(){