diff --git a/TUIKit/components/TUIContact/contact-info/index.vue b/TUIKit/components/TUIContact/contact-info/index.vue index 0a9c5f56..ed6769bf 100644 --- a/TUIKit/components/TUIContact/contact-info/index.vue +++ b/TUIKit/components/TUIContact/contact-info/index.vue @@ -301,6 +301,7 @@ const onContactInfoEmitSubmit = (item: any) => { }; const onContactInfoButtonClicked = (item: any) => { + item.onClick && item.onClick({ contactInfoData: contactInfoData.value, @@ -396,6 +397,7 @@ function onUserBlacklistUpdated(userBlacklist: IBlackListUserItem[]) { } async function onCurrentContactInfoUpdated(contactInfo: IContactInfoType) { + console.log('contactInfo-----', contactInfo); if ( contactInfoData.value && contactInfo diff --git a/TUIKit/components/TUIContact/contact-info/style/h5.css b/TUIKit/components/TUIContact/contact-info/style/h5.css new file mode 100644 index 00000000..a557b0bb --- /dev/null +++ b/TUIKit/components/TUIContact/contact-info/style/h5.css @@ -0,0 +1,128 @@ +.tui-contact-info-h5 { + padding: 0; + overflow: hidden; +} + +.tui-contact-info-h5-header { + background-color: #fff; + padding: 10px !important; + display: flex; + flex-direction: row; +} + +.tui-contact-info-h5-header-title { + flex: 1; + text-align: center; + font-weight: 500; + font-size: 14px; + margin-right: 30px; +} + +.tui-contact-info-h5-basic { + padding: 10px !important; + background: #fff; + margin-top: 10px !important; + display: flex; + flex-direction: row-reverse; + justify-content: left; + border-bottom: none; +} + +.tui-contact-info-h5-basic-text-name { + font-size: 20px; + padding-bottom: 1px; +} + +.tui-contact-info-h5-basic-text-other { + font-size: 14px; + padding: 3px 0; +} + +.tui-contact-info-h5-basic-avatar { + border-radius: 10px; + margin-right: 10px; +} + +.tui-contact-info-h5-more { + background: #fff; + margin-top: 10px !important; + overflow: hidden; + padding: 0; +} + +.tui-contact-info-h5-more-item { + width: 100%; + box-sizing: border-box; + overflow: hidden; + padding: 10px !important; + border-bottom: 1px solid #eee; +} + +.tui-contact-info-h5-more-item-label { + color: #000; +} + +.tui-contact-info-h5-more-item-content { + overflow: hidden; + color: #979797; + display: flex; + flex-direction: row; + justify-content: flex-end; +} + +.tui-contact-info-h5-more-item-content-text { + overflow: hidden; + display: flex; + flex-direction: row; +} + +.tui-contact-info-h5-more-item-content-text-data { + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.tui-contact-info-h5-more-item:last-child { + border-bottom: none; +} + +.tui-contact-info-h5-button { + margin-top: 10px !important; + display: flex; + flex-direction: column; + padding: 0; + background-color: #fff; +} + +.tui-contact-info-h5-button-item { + width: 100%; + margin: 0; + border: none; + padding: 16px !important; + font-size: 16px; + border-bottom: 1px solid #eee; + height: fit-content; +} + +.tui-contact-info-h5-button-item::after { + border: none; +} + +.tui-contact-info-h5-button-item-textarea { + background-color: #f8f8f8; +} + +.tui-contact-info-h5-button-item:last-child { + border-bottom: none; +} + +.tui-contact-info-h5-button .tui-contact-info-button-item-cancel { + background-color: #fff; + color: #006eff; +} + +.tui-contact-info-h5-button .tui-contact-info-button-item-submit { + background-color: #fff; + color: #FE3C3C; +} diff --git a/TUIKit/components/TUIContact/contact-info/style/h5.scss b/TUIKit/components/TUIContact/contact-info/style/h5.scss index 440a2798..855e7c0b 100644 --- a/TUIKit/components/TUIContact/contact-info/style/h5.scss +++ b/TUIKit/components/TUIContact/contact-info/style/h5.scss @@ -119,12 +119,13 @@ .tui-contact-info-button-item-cancel { background-color: #fff; - color: #e54545; + color: #006eff; } .tui-contact-info-button-item-submit { background-color: #fff; - color: #006eff; + + color: #FE3C3C; } } } diff --git a/TUIKit/components/TUIConversation/index.vue b/TUIKit/components/TUIConversation/index.vue index aa43da35..533627a1 100644 --- a/TUIKit/components/TUIConversation/index.vue +++ b/TUIKit/components/TUIConversation/index.vue @@ -34,7 +34,7 @@ import { onHide } from '@dcloudio/uni-app'; import './entry.ts'; // #endif -const emits = defineEmits(['handleSwitchConversation']); +const emits = defineEmits(['handleSwitchConversation','state']); const totalUnreadCount = ref(0); const headerRef = ref(); @@ -56,6 +56,7 @@ TUIStore.watch(StoreName.CUSTOM, { }); const handleSwitchConversation = (conversationID: string) => { + emits('state',false); TUIGlobal?.navigateTo({ url: '/TUIKit/components/TUIChat/index', }); diff --git a/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts b/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts index 155bdb6d..8f7a6b00 100644 --- a/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts +++ b/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts @@ -17,9 +17,9 @@ const groupIntroConfig = [ // }, { icon: 'https://web.sdk.qcloud.com/im/assets/images/Work.svg', - label: '好友工作群（Work）', + label: '好友群', type: TUIChatEngine.TYPES.GRP_WORK, - detail: '类似普通微信群，创建后仅支持已在群内的好友邀请加群，且无需被邀请方同意或群主审批。详见', + detail: '类似普通微信群，创建后仅支持已在群内的好友邀请加群，且无需被邀请方同意或群主审批', src: '产品文档', }, // { diff --git a/TUIKit/components/TUIGroup/create-group/index.vue b/TUIKit/components/TUIGroup/create-group/index.vue index 44bd1e01..e5a5b427 100644 --- a/TUIKit/components/TUIGroup/create-group/index.vue +++ b/TUIKit/components/TUIGroup/create-group/index.vue @@ -30,6 +30,7 @@
  • +
    • @@ -205,10 +206,8 @@ const createInfo = computed(() => { ? [groupNameInput] : [groupNameInput, groupIDInput]; }); - const submitDisabledStatus = computed(() => { return groupInfo.profile.name === '' && !groupInfo.isEdit; - }); const selected = (type: any) => { diff --git a/TUIKit/components/TUIGroup/create-group/style/color.css b/TUIKit/components/TUIGroup/create-group/style/color.css new file mode 100644 index 00000000..c1eff5a6 --- /dev/null +++ b/TUIKit/components/TUIGroup/create-group/style/color.css @@ -0,0 +1,102 @@ +.group { + background: #FFF; +} + +.group-list-item { + background: #FFF; +} + +.group-list-item label { + font-family: PingFangSC-Regular; + font-weight: 400; + color: #333; +} + +.group-list input { + border: 1px solid rgba(131, 137, 153, 0.4); + font-weight: 400; + color: #333; +} + +.group-list-edit { + background: #FFF; +} + +.group-profile-footer { + background: #FFF; +} + +.group-h5 { + background: #F7F8FA; +} + +.group-h5-list-item-introduction { + font-family: PingFangSC-Regular; + font-weight: 400; + color: #888; +} + +.group-h5-list-item-introduction a { + color: #006EFF; +} + +.select { + flex: 1; +} + +.select a { + color: #006EFF; +} + +.select-item { + border: 1px solid rgba(131, 137, 153, 0.4); +} + +.select-item-header .left { + font-weight: 500; + color: #333; +} + +.select-item-detail { + color: #4F4F4F; +} + +.select .selected { + border: 1px solid #006EFF; +} + +header { + background: #FFF; +} + +header h1 { + font-family: PingFangSC-Medium; + font-weight: 500; + color: #000; + letter-spacing: 0; +} + +.btn-default { + background: #FFF; + border: 1px solid #DDD; + font-family: PingFangSC-Medium; + font-weight: 500; + color: #828282; +} + +.btn-submit { + width: 100%; + background: #3370FF; + border: 0 solid #2F80ED; + font-family: PingFangSC-Regular; + font-weight: 400; + color: #FFF; + letter-spacing: 0; + background-color: #fe3c3c; +} + +.btn-submit:disabled { + background: #e8e8e9; + border: 1px solid #DDD; + color: #FFF; +} diff --git a/TUIKit/components/TUIGroup/create-group/style/color.scss b/TUIKit/components/TUIGroup/create-group/style/color.scss index 12c50473..db996f88 100644 --- a/TUIKit/components/TUIGroup/create-group/style/color.scss +++ b/TUIKit/components/TUIGroup/create-group/style/color.scss @@ -89,12 +89,14 @@ header { } .btn-submit { + width: 100%; background: #3370FF; border: 0 solid #2F80ED; font-family: PingFangSC-Regular; font-weight: 400; color: #FFF; letter-spacing: 0; + background-color: #fe3c3c; &:disabled { background: #e8e8e9; diff --git a/TUIKit/components/TUIGroup/create-group/style/web.css b/TUIKit/components/TUIGroup/create-group/style/web.css new file mode 100644 index 00000000..c1dab40c --- /dev/null +++ b/TUIKit/components/TUIGroup/create-group/style/web.css @@ -0,0 +1,104 @@ +.group { + padding: 30px; + box-sizing: border-box; + width: 750px; + max-height: calc(100vh - 100px); + overflow-y: auto; + border-radius: 10px; +} + +.group .group-box .group-box-header { + display: flex; + flex-direction: row-reverse; + justify-content: space-between; +} + +.group .group-box .group-box-header .group-box-header-title { + font-size: 18px; + line-height: 30px; +} + +.group-list-item { + display: flex; + padding: 10px 0; +} + +.group-list-item-label { + width: 84px; +} + +.group-list input { + flex: 1; + box-sizing: border-box; + padding: 6px 10px; + border-radius: 2px; + font-size: 14px; + line-height: 20px; +} + +.select { + flex: 1; +} + +.select-item { + padding: 12px 20px !important; + border-radius: 2px; + margin-bottom: 20px !important; +} + +.select-item-header { + display: flex; + justify-content: space-between; +} + +.select-item-header .left { + display: flex; + align-items: center; + font-size: 14px; +} + +.select-item-header .left .icon { + margin-right: 12px; +} + +.select-item-header .icon-selected { + position: relative; + left: 12px; + top: -4px; +} + +.select-item-type { + text-align: left; +} + +.select-item-detail { + padding-top: 6px; + font-size: 14px; +} + +.select-item .link { + display: inline-block; +} + +.group-profile-footer { + padding-top: 10px; + display: flex; + justify-content: flex-end; +} + +.btn-default { + width: 82px; + height: 32px; + border-radius: 4px; + font-size: 14px; + background-color: #fe3c3c; +} + +.btn-submit { + width: 100%; + background-color: #fe3c3c; + height: 32px; + border-radius: 4px; + margin-left: 10px; + font-size: 14px; +} diff --git a/TUIKit/components/TUIGroup/create-group/style/web.scss b/TUIKit/components/TUIGroup/create-group/style/web.scss index 0a1fe080..4537d290 100644 --- a/TUIKit/components/TUIGroup/create-group/style/web.scss +++ b/TUIKit/components/TUIGroup/create-group/style/web.scss @@ -95,10 +95,12 @@ height: 32px; border-radius: 4px; font-size: 14px; + background-color: #fe3c3c; } .btn-submit { - width: 82px; + width: 100%; + background-color: #fe3c3c; height: 32px; border-radius: 4px; margin-left: 10px; diff --git a/TUIKit/components/TUIGroup/manage-group/manage-notification.vue b/TUIKit/components/TUIGroup/manage-group/manage-notification.vue index 802cc2db..a5df7d31 100644 --- a/TUIKit/components/TUIGroup/manage-group/manage-notification.vue +++ b/TUIKit/components/TUIGroup/manage-group/manage-notification.vue @@ -197,11 +197,13 @@ const close = (tabName: string) => { border: 0 solid #2f80ed; padding: 4px 28px; font-weight: 400; - font-size: 12px; + font-size: 14px; color: #fff; line-height: 24px; border-radius: 4px; - + display: flex ; + align-items: center; + background-color: #fe3c3c; &-cancel { background: #fff; border: 1px solid #ddd; @@ -237,7 +239,7 @@ const close = (tabName: string) => { font-family: PingFangSC-Regular; font-weight: 400; font-size: 18px; - color: #3370ff; + color: #fe3c3c; letter-spacing: 0; line-height: 27px; } diff --git a/TUIKit/components/common/Dialog/index.vue b/TUIKit/components/common/Dialog/index.vue index ce0962a3..2109ce9f 100644 --- a/TUIKit/components/common/Dialog/index.vue +++ b/TUIKit/components/common/Dialog/index.vue @@ -35,6 +35,7 @@ diff --git a/TUIKit/components/common/Dialog/style/color.css b/TUIKit/components/common/Dialog/style/color.css new file mode 100644 index 00000000..91066ade --- /dev/null +++ b/TUIKit/components/common/Dialog/style/color.css @@ -0,0 +1,46 @@ +.dialog { + background: rgba(0, 0, 0, 0.6); +} + +.dialog-main { + background: #FFF; +} + +.dialog-main-header { + font-weight: 500; + color: #333; +} + +.dialog-main-title { + font-family: PingFangSC-Medium; + font-weight: 500; + color: #333; +} + +.dialog-main-back { + background: none; +} + +.dialog-main-content { + font-weight: 400; + color: #333; +} + +.btn { + font-weight: 400; + color: #FFF; + letter-spacing: 0; + background-color: #fe3c3c; +} + +.btn-cancel { + border: 1px solid #ddd; + color: #666; + background-color: #fe3c3c; +} + +.btn-default { + background: #006EFF; + border: 1px solid #006EFF; + background-color: #fe3c3c; +} diff --git a/TUIKit/components/common/Dialog/style/color.scss b/TUIKit/components/common/Dialog/style/color.scss index 2130fbd4..2ada635a 100644 --- a/TUIKit/components/common/Dialog/style/color.scss +++ b/TUIKit/components/common/Dialog/style/color.scss @@ -30,14 +30,16 @@ font-weight: 400; color: #FFF; letter-spacing: 0; - + background-color: #fe3c3c; &-cancel { border: 1px solid #ddd; color: #666; + background-color: #fe3c3c; } &-default { background: #006EFF; border: 1px solid #006EFF; + background-color: #fe3c3c; } } diff --git a/TUIKit/components/common/Dialog/style/h5.css b/TUIKit/components/common/Dialog/style/h5.css new file mode 100644 index 00000000..6824e58d --- /dev/null +++ b/TUIKit/components/common/Dialog/style/h5.css @@ -0,0 +1,59 @@ +.dialog-h5 { + height: 95%; + top: 30px; + align-items: inherit; +} + +.dialog-h5 .dialog-main { + border-radius: 0; + padding: 0; + display: flex; + flex-direction: column; + overflow: hidden; + width: 100%; + min-height: 80px; + min-width: 120px; +} + +.dialog-h5 .dialog-main-content { + flex: 1; + min-width: 0; + min-height: 0; + overflow: hidden; + text-align: center; + display: flex; + justify-content: center; + align-items: center; + margin-bottom: 0; +} + +.dialog-h5 .dialog-main-content-uniapp { + padding: 40px 0; +} + +.dialog-h5 .dialog-main-footer { + border-top: 1px solid #DDD; +} + +.dialog-h5 .dialog-main-footer .btn { + flex: 1; + margin: 0; + background: none; + border-right: 1px solid #DDD; + background-color: #fe3c3c; +} + +.dialog-h5 .dialog-main-footer .btn-default { + color: #fff; + border: none; + background-color: #fe3c3c; + display: flex; + align-items: center; + justify-content: center; +} + +.center { + align-items: center; + padding: 20px; + box-sizing: border-box; +} diff --git a/TUIKit/components/common/Dialog/style/h5.scss b/TUIKit/components/common/Dialog/style/h5.scss index 2e034f9f..de52616e 100644 --- a/TUIKit/components/common/Dialog/style/h5.scss +++ b/TUIKit/components/common/Dialog/style/h5.scss @@ -1,6 +1,6 @@ .dialog-h5 { - height: 100%; - top: 0; + height: 95%; + top: 30px; align-items: inherit; .dialog { @@ -38,10 +38,14 @@ margin: 0; background: none; border-right: 1px solid #DDD; - + background-color: #fe3c3c; &-default { - color: #FF584C; + color: #fff; border: none; + background-color: #fe3c3c; + display: flex; + align-items: center; + justify-content: center; } } } diff --git a/TUIKit/components/common/Dialog/style/web.css b/TUIKit/components/common/Dialog/style/web.css new file mode 100644 index 00000000..916115d8 --- /dev/null +++ b/TUIKit/components/common/Dialog/style/web.css @@ -0,0 +1,63 @@ +.dialog { + position: fixed; + width: 100%; + height: 100%; + left: 0; + top: 0; + z-index: 6; + display: flex; + justify-content: center; + align-items: center; +} + +.dialog-main { + min-width: 368px; + border-radius: 10px; + padding: 20px 30px; +} + +.dialog-main-header { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 16px; + line-height: 30px; +} + +.dialog-main-title { + font-size: 16px; + line-height: 30px; +} + +.dialog-main-content { + font-size: 14px; + display: flex; + justify-content: center; + align-items: center; + margin-bottom: 20px; +} + +.dialog-main-footer { + display: flex; + justify-content: flex-end; +} + +.btn { + padding: 8px 20px; + margin: 0 6px; + border-radius: 4px; + border: none; + font-size: 14px; + text-align: center; + line-height: 20px; + display: flex; + align-items: center; +} + +.btn:disabled { + opacity: 0.3; +} + +.btn:last-child { + margin-right: 0; +} diff --git a/TUIKit/components/common/Dialog/style/web.scss b/TUIKit/components/common/Dialog/style/web.scss index 2e283a78..c3b3791e 100644 --- a/TUIKit/components/common/Dialog/style/web.scss +++ b/TUIKit/components/common/Dialog/style/web.scss @@ -50,7 +50,8 @@ font-size: 14px; text-align: center; line-height: 20px; - + display: flex; + align-items: center; &:disabled { opacity: 0.3; } diff --git a/TUIKit/components/common/Transfer/index.vue b/TUIKit/components/common/Transfer/index.vue index 3cda8ec6..fffede06 100644 --- a/TUIKit/components/common/Transfer/index.vue +++ b/TUIKit/components/common/Transfer/index.vue @@ -3,20 +3,9 @@ class="transfer" :class="[!isPC ? 'transfer-h5' : '', isWeChat ? 'transfer-h5-wechat' : '']" > -
    -
    - +
    +
    +
    {{ transferTitle }} @@ -33,7 +22,7 @@ enterkeyhint="search" :class="[isUniFrameWork ? 'left-uniapp-input' : '']" @keyup.enter="handleInput" - > + /> + />
      @@ -59,10 +48,7 @@ :width="'18px'" :height="'18px'" /> - + {{ TUITranslateService.t("component.全选") }} @@ -89,18 +75,17 @@ class="avatar" :src=" item.avatar || - 'https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png' + 'https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png' " onerror="this.onerror=null;this.src='https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'" - > + /> {{ item.nick || item.userID }} - （{{ TUITranslateService.t("component.已在群中") }}） + （{{ TUITranslateService.t("component.已在群中") }}）
    -
    +
    {{ transferTitle }}
    -
      +

        - {{ item.nick || item.userID }} + /> + {{ + item.nick || item.userID + }} - - + +

      @@ -175,6 +143,7 @@ @@ -182,6 +151,13 @@ v-if="transferSelectedList.length > 0" class="btn" @click="submit" + style=" + background-color: #fe3c3c; + color: #fff; + display: flex; + justify-content: center; + align-items: center; + " > {{ TUITranslateService.t("component.完成") }} @@ -189,6 +165,13 @@ v-else class="btn btn-no" @click="submit" + style=" + background-color: #fe3c3c; + color: #fff; + display: flex; + justify-content: center; + align-items: center; + " > {{ TUITranslateService.t("component.完成") }} @@ -199,14 +182,14 @@ diff --git a/TUIKit/components/common/Transfer/style/h5.css b/TUIKit/components/common/Transfer/style/h5.css new file mode 100644 index 00000000..0f127cde --- /dev/null +++ b/TUIKit/components/common/Transfer/style/h5.css @@ -0,0 +1,91 @@ +.transfer-h5 { + width: 100%; + height: 92%; + display: flex; + flex-direction: column; +} + +.transfer-h5-wechat { + width: 100vw; + height: 100vh; +} + +.transfer-h5-header { + position: relative; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 18px; + padding: 16px 18px; +} + +.transfer-h5-header .space, .transfer-h5-header .icon { + width: 18px; + height: 18px; +} + +.transfer-h5 .main { + flex: 1; + flex-direction: column; + width: auto; + height: auto; + border-radius: 0; + border: none; + box-shadow: none; + max-height: calc(100% - 50px); + padding: 0; +} + +.transfer-h5 .main .avatar { + border-radius: 5px; +} + +.transfer-h5 .main .left { + padding: 0; + flex: 1; + border: none; + display: flex; + flex-direction: column; +} + +.transfer-h5 .main .left .transfer-header { + position: sticky; + top: 0; + padding: 0 18px; +} + +.transfer-h5 .main .left .transfer-header input { + border-radius: 5px; + font-size: 14px; +} + +.transfer-h5 .main .left-uniapp-input { + height: 36px; +} + +.transfer-h5 .main .right { + flex: 0; + flex-direction: row; + align-items: center; + box-shadow: inset 0 1px 0 0 #EEE; + padding: 8px 18px; +} + +.transfer-h5 .main .right .transfer-list { + flex-direction: row; + width: 0; +} + +.transfer-h5 .main .right .transfer-list-item-content { + flex: none; +} + +.transfer-h5 .main .right .transfer-right-footer { + padding: 6px 0; + display: flex; + align-items: center; +} + +.transfer-h5 .main .right .transfer-right-footer .btn { + font-size: 14px; +} diff --git a/TUIKit/components/common/Transfer/style/h5.scss b/TUIKit/components/common/Transfer/style/h5.scss index 0ecaa867..c74267f9 100644 --- a/TUIKit/components/common/Transfer/style/h5.scss +++ b/TUIKit/components/common/Transfer/style/h5.scss @@ -1,6 +1,6 @@ .transfer-h5 { width: 100%; - height: 100%; + height: 92%; display: flex; flex-direction: column; @@ -86,6 +86,7 @@ .btn { font-size: 14px; + } } } diff --git a/api/article.js b/api/article.js index 0d5baccf..f6e73ef8 100644 --- a/api/article.js +++ b/api/article.js @@ -23,7 +23,7 @@ export function getArticleCategory(category_type) { */ export function getArticleDetail(type) { return http.request({ - url: `/other/article/get/${type}`, + url: `/other/article/type/${type}`, method: Method.GET, }); } diff --git a/api/point.js b/api/point.js index 8236ada3..e4d378c0 100644 --- a/api/point.js +++ b/api/point.js @@ -23,6 +23,32 @@ export function mymon() { needToken: true, }); } +/** + * 达人下的用户 + * @param params + */ +export function bindUsers() { + return http.request({ + url: '/share/code/expert/bind/users', + method: Method.GET, + needToken: true, + }); +} + +/** + * 分销的消费记录 + * @param params + */ +export function getcompleted(data) { + return http.request({ + url: '/share/code/completed-orders', + method: Method.GET, + needToken: true, + params:data + }); +} + + /** * 绑定推荐码 * @param params diff --git a/components/m-share/index.vue b/components/m-share/index.vue index 8aac4d27..4d1a6eed 100644 --- a/components/m-share/index.vue +++ b/components/m-share/index.vue @@ -65,7 +65,7 @@ export default { { color: "#04BE02", title: "消息", - icon: "weixin-circle-fill", + icon: "man-add-fill", type: 2, }, ], @@ -73,7 +73,7 @@ export default { }, // 图片缩略图、 商品名称 、 type（goods,shop,pintuan) 拼团商品分享以及店铺分享 - props: ["thumbnail", "goodsName", "type", "goodsId", "link","price"], + props: ["thumbnail", "goodsName", "type", "goodsId", "link", "price"], methods: { close() { this.$emit("close"); @@ -154,37 +154,34 @@ export default { }); } if (val.type == 2) { - // 优化复制逻辑，确保内容存在 - // props: ["thumbnail", "goodsName", "type", "goodsId", "link","price"], - // console.log(this.link,'===') - // const mofn=JSON.stringify('名字:'+this.goodsName+',价格:'+this.price+','+this.link) - - const mofn=this.goodsName+','+this.price+','+this.thumbnail.split('?')[0].split('com')[1]+','+this.link.split('?')[1] - // const mofn={nage:this.goodsName,price:this.price,img:this.thumbnail.split('?')[0],link:this.link} - console.log('===+++',mofn.split(',')[1]) - console.log('===+++',this.thumbnail) - console.log('===+++',mofn.split(',')[3]) - // uni.setClipboardData({ - // data: mofn, - // success: () => { - // uni.showToast({ - // title: "复制成功", - // icon: "none", - // }); - // uni.switchTab({ - // url: "/pages/tabbar/im/index", - // fail: (err) => { - // console.error("跳转失败--:", err); // 查看具体错误 - // }, - // }); - - // }, - // fail: () => { - // uni.showToast({ - // title: "不支持", - // }); - // }, - // }); + const mofn = + this.goodsName + + "," + + this.price + + "," + + this.thumbnail.split("?")[0].split("com")[1] + + "," + + this.link.split("?")[1]; + uni.setClipboardData({ + data: mofn, + success: () => { + uni.showToast({ + title: "复制成功", + icon: "none", + }); + uni.switchTab({ + url: "/pages/tabbar/im/index", + fail: (err) => { + console.error("跳转失败--:", err); // 查看具体错误 + }, + }); + }, + fail: () => { + uni.showToast({ + title: "不支持", + }); + }, + }); } }, // #endif diff --git a/components/vlog/videoFollowComp.vue b/components/vlog/videoFollowComp.vue index 068a5317..0e678b1f 100755 --- a/components/vlog/videoFollowComp.vue +++ b/components/vlog/videoFollowComp.vue @@ -322,7 +322,7 @@ export default { return `${m}:${s < 10 ? '0' : ''}${s}`; }, onTimeUpdate(e) { - console.log(e.detail.currentTime); + // console.log(e.detail.currentTime); if (e.detail.currentTime > 0.2) { this.doplay(e.detail.currentTime); } diff --git a/config/config.js b/config/config.js index a00cd30b..155a8ffb 100644 --- a/config/config.js +++ b/config/config.js @@ -1,4 +1,4 @@ -const name = "lilishop"; //全局商城name +const name = "无终街"; //全局商城name const schemeName = 'lilishop' //唤醒app需要的schemeName export default { name: name, diff --git a/pages.json b/pages.json index a6143b64..9d68a29d 100644 --- a/pages.json +++ b/pages.json @@ -573,6 +573,18 @@ "navigationBarTitleText": "我的分销" } }, + { + "path": "mydistribution/my/myindex", + "style": { + "navigationBarTitleText": "用户" + } + }, + { + "path": "mydistribution/my/consumption", + "style": { + "navigationBarTitleText": "消费记录" + } + }, { "path": "makeMoney/index", "style": { diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue index f4f3f51d..4bfa0599 100644 --- a/pages/mine/address/add.vue +++ b/pages/mine/address/add.vue @@ -2,9 +2,9 @@
      - + diff --git a/pages/mine/expert/index.vue b/pages/mine/expert/index.vue index 534aa29a..d5415fbe 100644 --- a/pages/mine/expert/index.vue +++ b/pages/mine/expert/index.vue @@ -319,15 +319,21 @@ export default { border-color: #fe3c3c !important; background-color: #fe3c3c !important; } + .u-radio__icon-wrap--checked{ + border-color: #fe3c3c !important; + background-color: #fe3c3c !important; + } } .bunem { - width: 309px; + width: 309px; margin-top: 20px; - height: 41px; - font-size: 15px; - line-height: 41px; - text-align: center; - color: #ffffff; + height: 32px; + display: flex; + align-items: #ffffff; margin-bottom: 35px; + align-items: center; + justify-content: center; + color: #fff; + font-size: 14px; } diff --git a/pages/mine/help/tips.vue b/pages/mine/help/tips.vue index 5401e699..05f3555d 100644 --- a/pages/mine/help/tips.vue +++ b/pages/mine/help/tips.vue @@ -1,7 +1,14 @@ + + diff --git a/pages/mine/mydistribution/my/myindex.vue b/pages/mine/mydistribution/my/myindex.vue new file mode 100644 index 00000000..3da44029 --- /dev/null +++ b/pages/mine/mydistribution/my/myindex.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/pages/mine/openShop/ThirdApply.vue b/pages/mine/openShop/ThirdApply.vue index 25e8af60..55fa7f39 100644 --- a/pages/mine/openShop/ThirdApply.vue +++ b/pages/mine/openShop/ThirdApply.vue @@ -33,6 +33,7 @@ max-count="1" :action="action" @on-uploaded="onUploadedtwo" + @on-remove="onRemove" style="margin-left: 30px" >
      请压缩图片在2M以内，格式为gif，jpg，png
      @@ -207,6 +208,9 @@ export default { this.form.storeLogo.push(item.response.result); }); }, + onRemove(lists) { + this.form.storeLogo = []; + }, // 下一步 next() { this.$refs.thirdForm.validate((valid) => { @@ -220,11 +224,11 @@ export default { applyThird(params) .then((res) => { this.loading = false; - uni.showToast({ - title: "请正确输入", - icon: "none", - duration: 1500, - }); + // uni.showToast({ + // title: "请正确输入", + // icon: "none", + // duration: 1500, + // }); setTimeout(() => { uni.switchTab({ url: "/pages/tabbar/user/my", @@ -307,12 +311,15 @@ h4 { } .bunem { width: 309px; - margin-top: 50px; - height: 41px; - font-size: 15px; - line-height: 41px; - text-align: center; - color: #ffffff; + margin-top: 20px; + height: 32px; + display: flex; + align-items: #ffffff; + margin-bottom: 35px; + align-items: center; + justify-content: center; + color: #fff; + font-size: 14px; } ::v-deep { .u-checkbox__icon-wrap--checked { diff --git a/pages/mine/openShop/index.vue b/pages/mine/openShop/index.vue index 6b4d7bf8..2b8a4413 100644 --- a/pages/mine/openShop/index.vue +++ b/pages/mine/openShop/index.vue @@ -5,7 +5,7 @@ - +

      法人信息

      @@ -87,6 +89,7 @@ max-count="2" :action="action" @on-uploaded="onUploadedtwo" + @on-remove="onRemove" style="margin-left: 70px" >
      @@ -140,11 +143,10 @@ export default { form: { legalPhoto: [], licencePhoto: [], - + companyAddressIdPath: [], legalId: "", legalName: "", companyName: "", - // companyAddressIdPath: "", companyAddress: "", employeeNum: "", registeredCapital: "", @@ -159,13 +161,6 @@ export default { trigger: ["blur", "change"], }, ], - companyAddressIdPath: [ - { - required: true, - message: "请选择公司所在地", - trigger: ["change"], - }, - ], companyAddress: [ { required: true, @@ -313,12 +308,17 @@ export default { // 将需要绑定的地址设置为空，并赋值 this.form.consigneeAddressIdPath = []; this.form.consigneeAddressPath = []; + this.form.companyAddressIdPath = []; let name = ""; e.forEach((item, index) => { if (item.id) { // 遍历数据 this.form.consigneeAddressIdPath.push(item.id); + this.form.companyAddressIdPath.push(item.id); + console.log(item.id); + console.log(this.form.companyAddressIdPath); + this.form.consigneeAddressPath.push(item.localName); name += item.localName; this.form.companyAddressPath = name; @@ -349,12 +349,22 @@ export default { this.form.licencePhoto = item.response.result; }); }, + + onRemoveone(index, lists) { + this.form.licencePhoto=[] + }, // 法人证件电子版 onUploadedtwo(lists) { lists.forEach((item) => { - this.form.legalPhoto.push(item.response.result); + const fn = this.form.legalPhoto.indexOf(item.response.result); + if (fn == -1) { + this.form.legalPhoto.push(item.response.result); + } }); }, + onRemove(index, lists) { + this.form.legalPhoto.splice(index, 1); + }, // 下一步 next() { @@ -363,11 +373,14 @@ export default { let params = JSON.parse(JSON.stringify(this.form)); params.legalPhoto = this.form.legalPhoto.toString(); params.licencePhoto = this.form.licencePhoto.toString(); + params.companyAddressIdPath = this.form.companyAddressIdPath.toString(); if ( this.form.legalPhoto != "" && this.form.legalId != "" && this.form.legalName != "" ) { + console.log(params,'========'); + applyFirst(params) .then((res) => { if (res.data.success) { @@ -417,12 +430,14 @@ export default { .bunem { width: 309px; margin-top: 20px; - height: 41px; - font-size: 15px; - line-height: 41px; - text-align: center; - color: #ffffff; + height: 32px; + display: flex; + align-items: #ffffff; margin-bottom: 35px; + align-items: center; + justify-content: center; + color: #fff; + font-size: 14px; } .u-input { margin-left: 30px; // 可根据实际情况调整这个值 diff --git a/pages/mine/openShop/secon.vue b/pages/mine/openShop/secon.vue index 843726e0..4e3b03c6 100644 --- a/pages/mine/openShop/secon.vue +++ b/pages/mine/openShop/secon.vue @@ -175,12 +175,15 @@ h4 { // } .bunem{ width: 309px; - margin-top: 50px; - height: 41px; - font-size: 15px; - line-height: 41px; - text-align: center; - color: #ffffff; + margin-top: 20px; + height: 32px; + display: flex; + align-items: #ffffff; + margin-bottom: 35px; + align-items: center; + justify-content: center; + color: #fff; + font-size: 14px; } .u-input { margin-left: 30px; // 可根据实际情况调整这个值 diff --git a/pages/mine/set/editionIntro.vue b/pages/mine/set/editionIntro.vue index 81092068..a38c4abc 100644 --- a/pages/mine/set/editionIntro.vue +++ b/pages/mine/set/editionIntro.vue @@ -1,8 +1,14 @@ @@ -136,7 +142,7 @@ page { background: #fff; display: flex; flex-direction: column; - justify-content: center; + // justify-content: center; align-items: center; > h1 { @@ -154,7 +160,22 @@ page { letter-spacing: 2rpx; } .logo { - width: 200rpx; - height: 200rpx; + width: 100%; + // height: 200rpx; +} +.imgage { + width: 100%; + height: 37.5vh; + background: url("@/static/logn.png"); + background-size: 100% 100%; + & > div { + width: 100%; + height: 80%; + display: flex; + justify-content: center; + align-items: end; + color: #fff; + font-size: 14px; + } } diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue index 2c23b945..f7e97d64 100644 --- a/pages/mine/set/personMsg.vue +++ b/pages/mine/set/personMsg.vue @@ -39,7 +39,15 @@ placeholder="请选择城市" right-icon="arrow-right" > -
      +
      {{ form.___path || "请选择城市" }}
      @@ -87,7 +95,7 @@ export default { form: { nickName: storage.getUserInfo().nickName || "", birthday: storage.getUserInfo().birthday || "", - face: storage.getUserInfo().face || "/static/missing-face.png", //默认头像 + face: storage.getUserInfo().face || "/static/imlogo.png", //默认头像 regionId: [], //地址Id region: storage.getUserInfo().region || [], //地址 sex: storage.getUserInfo().sex, //性别 @@ -317,4 +325,7 @@ export default { background-color: #fe3c3c !important; } } + +.u-form-item div { +} diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue index eee6ce21..d4849097 100644 --- a/pages/mine/set/setUp.vue +++ b/pages/mine/set/setUp.vue @@ -20,7 +20,7 @@ - + {{userInfo.id ?'退出登录':'返回登录'}}
      @@ -256,7 +256,6 @@
      -
      -
      @@ -34,9 +34,9 @@ export default { diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue index e6bd5a23..81c29207 100644 --- a/pages/tabbar/home/views.vue +++ b/pages/tabbar/home/views.vue @@ -41,7 +41,7 @@ - + @@ -93,7 +93,7 @@ export default { config, pageData: "", //楼层页面数据 isIos: "", - isload:false + isload: false, }; }, components: { @@ -148,7 +148,7 @@ export default { methods: { loadMon() { - this.isload=!this.isload + this.isload = !this.isload; // this.$refs.loadMonfn.loadMon(); }, /** @@ -160,12 +160,14 @@ export default { if (this.ste == 1) { getFloorData().then((res) => { if (res.data.success) { + console.log("商城数据已加载完成"); this.pageData = JSON.parse(res.data.result.pageData); } }); } else { getFloorgetBendi().then((res) => { if (res.data.success) { + console.log("本地生活数据已加载完成"); this.pageData = JSON.parse(res.data.result.pageData); } }); @@ -186,7 +188,6 @@ export default { let path = encodeURIComponent(res.result); // WX_CODE 为小程序码 if (res.scanType == "WX_CODE") { - console.log(res); uni.navigateTo({ url: `/${res.path}`, }); diff --git a/pages/tabbar/im/index.vue b/pages/tabbar/im/index.vue index 8746b0ec..dfc5f8b7 100644 --- a/pages/tabbar/im/index.vue +++ b/pages/tabbar/im/index.vue @@ -1,47 +1,43 @@