Merge branch 'iteration-20240827' into online

src/views/message/api.ts

@@ -201,6 +201,7 @@ export const appSendConfigSave = (params: object) => {
   return request({
     url: '/cbs-app/appSendConfig/save',
     method: 'post',
+    noCleanDeep: true,
     data: params
   } as any)
 }
@@ -212,6 +213,7 @@ export const appSendConfigUpdate = (params: object) => {
   return request({
     url: '/cbs-app/appSendConfig/update',
     method: 'post',
+    noCleanDeep: true,
     data: params
   } as any)
 }

src/views/message/message-config/push/modal/push-config-edit.tsx

@@ -24,7 +24,7 @@ export default defineComponent({
   setup(props, {slots, attrs, emit}) {
     const message = useMessage()
     const btnLoading = ref(false)
-    const forms = reactive({
+    const forms = reactive<any>({
       name: null, // 平台名称
       sender: null, // 平台标识
       appKey: null, // 应用端
@@ -35,6 +35,7 @@ export default defineComponent({
       password: null, // 接入密码
       timeToLive: null as any, // 离线保存时长
       extendData: null, // 扩展参数
+      thirdPartyChannel: null, // 三方渠道参数
       deviceType: null, // 设备类型
     })
     const formsRef = ref()
@@ -58,6 +59,7 @@ export default defineComponent({
         forms.timeToLive = Number.parseFloat(state.rowData.timeToLive)/3600
         forms.accessUrl = state.rowData.accessUrl
         forms.extendData = state.rowData.extendData
+        forms.thirdPartyChannel = state.rowData.thirdPartyChannel
         forms.deviceType = state.rowData.deviceType
       }
       // 客户端
@@ -309,6 +311,25 @@ export default defineComponent({
                   />
                 </NFormItemGi>
               </NGrid>
+              <NGrid cols={1}>
+                <NFormItemGi
+                    label="三方渠道参数"
+                    path="thirdPartyChannel"
+                    rule={[
+                      {
+                        required: false,
+                        message: '请输入三方渠道参数'
+                      }
+                    ]}
+                >
+                  <NInput
+                      v-model:value={forms.thirdPartyChannel}
+                      placeholder="请输入三方渠道参数"
+                      autosize={{minRows: 3}}
+                      type={'textarea'}
+                  />
+                </NFormItemGi>
+              </NGrid>
             </NForm>
 
             <NSpace justify="end">

src/views/message/message-config/push/push-config.tsx

@@ -204,6 +204,13 @@ export default defineComponent({
           }
         },
         {
+          title: '三方渠道参数',
+          key: 'thirdPartyChannel',
+          render(row: any) {
+            return <TheTooltip content={row.thirdPartyChannel} />
+          }
+        },
+        {
           title: '状态',
           key: 'status',
           render(row: any) {

vite.config.ts

@@ -21,7 +21,7 @@ function pathResolve(dir: string) {
 // const proxyUrl = 'https://dev.lexiaoya.cn'
 // const proxyUrl = 'http://127.0.0.1:7293/'
 // const proxyUrl = 'https://resource.colexiu.com/'
-const proxyUrl = 'https://dev.resource.colexiu.com/'
+const proxyUrl = 'https://test.resource.colexiu.com/'
 // https://test.resource.colexiu.com/
 
 export default ({ command, mode }: ConfigEnv): UserConfig => {