diff --git a/App.vue b/App.vue
index 24b7205..5ca38e8 100644
--- a/App.vue
+++ b/App.vue
@@ -3,6 +3,7 @@
import store from '@/store'
import { getToken } from '@/utils/auth'
+
export default {
onLaunch: function() {
this.initApp()
diff --git a/config.js b/config.js
index c724aeb..028cde9 100644
--- a/config.js
+++ b/config.js
@@ -4,8 +4,8 @@ export default {
uploadQiNiuDomain: 'https://upload-z2.qiniup.com',
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
// baseUrl: 'http://47.93.242.168:8080',
- baseUrl: 'http://47.93.242.168:8080',
- // baseUrl: 'http://localhost:8080',
+ // baseUrl: 'http://47.93.242.168:8080',
+ baseUrl: 'http://localhost:8080',
// 应用信息
appInfo: {
// 应用名称
diff --git a/main.js b/main.js
index 08620ce..93f4d78 100644
--- a/main.js
+++ b/main.js
@@ -4,6 +4,7 @@ import store from './store' // store
import { install } from './plugins' // plugins
import './permission.js' // permission
import iconConfig from './utils/icon/icon.js'
+import { getDictLabelByValue } from '@/utils/dict'
// main.js
import uviewPlus from 'uview-plus'
@@ -11,6 +12,7 @@ import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, select
export function createApp() {
const app = createSSRApp(App)
app.config.globalProperties.iconConfig = iconConfig
+ app.config.globalProperties.getDictLabelByValue = getDictLabelByValue
app.config.globalProperties.parseTime = parseTime
app.config.globalProperties.resetForm = resetForm
app.config.globalProperties.handleTree = handleTree
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 6591528..4dbf2df 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -275,13 +275,17 @@ page{
}
.bgc {
- width: 750rpx;
- height: 500rpx;
- background: linear-gradient(180deg, rgb(201, 246, 245), rgb(248, 248, 226));
- position: fixed;
- top: 0rpx;
- left: 0rpx;
-
+ width: 750rpx;
+ height: 500rpx;
+ background: linear-gradient(
+ 180deg, /* 渐变方向,从上到下 */
+ #C9F6F5 0%, /* 起始颜色 */
+ #F8F8E2 80%, /* 中间颜色 */
+ #FBFBFB 100% /* 结束颜色 */
+ );
+ position: fixed;
+ top: 0rpx;
+ left: 0rpx;
}
.sousuoBox1 {
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 8ebc9ec..bcbfd64 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -16,7 +16,7 @@
活动地点:{{ actiInfoList.addres }}
-
+
@@ -28,33 +28,43 @@
- 未参加
+
+ 未参加
+
- 已参加
+
+ 已参加
+
- 立即报名
+
+ 立即报名
+
- 扫码签到
+
+ 扫码签到
+
- 已签到
+
+ 已签到
+
- 立即报名
+
+ 立即报名
+
- 取消报名
+
+ 取消报名
+
@@ -211,10 +221,11 @@ const toqrcode = (e) => {
};
diff --git a/pages/common/activityList/index.vue b/pages/common/activityList/index.vue
index 7216e40..690686c 100644
--- a/pages/common/activityList/index.vue
+++ b/pages/common/activityList/index.vue
@@ -16,7 +16,7 @@
结束时间:{{ item.endTime }}
-
+
活动地点:{{ item.addres }}
@@ -97,7 +97,7 @@ onShow(() => {
padding-left: 24rpx;
.titile {
- font-weight: 400;
+ font-weight: 600;
height: 80rpx;
font-size: 32rpx;
diff --git a/pages/common/file/fileUpload/index.vue b/pages/common/file/fileUpload/index.vue
index 72a9130..b4c605b 100644
--- a/pages/common/file/fileUpload/index.vue
+++ b/pages/common/file/fileUpload/index.vue
@@ -10,10 +10,11 @@
name="fileInfowx"
multiple
:previewFullImage="true"
+ width="210rpx"
+ height="210rpx"
>
-
-
+
+
@@ -148,30 +149,7 @@ const uploadFilePromise = async (fileInfo1, name) => {
const uploadQN = (file) => {
return uploadQN1(file.url);
};
-//废弃
-const uploadQN2 = (file) => {
- return new Promise((resolve, reject) => {
- const observable = qiniu.upload(file, dataToken.key, dataToken.token, putExtra, config);
- const subscription = observable.subscribe({
- next(res) {
- console.log("next:", res);
- },
- error(err) {
- console.log("error:", err);
- reject(err);
- },
- async complete(res) {
- console.log("complete:", res);
- form.url = res.key;
- form.name = res.key;
- form.type = res.mimeType;
- form.size = res.fsize;
- await addFileList(form);
- resolve(res.key);
- }
- });
- });
-};
+
//调用uni上传方法
const uploadQN1 = (file) => {
return new Promise((resolve, reject) => {
diff --git a/pages/common/file/fileUpload/index2.vue b/pages/common/file/fileUpload/index2.vue
new file mode 100644
index 0000000..f01d7a9
--- /dev/null
+++ b/pages/common/file/fileUpload/index2.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/common/talkState/audit.vue b/pages/common/talkState/audit.vue
index b064025..f9d1c5b 100644
--- a/pages/common/talkState/audit.vue
+++ b/pages/common/talkState/audit.vue
@@ -35,15 +35,20 @@ const { proxy } = getCurrentInstance();
const iconConfig = proxy.iconConfig;
const sh2x1 = iconConfig.sh2x1;
const sh2x = iconConfig.sh2x;
-const bgColor = ref('');
-bgColor.value = 'rgba(170, 0, 0, 0)'
+const bgColor = ref('rgba(170, 0, 0, 0)');
+
const leftClick = () => {
proxy.$tab.navigateBack(1)
}
-
diff --git a/pages/register.vue b/pages/register.vue
index 293264e..a981a2f 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -111,6 +111,7 @@
registerSuccess(result) {
// 设置用户信息
this.$store.dispatch('GetInfo').then(res => {
+ this.$store.dispatch('GetUserInfo');
this.$tab.reLaunch('/pages/index')
})
}
diff --git a/pages/takeaway/index.vue b/pages/takeaway/index.vue
index 987f156..19f6415 100644
--- a/pages/takeaway/index.vue
+++ b/pages/takeaway/index.vue
@@ -1,19 +1,159 @@
-
-