From dd1c85f36b3120d0031ce28145d55c94ee848c25 Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Tue, 4 Jun 2024 18:57:45 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                              |   4 +-
 main.js                                |   1 +
 package.json                           |   1 +
 pages.json                             |   8 ++
 pages/activity/publish.vue             | 174 +++++++++++++++++++++++++
 pages/common/activityList/index.vue    |   6 +
 pages/common/file/fileUpload/index.vue |   9 +-
 pages/index.vue                        |  11 +-
 pages/loginInfo/login.vue              |   2 +-
 pages/work/index.vue                   |   3 +
 store/modules/user.js                  |   2 +-
 11 files changed, 212 insertions(+), 9 deletions(-)
 create mode 100644 pages/activity/publish.vue

diff --git a/config.js b/config.js
index c724aeb..1692a89 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 c6877c5..3ff3274 100644
--- a/main.js
+++ b/main.js
@@ -12,6 +12,7 @@ export function createApp() {
   app.config.globalProperties.iconConfig = iconConfig
   app.use(uviewPlus)
   app.use(store)
+
   // app.use(uView)
   install(app)
   return {
diff --git a/package.json b/package.json
index 7cf09d4..0927339 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "dayjs": "^1.11.11",
     "qiniu": "^7.12.0",
     "qiniu-js": "^3.4.2",
+    "quill": "^1.3.7",
     "uview-plus": "^3.2.15"
   }
 }
diff --git a/pages.json b/pages.json
index aa77fb1..6fb4db7 100644
--- a/pages.json
+++ b/pages.json
@@ -56,6 +56,14 @@
 				"navigationBarTextStyle": "white"
 			}
 		}
