From 7c317cdb10035ab9ebb5a9101bb1b91758e638ea Mon Sep 17 00:00:00 2001 From: lnn19986213 <1667908750@qq.com> Date: Wed, 7 Dec 2022 17:20:34 +0800 Subject: [PATCH] gx --- package-lock.json | 210 +++++++----- package.json | 2 + src/main.js | 4 +- src/manifest.json | 1 + src/pages.json | 3 +- .../ActivitiesDetail/ActivitiesDetail.vue | 121 ++++--- src/pages/ArtActivities/ArtActivities.vue | 1 + src/pages/ArtWorks/ArtWorks.vue | 13 +- src/pages/ArtWorks/artWorkDetail.vue | 35 ++ src/pages/MyPoints/MyPoints.vue | 6 +- src/pages/PersonalCenter/ReEditSingleInfo.vue | 2 +- src/pages/ShoppingCart/ShoppingCart.vue | 2 + src/pages/improveData/improveData.vue | 2 +- src/pages/moreFun/moreFun.vue | 117 ++----- src/pages/my/My.vue | 4 +- src/pages/my/OrderActControl.vue | 303 +++++++++++++----- src/pages/orderHall/orderHall.vue | 21 +- src/pages/orderHall/orderHallDetails.vue | 15 +- src/pages/pageHome/pageHome.vue | 100 ++++-- src/pagesA/activeManage/activeManage.vue | 4 + src/request/interface.js | 4 +- src/vconsole/index.js | 3 + 22 files changed, 633 insertions(+), 340 deletions(-) create mode 100644 src/vconsole/index.js diff --git a/package-lock.json b/package-lock.json index 8e6dd00..cd71405 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2988,6 +2988,44 @@ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "css-loader": { "version": "3.6.0", "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-3.6.0.tgz", @@ -3061,6 +3099,13 @@ "slash": "^2.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "hash-sum": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz", @@ -3175,6 +3220,42 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } } } }, @@ -5591,6 +5672,11 @@ "resolved": "https://registry.npmmirror.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==" }, + "copy-text-to-clipboard": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz", + "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==" + }, "copy-to": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/copy-to/-/copy-to-2.0.1.tgz", @@ -8231,6 +8317,11 @@ "dev": true, "optional": true }, + "image-tools": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz", + "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==" + }, "immediate": { "version": "3.0.6", "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz", @@ -11742,6 +11833,11 @@ "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", "dev": true }, + "mutation-observer": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz", + "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==" + }, "mz": { "version": "2.7.0", "resolved": "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz", @@ -16268,6 +16364,32 @@ "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" }, + "vconsole": { + "version": "3.15.0", + "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.0.tgz", + "integrity": "sha512-8hq7wabPcRucSWQyN7/1tthMawP9JPvM95zgtMHpPknMMMCKj+abpoK7P7oKK4B0qw58C24Mdvo9+raUdpHyVQ==", + "requires": { + "@babel/runtime": "^7.17.2", + "copy-text-to-clipboard": "^3.0.1", + "core-js": "^3.11.0", + "mutation-observer": "^1.0.3" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.20.1", + "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.20.1.tgz", + "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", + "requires": { + "regenerator-runtime": "^0.13.10" + } + }, + "regenerator-runtime": { + "version": "0.13.10", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", + "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==" + } + } + }, "vendors": { "version": "1.0.4", "resolved": "https://registry.npmmirror.com/vendors/-/vendors-1.0.4.tgz", @@ -16318,94 +16440,6 @@ "vue-style-loader": "^4.1.0" } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", diff --git a/package.json b/package.json index 5d556dc..329e958 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,10 @@ "@vue/shared": "^3.0.0", "core-js": "^3.6.5", "flyio": "^0.6.2", + "image-tools": "^1.4.0", "regenerator-runtime": "^0.12.1", "uview-ui": "^2.0.31", + "vconsole": "^3.15.0", "vue": "^2.6.11", "vuex": "^3.2.0" }, diff --git a/src/main.js b/src/main.js index fe95334..34409a4 100644 --- a/src/main.js +++ b/src/main.js @@ -27,4 +27,6 @@ import http from "@/request/index.js" Vue.prototype.http=http // Vue.prototype.socketUrl = "ws://61.130.44.231/webSocket" -Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket" \ No newline at end of file +Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket" + +// import vConsole from './vconsole/index' \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index 12b821b..b2e9c36 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -86,6 +86,7 @@ "/pre" : { // 预发布 "target" : "http://10.0.0.5:8080/h5/api", // 目标接口域名 + // "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名 "changeOrigin" : true, // 是否跨域 "secure" : false, // 设置支持https协议的代理 "pathRewrite" : { diff --git a/src/pages.json b/src/pages.json index 003633d..0f4fa41 100644 --- a/src/pages.json +++ b/src/pages.json @@ -487,7 +487,8 @@ "style" : { "navigationBarTitleText": "点单管理", - "enablePullDownRefresh": false + "enablePullDownRefresh": true, + "onReachBottomDistance": 20 } }, diff --git a/src/pages/ActivitiesDetail/ActivitiesDetail.vue b/src/pages/ActivitiesDetail/ActivitiesDetail.vue index ad76322..99c3d2e 100644 --- a/src/pages/ActivitiesDetail/ActivitiesDetail.vue +++ b/src/pages/ActivitiesDetail/ActivitiesDetail.vue @@ -39,7 +39,7 @@ - 活动报名时间: + 报名时间: {{serveList.bmTime}}~{{serveList.ebmTime}} @@ -48,7 +48,8 @@ 活动人数: - {{serveList.hdBmCount}}/{{serveList.hdCount}} + + {{serveList.hdBmCount}}/{{serveList.hdCount}} @@ -57,16 +58,17 @@ - 志愿者报名时间: + 报名时间: {{serveList.zyzTime}}~{{serveList.ezyzTime}} - 志愿者招募数量: + 招募数量: - {{serveList.zyzBmCount}}/{{serveList.zyzCount}} + {{serveList.zyzBmCount}}/{{serveList.zyzCount}} @@ -82,31 +84,39 @@ - + - + - + - - - - - - + + + + + + - + - - + + @@ -120,11 +130,13 @@ - + 取消 - + 确定 @@ -138,11 +150,13 @@ 取消报名后无法再报名此活动，是否确认取消报名？ - + 取消 - + 确定 @@ -156,11 +170,13 @@ 若报名后不参加，将会扣除文艺积分（-10）噢～ - + 取消 - + 确定 @@ -195,7 +211,7 @@ this.id = options.id this.userType = uni.getStorageSync('userType') }, - + onShow() { this.getList() }, @@ -222,14 +238,14 @@ this.bm = val }, // 确认报名弹窗-取消 - closeH(){ + closeH() { this.showH = false }, // 确认报名弹窗-确认 sureH() { - if(this.bm == 0){ + if (this.bm == 0) { this.http.request('/activityUser/addActivity?activityId=' + this.activityId, {}, "POST").then(res => { - if(res.code == 200){ + if (res.code == 200) { this.showH = false this.getList() } @@ -239,9 +255,10 @@ icon: "none", }); }) - }else if(this.bm == 1){ - this.http.request('/activityUser/addZyzActivity?activityId=' + this.activityId, {}, "POST").then(res => { - if(res.code == 200){ + } else if (this.bm == 1) { + this.http.request('/activityUser/addZyzActivity?activityId=' + this.activityId, {}, "POST").then( + res => { + if (res.code == 200) { this.showH = false this.getList() } @@ -259,7 +276,7 @@ this.qx = val }, // 取消报名-取消 - close(){ + close() { this.showB = false this.value = '' }, @@ -269,7 +286,7 @@ this.showS = true }, //取消报名-原因 - closeS(){ + closeS() { this.showS = false this.showB = true }, @@ -279,9 +296,9 @@ id: this.activityId, reason: this.value } - if(this.qx == 0){ + if (this.qx == 0) { this.http.request('/activityUser/delActivity', data, "POST").then(res => { - if(res.code == 200){ + if (res.code == 200) { this.getList() this.showB = false this.showS = false @@ -293,9 +310,9 @@ icon: "none", }); }) - }else if(this.qx == 1){ + } else if (this.qx == 1) { this.http.request('/activityUser/delZyzActivity', data, "POST").then(res => { - if(res.code == 200){ + if (res.code == 200) { this.getList() this.showB = false this.showS = false @@ -308,15 +325,27 @@ }); }) } - + }, toGm(val) { uni.navigateTo({ - url: "/pagesA/activeManage/toGm?state=" + val + '&id=' + this.id + '&gmId=' + this.gmId + url: "/pagesA/activeManage/toGm?state=" + val + '&id=' + this.id + '&gmId=' + this.gmId }) - } + }, + grayGm() { + uni.showToast({ + title: '请在冠名申请时间内进行冠名', + icon: "none", + }); + }, + grayBm() { + uni.showToast({ + title: '请在报名时间内进行报名', + icon: "none", + }); + }, } - + } @@ -352,6 +381,7 @@ padding: 24rpx; display: flex; background: #F4F5F7; + .icon { width: 40rpx; height: 40rpx; @@ -359,6 +389,7 @@ // display: none; } } + .item_li { padding: 16rpx 32rpx 32rpx; margin: 16rpx 0; @@ -386,9 +417,7 @@ } } - .content { - - } + .content {} } } } @@ -414,12 +443,13 @@ font-weight: 600; } - .collection-A { + + .collection-A { flex: 1; margin-left: 24rpx; font-size: 32rpx; font-weight: 600; - + } .apply { @@ -430,6 +460,7 @@ font-weight: 600; border: none; } + .apply-A { flex: 1; font-size: 32rpx; diff --git a/src/pages/ArtActivities/ArtActivities.vue b/src/pages/ArtActivities/ArtActivities.vue index b90229e..473ea84 100644 --- a/src/pages/ArtActivities/ArtActivities.vue +++ b/src/pages/ArtActivities/ArtActivities.vue @@ -146,5 +146,6 @@ width: 104rpx; height: 104rpx; border-radius: 50%; + z-index: 999; } diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue index 77f4bc0..4ebaaa1 100644 --- a/src/pages/ArtWorks/ArtWorks.vue +++ b/src/pages/ArtWorks/ArtWorks.vue @@ -4,8 +4,11 @@ - + + + + {{detailData.introduce}} @@ -213,6 +223,11 @@ }) } }, + toUser(val1,val2,val3,val4){ + uni.navigateTo({ + url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4 + }) + }, //点击文件 downLoad(val) { this.contractUrl = val @@ -276,6 +291,26 @@ font-weight: 600; color: #251B1D; } + .img_box { + display: flex; + justify-content: space-between; + align-items: center; + .puber { + display: flex; + align-items: center; + .avtor { + border-radius: 12px; + overflow: hidden; + width: 24px; + height: 24px; + margin-right: 4px; + } + .autor { + color: #251B1D; + font-size: 12px; + } + } + } .work_desc { width: 94%; diff --git a/src/pages/MyPoints/MyPoints.vue b/src/pages/MyPoints/MyPoints.vue index e1f7062..eb541d9 100644 --- a/src/pages/MyPoints/MyPoints.vue +++ b/src/pages/MyPoints/MyPoints.vue @@ -59,7 +59,7 @@ 已完成 - 去完成 + 未完成 @@ -84,7 +84,7 @@ 已完成 - 去完成 + 未完成 @@ -108,7 +108,7 @@ 已完成 - 去完成 + 未完成 diff --git a/src/pages/PersonalCenter/ReEditSingleInfo.vue b/src/pages/PersonalCenter/ReEditSingleInfo.vue index bab623f..edc4a84 100644 --- a/src/pages/PersonalCenter/ReEditSingleInfo.vue +++ b/src/pages/PersonalCenter/ReEditSingleInfo.vue @@ -702,7 +702,7 @@ let token = uni.getStorageSync('token'); return new Promise((resolve, reject) => { let a = uni.uploadFile({ - url: http.config.baseUrl + '/upload/upload', + url: http.config.baseUrl + '/file/upload', filePath: url, name: 'file', header: { diff --git a/src/pages/ShoppingCart/ShoppingCart.vue b/src/pages/ShoppingCart/ShoppingCart.vue index 489d5f4..60373ca 100644 --- a/src/pages/ShoppingCart/ShoppingCart.vue +++ b/src/pages/ShoppingCart/ShoppingCart.vue @@ -247,6 +247,8 @@ let _this = this if (this.allChoosed == 0) { this.allChoosed = 1 + this.allMoney = 0 + this.allPoint = 0 this.list.forEach((item) => { item.checked = 1 if(item.goods.moneyPrice > 0){ diff --git a/src/pages/improveData/improveData.vue b/src/pages/improveData/improveData.vue index 860bd96..78b00a7 100644 --- a/src/pages/improveData/improveData.vue +++ b/src/pages/improveData/improveData.vue @@ -750,7 +750,7 @@ let token = uni.getStorageSync('token'); return new Promise((resolve, reject) => { let a = uni.uploadFile({ - url: http.config.baseUrl + '/upload/upload', + url: http.config.baseUrl + '/file/upload', filePath: url, name: 'file', header: { diff --git a/src/pages/moreFun/moreFun.vue b/src/pages/moreFun/moreFun.vue index d4ce36f..70d1598 100644 --- a/src/pages/moreFun/moreFun.vue +++ b/src/pages/moreFun/moreFun.vue @@ -15,112 +15,63 @@ data() { return { list: [ - // { - // imgUrl: '../../static/moreFun/moreFun5.png', - // label: '文艺活动' - // }, - // { - // imgUrl: '../../static/moreFun/moreFun6.png', - // label: '积分使用' - // }, - // { - // imgUrl: '../../static/moreFun/moreFun7.png', - // label: '文艺商城' - // }, { imgUrl: '../../static/moreFun/moreFun8.png', label: '文艺之家' }, // { - // imgUrl: '../../static/moreFun/moreFun9.png', - // label: '文艺援助' + // imgUrl: '../../static/moreFun/moreFun1.png', + // label: '媒体宣传' // }, - { - imgUrl: '../../static/moreFun/moreFun1.png', - label: '媒体宣传' - }, - { - imgUrl: '../../static/moreFun/moreFun3.png', - label: '机构设置' - }, - { - imgUrl: '../../static/moreFun/moreFun4.png', - label: '资料查找' - }, - { - imgUrl: '../../static/moreFun/moreFun2.png', - label: '文艺下乡' - }, { - imgUrl: '../../static/icon13.png', - label: '文艺比赛' - }, // { - // imgUrl: '../../static/moreFun/moreFun10.png', - // label: '点单大厅' + // imgUrl: '../../static/moreFun/moreFun3.png', + // label: '机构设置' // }, + // { + // imgUrl: '../../static/moreFun/moreFun4.png', + // label: '资料查找' + // }, + // { + // imgUrl: '../../static/moreFun/moreFun2.png', + // label: '文艺下乡' + // }, { + // imgUrl: '../../static/icon13.png', + // label: '文艺比赛' + // }, ] }; }, methods: { SwitchPage(id) { switch (id) { - // case 0: - // // uni.showToast({ - // // title: '功能未完善', - // // icon: "none", - // // }); - // uni.navigateTo({ - // url: "/pages/ArtActivities/ArtActivities" - // }) - // break; - // case 1: - // uni.navigateTo({ - // url: "/pages/MyPoints/MyPoints" - // }) - // break; - // case 2: - // uni.navigateTo({ - // url: "/pages/shop/Shop" - // }) - // break; case 0: uni.navigateTo({ url: "/pages/literFamily/literFamily" }) break; - // case 4: + // case 1: // uni.navigateTo({ - // url: "/pages/literHelp/literHelp" + // url: "/pages/mediaProp/mediaProp" // }) // break; - case 1: - uni.navigateTo({ - url: "/pages/mediaProp/mediaProp" - }) - break; - case 2: - uni.navigateTo({ - url: "/pages/moreFun/noWeb" - }) - break; - case 3: - uni.navigateTo({ - url: "/pages/moreFun/noWeb" - }) - break; - case 4: - uni.navigateTo({ - url: "/pages/moreFun/noWeb" - }) - break; - case 5: - uni.navigateTo({ - url: "/pages/moreFun/noWeb" - }) - break; - // case 10: + // case 2: // uni.navigateTo({ - // url: "/pages/orderHall/orderHall" + // url: "/pages/moreFun/noWeb" + // }) + // break; + // case 3: + // uni.navigateTo({ + // url: "/pages/moreFun/noWeb" + // }) + // break; + // case 4: + // uni.navigateTo({ + // url: "/pages/moreFun/noWeb" + // }) + // break; + // case 5: + // uni.navigateTo({ + // url: "/pages/moreFun/noWeb" // }) // break; } diff --git a/src/pages/my/My.vue b/src/pages/my/My.vue index 54b42df..89ffa05 100644 --- a/src/pages/my/My.vue +++ b/src/pages/my/My.vue @@ -61,7 +61,7 @@ - + diff --git a/src/pages/my/OrderActControl.vue b/src/pages/my/OrderActControl.vue index 6497a99..5cfe823 100644 --- a/src/pages/my/OrderActControl.vue +++ b/src/pages/my/OrderActControl.vue @@ -1,20 +1,18 @@