diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md index f4e08bd..7c91d7b 100644 --- a/node_modules/jweixin-module/README.md +++ b/node_modules/jweixin-module/README.md @@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js ## 使用 ```js -var wx = require('jweixin-module') -wx.ready(function(){ +var jweixin = require('jweixin-module') +jweixin.ready(function(){ // TODO }); ``` diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json index 4f3cd45..5b6160e 100644 --- a/node_modules/jweixin-module/package.json +++ b/node_modules/jweixin-module/package.json @@ -1,41 +1,40 @@ { - "_from": "jweixin-module", - "_id": "jweixin-module@1.4.1", + "_args": [ + [ + "jweixin-module@1.6.0", + "D:\\Web-Object\\rush-goods" + ] + ], + "_from": "jweixin-module@1.6.0", + "_id": "jweixin-module@1.6.0", "_inBundle": false, - "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==", + "_integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==", "_location": "/jweixin-module", "_phantomChildren": {}, "_requested": { - "type": "tag", + "type": "version", "registry": true, - "raw": "jweixin-module", + "raw": "jweixin-module@1.6.0", "name": "jweixin-module", "escapedName": "jweixin-module", - "rawSpec": "", + "rawSpec": "1.6.0", "saveSpec": null, - "fetchSpec": "latest" + "fetchSpec": "1.6.0" }, "_requiredBy": [ - "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz", - "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1", - "_spec": "jweixin-module", - "_where": "E:\\demo\\niushop_uniapp", + "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", + "_spec": "1.6.0", + "_where": "D:\\Web-Object\\rush-goods", "author": { "name": "Shengqiang Guo" }, "bugs": { "url": "https://github.com/zhetengbiji/jweixin-module/issues" }, - "bundleDependencies": false, - "deprecated": false, "description": "微信JS-SDK", - "devDependencies": { - "textfile": "^1.2.0", - "uglify-js": "^3.4.9" - }, + "devDependencies": {}, "homepage": "https://github.com/zhetengbiji/jweixin-module#readme", "keywords": [ "wxjssdk", @@ -46,15 +45,12 @@ "wx" ], "license": "ISC", - "main": "out/index.js", + "main": "lib/index.js", "name": "jweixin-module", "repository": { "type": "git", "url": "git+https://github.com/zhetengbiji/jweixin-module.git" }, - "scripts": { - "build": "node build", - "prepublish": "npm run build" - }, - "version": "1.4.1" + "scripts": {}, + "version": "1.6.0" } diff --git a/pages.json b/pages.json index 22d7574..c2c373c 100644 --- a/pages.json +++ b/pages.json @@ -1067,6 +1067,15 @@ // #endif "navigationBarTitleText": "消息列表" } + }, + { + "path": "message/words", + "style": { + // #ifdef H5 + "navigationStyle": "custom", + // #endif + "navigationBarTitleText": "留言反馈" + } } ] }, diff --git a/pages_promotion/message/index.vue b/pages_promotion/message/index.vue index 17aba4a..6d1aac2 100644 --- a/pages_promotion/message/index.vue +++ b/pages_promotion/message/index.vue @@ -33,6 +33,7 @@ {{ titles[item.type].title }} {{ item.message_content }} + 回复内容:{{ item.reply_content }} 查看详情 @@ -48,8 +49,12 @@ - - + + + {{ see_info.message_content }} + 回复内容:{{ see_info.reply_content }} + 关闭 + @@ -76,7 +81,7 @@ export default { 4: {title: '留言反馈', type: 'words', icon: 'public/static/img/message/words.png'}, }, list: [], - message: '', + see_info: {}, }; }, mixins: [], @@ -117,7 +122,7 @@ export default { // 查看详情 seeDetails(item,index){ // 显示消息 - this.message = item.message_content; + this.see_info = item; this.$refs.messageContent.open(); // 判断:如果当前消息未查看 则修改为已查看 if(parseInt(item.is_see) === 0 && parseInt(item.type) !== 4){ @@ -221,7 +226,6 @@ export default { background: #fb3146; border-radius: 50%; border: 2rpx solid #f6e1e8; - } } .message-block-top-title{ @@ -243,6 +247,9 @@ export default { margin: 20rpx 0; color: #828282; } + .message-block-reply{ + color: #c0c0c0; + } .message-block-bottom{ display: inline-flex; width: 100%; @@ -278,5 +285,35 @@ export default { } } } + .see-details{ + width: 80vw!important; + background: #fff; + padding: 20rpx 20rpx 10rpx 20rpx; + border-radius: 20rpx; + margin: auto; + + .see-details-content { + font-size: 30rpx; + line-height: 40rpx; + width: 100%; + margin-bottom: 20rpx; + } + .see-details-reply{ + font-size: 26rpx; + line-height: 40rpx; + width: 100%; + margin-bottom: 20rpx; + color: #c0c0c0; + } + + .see-details-buttons{ + width: 100%; + text-align: center; + font-size: 36rpx; + height: 60rpx; + line-height: 60rpx; + margin-top: 30rpx; + } + } } diff --git a/pages_promotion/message/list.vue b/pages_promotion/message/list.vue index 2257555..3412e88 100644 --- a/pages_promotion/message/list.vue +++ b/pages_promotion/message/list.vue @@ -13,6 +13,7 @@ {{ type_info.title }} {{ item.message_content }} + 回复内容:{{ item.reply_content }} {{ $util.timeStampTurnTime(item.created_time) }} @@ -141,6 +142,9 @@ export default { margin: 20rpx 0; color: #828282; } + .message-block-reply{ + color: #c0c0c0; + } .message-block-bottom{ height: 60rpx; line-height: 60rpx; diff --git a/pages_promotion/message/words.vue b/pages_promotion/message/words.vue new file mode 100644 index 0000000..2150801 --- /dev/null +++ b/pages_promotion/message/words.vue @@ -0,0 +1,226 @@ + + + + +