Merge branch 'admin_dev' of http://112.213.107.185:3000/cwg-crm/gypsy-crm-frontend-vu into admin_dev

components/cwg-droplist.vue

@@ -27,7 +27,7 @@
                 :key="index"
                 :command="item.command !== undefined ? item.command : (item.value !== undefined ? item.value : item)"
                 :disabled="item.disabled"
-                @click="emit('menuClick', { value: item, index })"
+                @click="handleMenuClick(item,index)"
               >
                 {{ item.label || item.text || item.title || item }}
               </cwg-droplist-item>
@@ -204,6 +204,14 @@ const handleItemClick = (command) => {
     closeMenu()
   }
 }
+//
+const handleMenuClick = (item,index) => {
+  emit('menuClick', { value: item, index })
+  console.log('menuClick', item, index,'关闭',props.hideOnClick)
+  if (props.hideOnClick) {
+    closeMenu()
+  }
+}
 
 // 暴露给外部或子组件的方法
 defineExpose({

components/cwg-tabel.vue

@@ -220,6 +220,8 @@ const props = defineProps({
     stickyHeader: { type: Boolean, default: true },
     stickyOffset: { type: [String, Number], default: '0' },
     isPages: { type: Boolean, default: false },
+    // 自定义详情的时候，手机端才跳转，pc端不跳转
+    pagesToDetail: { type: Boolean, default: false },
     // 是否显示总计行
     showSummary: { type: Boolean, default: false },
     // 自定义总计数据，若不传则尝试使用 api 响应中的 res.sum
@@ -522,7 +524,12 @@ const toggleRowExpand = (rowIndex) => {
 const openRowDetail = (row) => {
 
     if (props.isPages) {
-        emit('go-pages', row)
+      if (props.pagesToDetail){
+        if (isMobile.value){
+          emit('go-pages', row)
+        }
+      }else {
+      }
     } else if (!isMobile.value) {
         // 只有移动端才打开详情弹窗
         return

pages/ib/components/applyIbDialog.vue

@@ -72,7 +72,7 @@
             </tbody>
           </table>
         </view>
-        <view v-else style="height: 50px"/>
+<!--        <view v-else style="height: 50px"/>-->
       </uni-forms>
     </view>
   </cwg-popup>

pages/ib/linkList.vue

@@ -9,7 +9,7 @@
         </view>
       </view>
       <cwg-tabel ref="tableRef" :columns="columns" :mobilePrimaryFields="mobilePrimaryFields"
-                 :api="listApi" :show-operation="false" :showPagination="true" isPages @goPages="openDetail">
+                 :api="listApi" :show-operation="false" :showPagination="true" isPages pagesToDetail @goPages="openDetail">
         <template #link="{ row }">
           <view class="link-cell">
             <uni-easyinput class="read-input" disabled v-model.trim="row.link"></uni-easyinput>
@@ -268,7 +268,7 @@
   ])
 
   const getGroupNameByLoginType = (loginConfig, loginType) => {
-    if (!loginConfig) return ''
+    if (!loginConfig) return '--'
 
     // 如果 loginConfig 是字符串，尝试解析为数组
     let config = loginConfig
@@ -276,13 +276,13 @@
       try {
         config = JSON.parse(loginConfig)
       } catch (e) {
-        return ''
+        return '--'
       }
     }
 
     // 确保是数组
     if (!Array.isArray(config)) {
-      return ''
+      return '--'
     }
 
     // 查找匹配的 loginType
@@ -293,7 +293,7 @@
         String(item.loginType) === String(loginType)
     })
 
-    return matchedItem ? (matchedItem.groupName || '') : ''
+    return matchedItem ? (matchedItem.groupName || '--') : '--'
   }
 
   const CopyLink = (link) => {
@@ -574,7 +574,6 @@
   }
   // 关闭详情弹窗
   const closeDetail = () => {
-    console.log('asd')
     datailVisible.value = false
     detail.value = {}
   }

pages/ib/recording.vue

@@ -42,7 +42,7 @@
           <text v-if="row.status == 5">
             {{ t('State.Cancelled') }}
           </text>
-          <button v-if="row.status == 1" @click.stop="cancel(row.id)">
+          <button class="cancel-btn" v-if="row.status == 1" @click.stop="cancel(row.id)">
             {{ t('Btn.Cancel') }}
           </button>
         </template>
@@ -78,7 +78,7 @@
     { text: t('Ib.Recording.MaidAdjust'), value: 5 },
     { text: t('Ib.Recording.BelongingAdjust'), value: 6 },
     { text: t('Ib.Recording.CommissionAllocation'), value: 7 },
-    { text: t('Home.page_ib.item8'), value: 8 },
+    { text: t('Custom.Withdraw.Title'), value: 8 },
     { text: t('Ib.Recording.MamHangUndo'), value: 9 },
     { text: t('Home.page_ib.item9'), value: 10 },
     { text: t('Ib.PammManager.title2'), value: 11 },
@@ -249,4 +249,9 @@
       flex: none;
     }
   }
+  .cancel-btn{
+    display: block;
+    width: px2rpx(50);
+    line-height: px2rpx(10) !important;
+  }
 </style>

pages/login/index.vue

@@ -81,6 +81,8 @@
         //  console.log(12112);
       }
     } catch (error) {
+      // console.log(error)
+      uni.showToast({ title: error.msg, icon: 'none' })
       //  console.log(error, 19089);
     }
   }
@@ -192,7 +194,7 @@
                     <text class="bg-secondary-opacity subtitle w-40" v-t="'newLoop.item11'"></text>
                   </view>
                   <view class="title w-700">
-                    {{`${t('newLoop.item12')} `}}
+                    {{ `${t('newLoop.item12')} ` }}
                     <text class="color-white" v-t="'newLoop.item13'"></text>
                   </view>
                   <view class="text-white" v-t="'newLoop.item14'"></view>