This commit is contained in:
lnn19986213
parent
70784337c0
commit
7c317cdb10
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket"
|
||||
|
||||
// import vConsole from './vconsole/index'
|
||||
|
|
@ -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" : {
|
||||
|
|
|
|||
|
|
@ -487,7 +487,8 @@
|
|||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "点单管理",
|
||||
"enablePullDownRefresh": false
|
||||
"enablePullDownRefresh": true,
|
||||
"onReachBottomDistance": 20
|
||||
}
|
||||
|
||||
},
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<view class="item_li">
|
||||
<view class="standard">
|
||||
<image class="icon" src="../../static/detailIcon/icon4.png" mode="scaleToFill"></image>
|
||||
<text>活动报名时间:</text>
|
||||
<text>报名时间:</text>
|
||||
</view>
|
||||
<view class="content"> {{serveList.bmTime}}~{{serveList.ebmTime}} </view>
|
||||
</view>
|
||||
|
|
@ -48,7 +48,8 @@
|
|||
<image class="icon" src="../../static/detailIcon/icon6.png" mode="scaleToFill"></image>
|
||||
<text> 活动人数:</text>
|
||||
</view>
|
||||
<view class="content"><text style=" color: #99241B;"> {{serveList.hdBmCount}}</text>/{{serveList.hdCount}} </view>
|
||||
<view class="content"><text style=" color: #99241B;">
|
||||
{{serveList.hdBmCount}}</text>/{{serveList.hdCount}} </view>
|
||||
</view>
|
||||
<view class="title">
|
||||
<image class="icon" src="../../static/detailIcon/icon0.png" mode="scaleToFill"></image>
|
||||
|
|
@ -57,16 +58,17 @@
|
|||
<view class="item_li">
|
||||
<view class="standard">
|
||||
<image class="icon" src="../../static/detailIcon/icon4.png" mode="scaleToFill"></image>
|
||||
<text>志愿者报名时间:</text>
|
||||
<text>报名时间:</text>
|
||||
</view>
|
||||
<view class="content"> {{serveList.zyzTime}}~{{serveList.ezyzTime}} </view>
|
||||
</view>
|
||||
<view class="item_li">
|
||||
<view class="standard">
|
||||
<image class="icon" src="../../static/detailIcon/icon6.png" mode="scaleToFill"></image>
|
||||
<text>志愿者招募数量:</text>
|
||||
<text>招募数量:</text>
|
||||
</view>
|
||||
<view class="content"><text style=" color: #99241B;">{{serveList.zyzBmCount}}</text>/{{serveList.zyzCount}}</view>
|
||||
<view class="content"><text
|
||||
style=" color: #99241B;">{{serveList.zyzBmCount}}</text>/{{serveList.zyzCount}}</view>
|
||||
</view>
|
||||
<view class="title">
|
||||
<image class="icon" src="../../static/detailIcon/icon0.png" mode="scaleToFill"></image>
|
||||
|
|
@ -82,31 +84,39 @@
|
|||
</view>
|
||||
</view>
|
||||
<u-gap height="80" bgColor="#fff"></u-gap>
|
||||
<view v-if="hdStatus == '0'" >
|
||||
<view v-if="hdStatus == '0'">
|
||||
<view class="operation" v-if="userType == 'fws'">
|
||||
<button type="default" class="apply" v-if="serveList.isGm && serveList.gmState == 0">已申请，审核中</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 1" @click="toGm(1)">上传物资照片</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 1"
|
||||
@click="toGm(1)">上传物资照片</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 2">验收中</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 3">已验收</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == null" @click="toGm(0)">申请冠名</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == null"
|
||||
@click="toGm(0)">申请冠名</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.isGm == false">此活动不接受冠名</button>
|
||||
</view>
|
||||
<view class="operation" v-else>
|
||||
<button type="default" class="apply" @click="baoMingQX(0)" v-if="serveList.hdbm && serveList.hdqxbm == false">取消活动报名</button>
|
||||
<button type="default" class="apply" @click="baoMing(0)" v-else-if="serveList.hdbm == false && serveList.hdqxbm == false">活动报名</button>
|
||||
<button type="default" class="apply" v-else-if="serveList.hdbm == false && serveList.hdqxbm">活动已无法报名</button>
|
||||
<button type="default" class="collection" @click="baoMingQX(1)" v-if="serveList.zyzbm && serveList.zyzqxbm == false">取消志愿者报名</button>
|
||||
<button type="default" class="collection" @click="baoMing(1)" v-else-if="serveList.zyzbm == false && serveList.zyzqxbm == false">志愿者报名</button>
|
||||
<button type="default" class="collection" v-else-if="serveList.zyzbm == false && serveList.zyzqxbm">已无法报名志愿者</button>
|
||||
<button type="default" class="apply" @click="baoMingQX(0)"
|
||||
v-if="serveList.hdbm && serveList.hdqxbm == false">取消活动报名</button>
|
||||
<button type="default" class="apply" @click="baoMing(0)"
|
||||
v-else-if="serveList.hdbm == false && serveList.hdqxbm == false">活动报名</button>
|
||||
<button type="default" class="apply"
|
||||
v-else-if="serveList.hdbm == false && serveList.hdqxbm">活动已无法报名</button>
|
||||
<button type="default" class="collection" @click="baoMingQX(1)"
|
||||
v-if="serveList.zyzbm && serveList.zyzqxbm == false">取消志愿者报名</button>
|
||||
<button type="default" class="collection" @click="baoMing(1)"
|
||||
v-else-if="serveList.zyzbm == false && serveList.zyzqxbm == false">志愿者报名</button>
|
||||
<button type="default" class="collection"
|
||||
v-else-if="serveList.zyzbm == false && serveList.zyzqxbm">已无法报名志愿者</button>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else>
|
||||
<view class="operation" v-if="userType == 'fws'">
|
||||
<button type="default" class="apply-A">活动冠名</button>
|
||||
<button type="default" class="apply-A" @click="grayGm()">活动冠名</button>
|
||||
</view>
|
||||
<view class="operation" v-else>
|
||||
<button type="default" class="apply-A" >活动报名</button>
|
||||
<button type="default" class="collection-A">志愿者报名</button>
|
||||
<button type="default" class="apply-A" @click="grayBm()">活动报名</button>
|
||||
<button type="default" class="collection-A" @click="grayBm()">志愿者报名</button>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 取消报名-原因 -->
|
||||
|
|
@ -120,11 +130,13 @@
|
|||
<view style="margin: 0 32rpx 32rpx;">
|
||||
<u--input placeholder="请输入内容" border="surround" v-model="value"></u--input>
|
||||
</view>
|
||||
<view style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
|
||||
<view
|
||||
style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center;" @click="close">
|
||||
取消
|
||||
</view>
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #3F84FD;" @click="sure">
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #3F84FD;"
|
||||
@click="sure">
|
||||
确定
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -138,11 +150,13 @@
|
|||
取消报名后无法再报名此活动，是否确认取消报名？
|
||||
</view>
|
||||
</view>
|
||||
<view style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
|
||||
<view
|
||||
style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center;" @click="closeS">
|
||||
取消
|
||||
</view>
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #3F84FD;" @click="sureS">
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #3F84FD;"
|
||||
@click="sureS">
|
||||
确定
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -156,11 +170,13 @@
|
|||
若报名后不参加，将会扣除文艺积分（-10）噢～
|
||||
</view>
|
||||
</view>
|
||||
<view style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
|
||||
<view
|
||||
style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center;" @click="closeH">
|
||||
取消
|
||||
</view>
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #3F84FD;" @click="sureH">
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #3F84FD;"
|
||||
@click="sureH">
|
||||
确定
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -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",
|
||||
});
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -146,5 +146,6 @@
|
|||
width: 104rpx;
|
||||
height: 104rpx;
|
||||
border-radius: 50%;
|
||||
z-index: 999;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,11 @@
|
|||
<u-loading-page :loading="load"></u-loading-page>
|
||||
</view>
|
||||
<view v-if="load == false">
|
||||
<u-search height=42 margin="0 0 12px 0" searchIconColor="#251B1D" shape="square" :showAction="false"
|
||||
v-model="artValue" placeholder="请输入名家名称" @search='search'></u-search>
|
||||
<view class="search_box">
|
||||
<u-search height=42 margin="0 0 12px 0" searchIconColor="#251B1D" shape="square" :showAction="false"
|
||||
v-model="artValue" placeholder="请输入名家名称" @search='search'></u-search>
|
||||
</view>
|
||||
|
||||
<!-- <u-tabs @click="clickTabs" :list="list1" :activeStyle="{
|
||||
color: '#251B1D',
|
||||
fontWeight: 'bold',
|
||||
|
|
@ -370,6 +373,10 @@
|
|||
background-color: transparent !important;
|
||||
bottom: 2px !important;
|
||||
}
|
||||
.search_box {
|
||||
width: calc(100% - 32px);
|
||||
margin: 0 16px;
|
||||
}
|
||||
|
||||
// page {
|
||||
// width: calc(100% - 32px);
|
||||
|
|
@ -558,6 +565,6 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,16 @@
|
|||
<view class="work_name">
|
||||
{{detailData.name}}
|
||||
</view>
|
||||
<view class="img_box">
|
||||
<view class=" puber" @click="toUser(detailData.user.id,detailData.user.images,detailData.user.userName,detailData.isFollow)">
|
||||
<view class="avtor">
|
||||
<image :src="detailData.user.images" mode=""></image>
|
||||
</view>
|
||||
<view class="autor">
|
||||
{{ detailData.user.userName }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 作品描述 -->
|
||||
<view class="work_desc">
|
||||
{{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%;
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
<view class="operation">
|
||||
<u-button v-if="v.state==1" type="default" plain size="small" color="#AFADB0"> 已完成
|
||||
</u-button>
|
||||
<u-button v-else type="default" plain size="small" color="#99241B"> 去完成</u-button>
|
||||
<u-button v-else type="default" plain size="small" color="#99241B"> 未完成</u-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
<view class="operation">
|
||||
<u-button v-if="v.state==1" type="default" plain size="small" color="#AFADB0"> 已完成
|
||||
</u-button>
|
||||
<u-button v-else type="default" plain size="small" color="#99241B"> 去完成</u-button>
|
||||
<u-button v-else type="default" plain size="small" color="#99241B"> 未完成</u-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
<view class="operation">
|
||||
<u-button v-if="v.state==1" type="default" plain size="small" color="#AFADB0"> 已完成
|
||||
</u-button>
|
||||
<u-button v-else type="default" plain size="small" color="#99241B"> 去完成</u-button>
|
||||
<u-button v-else type="default" plain size="small" color="#99241B"> 未完成</u-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -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){
|
||||
|
|
|
|||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="jifen_box">
|
||||
<view class="jifen_box_itm" @click="gopointsPg">
|
||||
<!-- <view class="jifen_box_itm" @click="gopointsPg">
|
||||
<view class="ji_ico">
|
||||
<image src="../../static/MoneyIco.png" mode=""></image>
|
||||
</view>
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
积分 {{point}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="jifen_box_itm" @click="goOrderDetails">
|
||||
<view class="ji_ico">
|
||||
<image src="../../static/DunIcon.png" mode=""></image>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,18 @@
|
|||
<template>
|
||||
<view>
|
||||
|
||||
<view class="tabss"
|
||||
style="display: flex;justify-content: space-between; align-items: center;background-color: #FFFFFF; ">
|
||||
<view @click="clickTab(1)" :class="{'acttiveSty': tabNum==1}"
|
||||
style="flex: 1; text-align: center;height: 40px; line-height: 40px;">
|
||||
<text>已发布</text>
|
||||
|
||||
</view>
|
||||
<view style="flex: 1;text-align: center;" :class="{'acttiveSty': tabNum==2}" @click="clickTab(2)">
|
||||
<text>已接单</text>
|
||||
|
||||
</view>
|
||||
<view style="flex: 1;text-align: center;" :class="{'acttiveSty': tabNum==3}" @click="clickTab(3)">
|
||||
<text>已完成</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="main">
|
||||
<view class="art_act_itm" v-for="(item,i) in orderList" :key="i" v-if="tabNum==1">
|
||||
<!-- <image src="../../static/icon12.jpg" mode=""></image> -->
|
||||
|
|
@ -24,17 +22,12 @@
|
|||
<view class="title">
|
||||
{{item.title}}
|
||||
</view>
|
||||
|
||||
<view class="tag_sta_end" v-if='item.state=="3"'>
|
||||
已完成
|
||||
</view>
|
||||
<view class="tag_sta_fail" v-if='item.state=="4"'>
|
||||
未接单
|
||||
</view>
|
||||
<!-- <view class="tag_sta_fail" v-if='item.state=="3"'>
|
||||
已结束
|
||||
</view> -->
|
||||
|
||||
<view class="tag_sta_going" v-if='item.state=="1"||item.state=="0"'>
|
||||
进行中
|
||||
</view>
|
||||
|
|
@ -43,13 +36,9 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="act_time">
|
||||
|
||||
活动时间： {{item.createdAt}}
|
||||
</view>
|
||||
<view class="but_box" style="margin-top: 20rpx;" v-if="!(item.state=='4')">
|
||||
|
||||
|
||||
|
||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='!(item.state== "0")'>
|
||||
<u-button icon="photo-fill" shape="circle" text="已传图片" @click="touploadedimg(item.images)">
|
||||
</u-button>
|
||||
|
|
@ -57,22 +46,24 @@
|
|||
<view style="width: 236rpx; margin: 0 10rpx;" v-if='item.state=="1"' @click="done(item.id)">
|
||||
<u-button color="#99241B" shape="circle" text="确认完成"></u-button>
|
||||
</view>
|
||||
|
||||
<view style="width: 236rpx; margin: 0 10rpx;" @click="undone(item.id)" v-if='item.state !="2" && item.state !="3"'>
|
||||
<u-button color="#99241B" shape="circle" text="未完成"></u-button>
|
||||
</view>
|
||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='(item.state== "0")'>
|
||||
<u-button icon="photo-fill" shape="circle" color="#99241B" plain text="图片上传"
|
||||
@click="toUpimgPage(item.id)"></u-button>
|
||||
</view>
|
||||
|
||||
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "2" '>
|
||||
<u-button plain color="#99241B" shape="circle" text="评价" @click="pingjia(i,item.id)">
|
||||
</u-button>
|
||||
</view>
|
||||
|
||||
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "3"'>
|
||||
<!-- <view style="width: 190rpx;margin: 0 10rpx; " > -->
|
||||
<u-button shape="circle" text="已评价" @click="toEvlauedpg(item.id)"></u-button>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view style="margin-top: 50rpx;text-align: center; width: 100%; font-size: 36rpx; font-weight: 600;" v-if="item.state=='4'">
|
||||
活动已逾期
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -87,48 +78,70 @@
|
|||
<view class="tag_sta" v-if="item.state=='0'">
|
||||
已报名
|
||||
</view>
|
||||
|
||||
<view class="tag_sta_end" v-if='item.state=="2"'>
|
||||
已完成
|
||||
</view>
|
||||
|
||||
<view class="tag_sta_going" v-if='item.state=="1"'>
|
||||
进行中
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="act_time">
|
||||
活动时间： {{item.createdAt}}
|
||||
</view>
|
||||
<view class="but_box" style="margin-top: 20rpx;">
|
||||
|
||||
|
||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state== "0"'>
|
||||
<u-button shape="circle" text="取消报名" @click="cancleBM(item.id)"></u-button>
|
||||
</view>
|
||||
|
||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state== "3"'>
|
||||
<u-button shape="circle" text="收到的评价" @click="receiveevlaue(item.id)"></u-button>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<view class="art_act_itm" v-for="(item,i) in orderList" :key="i" v-if="tabNum==3">
|
||||
<!-- <image src="../../static/icon12.jpg" mode=""></image> -->
|
||||
<image :src="item.enclosure" mode="" @click="goActDeat(item.id,1)"></image>
|
||||
<view class="bottom_part" style="padding: 0 12px;">
|
||||
<view class="ddd" style="display: flex; justify-content: space-between; align-items: center;">
|
||||
<view class="title">
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="tag_sta_end">
|
||||
已完成
|
||||
</view>
|
||||
</view>
|
||||
<view class="act_time">
|
||||
活动时间： {{item.createdAt}}
|
||||
</view>
|
||||
<view class="but_box" style="margin-top: 20rpx;">
|
||||
<view style="width: 236rpx;margin: 0 10rpx;">
|
||||
<u-button icon="photo-fill" shape="circle" text="已传图片" @click="touploadedimg(item.images)">
|
||||
</u-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<u-popup :show="showS" @close="closeS" mode="center" :round="10">
|
||||
<view style="width: 640rpx;">
|
||||
<view style="padding: 32rpx;">
|
||||
<view style="font-size: 32rpx; font-weight: 800;">
|
||||
确认接单者未完成或已逾期？
|
||||
</view>
|
||||
</view>
|
||||
<view style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center;" @click="closeS">
|
||||
取消
|
||||
</view>
|
||||
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #3F84FD;" @click="sureS">
|
||||
确定
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
<u-modal :show="show" @close="close()" :closeOnClickOverlay="true">
|
||||
|
||||
<view class="pinContent">
|
||||
<view class="pinContent_itm" v-for='(v,i) in baomingpingjia' :key="i">
|
||||
|
||||
<view class="pinContent_avator">
|
||||
<!-- <image class="pinContent_avator_img" src="../../static/MyBg.png" mode=""></image> -->
|
||||
<image class="pinContent_avator_img" :src="v.image" mode=""></image>
|
||||
|
|
@ -141,30 +154,22 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view slot="confirmButton" style="display: flex; justify-content: center; align-items: center;">
|
||||
<view style="width: 400rpx;">
|
||||
<u-button color="#99241B" shape="circle" text="提交" @click="subEvalue(baomingpingjia)"></u-button>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</u-modal>
|
||||
|
||||
|
||||
<u-modal :show="showShoudao" @close="closeRecive()" title="收到的评价" :closeOnClickOverlay="true">
|
||||
|
||||
<u-rate count=5 v-model='starsvalue' readonly></u-rate>
|
||||
|
||||
<view slot="confirmButton" style="display: flex; justify-content: center; align-items: center;">
|
||||
<view style="width: 400rpx;">
|
||||
<u-button color="#99241B" shape="circle" text="确定" @click="showShoudao=false"></u-button>
|
||||
</view>
|
||||
</view>
|
||||
</u-modal>
|
||||
|
||||
|
||||
<view v-if="!(orderList.length>0)">
|
||||
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
|
||||
<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
|
||||
</u-empty>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -176,6 +181,7 @@
|
|||
return {
|
||||
showShoudao: false,
|
||||
show: false,
|
||||
showS: false,
|
||||
count: 4,
|
||||
value: 2,
|
||||
rate2: 2,
|
||||
|
|
@ -186,27 +192,36 @@
|
|||
}],
|
||||
starvalue: 0,
|
||||
orderList: [],
|
||||
|
||||
tabNum: 1,
|
||||
pingjiaobj: {},
|
||||
baomingpingjia: [],
|
||||
starsvalue: 0
|
||||
|
||||
starsvalue: 0,
|
||||
page: 1,
|
||||
size:20,
|
||||
};
|
||||
},
|
||||
onShow() {
|
||||
this.clickTab(this.tabNum)
|
||||
},
|
||||
// 下拉刷新
|
||||
onPullDownRefresh() {
|
||||
this.clickTab(this.tabNum)
|
||||
setTimeout(function() {
|
||||
uni.stopPullDownRefresh();
|
||||
}, 1000);
|
||||
},
|
||||
//上拉
|
||||
onReachBottom() {
|
||||
this.pages++
|
||||
this.moreOrder();
|
||||
},
|
||||
methods: {
|
||||
receiveevlaue(id) {
|
||||
|
||||
this.showShoudao = true
|
||||
this.http.request('/hallUser/sdpj?id=' + id, {}, "POST").then(res => {
|
||||
if (res.code == 200) {
|
||||
|
||||
this.starsvalue = res.data.evaluate
|
||||
this.showShoudao = true
|
||||
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
|
|
@ -228,7 +243,6 @@
|
|||
})
|
||||
},
|
||||
pingjia(num, id) {
|
||||
console.log("ddd", id)
|
||||
this.show = true
|
||||
this.pingjiaobj = this.orderList[num]
|
||||
let that = this
|
||||
|
|
@ -265,27 +279,28 @@
|
|||
clickTab(num) {
|
||||
this.orderList = []
|
||||
this.tabNum = num
|
||||
this.page = 1
|
||||
if (num == 1) {
|
||||
let that = this
|
||||
this.http.request('/hallUser/ddgl', {}, "GET").then(res => {
|
||||
this.http.request('/hallUser/ddgl', {page:this.page,size:this.size}, "GET").then(res => {
|
||||
if (res.code == 200) {
|
||||
console.log("testdata", res.data)
|
||||
|
||||
res.data.records.forEach(function(item) {
|
||||
if (item.enclosure) {
|
||||
let fileArr = item.enclosure.split(',')
|
||||
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
||||
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
|
||||
'gif' || gs == 'tif' || gs == 'tiff') {
|
||||
item.enclosure = fileArr[0]
|
||||
} else if (gs == 'pdf') {
|
||||
item.enclosure = '../../static/fileImg/pdfB.png'
|
||||
if(res.data.records.length > 0){
|
||||
res.data.records.forEach(function(item) {
|
||||
if (item.enclosure) {
|
||||
let fileArr = item.enclosure.split(',')
|
||||
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
||||
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
|
||||
'gif' || gs == 'tif' || gs == 'tiff') {
|
||||
item.enclosure = fileArr[0]
|
||||
} else if (gs == 'pdf') {
|
||||
item.enclosure = '../../static/fileImg/pdfB.png'
|
||||
}
|
||||
}
|
||||
}
|
||||
that.orderList.push(item)
|
||||
})
|
||||
// that.orderList = res.data.records
|
||||
|
||||
that.orderList.push(item)
|
||||
})
|
||||
}else if(res.data.records.length == 0){
|
||||
this.page--
|
||||
}
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
|
|
@ -294,11 +309,9 @@
|
|||
});
|
||||
})
|
||||
} else if (num == 2) {
|
||||
|
||||
let that = this
|
||||
this.http.request('/hallUser/myHall', {}, "GET").then(res => {
|
||||
if (res.code == 200) {
|
||||
console.log("testdata2", res)
|
||||
this.http.request('/hallUser/myHall', {page:this.page,size:this.size}, "GET").then(res => {
|
||||
if(res.data.records.length > 0){
|
||||
res.data.records.forEach(function(item) {
|
||||
if (item.enclosure) {
|
||||
let fileArr = item.enclosure.split(',')
|
||||
|
|
@ -312,8 +325,121 @@
|
|||
}
|
||||
that.orderList.push(item)
|
||||
})
|
||||
// this.orderList = res.data.records
|
||||
|
||||
}else if(res.data.records.length == 0){
|
||||
this.page--
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
title: e.data.message,
|
||||
icon: "none",
|
||||
});
|
||||
})
|
||||
} else if (num == 3) {
|
||||
let that = this
|
||||
this.http.request('/hallUser/myHall?state=2', {page:this.page,size:this.size}, "GET").then(res => {
|
||||
if(res.data.records.length > 0){
|
||||
res.data.records.forEach(function(item) {
|
||||
if (item.enclosure) {
|
||||
let fileArr = item.enclosure.split(',')
|
||||
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
||||
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
|
||||
'gif' || gs == 'tif' || gs == 'tiff') {
|
||||
item.enclosure = fileArr[0]
|
||||
} else if (gs == 'pdf') {
|
||||
item.enclosure = '../../static/fileImg/pdfB.png'
|
||||
}
|
||||
}
|
||||
that.orderList.push(item)
|
||||
})
|
||||
}else if(res.data.records.length == 0){
|
||||
this.page--
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
title: e.data.message,
|
||||
icon: "none",
|
||||
});
|
||||
})
|
||||
}
|
||||
},
|
||||
moreOrder() {
|
||||
if (this.tabNum == 1) {
|
||||
let that = this
|
||||
this.http.request('/hallUser/ddgl', {page:this.page,size:this.size}, "GET").then(res => {
|
||||
if (res.code == 200) {
|
||||
if(res.data.records.length > 0){
|
||||
res.data.records.forEach(function(item) {
|
||||
if (item.enclosure) {
|
||||
let fileArr = item.enclosure.split(',')
|
||||
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
||||
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
|
||||
'gif' || gs == 'tif' || gs == 'tiff') {
|
||||
item.enclosure = fileArr[0]
|
||||
} else if (gs == 'pdf') {
|
||||
item.enclosure = '../../static/fileImg/pdfB.png'
|
||||
}
|
||||
}
|
||||
that.orderList.push(item)
|
||||
})
|
||||
}else if(res.data.records.length == 0){
|
||||
this.page--
|
||||
}
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
title: e.data.message,
|
||||
icon: "none",
|
||||
});
|
||||
})
|
||||
} else if (this.tabNum == 2) {
|
||||
let that = this
|
||||
this.http.request('/hallUser/myHall', {page:this.page,size:this.size}, "GET").then(res => {
|
||||
if (res.code == 200) {
|
||||
if(res.data.records.length > 0){
|
||||
res.data.records.forEach(function(item) {
|
||||
if (item.enclosure) {
|
||||
let fileArr = item.enclosure.split(',')
|
||||
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
||||
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
|
||||
'gif' || gs == 'tif' || gs == 'tiff') {
|
||||
item.enclosure = fileArr[0]
|
||||
} else if (gs == 'pdf') {
|
||||
item.enclosure = '../../static/fileImg/pdfB.png'
|
||||
}
|
||||
}
|
||||
that.orderList.push(item)
|
||||
})
|
||||
}else if(res.data.records.length == 0){
|
||||
this.page--
|
||||
}
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
title: e.data.message,
|
||||
icon: "none",
|
||||
});
|
||||
})
|
||||
} else if (this.tabNum == 3) {
|
||||
let that = this
|
||||
this.http.request('/hallUser/myHall?state=2', {page:this.page,size:this.size}, "GET").then(res => {
|
||||
if (res.code == 200) {
|
||||
if(res.data.records.length > 0){
|
||||
res.data.records.forEach(function(item) {
|
||||
if (item.enclosure) {
|
||||
let fileArr = item.enclosure.split(',')
|
||||
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
|
||||
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
|
||||
'gif' || gs == 'tif' || gs == 'tiff') {
|
||||
item.enclosure = fileArr[0]
|
||||
} else if (gs == 'pdf') {
|
||||
item.enclosure = '../../static/fileImg/pdfB.png'
|
||||
}
|
||||
}
|
||||
that.orderList.push(item)
|
||||
})
|
||||
}else if(res.data.records.length == 0){
|
||||
this.page--
|
||||
}
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
|
|
@ -373,7 +499,6 @@
|
|||
userId: em.userId
|
||||
})
|
||||
})
|
||||
console.log("ietm", arr)
|
||||
that.http.request('/hallUser/evaluate',
|
||||
arr, "POST").then(res => {
|
||||
if (res.code == 200) {
|
||||
|
|
@ -401,6 +526,26 @@
|
|||
},
|
||||
closeRecive() {
|
||||
this.showShoudao = false
|
||||
},
|
||||
undone(val){
|
||||
this.undoneId = val
|
||||
this.showS = true
|
||||
},
|
||||
closeS(){
|
||||
this.showS = false
|
||||
},
|
||||
sureS(){
|
||||
this.http.request('/hallUser/undone?id=' + this.undoneId, {}, "POST").then(res => {
|
||||
if(res.code == 200){
|
||||
this.clickTab(this.tabNum)
|
||||
this.showS = false
|
||||
}
|
||||
}).catch(e => {
|
||||
uni.showToast({
|
||||
title: e.data.message,
|
||||
icon: "none",
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -499,15 +644,11 @@
|
|||
background-color: #FFFFFF;
|
||||
|
||||
.title {
|
||||
|
||||
height: 88rpx;
|
||||
width: 580rpx;
|
||||
color: #000000;
|
||||
line-height: 88rpx;
|
||||
font-size: 32rpx;
|
||||
font-weight: 600;
|
||||
color: #251B1D;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,17 @@
|
|||
<view class="mainList" v-for="(item,i) in mainList" :key="i">
|
||||
<view class="mainListImg" @click="toDetail(item.id)">
|
||||
<img class='img' :src="item.enclosure" alt="">
|
||||
<view class="imgTags" v-if="item.isBaoming">
|
||||
<u-tag text="已完成" type="success" v-if="item.hallState == '3'"></u-tag>
|
||||
<u-tag text="已逾期" type="error" v-else-if="item.hallState == '4'"></u-tag>
|
||||
<u-tag text="已接单" type="warning" v-else></u-tag>
|
||||
</view>
|
||||
<view class="imgTags" v-else>
|
||||
<u-tag text="招募中" v-if="item.hallState == '1'"></u-tag>
|
||||
<u-tag text="进行中" v-else-if="item.hallState == '2'"></u-tag>
|
||||
<u-tag text="已完成" type="success" v-else-if="item.hallState == '3'"></u-tag>
|
||||
<u-tag text="已逾期" type="error" v-else-if="item.hallState == '4'"></u-tag>
|
||||
</view>
|
||||
</view>
|
||||
<view class="text">
|
||||
<view class="text1">{{item.title}}</view>
|
||||
|
|
@ -85,6 +96,7 @@
|
|||
},
|
||||
onShow() {
|
||||
this.pages = 1
|
||||
this.load = true
|
||||
this.mainList = []
|
||||
this.getData()
|
||||
},
|
||||
|
|
@ -127,6 +139,7 @@
|
|||
this.action = index
|
||||
this.type = val
|
||||
this.pages = 1
|
||||
this.load = true
|
||||
this.mainList = []
|
||||
this.getData()
|
||||
},
|
||||
|
|
@ -198,11 +211,16 @@
|
|||
|
||||
.mainListImg {
|
||||
height: 400rpx;
|
||||
|
||||
position: relative;
|
||||
.img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.imgTags{
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.text {
|
||||
|
|
@ -250,6 +268,7 @@
|
|||
width: 104rpx;
|
||||
height: 104rpx;
|
||||
border-radius: 50%;
|
||||
z-index: 999;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -92,11 +92,18 @@
|
|||
</view>
|
||||
|
||||
<view v-if="isCheck == 0">
|
||||
<view class="orderBtn" v-if="data.isBaoming">
|
||||
<view class="btnQ" @click="baoQ">取消接单</view>
|
||||
<view class="" v-if="data.hallState == 1">
|
||||
<view class="orderBtn" v-if="data.isBaoming">
|
||||
<view class="btnQ" @click="baoQ">取消接单</view>
|
||||
</view>
|
||||
<view class="orderBtn" v-else>
|
||||
<view class="btn" @click="bao">申请接单</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="orderBtn" v-else>
|
||||
<view class="btn" @click="bao">申请接单</view>
|
||||
<view class="" v-else>
|
||||
<view class="orderBtn">
|
||||
<view class="btnQ">已无法接单</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else-if="isCheck == 1">
|
||||
|
|
|
|||
|
|
@ -88,7 +88,17 @@
|
|||
<u-swiper :list="list2" keyName="image" showTitle :autoplay="false" circular @click="goActDeat"></u-swiper>
|
||||
</view>
|
||||
</view>
|
||||
<u-gap height="5" bgColor="#ffffff"></u-gap>
|
||||
<u-gap height="32" bgColor="#ffffff"></u-gap>
|
||||
<view class="not">
|
||||
<view class="notice">
|
||||
本服务由浙江政务服务网、象山县文学艺术界联合会提供
|
||||
</view>
|
||||
<view class="notice">
|
||||
服务咨询热线：<!-- <text class="phone" @click="callPhone()">65712324</text> -->
|
||||
<a href="tel:65712324">打电话</a>
|
||||
</view>
|
||||
</view>
|
||||
<u-gap height="32" bgColor="#ffffff"></u-gap>
|
||||
<tabbar tabbarId='1'></tabbar>
|
||||
</view>
|
||||
|
||||
|
|
@ -132,19 +142,24 @@
|
|||
},
|
||||
{
|
||||
id: 6,
|
||||
imgUrl: '../../static/icon7.png',
|
||||
title: '文艺援助'
|
||||
},
|
||||
{
|
||||
id: 7,
|
||||
imgUrl: '../../static/icon5.png',
|
||||
title: '积分使用'
|
||||
},
|
||||
{
|
||||
id: 8,
|
||||
imgUrl: '../../static/icon1.png',
|
||||
title: '更多功能'
|
||||
imgUrl: '../../static/moreFun/moreFun8.png',
|
||||
title: '文艺之家'
|
||||
},
|
||||
// {
|
||||
// id: 6,
|
||||
// imgUrl: '../../static/icon7.png',
|
||||
// title: '文艺援助'
|
||||
// },
|
||||
// {
|
||||
// id: 7,
|
||||
// imgUrl: '../../static/icon5.png',
|
||||
// title: '积分使用'
|
||||
// },
|
||||
// {
|
||||
// id: 8,
|
||||
// imgUrl: '../../static/icon1.png',
|
||||
// title: '更多功能'
|
||||
// },
|
||||
],
|
||||
enjoyList: [],
|
||||
writerList: [],
|
||||
|
|
@ -308,19 +323,24 @@
|
|||
break;
|
||||
case 6:
|
||||
uni.navigateTo({
|
||||
url: "/pages/literHelp/literHelp"
|
||||
})
|
||||
break;
|
||||
case 7:
|
||||
uni.navigateTo({
|
||||
url: "/pages/MyPoints/MyPoints"
|
||||
})
|
||||
break;
|
||||
case 8:
|
||||
uni.navigateTo({
|
||||
url: "/pages/moreFun/moreFun"
|
||||
url: "/pages/literFamily/literFamily"
|
||||
})
|
||||
break;
|
||||
// case 6:
|
||||
// uni.navigateTo({
|
||||
// url: "/pages/literHelp/literHelp"
|
||||
// })
|
||||
// break;
|
||||
// case 7:
|
||||
// uni.navigateTo({
|
||||
// url: "/pages/MyPoints/MyPoints"
|
||||
// })
|
||||
// break;
|
||||
// case 8:
|
||||
// uni.navigateTo({
|
||||
// url: "/pages/moreFun/moreFun"
|
||||
// })
|
||||
// break;
|
||||
}
|
||||
}
|
||||
,famouserDetaol(val){
|
||||
|
|
@ -339,6 +359,24 @@
|
|||
uni.navigateTo({
|
||||
url:'/pages/ActivitiesDetail/ActivitiesDetail?id=' + id
|
||||
})
|
||||
},
|
||||
callPhone(){
|
||||
uni.makePhoneCall({
|
||||
// 手机号
|
||||
phoneNumber: '65712324',
|
||||
// 成功回调
|
||||
success: (res) => {
|
||||
console.log('调用成功!')
|
||||
},
|
||||
// 失败回调
|
||||
fail: (res) => {
|
||||
console.log('调用失败!')
|
||||
uni.showToast({
|
||||
title: '调用失败!',
|
||||
icon: 'none',
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -431,5 +469,19 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.not{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
.notice{
|
||||
font-size: 24rpx;
|
||||
color: #808DA1;
|
||||
font-weight: 400;
|
||||
line-height: 36RPX;
|
||||
.phone{
|
||||
color: #1492ff;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -460,6 +460,8 @@
|
|||
if (this.qx == 0) {
|
||||
this.http.request('/activityUser/delActivity', data, "POST").then(res => {
|
||||
if (res.code == 200) {
|
||||
this.pages = 1
|
||||
this.list2 = []
|
||||
this.getData()
|
||||
this.showB = false
|
||||
this.showS = false
|
||||
|
|
@ -474,6 +476,8 @@
|
|||
} else if (this.qx == 1) {
|
||||
this.http.request('/activityUser/delZyzActivity', data, "POST").then(res => {
|
||||
if (res.code == 200) {
|
||||
this.pages = 1
|
||||
this.list2 = []
|
||||
this.getData()
|
||||
this.showB = false
|
||||
this.showS = false
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
export default {
|
||||
config: {
|
||||
// baseUrl: "http://192.168.0.57:8080/h5/api", //王锡
|
||||
// baseUrl: "/pre", //俞燕红-跨域
|
||||
baseUrl: "/pre", //俞燕红-跨域
|
||||
// baseUrl: "https://yxx.ydool.net/h5/api", //
|
||||
baseUrl: "/h5/api", //俞燕红 线上
|
||||
// baseUrl: "/h5/api", //俞燕红 线上
|
||||
header: {
|
||||
'Content-Type': 'application/json;charset=UTF-8',
|
||||
// 'Content-Type':'application/x-www-form-urlencoded'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
import Vconsole from 'vconsole'
|
||||
let vConsole = new Vconsole()
|
||||
export default vConsole
|
||||
Loading…
Reference in New Issue