Merge remote-tracking branch 'origin/main' into main

packages/app/src/pages/messages/index.vue

@@ -175,6 +175,12 @@ onShow(async () => {
     pageHelperRef.value?.reload()
   })
 })
+onLoad(async (query)=>{
+	console.log(query)
+	if(query.tab){
+		tab.value = Number(query.tab)
+	}
+})
 </script>
 
 <template>

packages/merchant/src/pages/agent/designer/archives/basic-info/index.vue

@@ -11,6 +11,7 @@ import {
   getDesignerBasicInfo,
   updateDesignerBasicInfo,
 } from '../../../../../core/libs/agent-requests'
+import { getByDictType } from '../../../../../core/libs/requests'
 import { messages } from '../../../../../core/libs/messages'
 import BottomAppBar from '@/components/bottom-app-bar.vue'
 import DataForm from '@/components/data-form.vue'
@@ -30,6 +31,7 @@ const tabs = [
   { label: '其他活动信息', value: 'events' },
 ]
 const id = ref()
+const wish = ref()
 const { data: basicData, run: setBasicData } = useRequest(() => getDesignerBasicInfo(id.value))
 const formData = ref({})
 const schema = ref<
@@ -103,12 +105,13 @@ const schema = ref<
     label: messages.objects.designerBasiceInfo.sharingIntent,
     labelWidth: 120,
     props: {
-      columns: [
-        { label: '不愿意', value: 3 },
-        { label: '一般', value: 1 },
-        { label: '愿意', value: 2 },
-        { label: '非常愿意', value: 4 },
-      ],
+      // columns: [
+      //   { label: '不愿意', value: 3 },
+      //   { label: '一般', value: 1 },
+      //   { label: '愿意', value: 2 },
+      //   { label: '非常愿意', value: 4 },
+      // ],
+	  columns: []
     },
   },
   // imageUrl: {
@@ -153,7 +156,11 @@ onLoad(async (query: { id: string }) => {
   await setBasicData()
   formData.value = {
     ...omit(basicData.value, ['sex']),
-  }
+  };
+  let value1 = await getByDictType('sharing_intent_type') 
+  schema.value.sharingIntent!.props!.columns = value1.data
+  // console.log(value1)
+  console.log(schema.value.sharingIntent.props?.columns)
 })
 </script>
 <template>

packages/merchant/src/pages/login/index.vue

@@ -22,7 +22,12 @@ const formData = ref({
   socialState: '9b2ffbc1-7425-4155-9894-9d5c08541d62',
   socialCodeValid: true,
 })
+const agree = ref(false)
 const handleLogin = async () => {
+  if(!agree.value){
+	  await uni.showToast({ title: "请勾选阅读并同意服务使用协议",icon:"none" })
+	  return false
+  }	
   const { msg, code, data } = await login(formData.value)
   if (code !== 0) {
     await uni.showToast({ title: msg })
@@ -34,6 +39,9 @@ const handleLogin = async () => {
     uni.reLaunch({ url: '/pages/home/index' })
   }
 }
+const agreeChange = ({ value }) =>{
+	agree.value = value
+}
 onLoad(() => {
   if (isLogined.value) {
     uni.reLaunch({ url: '/pages/home/index' })
@@ -79,9 +87,10 @@ onShareAppMessage(async () => ({}))
       <div class="w-full mt-[50px]">
         <wd-button block :round="false" @click="handleLogin">登录</wd-button>
       </div>
-      <div class="mt-8">
+      <div class="mt-8 flex">
+		<wd-checkbox :modelValue="agree" shape="circle" @change="agreeChange"></wd-checkbox> 
         <span class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-tight">
-          登录即代表您已阅读并同意筑巢荟的
+          我已阅读并同意筑巢荟的
         </span>
         <span
           class="text-[#2357e9] text-xs font-normal font-['PingFang_SC'] leading-tight"