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

# Conflicts:
#	src/views/Send/index.vue

src/views/Send/index.vue

@@ -60,10 +60,8 @@ onMounted(async () => {
   }
 })
   
-  
 //切換tab
 watch(() => activeName.value, function (newVal, oldVal) {  
-  
   if (newVal !== oldVal) {
     showFlex(newVal)
   }
@@ -152,6 +150,7 @@ const sendEcard = async () => {
 
   let content = JSON.parse(JSON.stringify(state.value.flexContent))
 
+  console.log('content', JSON.stringify(state.value.flexContent))
   let res
 
   if (activeName.value === '0') {
@@ -321,6 +320,7 @@ const changeTpl = async (val) => {
   .tpl-item {
     width: 150px;
     padding: 10px;
+
     img {
       width: 100%;
     }