Merge remote-tracking branch 'origin/main'

App.vue

@@ -30,10 +30,7 @@
 </script>
 
 <style lang="scss">
-page{
-    background-color: #FBFBFB;
 
-}
 /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 @import "uview-plus/index.scss";
 @import '@/static/scss/index.scss';

manifest.json

@@ -35,14 +35,17 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             "sdkConfigs" : {
                 "oauth" : {
                     "weixin" : {
                         "appid" : "wxae7a0c156da9383b",
                         "UniversalLinks" : ""
                     }
-                }
+                },
+                "ad" : {}
             }
         }
     },

pages.json

@@ -273,6 +273,20 @@
 				"navigationBarTitleText": "组件"
 			}
 		}
+		,
+		{
+			"path": "pages/takeaway/index",
+			"style": {
+				"navigationBarTitleText": "外卖"
+			}
+		}
+		,
+		{
+			"path": "pages/partJob/index",
+			"style": {
+				"navigationBarTitleText": "兼职"
+			}
+		}
 
 	],
 	"tabBar": {
@@ -282,20 +296,34 @@
 		"backgroundColor": "#ffffff",
 		"list": [{
 			"pagePath": "pages/index",
-			"iconPath": "static/images/tabbar/home.png",
+			"iconPath": "static/images/tabbar/tu1-2.png",
-			"selectedIconPath": "static/images/tabbar/home_.png",
+			"selectedIconPath": "static/images/tabbar/tu1-1.png",
 			"text": "首页"
 		}, {
 			"pagePath": "pages/activity/index",
 			"iconPath": "static/images/tabbar/tu1-4.png",
 			"selectedIconPath": "static/images/tabbar/tu1-3.png",
 			"text": "活动"
-		}, {
+		}
-			"pagePath": "pages/work/index",
+		// , {
-			"iconPath": "static/images/tabbar/work.png",
+		// 	"pagePath": "pages/work/index",
-			"selectedIconPath": "static/images/tabbar/work_.png",
+		// 	"iconPath": "static/images/tabbar/work.png",
-			"text": "工作台"
+		// 	"selectedIconPath": "static/images/tabbar/work_.png",
-		}, {
+		// 	"text": "工作台"
+		// }
+		,{
+			"pagePath": "pages/partJob/index",
+		     "iconPath": "static/images/tabbar/tu1-6.png",
+		 	"selectedIconPath": "static/images/tabbar/tu1-5.png",
+		 	"text": "兼职"
+		}
+		,{
+			"pagePath": "pages/takeaway/index",
+		     "iconPath": "static/images/tabbar/tu1-8.png",
+		 	"selectedIconPath": "static/images/tabbar/tu1-7.png",
+		 	"text": "外卖"
+		}
+		, {
 			"pagePath": "pages/mine/index",
 			"iconPath": "static/images/tabbar/tu1-10.png",
 			"selectedIconPath": "static/images/tabbar/tu1-9.png",

pages/activity/index.vue

@@ -225,6 +225,10 @@ function toESearch() {
 
 </script>
 <style lang="scss">
+page{
+    background-color: #FBFBFB;
+
+}
 .fixed-header {
     overflow: auto;
 }

pages/activity/info.vue

@@ -261,7 +261,7 @@ const toqrcode = (e) => {
     }
 
     .cardx {
-
+        margin-top: 48rpx;
         .image {
             width: 686rpx;
             height: 720rpx;
@@ -332,7 +332,6 @@ const toqrcode = (e) => {
     /* 底部对齐 */
     border-top: 1px solid #ccc;
     /* 上边框 */
-
     background-color: white;
     /* 背景色设置为白色，防止透明背景导致内容重叠可见 */
     z-index: 10;

pages/common/talkState/audit.vue

@@ -78,7 +78,7 @@ const leftClick = () => {
 }
 
 .text {
-    font-weight: 400;
+    font-weight: 600;
 
     font-size: 48rpx;
     text-align: left;
@@ -94,7 +94,7 @@ const leftClick = () => {
     align-items: center;
 }
 .fbText{
-font-weight: 400;
+font-weight: 600;
 
 font-size: 30rpx;
 text-align: left;

pages/mine/index.vue

@@ -1,7 +1,8 @@
 <template>
   <view>
     <view class="cards">
-      <image class="bg" :src="bjt"></image>
+      <image class="bg" :src="bjt" v-if="!name"></image>
+      <image class="bg" :src="bjt2" v-else></image>
       <view>
         <view v-if="!name">
           <view class="userInfoNot" @click="handleToLogin">
@@ -75,9 +76,11 @@
 import { useStore } from 'vuex'
 import { useRouter } from 'vue-router'
 import { ref, getCurrentInstance } from 'vue';
+import { getDicts } from "@/api/system/dict/data";
 const { proxy } = getCurrentInstance();
 const iconConfig = proxy.iconConfig;
 const bjt = iconConfig.bjt;
+const bjt2 = iconConfig.bjt2;
 //+更多
 const gd11 = iconConfig.gd11;
 const gd12 = iconConfig.gd12;

pages/partJob/index.vue

@@ -0,0 +1,19 @@
+<template class="content">
+    <view class="fixed-header">
+兼职
+    </view>
+</template>
+<script setup>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/activityInfo/info";
+import ActiInfoList from '../common/activityList/index.vue'
+import { onShow, onLoad ,onPullDownRefresh} from '@dcloudio/uni-app'
+import { getDicts } from "@/api/system/dict/data"
+import { ref, reactive, getCurrentInstance, toRefs } from 'vue'
+import { useStore } from 'vuex';
+import { func } from "uview-plus/libs/function/test";
+const { proxy } = getCurrentInstance();
+
+</script>
+<style lang="scss">
+
+</style>

pages/takeaway/index.vue

@@ -0,0 +1,19 @@
+<template class="content">
+    <view class="fixed-header">
+外卖
+    </view>
+</template>
+<script setup>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/activityInfo/info";
+import ActiInfoList from '../common/activityList/index.vue'
+import { onShow, onLoad ,onPullDownRefresh} from '@dcloudio/uni-app'
+import { getDicts } from "@/api/system/dict/data"
+import { ref, reactive, getCurrentInstance, toRefs } from 'vue'
+import { useStore } from 'vuex';
+import { func } from "uview-plus/libs/function/test";
+const { proxy } = getCurrentInstance();
+
+</script>
+<style lang="scss">
+
+</style>

utils/icon/icon.js

@@ -33,6 +33,7 @@ const sb2x1 = ref(QNDomain + "home/icon/image/png/审核失败@2x1_2024060510110
 //我的界面
 //+背景图
 const bjt = ref(QNDomain + "home/icon/image/png/bjtu_20240608121940341.png");
+const bjt2 = ref(QNDomain + "home/icon/image/png/minebackpng2_20240608144208172.png");
 
 //+更多
 const gd11 = ref(QNDomain + "home/icon/image/png/gd11_20240608080819017.png");
@@ -63,7 +64,7 @@ export default {
   sb2x,sb2x1,
 
   //我的界面
-  bjt,
+  bjt,bjt2,
   gd11,gd12,gd13,gd14,gd21,gd22,gd23,gd24,
   ht11,ht12,ht13,ht14,ht15,
   hd11,hd12,hd13,hd14,hd15,