+		, {
+			"path": "pages/activity/publish",
+			"style": {
+				"navigationBarTitleText": "发布活动",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		}
 		, {
 			"path": "pages/work/index",
 			"style": {
diff --git a/pages/activity/publish.vue b/pages/activity/publish.vue
new file mode 100644
index 0000000..e1c92e0
--- /dev/null
+++ b/pages/activity/publish.vue
@@ -0,0 +1,174 @@
+<template>
+
+    <view>
+        <!-- 顶部导航栏 -->
+        <up-navbar leftText="" title="" :placeholder="true" :safeAreaInsetTop="true" @leftClick="leftClick"
+            :bgColor="bgColor">
+
+            <template #center>
+                <div class="navbarcenter"><span>发布活动</span></div>
+            </template>
+        </up-navbar>
+    </view>
+    <view class="bgc"></view>
+    <view class="cardz">
+        <view class="titleInfo">
+            <up-input placeholder="输入活动标题~（5~20个字）" v-model="title" border="none" maxlength="20" fontSize="34rpx"
+                color="#C0C0C0" clearable></up-input>
+            <view class="xian"></view>
+        </view>
+        <view class="contentInfo">
+            <up-textarea v-model="content" placeholder="输入活动内容
+活动图片最多可发布两张
+输入准确定位可以更好提供活动信息奥！安全指南：请勿发布带有个人信息（如：住址）" count border="none" height="270" maxlength="500"
+                placeholderStyle="color: #c0c0c0;font-size: 30rpx; background:none;"></up-textarea>
+        </view>
+        <view class="cardzfile">
+            <fileUpload v-model="fileList1" :fileTypeInfo="fileTypeInfo1"></fileUpload>
+        </view>
+    </view>
+    <view class="cardx">
+        <up-cell-group :border="false">
+            <up-cell :isLink="true" :center="true">
+                <template #title style="margin-top: 2rpx;width: 100%;height: 30rpx;display: flex;align-items: center;">
+                    <image :src="tu52" style="width: 30rpx; height: 32rpx;"></image>
+                    <span>请选择活动开始时间</span>
+                </template>
+            </up-cell>
+            <up-cell :isLink="true" :center="true">
+                <template #title style="margin-top: 2rpx;width: 100%;height: 30rpx;display: flex;align-items: center;">
+                    <image :src="tu53" style="width: 30rpx; height: 32rpx;"></image>
+                    <span>请选择活动结束时间</span>
+                </template>
+            </up-cell>
+            <up-cell :border="false" :isLink="true" :center="true">
+                <template #title style="margin-top: 2rpx;width: 100%;height: 30rpx;display: flex;align-items: center;">
+                    <image :src="tu51" style="width: 30rpx; height: 32rpx;"></image>
+                    <span>添加活动具体位置</span>
+                </template>
+            </up-cell>
+        </up-cell-group>
+    </view>
+    <view class="cardxx">
+        <up-button    color="#C9F6F5" size="large" shape="circle" @click="publish"><span
+                class="fbText">发布</span></up-button>
+                <view style="width: 26rpx;height: 80rpx;"></view>
+        <up-button  color="#F8F8E3" size="large" shape="circle" @click="draft" style="margin-left: 26rpx;"><span
+                class="cgText">存草稿</span></up-button>
+    </view>
+
+</template>
+<script setup>
+import fileUpload from '../common/file/fileUpload'
+import { onShow, onLoad } from '@dcloudio/uni-app'
+import { ref, reactive, getCurrentInstance } from 'vue'
+import { useStore } from 'vuex';
+const { proxy } = getCurrentInstance();
+const iconConfig = proxy.iconConfig;
+const tu51 = iconConfig.tu51;
+const tu52 = iconConfig.tu52;
+const tu53 = iconConfig.tu53;
+const title = ref('')
+const content = ref('');
+const fileList1 = ref([])
+const fileTypeInfo1 = ref('image')
+const bgColor = ref('');
+bgColor.value = 'rgba(170, 0, 0, 0)'
+
+onLoad((options) => {
+    console.log("页面参数：", options.id);
+})
+const leftClick = () => {
+    proxy.$tab.navigateBack(1)
+}
+const draft = () => {
+    console.log("存草稿");
+}
+const publish = () => {
+    console.log("发布");
+}
+</script>
+<style lang="scss" >
+.navbarcenter {
+    font-weight: 400;
+
+    font-size: 36rpx;
+    text-align: left;
+    color: #000000;
+}
+
+.bgc {
+    width: 100%;
+    height: 500rpx;
+    background: linear-gradient(-180deg, #c9f6f5, #ffffff);
+    position: fixed;
+    top: 0rpx;
+    left: 0rpx;
+    z-index: -1;
+}
+
+.cardz {
+    margin-left: 32rpx;
+    margin-right: 32rpx;
+
+    .titleInfo {
+        margin-top: 40rpx;
+
+        .xian {
+            margin-top: 32rpx;
+            height: 2rpx;
+            border-radius: 1rpx 1rpx 1rpx 1rpx;
+            background: #ffffff;
+        }
+    }
+
+    .contentInfo {
+        margin-top: 46rpx;
+    }
+
+    .cardzfile {
+        background-color: #FFFFFF;
+    }
+}
+
+.cardx {
+    background-color: #FFFFFF;
+    padding-top: 72rpx;
+    margin-left: 32rpx;
+    margin-right: 32rpx;
+
+    .c1 {
+        margin-top: 2rpx;
+        width: 100%;
+        height: 102rpx;
+        display: flex;
+        align-items: center;
+    }
+
+
+
+}
+
+.cardxx {
+    display: flex;
+    margin-left: 32rpx;
+    margin-right: 32rpx;
+    margin-top: 80rpx;
+        
+        .fbText {
+        font-weight: 400;
+        font-size: 30rpx;
+        color: #FBFBFB !important;
+    }
+    
+   
+        
+        .cgText {
+        font-weight: 400;
+        font-size: 30rpx;
+        color: #999999 !important;
+    }
+    
+
+}
+</style>
\ No newline at end of file
diff --git a/pages/common/activityList/index.vue b/pages/common/activityList/index.vue
index 604a63d..05f81c7 100644
--- a/pages/common/activityList/index.vue
+++ b/pages/common/activityList/index.vue
@@ -43,6 +43,12 @@ import { useStore } from 'vuex';
 const emit = defineEmits(['scrolltolower']);
 const { proxy } = getCurrentInstance();
 
+const iconConfig = proxy.iconConfig;
+const tu21 = iconConfig.tu21;
+const tu22 = iconConfig.tu22;
+const tu51 = iconConfig.tu51;
+const tu52 = iconConfig.tu52;
+const tu53 = iconConfig.tu53;
 const props = defineProps({
     modelValue: Array
 });
diff --git a/pages/common/file/fileUpload/index.vue b/pages/common/file/fileUpload/index.vue
index 05079d9..b881eb6 100644
--- a/pages/common/file/fileUpload/index.vue
+++ b/pages/common/file/fileUpload/index.vue
@@ -113,6 +113,7 @@ const afterRead = async (event) => {
 };
 
 const uploadFilePromise = async (fileInfo1, name) => {
+  console.log("fileInfo1:",fileInfo1);
   // 主要目的的拼名字，大小，类型
   let fileNameOld = [0, 1];
   if (fileInfo1.name !== undefined) {
@@ -122,12 +123,14 @@ const uploadFilePromise = async (fileInfo1, name) => {
   fileInfo.name = fileNameOld[0] + "_" + store.state.user.phoneType + "_" + name;
   
   let extension1 = fileInfo1.url.split('.');
+  
   // 防止 h5 报错
-  if (extension1[1] == null) {
-    extension1[1] = fileNameOld[1];
+  if (extension1[1] === undefined) {
+    extension1[1] = fileNameOld[fileNameOld.length-1]; //保证取最后一个
   }
   //主要是为了拼接文件type（video/mp4），因为各端传入的type各有不同
-  fileInfo.type = fileInfo1.type + "/" + extension1[1];
+  fileInfo.type = fileInfo1.type + "/" + extension1[extension1.length-1];
+  console.log("fileInfo.type:",fileInfo);
   fileInfo.extension = extension1[1];
   try {
     const tokenData = await getQNtoken(fileInfo);
diff --git a/pages/index.vue b/pages/index.vue
index ab30ab4..1324aa2 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -10,7 +10,7 @@
 				  <!-- 加号小弹窗 -->
 				  <view class="postTypeContainer" v-if="postTypeOpen">
 				    <view class="postTypeWindow" v-for="(item, index) in postTypeList" :key="index">
-				      <text>{{item}}</text>
+				      <text @click="publishTalk(item)">{{item.lable}}</text>
 				    </view>
 				  </view>
 				</view>
@@ -239,7 +239,7 @@
 				lefther: 0,
 				searchPrerequisite: '热门',
 				postTypeOpen: false,
-				postTypeList: ['发布话题', '发布活动'],
+				postTypeList: [{lable:'发布话题',id:1}, {lable:'发布活动',id:2}],
 				bgColor: 'rgba(170, 0, 0, 0)',
 				searchPrerequisiteList: [
 					'热门', '最新', '筛选3', '筛选4', '筛选5', '筛选6', '筛选7', '筛选8', '筛选9'
@@ -362,6 +362,13 @@
 				console.log()
 				this.$tab.navigateTo('/pages/search/index')
 			},
+			publishTalk(item){
+				console.log()
+				if(item.id === 2){
+					this.$tab.navigateTo('/pages/activity/publish')
+				}
+				
+			},
 			rightClick() {
 				console.log('rightClick');
 			},
diff --git a/pages/loginInfo/login.vue b/pages/loginInfo/login.vue
index a68802d..61b5425 100644
--- a/pages/loginInfo/login.vue
+++ b/pages/loginInfo/login.vue
@@ -85,7 +85,7 @@ const loginSuccess = async () => {
     await store.dispatch('GetInfo')
     await store.dispatch('getQNDomainInfo')
     proxy.$tab.reLaunch('/pages/index');
-   // await store.dispatch('GetUserInfo');
+     store.dispatch('GetUserInfo');
   } catch (error) {
     console.log("获取用户信息失败", error)
   }
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 4d36ed7..dc2b817 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -79,10 +79,13 @@
       </view>
     </view>
 
+
+
   </view>
 </template>
 
 <script setup>
+
 import fileUpload from './../common/file/fileUpload/index.vue'
 import {ref, reactive,getCurrentInstance} from 'vue'
 import { useStore } from 'vuex';
diff --git a/store/modules/user.js b/store/modules/user.js
index bbe78c9..d637a71 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -137,7 +137,7 @@ const user = {
             const avatar =
               user == null || user.avatar == "" || user.avatar == null
                 ? defaultAvatar
-                : baseUrl + user.avatar;
+                : qnDomain + user.avatar;
             const username =
               user == null || user.userName == "" || user.userName == null
                 ? ""

From 08761592e974a706157e18e5e5fdd7d9fa0bf319 Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Tue, 4 Jun 2024 19:06:52 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/index.vue b/pages/index.vue
index 1324aa2..cc3157a 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -365,6 +365,7 @@
 			publishTalk(item){
 				console.log()
 				if(item.id === 2){
+					//todo 判断用户是否有增加活动的接口调用权限
 					this.$tab.navigateTo('/pages/activity/publish')
 				}
 				

From a8e3222a0635a3e51f5e68855732965f343409b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=95=E5=AE=8B?= <1835677847@qq.com>
Date: Tue, 4 Jun 2024 21:40:25 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=9B=9E=E5=AE=B6=E5=81=9A=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           |  68 +++-
 pages/Friend/addfruebd.vue           |  14 +
 pages/Friend/messagenotification.vue |  14 +
 pages/common/navbar/navbar.css       |  13 +
 pages/common/navbar/navbar_nead.vue  |  43 +++
 pages/signln/exchangemall.vue        | 214 +++++++++++++
 pages/signln/exdetail.vue            |  36 +++
 pages/signln/signid.vue              | 451 +++++++++++++++++++++++++++
 pages/signln/signiddetails.vue       |   9 +-
 pages/signln/to.js                   |   9 +
 static/images/sign/1.png             | Bin 0 -> 2900 bytes
 static/images/sign/return.png        | Bin 0 -> 522 bytes
 static/images/sign/返回.png          | Bin 0 -> 627 bytes
 13 files changed, 853 insertions(+), 18 deletions(-)
 create mode 100644 pages/Friend/addfruebd.vue
 create mode 100644 pages/Friend/messagenotification.vue
 create mode 100644 pages/common/navbar/navbar.css
 create mode 100644 pages/common/navbar/navbar_nead.vue
 create mode 100644 pages/signln/exchangemall.vue
 create mode 100644 pages/signln/exdetail.vue
 create mode 100644 pages/signln/signid.vue
 create mode 100644 pages/signln/to.js
 create mode 100644 static/images/sign/1.png
 create mode 100644 static/images/sign/return.png
 create mode 100644 static/images/sign/返回.png

diff --git a/pages.json b/pages.json
index aa77fb1..958769e 100644
--- a/pages.json
+++ b/pages.json
@@ -8,16 +8,14 @@
 		}
 	},
 	"pages": [
-
 		{
-			"path": "pages/index",
-			"style": {
-				"navigationBarTitleText": "若依移动端框架",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+			"path" : "pages/signln/signid",
+			"style" : 
+			{
+				"navigationBarTitleText" : "签到任务",
+				"navigationStyle": "custom"
 			}
 		},
-		
 		{
 			"path": "pages/signln/signiddetails",
 			"style": {
@@ -26,8 +24,31 @@
 			}
 		
 		},
+		{
+			"path" : "pages/signln/exchangemall",
+			"style" : 
+			{
+				"navigationBarTitleText" : "兑换商城",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/signln/exdetail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "兑换商城详情",
+				"navigationStyle": "custom"
+			}
+		},
 		
-
+		{
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "若依移动端框架",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path": "pages/loginInfo/login",
 			"style": {
@@ -129,15 +150,30 @@
 			"style": {
 				"navigationBarTitleText": "添加好友"
 			}
+		},
+		
+		{
+			"path" : "pages/common/navbar/navbar_nead",
+			"style" : 
+			{
+				"navigationBarTitleText" : "navbar"
+			}
+		},
+		{
+			"path" : "pages/Friend/messagenotification",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/Friend/addfruebd",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
-		// {
-		// 	"path": "pages/signln/signiddetails",
-		// 	"style": {
-		// 		"navigationBarTitleText": "签到明细",
-		// 		"navigationStyle": "custom"
-		// 	}
-
-		// }
+		
 	],
 	"tabBar": {
 		"color": "#000000",
diff --git a/pages/Friend/addfruebd.vue b/pages/Friend/addfruebd.vue
new file mode 100644
index 0000000..24e0486
--- /dev/null
+++ b/pages/Friend/addfruebd.vue
@@ -0,0 +1,14 @@
+<!-- 添加好友 -->
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script setup>
+	
+</script>
+
+<style>
+	       
+</style>
diff --git a/pages/Friend/messagenotification.vue b/pages/Friend/messagenotification.vue
new file mode 100644
index 0000000..2c70a35
--- /dev/null
+++ b/pages/Friend/messagenotification.vue
@@ -0,0 +1,14 @@
+<!-- 消息通知 -->
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script setup>
+	
+</script>
+
+<style>
+	       
+</style>
diff --git a/pages/common/navbar/navbar.css b/pages/common/navbar/navbar.css
new file mode 100644
index 0000000..ccc2f35
--- /dev/null
+++ b/pages/common/navbar/navbar.css
@@ -0,0 +1,13 @@
+:deep(.uni-nav-bar-text.data-v-26544265) {
+	font-size: 36rpx;
+	font-weight: 600;
+}
+
+:deep(.uni-icons) {
+	font-family: uniicons;
+	text-decoration: none;
+	text-align: center;
+	width: 31rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+}
\ No newline at end of file
diff --git a/pages/common/navbar/navbar_nead.vue b/pages/common/navbar/navbar_nead.vue
new file mode 100644
index 0000000..b5d4786
--- /dev/null
+++ b/pages/common/navbar/navbar_nead.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="uninavbars">
+		<image :src="leftImage" @click="left_return"></image>
+	</view>
+	<view class="uninavbar">
+		<uni-nav-bar statusBar="false" :fixed="true" :border="false" :background-color=background_color :title="title" />
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		toRefs,
+		defineProps,
+		defineEmits
+	} from "vue";
+
+	const props = defineProps({
+		title: String,
+		background_color:String
+	})
+	const {
+		title,
+		background_color
+	} = toRefs(props)
+
+	let leftImage = ref("../../../static/images/sign/return.png")
+</script>
+
+<style>
+	.uninavbars {
+		position: fixed;
+		z-index: 9999;
+		top: 110rpx;
+		left: 32rpx;
+	}
+
+	.uninavbars>image {
+		width: 31rpx;
+		height: 44rpx;
+		color: #000000;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/signln/exchangemall.vue b/pages/signln/exchangemall.vue
new file mode 100644
index 0000000..a51550c
--- /dev/null
+++ b/pages/signln/exchangemall.vue
@@ -0,0 +1,214 @@
+<!-- 兑换商城 -->
+<template class="content">
+	
+	<navbar_neadVue title="兑换商城"></navbar_neadVue>
+	
+	<view class="view-top">
+		<view class="view-top-rigth-text">
+			<text>我的校园币:{{count}}</text>
+		</view>
+	</view>
+	<view class="cp">
+		<view class="view-content" v-for="(item,index) in arr" :key="index">
+			<view class="content-main">
+				<view class="content-image">
+					<image :src="item.src"></image>
+				</view>
+				<view class="content-text">
+					<view class="text1">
+						{{item.content}}
+					</view>
+					<view class="text-flex">
+
+						<view class="text2">
+							兑换所需
+						</view>
+
+						<view class="text3">
+							<image src="../../static/images/sign/1.png"></image>
+							<text>{{item.count}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive
+	} from "vue";
+	
+	import navbar_neadVue from "../common/navbar/navbar_nead.vue";
+	
+	const count = ref("750");
+	
+	let arr = reactive([{
+			id: 1,
+			src: "https://cbu01.alicdn.com/img/ibank/2019/524/629/11890926425_297889188.jpg",
+			content: "[端午礼盒] 西凤酒52度头曲礼盒 陕西凤香型白酒礼11111111111",
+			count: 700
+		},
+		{
+			id: 2,
+			src: "https://cbu01.alicdn.com/img/ibank/2016/442/823/3216328244_1451018438.jpg",
+			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
+			count: 200
+		},
+		{
+			id: 3,
+			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
+			count: 500
+		},
+		{
+			id: 3,
+			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
+			count: 500
+		},
+		{
+			id: 3,
+			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
+			count: 500
+		},
+		{
+			id: 3,
+			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
+			count: 500
+		},
+		{
+			id: 3,
+			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
+			count: 500
+		},
+	]);
+	
+	function return_left(){
+		console.log("返回事件")
+	}
+</script>
+
+<style>
+	.content {
+		background: #faf9fa;
+	}
+
+	.view-top {
+		/* height: 100rpx; */
+	}
+
+	.view-top-rigth-text {
+		margin-top: 24rpx;
+		margin-left: 479rpx;
+		margin-right: 32rpx;
+	}
+
+	.view-top-rigth-text>text {
+		font-weight: Regular;
+		width: 239rpx;
+		height: 31rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: #000000;
+	}
+
+
+	.cp {
+		display: grid;
+		grid-template-columns: auto auto;
+		margin-left: 32rpx;
+		margin-right: 32rpx;
+		margin-top: 23rpx;
+		grid-column-gap: 26rpx;
+		grid-row-gap: 24rpx;
+	}
+
+	.view-content {
+		width: 330rpx;
+		height: 482rpx;
+		box-sizing: border-box;
+	}
+
+	.content-main {
+		width: 330rpx;
+		height: 482rpx;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		background: #ffffff;
+	}
+
+	.content-image>image {
+		width: 330rpx;
+		height: 330rpx;
+		border-radius: 24rpx 24rpx 0 0;
+		display: block;
+	}
+
+	.content-text {
+		margin-left: 24rpx;
+		margin-top: 24rpx;
+	}
+
+	.text1 {
+		font-weight: Regular;
+		width: 266rpx;
+		height: 54rpx;
+		line-height: 27rpx;
+		font-size: 22rpx;
+		text-align: left;
+		color: #000000;
+
+		overflow: hidden;
+		word-wrap: break-word;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+
+	}
+
+	.text-flex {
+		margin-top: 28rpx;
+		width: 330rpx;
+		height: 20rpx;
+	}
+
+	.text2 {
+		font-weight: Regular;
+		width: 100rpx;
+		height: 20rpx;
+		font-size: 20rpx;
+		text-align: left;
+		color: #999999;
+		line-height: 20rpx;
+		align-items: center;
+		float: left;
+	}
+
+	.text3 {
+		float: right;
+		margin-right: 24rpx;
+		line-height: 19rpx;
+	}
+
+	.text3>image {
+		width: 21rpx;
+		height: 21rpx;
+	}
+
+	.text3>text {
+		font-weight: Regular;
+		width: 41rpx;
+		height: 19rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #f99b46;
+		padding: 1rpx;
+		margin-left: 8rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/signln/exdetail.vue b/pages/signln/exdetail.vue
new file mode 100644
index 0000000..9e300d0
--- /dev/null
+++ b/pages/signln/exdetail.vue
@@ -0,0 +1,36 @@
+<!-- 兑换商城详情 -->
+<template>
+	<view class="uninavbar">
+		<image src="../../static/images/sign/return.png"></image>
+	</view>
+	<view>
+		<image :src="images"></image>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	}
+	from "vue"
+
+	const images = ref("https://cbu01.alicdn.com/img/ibank/2016/442/823/3216328244_1451018438.jpg")
+</script>
+
+<style>
+	.uninavbar {
+		position: absolute;
+		z-index:9999;
+		top: 110rpx;
+		left: 32rpx;
+	}
+	.uninavbar > image{
+		width: 31rpx;
+		height: 44rpx;
+		color: #000000;
+	}
+	view > image {
+		width: 750rpx;
+		height: 500rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/signln/signid.vue b/pages/signln/signid.vue
new file mode 100644
index 0000000..c4dc29a
--- /dev/null
+++ b/pages/signln/signid.vue
@@ -0,0 +1,451 @@
+<!-- 签到任务 -->
+<template>
+	<navbar_neadVue title="签到任务" background_color="#CAF6F5"></navbar_neadVue>
+	<view class="content-top">
+		<view class="top">
+			<view class="top-right-text">
+				<text @click="GoTo()">签到明细</text>
+			</view>
+
+			<view>
+				<view class="top-left-text">
+					<text>{{count}}</text>
+					<text>校园币</text>
+				</view>
+
+				<view class="top-left">
+					<text>我的校园币</text>
+				</view>
+			</view>
+
+			<view class="right-image">
+				<image src="../../static/images/sign/金币.png"></image>
+			</view>
+
+			<view class="content-bottom">
+				<view class="c-bottom">
+					<text>
+						已连续签到<text class="text-1">1</text>天
+					</text>
+				</view>
+			</view>
+
+			<view class="content-bottom-bot">
+				<view class="bot-text">
+					<text>记得去商城兑换礼物奥！</text>
+				</view>
+
+				<view>
+
+					<ul style="display: flex; margin-left: 24rpx;padding-left: 2rpx;margin-top: 48rpx;">
+						<li>
+							<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
+							</image>
+
+							<text style="display: block; font-weight: Regular;
+width: 60rpx;
+height: 22rpx;
+font-size: 24rpx;
+text-align: center;
+color: #7E7E7E;">12日</text>
+						</li>
+
+						<li style="margin-left: 58rpx;">
+							<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
+							</image>
+
+							<text style="display: block; font-weight: Regular;
+						width: 60rpx;
+						height: 22rpx;
+						font-size: 24rpx;
+						text-align: left;
+						padding-right: 4rpx;
+						color: #7E7E7E;">12日</text>
+						</li>
+						
+						<li style="margin-left: 58rpx;">
+							<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
+							</image>
+						
+							<text style="display: block; font-weight: Regular;
+						width: 60rpx;
+						height: 22rpx;
+						font-size: 24rpx;
+						text-align: left;
+						padding-right: 4rpx;
+						color: #7E7E7E;">12日</text>
+						</li>
+						
+						<li style="margin-left: 58rpx;">
+							<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
+							</image>
+						
+							<text style="display: block; font-weight: Regular;
+						width: 60rpx;
+						height: 22rpx;
+						font-size: 24rpx;
+						text-align: left;
+						padding-right: 4rpx;
+						color: #7E7E7E;">12日</text>
+						</li>
+						
+						<li style="margin-left: 58rpx;">
+							<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
+							</image>
+						
+							<text style="display: block; font-weight: Regular;
+						width: 60rpx;
+						height: 22rpx;
+						font-size: 24rpx;
+						text-align: left;
+						padding-right: 4rpx;
+						color: #7E7E7E;">12日</text>
+						</li>
+						<li style="margin-left: 58rpx;">
+							<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
+							</image>
+						
+							<text style="display: block; font-weight: Regular;
+						width: 60rpx;
+						height: 22rpx;
+						font-size: 24rpx;
+						text-align: left;
+						padding-right: 4rpx;
+						color: #7E7E7E;">12日</text>
+						</li>
+					</ul>
+				</view>
+
+			</view>
+
+		</view>
+	</view>
+
+	<!-- 签到任务 -->
+	<view class="task">
+		<view style="height: 60rpx;">
+			<text class="tasktext">签到任务</text>
+		</view>
+
+		<view class="task-content" v-for="(item,index) in arr" :key="index">
+			<view class="task-right">
+				<text>{{item.type}}</text>
+			</view>
+			<view>
+				<text class="c-text">{{item.title}}</text>
+				<image style="width: 21rpx;height: 21rpx;margin-left: 36rpx;" src="../../static/images/sign/1.png">
+				</image>
+				<text class="count-text">{{item.count}}</text>
+			</view>
+			<view class="task-left">
+				<text class="left-text">{{item.content.title}} <text class="left-0text">
+						{{item.content.count}}
+					</text>{{item.content.cuent}}</text>
+			</view>
+		</view>
+
+		<view style="height: 24rpx;"></view>
+
+	</view>
+
+
+	<view>
+
+	</view>
+
+
+</template>
+
+<script setup>
+	import navbar_neadVue from "../common/navbar/navbar_nead.vue";
+	import exchangemall from "./exchangemall.vue"
+
+	//
+	function GoTo() {
+		
+	}
+
+	import {
+		ref,
+		reactive
+	} from "vue";
+	const count = ref("750");
+	const arr = reactive([{
+			id: 1,
+			type: "立即签到",
+			title: "每日签到",
+			count: "+1",
+			content: {
+				title: "点击签到获得每日奖励 ",
+				count: "(" + "0",
+				cuent: "/" + "1" + ")"
+			},
+		},
+		{
+			id: 2,
+			type: "去关注",
+			title: "关注",
+			count: "+2",
+			content: {
+				title: "关注优秀用户得奖励 ",
+				count: "(" + "0",
+				cuent: "/" + "1" + ")"
+			},
+		},
+		{
+			id: 3,
+			type: "去点赞",
+			title: "点赞",
+			count: "+2",
+			content: {
+				title: "点赞话题获取奖励 ",
+				count: "(" + "0",
+				cuent: "/" + "3" + ")"
+			},
+		},
+		{
+			id: 4,
+			type: "去发布",
+			title: "发布话题",
+			count: "+3",
+			content: {
+				title: "点赞话题获取奖励 ",
+				count: "(" + "0",
+				cuent: "/" + "1" + ")"
+			},
+		},
+		{
+			id: 5,
+			type: "立即邀请",
+			title: "邀请新用户",
+			count: "+5",
+			content: {
+				title: "邀请新用户得奖励	 ",
+				count: "",
+				cuent: ""
+			},
+		}
+	])
+</script>
+
+
+
+
+<style scoped>
+	@import '../../pages/common/navbar/navbar.css';
+
+	.content-top {
+		/* height: 424rpx; */
+		height: 502rpx;
+		background: linear-gradient(-180deg, #c9f6f5, #ffffff);
+	}
+
+	.top {
+		margin-left: 32rpx;
+		margin-right: 32rpx;
+	}
+
+	.top-right-text>text {
+		font-weight: Regular;
+		/* width: 95rpx; */
+		height: 24rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #000000;
+		float: right;
+		margin-top: 24rpx;
+	}
+
+	.top-left-text {
+		padding-top: 99rpx;
+		padding-left: 1rpx;
+	}
+
+	.top-left-text>text:first-child {
+		color: #000000;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 48rpx;
+		text-align: left;
+		line-height: 46.29rpx;
+	}
+
+	.top-left-text>text:last-child {
+		color: #000000;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 28rpx;
+		text-align: left;
+		line-height: 46.29rpx;
+	}
+
+	.top-left>text {
+		display: block;
+		font-weight: Regular;
+		/* width: 119rpx; */
+		font-size: 24rpx;
+		text-align: left;
+		color: #6F6F6F;
+		padding-left: 1rpx;
+		line-height: 24rpx;
+	}
+
+	.right-image>image {
+		width: 248rpx;
+		height: 289rpx;
+		position: absolute;
+		top: 279rpx;
+		right: 32rpx;
+		z-index: 7;
+	}
+
+	.content-bottom {
+		width: 319rpx;
+		height: 60rpx;
+		border-radius: 20rpx 20rpx 0 0;
+		background: #ffffff;
+		margin-top: 48rpx;
+	}
+
+	.c-bottom {
+		padding-left: 26rpx;
+		padding-top: 8rpx;
+	}
+
+	.c-bottom>text:first-child {
+		color: #000000;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 28rpx;
+		text-align: left;
+		line-height: 46.29rpx;
+	}
+
+	.text-1 {
+		color: #fa3939;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 28rpx;
+		text-align: left;
+		line-height: 46.29rpx;
+	}
+
+	.content-bottom-bot {
+		position: relative;
+		/* 		width: 686rpx; */
+		height: 214rpx;
+		border-radius: 0 32rpx 32rpx 32rpx;
+		background: #ffffff;
+		z-index: 9;
+	}
+
+	.bot-text {
+		padding-left: 24rpx;
+		display: block;
+		/* padding-top: 12rpx; */
+	}
+
+	.bot-text>text {
+		font-weight: Regular;
+		width: 248rpx;
+		height: 24rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #6F6F6F;
+	}
+
+	.task {
+		width: 686rpx;
+		/* height: 484rpx; */
+		border-radius: 32rpx 32rpx 32rpx 32rpx;
+		background: #ffffff;
+		/* background: #fa3939; */
+		margin-left: 32rpx;
+		margin-right: 32rpx;
+		margin-top: 24rpx;
+	}
+
+	.tasktext {
+		display: block;
+		font-weight: Regular;
+		width: 144rpx;
+		height: 36rpx;
+		font-size: 36rpx;
+		text-align: left;
+		color: #000000;
+		padding-top: 24rpx;
+		margin-left: 24rpx;
+	}
+
+	.task-content {
+		margin-left: 24rpx;
+		margin-top: 24rpx;
+	}
+
+	.task-right {
+		margin-top: 16rpx;
+		width: 120rpx;
+		height: 48rpx;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		background: #f99b46;
+		float: right;
+		margin-right: 24rpx;
+	}
+
+	.c-text {
+		font-weight: Regular;
+		width: 95rpx;
+		height: 24rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #000000;
+	}
+
+	.count-text {
+		font-weight: Regular;
+		width: 20rpx;
+		height: 16rpx;
+		font-size: 20rpx;
+		text-align: left;
+		color: #F99B46;
+		padding-left: 3rpx;
+		line-height: 16rpx;
+		vertical-align: middle;
+	}
+
+	.task-right>text {
+		font-weight: Regular;
+		width: 95rpx;
+		height: 25rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #FFFFFF;
+		display: block;
+		margin: auto;
+		text-align: center;
+		line-height: 48rpx;
+	}
+
+	.task-left {
+		/* display: block; */
+		height: 20rpx;
+	}
+
+	.left-text {
+		display: block;
+		color: #999999;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 20rpx;
+		text-align: left;
+		/* margin-top: 12rpx; */
+	}
+
+	.left-0text {
+		color: #fb5c5c;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 20rpx;
+		text-align: left;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/signln/signiddetails.vue b/pages/signln/signiddetails.vue
index ca62781..d3c9c96 100644
--- a/pages/signln/signiddetails.vue
+++ b/pages/signln/signiddetails.vue
@@ -1,6 +1,7 @@
+<!-- 签到明细 -->
 <template>
 	<view class="uninavbar">
-		<uni-nav-bar statusBar="false" :border="false" left-icon="left" title="签到明细" />
+		<uni-nav-bar statusBar="false" :border="false" left-icon="leftIcon" title="签到明细" />
 	</view>
 	<view style="height: 24rpx;"></view>
 	<view class="content" v-for="(item,index) in arr" :key="index">
@@ -20,6 +21,7 @@
 		reactive,
 		ref
 	} from "vue"
+	let leftIcon = ref("../../static/images/sign/return.png")
 	let arr = reactive([{
 			id: 1,
 			text: "每日签到",
@@ -79,7 +81,10 @@
 		height: 44rpx;
 		line-height: 44rpx;
 	}
-
+		
+	*{
+		background-color: #ffffff;;
+	}
 
 	.content {
 		margin-left: 32rpx;
diff --git a/pages/signln/to.js b/pages/signln/to.js
new file mode 100644
index 0000000..dc5a4db
--- /dev/null
+++ b/pages/signln/to.js
@@ -0,0 +1,9 @@
+// 跳转
+
+
+// 打印
+
+
+export function Log(t1){
+	console.log(t1);
+}
\ No newline at end of file
diff --git a/static/images/sign/1.png b/static/images/sign/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..948d92e12fb27821795a9b0bb7b21f37aceda0be
GIT binary patch
literal 2900
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

literal 0
HcmV?d00001

diff --git a/static/images/sign/return.png b/static/images/sign/return.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecd0fbb8b5922517fce918eb640daf68e3842756
GIT binary patch
literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq0018V001lq1^@s6oj_wc00009a7bBm000XU
z000XU0RWnu7ytkPyh%hsR9J<**iDFzQ53-OUp_`67Bnd(2}!e3lTwPL*io8=WW&bC
zhO9^_td!J<*jU+F5H%YMN=m7joe`NN5z1#scr2cjbnfz;Q}6osfA90YxBFab=M>&y
z3cIV&dANb@zfbyX#;XASoDClg&<>MWm4z-8FLQ^Bn2`l9$IAwMI17d2_!*#+Sepr-
z3(yYtFgFWbfkzGaP!<Y1@FPG!U|S}9K0rI%#$XmYNB<ln_-qymJMlU|-(!0wye~jI
zJj0SKbe8@(M(}A2WWj6jv;iN<Lh1jbtz{m{gs(K<>zJK|4r9Clr|wpp8t8Xy$b?(V
zd<}~;;mZN~R`PE3ccO3npaO<njerR(st8zz$3ehH9H<DGiTgo7hhr51u)h)TP|;%;
z!IvQ54K`K;4B}1@(BWi70PW+_SXIDYd<_D|v9%&#srZGj)9)4OvjC%wfUB5R5plE;
zFo9(i0qgNR2>7Px)?vQ>S0Amyg^B<;(FnMU)fEA)lTfF>8cCla+-wA#sR*EbEE|*f
zlJW11;8PGVg)J2UEAb=<=&+|EU;vk*fawMJFWl0f1%~lkf1B~*4=d&o5`T6{tN;K2
M07*qoM6N<$g2sN}DgXcg

literal 0
HcmV?d00001

diff --git a/static/images/sign/返回.png b/static/images/sign/返回.png
new file mode 100644
index 0000000000000000000000000000000000000000..15da290414b86b7d82b9cafea90196f9d2ea9c1a
GIT binary patch
literal 627
zcmV-(0*w8MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%ElET{R9Hv7*8iteK^VvJ&og^hWm8Jol--?kW?Drlt&~zqDWxw;#U=VeL_|bH
z6cG^-5pff7>-K;2C)6)9^IJdeKX92R5A*Zg^JTXA2i~vqoX43%n8O*3MteJ*&Juv%
z-uruNB`9~lEXy%~p8)m)c;&r+`QHH6S`%ZG_`xc1fn}S3)><p2BtEGc&jv8Y448QZ
zz>zxfEP%mau(R9kO8i*ecxymW6n!F+_=zU*R)Fz%ylr)Lb%lsdHH|k042Q!l3kwVK
z<Y(H%8v(4fn_`R-Ki4*18_@6fd%a#y;umtnYXP*@>y=UxzmzLp88Dely3^@Y7Vc`!
zcvXNZ%Tk{FdhU27fHCF=GvAy?d?r9^eN-v+YhLl00AtKuW?o|ETOkB_4cX6{x1qIm
zU5xP$08K=T&bj5>f|=KGQ4}|b=sN%f;I{YvTTaAGfW(Y3*O*xlU1q)$Lim~sQ3)Wi
zq9`t>No)Xc-+M3re63GqfRxIzya+%hv5}b{gb+Tr71RPqOly5!DJ6)_MD)-(_o)q{
zHXu#nY?{PY0FS))ADbc?0n%cgPK&vnh#ouVJ~Tlz2BgJ2nHF;gfG6Jj_jM7i0BI7(
z(<F8=^V1N*yE=&0fV7x$XUJD_L`2V=b8o96vH;Rz9wwq?W-b9d_ujv$g2)Dtn6>s$
zj8P`Bn}}XG=U&f3WCf(fJRp+*u&2s3o*j@Db00H*0r1y*e`T#H`~y*m)*)WNR~!HU
N002ovPDHLkV1hV}7Y+ab

literal 0
HcmV?d00001


From 3ce2661da7b93a564471a067031790018438459e Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Tue, 4 Jun 2024 22:00:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  24 +++++
 pages/common/talkState/audit.vue        |  18 ++++
 pages/common/talkState/auditFailure.vue |  18 ++++
 pages/common/talkState/publish.vue      | 103 +++++++++++++++++++++
 pages/work/index.vue                    | 118 +++++++-----------------
 permission.js                           |  63 ++++++-------
 utils/icon/icon.js                      |   8 +-
 7 files changed, 233 insertions(+), 119 deletions(-)
 create mode 100644 pages/common/talkState/audit.vue
 create mode 100644 pages/common/talkState/auditFailure.vue
 create mode 100644 pages/common/talkState/publish.vue

diff --git a/pages.json b/pages.json
index 6fb4db7..6d1eed5 100644
--- a/pages.json
+++ b/pages.json
@@ -17,6 +17,30 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/common/talkState/publish",
+			"style": {
+				"navigationBarTitleText": "发布活动",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/common/talkState/audit",
+			"style": {
+				"navigationBarTitleText": "审核中",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+			{
+			"path": "pages/common/talkState/auditFailure",
+			"style": {
+				"navigationBarTitleText": "审核不通过",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+			},
 		
 		{
 			"path": "pages/signln/signiddetails",
diff --git a/pages/common/talkState/audit.vue b/pages/common/talkState/audit.vue
new file mode 100644
index 0000000..91ad993
--- /dev/null
+++ b/pages/common/talkState/audit.vue
@@ -0,0 +1,18 @@
+<template>
+    <view>
+
+    </view>
+</template>
+<script setup>
+import { onShow, onLoad } from '@dcloudio/uni-app'
+import { getDicts } from "@/api/system/dict/data"
+import { ref, reactive, getCurrentInstance } from 'vue'
+import { useStore } from 'vuex';
+const emit = defineEmits(['scrolltolower']);
+const { proxy } = getCurrentInstance();
+
+const iconConfig = proxy.iconConfig;
+const tu21 = iconConfig.tu21;
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/pages/common/talkState/auditFailure.vue b/pages/common/talkState/auditFailure.vue
new file mode 100644
index 0000000..91ad993
--- /dev/null
+++ b/pages/common/talkState/auditFailure.vue
@@ -0,0 +1,18 @@
+<template>
+    <view>
+
+    </view>
+</template>
+<script setup>
+import { onShow, onLoad } from '@dcloudio/uni-app'
+import { getDicts } from "@/api/system/dict/data"
+import { ref, reactive, getCurrentInstance } from 'vue'
+import { useStore } from 'vuex';
+const emit = defineEmits(['scrolltolower']);
+const { proxy } = getCurrentInstance();
+
+const iconConfig = proxy.iconConfig;
+const tu21 = iconConfig.tu21;
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/pages/common/talkState/publish.vue b/pages/common/talkState/publish.vue
new file mode 100644
index 0000000..1e6d523
--- /dev/null
+++ b/pages/common/talkState/publish.vue
@@ -0,0 +1,103 @@
+<template>
+    <view>
+
+        <view>
+            <!-- 顶部导航栏 -->
+            <up-navbar leftText="" title="" :placeholder="true" :safeAreaInsetTop="true" @leftClick="leftClick"
+                :bgColor="bgColor">
+
+                <template #center>
+                    <div class="navbarcenter"><span>发布话题</span></div>
+                </template>
+            </up-navbar>
+        </view>
+            <image class="bacimg2" :src="sh2x"></image>
+        <view class="bgc"></view>
+        <view class="cardz">
+            <image :src="sh2x1" class="shenhe2x1"></image>
+            <span class="text">待审核</span>
+        </view>
+        <view style="position: fixed; top: 632rpx; width: 100%; padding-left: 32rpx; padding-right: 32rpx;">
+            <up-button    color="#c0f0ec" size="large" shape="circle" @click="publish"><span
+                class="fbText">继续发布</span></up-button>
+        </view>
+       
+    </view>
+</template>
+<script setup>
+import { onShow, onLoad } from '@dcloudio/uni-app'
+import { getDicts } from "@/api/system/dict/data"
+import { ref, reactive, getCurrentInstance } from 'vue'
+import { useStore } from 'vuex';
+const emit = defineEmits(['scrolltolower']);
+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 leftClick = () => {
+    proxy.$tab.navigateBack(1)
+}
+</script>
+<style lang="scss" scoped>
+.bacimg2 {
+    width: 508rpx;
+    height: 540rpx;
+    position: fixed;
+    top: -100rpx;
+    left: -100rpx;
+}
+
+.navbarcenter {
+    font-weight: 400;
+
+    font-size: 36rpx;
+    text-align: left;
+    color: #000000;
+}
+
+.bgc {
+    width: 100%;
+    height: 500rpx;
+    background: linear-gradient(-180deg, #a3e6df, #ffffff);
+    position: fixed;
+    top: 0rpx;
+    left: 0rpx;
+    z-index: -1;
+}
+
+.shenhe2x1 {
+    width: 232rpx;
+    height: 228rpx;
+    position: fixed;
+    top: 276rpx;
+    left: 260rpx;
+}
+
+.text {
+    font-weight: 400;
+
+    font-size: 48rpx;
+    text-align: left;
+    color: #00CCBE !important;
+    position: fixed;
+    top: 500rpx;
+    left: 300rpx;
+}
+.cardz{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+.fbText{
+font-weight: 400;
+
+font-size: 30rpx;
+text-align: left;
+color: #00CCBE !important;
+}
+</style>
\ No newline at end of file
diff --git a/pages/work/index.vue b/pages/work/index.vue
index dc2b817..ef3b22d 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -14,111 +14,57 @@
     <!-- 宫格组件 -->
     <uni-section title="系统管理" type="line"></uni-section>
     <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false" @change="changeGrid">
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="person-filled" size="30"></uni-icons>
-            <text class="text">用户管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="staff-filled" size="30"></uni-icons>
-            <text class="text">角色管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="color" size="30"></uni-icons>
-            <text class="text">菜单管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="settings-filled" size="30"></uni-icons>
-            <text class="text">部门管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="heart-filled" size="30"></uni-icons>
-            <text class="text">岗位管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="bars" size="30"></uni-icons>
-            <text class="text">字典管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="gear-filled" size="30"></uni-icons>
-            <text class="text">参数设置</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="chat-filled" size="30"></uni-icons>
-            <text class="text">通知公告</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="wallet-filled" size="30"></uni-icons>
-            <text class="text">日志管理</text>
-          </view>
-        </uni-grid-item>
-      </uni-grid>
+
     </view>
-    <fileUpload v-model="fileList1"  :fileTypeInfo="fileTypeInfo1"  ></fileUpload>
-    <fileUpload v-model="fileList1"  :fileTypeInfo="fileTypeInfo2"  ></fileUpload>
-    <view class="album" v-for="(item,index) in fileList1" :key="index">
+    <view>
+      <up-button type="primary" text="待审核" size @click="clickBannerItem(1)"></up-button>
+    </view>
+    <fileUpload v-model="fileList1" :fileTypeInfo="fileTypeInfo1"></fileUpload>
+    <fileUpload v-model="fileList1" :fileTypeInfo="fileTypeInfo2"></fileUpload>
+    <view class="album" v-for="(item, index) in fileList1" :key="index">
       <view class="album__avatar">
-        <image :src="QNDomain+item.furl" mode="" style="width: 32px;height: 32px;"></image>
+        <image :src="QNDomain + item.furl" mode="" style="width: 32px;height: 32px;"></image>
       </view>
     </view>
-
-
-
   </view>
 </template>
 
 <script setup>
 
 import fileUpload from './../common/file/fileUpload/index.vue'
-import {ref, reactive,getCurrentInstance} from 'vue'
+import { ref, reactive, getCurrentInstance } from 'vue'
 import { useStore } from 'vuex';
 const { proxy } = getCurrentInstance();
 const store = useStore();
 const fileTypeInfo1 = ref("image")
 const fileTypeInfo2 = ref("video")
 const QNDomain = store.state.user.QNDomain
-     const current = ref(0)
-     const swiperDotIndex = ref(0)
+const current = ref(0)
+const swiperDotIndex = ref(0)
 
-     const  data = ref( [{
-        image: '/static/images/banner/banner01.jpg'
-      },
-      {
-        image: '/static/images/banner/banner02.jpg'
-      },
-      {
-        image: '/static/images/banner/banner03.jpg'
-      }
-      ])
-      const fileList1 = ref([])
+const data = ref([{
+  image: '/static/images/banner/banner01.jpg'
+},
+{
+  image: '/static/images/banner/banner02.jpg'
+},
+{
+  image: '/static/images/banner/banner03.jpg'
+}
+])
+const fileList1 = ref([])
 
 
-   function clickBannerItem(item) {
-      console.info(item)
-    }
-    function changeSwiper(e) {
-      current.value = e.detail.current
-    }
-    function changeGrid(e) {
-      proxy.$modal.showToast('模块建设中~')
-    }
+function clickBannerItem(item) {
+  if (item === 1) {
+    proxy.$tab.navigateTo('/pages/common/talkState/publish')
+  }
+
+}
+function changeSwiper(e) {
+  current.value = e.detail.current
+}
+
 
 </script>
 
diff --git a/permission.js b/permission.js
index 240b684..805fa42 100644
--- a/permission.js
+++ b/permission.js
@@ -1,41 +1,42 @@
-import { getToken } from '@/utils/auth'
+import { getToken } from "@/utils/auth";
 
 // 登录页面
-const loginPage = "/pages/loginInfo/login"
-  
+const loginPage = "/pages/loginInfo/login";
+
 // 页面白名单
 const whiteList = [
-  '/pages/loginInfo/login', '/pages/register', '/pages/common/webview/index'
-]
+  "/pages/loginInfo/login",
+  "/pages/register",
+  "/pages/common/webview/index",
+];
 
 // 检查地址白名单
 function checkWhite(url) {
-  const path = url.split('?')[0]
-  return whiteList.indexOf(path) !== -1
+  const path = url.split("?")[0];
+  return whiteList.indexOf(path) !== -1;
 }
 
 // 页面跳转验证拦截器
-let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
-list.forEach(item => {
-  uni.addInterceptor(item, {
-    invoke(to) {
-
-      if (getToken()) {
-        if (to.url === loginPage) {
-          console.log("to:",to);
-          uni.reLaunch({ url: "/" })
-        }
-        return true
-      } else {
-        if (checkWhite(to.url)) {
-          return true
-        }
-        uni.reLaunch({ url: loginPage })
-        return false
-      }
-    },
-    fail(err) {
-      console.log("错误信息：",err)
-    }
-  })
-})
\ No newline at end of file
+let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
+// list.forEach((item) => {
+//   uni.addInterceptor(item, {
+//     invoke(to) {
+//       if (getToken()) {
+//         if (to.url === loginPage) {
+//           console.log("to:", to);
+//           uni.reLaunch({ url: "/" });
+//         }
+//         return true;
+//       } else {
+//         if (checkWhite(to.url)) {
+//           return true;
+//         }
+//         uni.reLaunch({ url: loginPage });
+//         return false;
+//       }
+//     },
+//     fail(err) {
+//       console.log("错误信息：", err);
+//     },
+//   });
+// });
diff --git a/utils/icon/icon.js b/utils/icon/icon.js
index 2709241..5caef50 100644
--- a/utils/icon/icon.js
+++ b/utils/icon/icon.js
@@ -9,10 +9,14 @@ const tu51 = ref(QNDomain + "home/icon/image/png/tu5-1_20240601124004353.png")
 const tu52 = ref(QNDomain + "home/icon/image/png/tu5-2_20240601124010403.png")
 const tu53 = ref(QNDomain + "home/icon/image/png/tu5-3_20240601124016641.png")
 const tu23 = ref(QNDomain + "home/icon/image/png/tu2-3_20240602093303793.png")
+//文件上传
 const tu2x = ref(QNDomain + "home/icon/image/png/添加图片@2x_20240603101717136.png")
 
-
+//话题发布-等待审核
+const sh2x = ref(QNDomain + "home/icon/image/png/等待审核@2x_20240604202431502.png")
+const sh2x1 = ref(QNDomain + "home/icon/image/png/等待审核@2x1_20240604202431492.png")
 export default {
   tu21,tu22,tu23,tu2x,
-  tu51,tu52,tu53
+  tu51,tu52,tu53,
+  sh2x,sh2x1
 }
\ No newline at end of file

From c5483524a9b2e4f4262ef9306e2454ed07c6b9a6 Mon Sep 17 00:00:00 2001
From: 26947 <12@1>
Date: Tue, 4 Jun 2024 22:03:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pages.json b/pages.json
index e7516fb..906021f 100644
--- a/pages.json
+++ b/pages.json
@@ -8,6 +8,14 @@
 		}
 	},
 	"pages": [
+		{
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "若依移动端框架",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path" : "pages/signln/signid",
 			"style" :
@@ -41,14 +49,7 @@
 			}
 		},
 
-		{
-			"path": "pages/index",
-			"style": {
-				"navigationBarTitleText": "若依移动端框架",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
-			}
-		},
+
 		{
 			"path": "pages/common/talkState/publish",
 			"style": {
@@ -74,14 +75,7 @@
 			}
 			},
 
-		{
-			"path": "pages/signln/signiddetails",
-			"style": {
-				"navigationBarTitleText": "签到明细",
-				"navigationStyle": "custom"
-			}
 
-		},
 
 
 		{