From ede5f226e09e66ec331cb4ff3c7917504c026750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Thu, 31 Oct 2024 15:28:26 +0800 Subject: [PATCH] update uni-app --- uni-app/src/App.vue | 152 +++++---- .../src/addon/components/diy/group/index.scss | 2 +- .../src/addon/components/diy/group/index.vue | 6 +- .../addon/components/diy/group/useDiyGroup.ts | 5 +- uni-app/src/app/api/auth.ts | 4 +- uni-app/src/app/api/system.ts | 35 +- .../app/components/diy/active-cube/index.vue | 68 ++-- .../components/diy/carousel-search/index.vue | 175 ++++++---- .../app/components/diy/member-level/index.vue | 67 +++- .../src/app/components/diy/notice/index.vue | 27 +- .../app/components/diy/picture-show/index.vue | 135 ++++++++ uni-app/src/app/pages/auth/agreement.vue | 28 +- uni-app/src/app/pages/member/account.vue | 2 +- uni-app/src/app/pages/member/address.vue | 17 +- uni-app/src/app/pages/member/address_edit.vue | 24 +- .../src/app/pages/member/apply_cash_out.vue | 3 +- uni-app/src/app/pages/member/balance.vue | 5 +- uni-app/src/app/pages/member/cash_out.vue | 1 - .../src/app/pages/member/cash_out_detail.vue | 15 +- uni-app/src/app/pages/member/contact.vue | 4 +- .../src/app/pages/member/detailed_account.vue | 2 +- uni-app/src/app/pages/member/point_detail.vue | 4 - uni-app/src/app/pages/member/sign_in.vue | 10 +- uni-app/src/app/pages/pay/browser.vue | 2 +- uni-app/src/app/pages/pay/result.vue | 21 +- uni-app/src/app/pages/verify/record.vue | 4 - uni-app/src/app/pages/webview/index.vue | 2 +- .../src/components/nc-contact/nc-contact.vue | 3 +- .../components/select-date/select-date.vue | 33 +- .../components/share-poster/share-poster.vue | 2 +- uni-app/src/components/sms-code/sms-code.vue | 2 +- uni-app/src/components/tabbar/tabbar.vue | 50 +-- .../src/components/top-tabbar/top-tabbar.vue | 39 +-- .../src/components/x-skeleton/x-skeleton.vue | 4 +- uni-app/src/hooks/useGoods.ts | 50 +++ uni-app/src/hooks/useLogin.ts | 9 +- uni-app/src/hooks/useShare.ts | 12 +- uni-app/src/locale/zh-Hans.json | 98 +++++- uni-app/src/locale/zh-Hans/common.json | 2 +- uni-app/src/manifest.json | 20 +- uni-app/src/pages.json | 3 + uni-app/src/stores/config.ts | 16 +- uni-app/src/stores/member.ts | 7 +- uni-app/src/stores/system.ts | 88 ++++- uni-app/src/styles/common.scss | 62 +++- uni-app/src/styles/iconfont.css | 22 +- .../src/uni_modules/uni-popup/changelog.md | 84 ----- .../components/uni-popup-dialog/keypress.js | 45 --- .../uni-popup-dialog/uni-popup-dialog.vue | 316 ------------------ .../uni-popup-message/uni-popup-message.vue | 143 -------- .../uni-popup-share/uni-popup-share.vue | 187 ----------- .../components/uni-popup/i18n/en.json | 7 - .../components/uni-popup/i18n/index.js | 8 - .../components/uni-popup/i18n/zh-Hans.json | 7 - .../components/uni-popup/i18n/zh-Hant.json | 7 - .../uni-popup/components/uni-popup/popup.js | 1 - .../components/uni-popup/uni-popup.vue | 6 +- uni-app/src/uni_modules/uni-popup/readme.md | 17 - uni-app/src/utils/common.ts | 47 ++- uni-app/src/utils/interceptor.ts | 14 +- uni-app/src/utils/mixin.ts | 4 +- uni-app/src/utils/wechat.ts | 4 +- 62 files changed, 1054 insertions(+), 1185 deletions(-) create mode 100644 uni-app/src/app/components/diy/picture-show/index.vue create mode 100644 uni-app/src/hooks/useGoods.ts delete mode 100644 uni-app/src/uni_modules/uni-popup/changelog.md delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json delete mode 100644 uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json delete mode 100644 uni-app/src/uni_modules/uni-popup/readme.md diff --git a/uni-app/src/App.vue b/uni-app/src/App.vue index 013673d67..56362fb9b 100644 --- a/uni-app/src/App.vue +++ b/uni-app/src/App.vue @@ -1,14 +1,14 @@ + \ No newline at end of file diff --git a/uni-app/src/addon/components/diy/group/useDiyGroup.ts b/uni-app/src/addon/components/diy/group/useDiyGroup.ts index d3ad816b0..ab06d45a4 100644 --- a/uni-app/src/addon/components/diy/group/useDiyGroup.ts +++ b/uni-app/src/addon/components/diy/group/useDiyGroup.ts @@ -1,4 +1,4 @@ -import { ref, reactive, onMounted, nextTick, computed } from 'vue'; +import { ref, onMounted, nextTick, computed } from 'vue'; import Sortable from 'sortablejs'; import { range } from 'lodash-es'; import { onPageScroll, onHide, onShow } from '@dcloudio/uni-app'; @@ -60,13 +60,12 @@ export function useDiyGroup(params: any = {}) { return false; } - // 监听页面加载完成 const onMountedLifeCycle = () => { onMounted(() => { // #ifdef H5 if (diyStore.mode == 'decorate') { - var el = document.getElementById('componentList'); + var el: any = document.getElementById('componentList'); const sortable = Sortable.create(el, { draggable: '.draggable-element', animation: 200, diff --git a/uni-app/src/app/api/auth.ts b/uni-app/src/app/api/auth.ts index f016ff99e..ded313f28 100644 --- a/uni-app/src/app/api/auth.ts +++ b/uni-app/src/app/api/auth.ts @@ -17,8 +17,8 @@ export function mobileLogin(data : AnyObject) { /** * 获取登录配置 */ -export function getConfig() { - return request.get('login/config') +export function getConfig(params: Record) { + return request.get('login/config', params) } /** diff --git a/uni-app/src/app/api/system.ts b/uni-app/src/app/api/system.ts index 6d9b1ea7b..3e1f3b899 100644 --- a/uni-app/src/app/api/system.ts +++ b/uni-app/src/app/api/system.ts @@ -4,56 +4,56 @@ import request from '@/utils/request' * 获取验证码 */ export function getCaptcha() { - return request.get('captcha', {}, {showErrorMessage: true}) + return request.get('captcha', {}, { showErrorMessage: true }) } /** * 获取微信公众号授权码 */ export function getWechatAuthCode(data: AnyObject) { - return request.get('wechat/codeurl', data, {showErrorMessage: false }) + return request.get('wechat/codeurl', data, { showErrorMessage: false }) } /** * 同步微信信息 */ export function wechatSync(data: AnyObject) { - return request.post('wechat/sync', data, {showErrorMessage: false}) + return request.post('wechat/sync', data, { showErrorMessage: false }) } /** * 获取协议信息 */ export function getAgreementInfo(key: string) { - return request.get(`agreement/${key}`) + return request.get(`agreement/${ key }`) } /** * 重置密码 */ export function resetPassword(data: AnyObject) { - return request.post(`password/reset`, data, {showErrorMessage: true}) + return request.post(`password/reset`, data, { showErrorMessage: true }) } /** * 发送短信验证码 */ export function sendSms(data: AnyObject) { - return request.post(`send/mobile/${data.type}`, data, {showErrorMessage: true}) + return request.post(`send/mobile/${ data.type }`, data, { showErrorMessage: true }) } /** * 获取微信jssdk config */ -export function getWechatSkdConfig(data: AnyObject) { - return request.get('wechat/jssdkconfig', data, {showErrorMessage: false}) +export function getWechatSdkConfig(data: AnyObject) { + return request.get('wechat/jssdkconfig', data, { showErrorMessage: false }) } /** * 上传图片 */ export function uploadImage(data: AnyObject) { - return request.upload('file/image', data, {showErrorMessage: true}) + return request.upload('file/image', data, { showErrorMessage: true }) } /** @@ -81,7 +81,7 @@ export function getSiteInfo() { * 获取微信小程序订阅消息模板id */ export function getWeappTemplateId(keys: string) { - return request.get('weapp/subscribemsg', {keys}) + return request.get('weapp/subscribemsg', { keys }) } /** @@ -89,7 +89,7 @@ export function getWeappTemplateId(keys: string) { * @param pid */ export function getAreaListByPid(pid: number = 0) { - return request.get(`area/list_by_pid/${pid}`) + return request.get(`area/list_by_pid/${ pid }`) } /** @@ -97,7 +97,7 @@ export function getAreaListByPid(pid: number = 0) { * @param level */ export function getAreatree(level: number = 1) { - return request.get(`area/tree/${level}`) + return request.get(`area/tree/${ level }`) } /** @@ -105,7 +105,7 @@ export function getAreatree(level: number = 1) { * @param code */ export function getAreaByCode(code: number | string) { - return request.get(`area/code/${code}`) + return request.get(`area/code/${ code }`) } /** @@ -113,7 +113,7 @@ export function getAreaByCode(code: number | string) { * @param params */ export function getAddressByLatlng(params: Record) { - return request.get(`area/address_by_latlng`, params, {showErrorMessage: true}) + return request.get(`area/address_by_latlng`, params, { showErrorMessage: true }) } /** @@ -145,3 +145,10 @@ export function getMap() { export function getMsgJumpPath(params: Record) { return request.get('weapp/getMsgJumpPath', params) } + +/** + * 获取初始化数据信息 + */ +export function getInitInfo(params: Record) { + return request.get('init', params) +} \ No newline at end of file diff --git a/uni-app/src/app/components/diy/active-cube/index.vue b/uni-app/src/app/components/diy/active-cube/index.vue index ad71d65b5..9eca35d3f 100644 --- a/uni-app/src/app/components/diy/active-cube/index.vue +++ b/uni-app/src/app/components/diy/active-cube/index.vue @@ -3,7 +3,7 @@ - + {{ diyComponent.text }} {{ diyComponent.subTitle.text }} @@ -27,10 +27,17 @@ + + + + + + {{ diyComponent.subTitle.text }} + @@ -66,7 +110,6 @@ import { img, redirect } from '@/utils/common' import useMemberStore from '@/stores/member' import { t } from '@/locale' - import { getMemberLevel } from '@/app/api/member'; import useDiyStore from '@/app/stores/diy' const props = defineProps(['component', 'index', 'pullDownRefreshCount']); @@ -216,4 +259,22 @@ right: 0; } } + .style-4{ + background-size: cover; + background-repeat: no-repeat; + .style-btn{ + background: linear-gradient(#FFF3C1, #FFEFB0); + } + } + + .style-5{ + background-size: cover; + background-repeat: no-repeat; + .content-head{ + background: linear-gradient(to right, rgba(255,255,255,0), rgba(255,255,255,0.14)); + } + .style-btn{ + background: linear-gradient(#FFFFFF, #FFF8CC); + } + } diff --git a/uni-app/src/app/components/diy/notice/index.vue b/uni-app/src/app/components/diy/notice/index.vue index 4eebd0d09..38a883b85 100644 --- a/uni-app/src/app/components/diy/notice/index.vue +++ b/uni-app/src/app/components/diy/notice/index.vue @@ -26,7 +26,7 @@ diff --git a/uni-app/src/app/components/diy/picture-show/index.vue b/uni-app/src/app/components/diy/picture-show/index.vue new file mode 100644 index 000000000..126a5738f --- /dev/null +++ b/uni-app/src/app/components/diy/picture-show/index.vue @@ -0,0 +1,135 @@ + + + + + \ No newline at end of file diff --git a/uni-app/src/app/pages/auth/agreement.vue b/uni-app/src/app/pages/auth/agreement.vue index 2316a76b3..65fbc931a 100644 --- a/uni-app/src/app/pages/auth/agreement.vue +++ b/uni-app/src/app/pages/auth/agreement.vue @@ -12,25 +12,33 @@ - diff --git a/uni-app/src/app/pages/member/account.vue b/uni-app/src/app/pages/member/account.vue index 82e58826e..8507884a0 100644 --- a/uni-app/src/app/pages/member/account.vue +++ b/uni-app/src/app/pages/member/account.vue @@ -2,7 +2,7 @@ - + diff --git a/uni-app/src/app/pages/member/address.vue b/uni-app/src/app/pages/member/address.vue index 0c46bbd04..ef98aa1b1 100644 --- a/uni-app/src/app/pages/member/address.vue +++ b/uni-app/src/app/pages/member/address.vue @@ -11,14 +11,14 @@ {{ item.full_address }} - - - + + + 设为默认 - 编辑 - 删除 + 编辑 + 删除 @@ -36,7 +36,7 @@ diff --git a/uni-app/src/components/top-tabbar/top-tabbar.vue b/uni-app/src/components/top-tabbar/top-tabbar.vue index 5792b1388..29b780154 100644 --- a/uni-app/src/components/top-tabbar/top-tabbar.vue +++ b/uni-app/src/components/top-tabbar/top-tabbar.vue @@ -23,7 +23,7 @@ - + {{topStatusBarData.inputPlaceholder}} @@ -40,7 +40,7 @@ - + @@ -56,11 +56,7 @@ import { cloneDeep } from 'lodash-es' // 获取系统状态栏的高度 let systemInfo = uni.getSystemInfoSync(); let platform = systemInfo.platform; -let menuButtonInfo: any = {}; -// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容) -// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ -menuButtonInfo = uni.getMenuButtonBoundingClientRect(); -// #endif +const systemStore = useSystemStore(); const diyStore = useDiyStore(); @@ -87,9 +83,12 @@ const props = defineProps({ isBack: { type: Boolean, default: true + }, + isFill: { + type: Boolean, + default: true } }) - const data = computed(() => { return props.data; }); @@ -113,8 +112,8 @@ const navbarInnerStyle = computed(() => { } // #ifdef MP // 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离 - style += 'height:' + menuButtonInfo.height + 'px;'; - style += 'padding-top:' + menuButtonInfo.top + 'px;'; + style += 'height:' + systemStore.menuButtonInfo.height + 'px;'; + style += 'padding-top:' + systemStore.menuButtonInfo.top + 'px;'; style += 'padding-bottom: 8px;'; // #endif return style; @@ -196,26 +195,29 @@ const goBack = () => { // 微信胶囊宽度+right const capsuleWidth = computed(() => { - let width = `calc(100vw - ${menuButtonInfo.right}px + ${menuButtonInfo.width}px + 10px)`; + let width = `calc(100vw - ${systemStore.menuButtonInfo.right}px + ${systemStore.menuButtonInfo.width}px + 10px)`; return width; }) // 导航栏塌陷的高度 const placeholderHeight = ref(0); const instance = getCurrentInstance(); +// #ifdef MP +let statusBarHeight = systemStore.menuButtonInfo.height + systemStore.menuButtonInfo.top + 8; +placeholderHeight.value = statusBarHeight || 0; +// #endif const navbarPlaceholderHeight = () => { nextTick(() => { - const query = uni.createSelectorQuery().in(instance); - query.select('.ns-navbar-wrap .u-navbar .content-wrap').boundingClientRect(data => { - placeholderHeight.value = data ? data.height : 0; - diyStore.topTabarHeight = placeholderHeight.value; - }).exec(); - }) + const query = uni.createSelectorQuery().in(instance); + query.select('.ns-navbar-wrap .u-navbar .content-wrap').boundingClientRect(data => { + placeholderHeight.value = data ? data.height : 0; + diyStore.topTabarHeight = placeholderHeight.value; + }).exec(); + }) } /******************************* 定位-start ***********************/ // 获取地图配置 -const systemStore = useSystemStore(); const currentPosition = ref('定位中...') let mapConfig = uni.getStorageSync('mapConfig'); @@ -313,7 +315,6 @@ const getQueryVariable = (variable:any)=> { return false; } /******************************* 定位-end ***********************/ - onMounted(() => { navbarPlaceholderHeight(); if (pages.length > 1) { diff --git a/uni-app/src/components/x-skeleton/x-skeleton.vue b/uni-app/src/components/x-skeleton/x-skeleton.vue index cd9e6e0b8..b2361f7e7 100644 --- a/uni-app/src/components/x-skeleton/x-skeleton.vue +++ b/uni-app/src/components/x-skeleton/x-skeleton.vue @@ -95,12 +95,12 @@ // 骨架的背景色 bgColor: { type: String, - default: '#EAEDF5' + default: '' // #EAEDF5 }, // 骨架的动画高亮背景色 highlightBgColor: { type: String, - default: '#F9FAFF' + default: '' // #F9FAFF }, // 自定义配置 config: { diff --git a/uni-app/src/hooks/useGoods.ts b/uni-app/src/hooks/useGoods.ts new file mode 100644 index 000000000..e08bc607a --- /dev/null +++ b/uni-app/src/hooks/useGoods.ts @@ -0,0 +1,50 @@ +import { redirect, img, getToken } from '@/utils/common'; +export function useGoods(params: any = {}) { + + const baseTagStyle = (data:any)=>{ + let style = ""; + if(data.color_json.text_color){ + style += `color:${data.color_json.text_color};`; + } + if(data.color_json.border_color){ + style += `border-color: ${data.color_json.border_color};`; + } + if(data.color_json.bg_color){ + style += `background-color: ${data.color_json.bg_color};`; + } + return style; + } + + // 价格类型 + const priceType = (data:any) =>{ + let type = ""; + if(data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) { + type = 'member_price' // 会员价 + } + return type; + } + + // 商品价格 + const goodsPrice = (data:any) => { + let price = "0.00"; + if (data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) { + price = data.goodsSku.member_price ? data.goodsSku.member_price : data.goodsSku.price // 会员价 + } else { + price = data.goodsSku ? data.goodsSku.price : data.price; //兼容商品推荐组件 + } + return parseFloat(price); + } + + + // 错误图片展示 + const errorImgFn = (data: any, type: any) =>{ + data[type] = ''; + } + + return { + baseTagStyle: baseTagStyle, + goodsPrice: goodsPrice, + priceType: priceType, + error: errorImgFn + } +} diff --git a/uni-app/src/hooks/useLogin.ts b/uni-app/src/hooks/useLogin.ts index 96a5e4b2f..d82a1bf40 100644 --- a/uni-app/src/hooks/useLogin.ts +++ b/uni-app/src/hooks/useLogin.ts @@ -10,6 +10,7 @@ import { import { getWechatAuthCode } from '@/app/api/system' import useMemberStore from '@/stores/member' import useConfigStore from '@/stores/config' +import useSystemStore from '@/stores/system' export function useLogin() { /** @@ -19,6 +20,7 @@ export function useLogin() { uni.setStorage({ key: 'loginBack', data }) setTimeout(() => { const config = useConfigStore() + const systemStore = useSystemStore() // #ifdef MP-WEIXIN if (!uni.getStorageSync('autoLoginLock') && uni.getStorageSync('openid') && config.login.is_bind_mobile) { @@ -39,7 +41,7 @@ export function useLogin() { // #ifdef MP-WEIXIN if (config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) { redirect({ url: '/app/pages/auth/login', param: { type: 'username' }, mode: 'redirectTo' }) - } else if (!config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) { + } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) { uni.showToast({ title: '商家未开启登录注册', icon: 'none' }) } else { redirect({ url: '/app/pages/auth/index', mode: 'redirectTo' }) @@ -51,7 +53,7 @@ export function useLogin() { // 微信浏览器 if (config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) { redirect({ url: '/app/pages/auth/login', param: { type: 'username' }, mode: 'redirectTo' }) - } else if (!config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) { + } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) { uni.showToast({ title: '商家未开启登录注册', icon: 'none' }) } else { redirect({ url: '/app/pages/auth/index', mode: 'redirectTo' }) @@ -60,7 +62,7 @@ export function useLogin() { // 普通浏览器 if (config.login.is_username && !config.login.is_mobile) { redirect({ url: '/app/pages/auth/login', param: { type: 'username' }, mode: 'redirectTo' }) - } else if (!config.login.is_username && !config.login.is_mobile) { + } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile) { uni.showToast({ title: '商家未开启登录注册', icon: 'none' }) } else { redirect({ url: '/app/pages/auth/index', mode: 'redirectTo' }) @@ -131,6 +133,7 @@ export function useLogin() { } }).catch((err) => { uni.showToast({ title: err.msg, icon: 'none' }) + if (params.successCallback) params.successCallback() }) // #endif diff --git a/uni-app/src/hooks/useShare.ts b/uni-app/src/hooks/useShare.ts index 52b3c0caf..d76b20884 100644 --- a/uni-app/src/hooks/useShare.ts +++ b/uni-app/src/hooks/useShare.ts @@ -1,6 +1,7 @@ import { img, isWeixinBrowser, currRoute, currShareRoute } from '@/utils/common' import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app' import { getShareInfo } from '@/app/api/diy'; +import useSystemStore from '@/stores/system'; // #ifdef H5 import wechat from '@/utils/wechat' @@ -67,13 +68,16 @@ export const useShare = () => { wechatOptions.link = options.wechat.link || h5Link wechatOptions.desc = options.wechat.desc || '' wechatOptions.imgUrl = options.wechat.url ? img(options.wechat.url) : '' + // wechatOptions.success = options.wechat.callback || null; + // useSystemStore().shareCallback = options.wechat.callback || null; wechatShare() // #endif // #ifdef MP-WEIXIN weappOptions.title = options.weapp.title || '' - weappOptions.query = options.weapp.path || queryStr.join('&') + if (options.weapp.path) weappOptions.path = options.weapp.path weappOptions.imageUrl = options.weapp.url ? img(options.weapp.url) : '' + useSystemStore().shareCallback = options.weapp.callback || null; // #endif uni.setStorageSync('weappOptions', weappOptions) @@ -112,9 +116,10 @@ export const useShare = () => { // 小程序分享，分享给好友 const shareApp = (options = {}) => { - onShareAppMessage(() => { + return onShareAppMessage(() => { let config: any = uni.getStorageSync('weappOptions') if (!config) config = {} + if (useSystemStore().shareCallback) useSystemStore().shareCallback(); return { ...config, ...options @@ -125,9 +130,10 @@ export const useShare = () => { // 小程序分享，分享到朋友圈 const shareTime = (options = {}) => { - onShareTimeline(() => { + return onShareTimeline(() => { let config: any = uni.getStorageSync('weappOptions') if (!config) config = {} + if (useSystemStore().shareCallback) useSystemStore().shareCallback(); return { ...config, ...options diff --git a/uni-app/src/locale/zh-Hans.json b/uni-app/src/locale/zh-Hans.json index 8554dd225..cafa74706 100644 --- a/uni-app/src/locale/zh-Hans.json +++ b/uni-app/src/locale/zh-Hans.json @@ -30,11 +30,105 @@ "pages.member.personal": "个人资料", "pages.member.contact": "客服", "pages.pay.browser": "支付", - "pages.pay.result": "支付结果", + "pages.pay.result": "", "pages.setting.index": "设置", "pages.verify.index": "核销台", "pages.verify.verify": "核销", "pages.verify.detail": "核销详情", "pages.verify.record": "核销记录", - "pages.webview.index": "" + "pages.webview.index": "", + "tourism.pages.way.list": "线路列表", + "tourism.pages.way.detail": "线路详情", + "tourism.pages.way.order": "线路订单", + "tourism.pages.hotel.list": "酒店列表", + "tourism.pages.hotel.detail": "酒店详情", + "tourism.pages.hotel.order": "酒店订单", + "tourism.pages.scenic.list": "景点列表", + "tourism.pages.scenic.detail": "景点详情", + "tourism.pages.scenic.order": "景点订单", + "tourism.pages.order.list": "旅游订单", + "tourism.pages.order.detail": "订单详情", + "tourism.pages.verify.index": "核销", + "tourism.pages.verify.record": "核销记录", + "tourism.pages.verify.detail": "核销详情", + "vipcard.pages.verify.index": "核销", + "vipcard.pages.verify.record": "核销记录", + "vipcard.pages.verify.detail": "核销详情", + "vipcard.pages.order.payment": "订单结算", + "vipcard.pages.order.list": "订单列表", + "vipcard.pages.order.my_reserved": "我的预约", + "vipcard.pages.order.my_reserved_detail": "我的预约详情", + "vipcard.pages.order.my_card": "我的卡项", + "vipcard.pages.order.detail": "订单详情", + "vipcard.pages.service.list": "项目列表", + "vipcard.pages.card.list": "卡项列表", + "vipcard.pages.card.detail": "卡项详情", + "recharge.pages.recharge": "充值", + "recharge.pages.recharge_record": "充值记录", + "recharge.pages.recharge_record_detail": "充值记录详情", + "shop.pages.goods.search": "搜索", + "shop.pages.goods.cart": "购物车", + "shop.pages.goods.category": "商品分类", + "shop.pages.goods.detail": "商品详情", + "shop.pages.goods.list": "商品列表", + "shop.pages.member.index": "个人中心", + "shop.pages.member.my_coupon": "我的优惠券", + "shop.pages.order.list": "订单列表", + "shop.pages.order.detail": "订单详情", + "shop.pages.order.payment": "待付款订单", + "shop.pages.evaluate.order_evaluate": "商品评价", + "shop.pages.evaluate.order_evaluate_view": "商品评价", + "shop.pages.evaluate.list": "评价列表", + "shop.pages.coupon.list": "优惠券列表", + "shop.pages.coupon.detail": "优惠券详情", + "shop.pages.discount.list": "限时折扣", + "shop.pages.refund.list": "退款列表", + "shop.pages.refund.detail": "退款详情", + "shop.pages.refund.apply": "申请退款", + "shop.pages.refund.edit_apply": "编辑退款信息", + "shop.pages.refund.log": "协商记录", + "shop.pages.point.index":"积分商城", + "shop.pages.point.list":"积分商品列表", + "shop.pages.point.detail":"积分商品详情", + "shop.pages.point.payment":"待付款订单", + "shop.pages.point.order_list":"积分兑换记录", + "shop.pages.newcomer.list":"新人专享列表", + "cms.pages.list": "资讯中心", + "cms.pages.detail": "文章详情", + "shop_fenxiao.pages.index": "分销中心", + "shop_fenxiao.pages.zone": "分销专区", + "shop_fenxiao.pages.level": "分销商等级", + "shop_fenxiao.pages.child_fenxiao": "分销商", + "shop_fenxiao.pages.goods": "分销商品", + "shop_fenxiao.pages.team": "团队", + "shop_fenxiao.pages.ranking_list": "排行榜", + "shop_fenxiao.pages.agent_list": "渠道代理", + "shop_fenxiao.pages.bill": "账单", + "shop_fenxiao.pages.order": "分销订单", + "shop_fenxiao.pages.order_detail": "订单详情", + "shop_fenxiao.pages.apply": "分销商申请", + "shop_fenxiao.pages.task_rewards": "任务奖励", + "shop_fenxiao.pages.task_detail": "任务奖励详情", + "shop_fenxiao.pages.task_rewards_detail": "任务奖励明细", + "shop_fenxiao.pages.sale": "销售奖励", + "shop_fenxiao.pages.sale_detail": "销售奖励详情", + "shop_fenxiao.pages.sale_ranking": "销售排行榜", + "shop_fenxiao.pages.promote_code": "分销推广", + "shop_giftcard.pages.index": "礼品卡首页", + "shop_giftcard.pages.list": "礼品卡列表", + "shop_giftcard.pages.detail": "加载中", + "shop_giftcard.pages.order_list": "礼品卡订单列表", + "shop_giftcard.pages.order_detail": "礼品卡订单详情", + "shop_giftcard.pages.member": "我的", + "shop_giftcard.pages.my_card_list": "我的卡包", + "shop_giftcard.pages.card_bag": "我的卡包", + "shop_giftcard.pages.activate": "卡密激活", + "shop_giftcard.pages.receive_list": "收到的礼品卡", + "shop_giftcard.pages.give_list": "送出的礼品卡", + "shop_giftcard.pages.give_detail": "送出礼品卡详情", + "shop_giftcard.pages.give": "礼品卡赠送", + "shop_giftcard.pages.receive_info": "领取礼品卡", + "shop_giftcard.pages.use_card": "礼品卡使用", + "shop_giftcard.pages.use_goods_select": "选择兑换商品", + "shop_giftcard.pages.payment": "待付款订单" } diff --git a/uni-app/src/locale/zh-Hans/common.json b/uni-app/src/locale/zh-Hans/common.json index c482eaccd..8690bf8c8 100644 --- a/uni-app/src/locale/zh-Hans/common.json +++ b/uni-app/src/locale/zh-Hans/common.json @@ -16,7 +16,7 @@ "codePlaceholder": "请输入手机验证码", "memberCenter": "个人中心", "userAgreement": "用户协议", - "and":"和", + "and": "和", "privacyAgreement": "隐私协议", "isAgreeTips": "请先阅读并同意协议", "nickname": "昵称", diff --git a/uni-app/src/manifest.json b/uni-app/src/manifest.json index edbe52c10..463a2b374 100644 --- a/uni-app/src/manifest.json +++ b/uni-app/src/manifest.json @@ -1,6 +1,6 @@ { - "name" : "加载中", - "appid" : "__UNI__9B03DBD", + "name" : "", + "appid" : "__UNI__713550E", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -50,7 +50,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxc106e776c693c9a7", + "appid" : "", "setting" : { "urlCheck" : false }, @@ -87,16 +87,16 @@ "sdkConfigs" : { "maps" : { "qqmap" : { - "key" : "6ZDBZ-CLSLX-66747-7MVM4-HLK47-XMBXU" + "key" : "" } } }, - "async" : { - "loading" : "", - "error" : "", - "delay" : 0, - "timeout" : 3000 - } + "async" : { + "loading" : "", + "error" : "", + "delay" : 0, + "timeout" : 3000 + } }, "fallbackLocale" : "zh-Hans" } diff --git a/uni-app/src/pages.json b/uni-app/src/pages.json index 90f195ee0..799c0ad54 100644 --- a/uni-app/src/pages.json +++ b/uni-app/src/pages.json @@ -246,6 +246,9 @@ { "path": "app/pages/pay/result", "style": { + // #ifndef H5 + "navigationStyle": "custom", + // #endif "navigationBarTitleText": "%pages.pay.result%" } }, diff --git a/uni-app/src/stores/config.ts b/uni-app/src/stores/config.ts index 62d0bf377..c0425a866 100644 --- a/uni-app/src/stores/config.ts +++ b/uni-app/src/stores/config.ts @@ -1,6 +1,6 @@ import { defineStore } from 'pinia' import { getConfig } from '@/app/api/auth' -import { getTabbarList } from '@/app/api/diy' +import { isWeixinBrowser } from "@/utils/common"; interface loginConfig { is_username: number | boolean, @@ -49,7 +49,14 @@ const useConfigStore = defineStore('config', { }, actions: { async getLoginConfig() { - await getConfig().then((res: any) => { + + let url = ''; + // #ifdef H5 + if (isWeixinBrowser()) { + url = uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : location.href + } + // #endif + await getConfig({ url }).then((res: any) => { this.login.is_username = res.data.is_username this.login.is_mobile = res.data.is_mobile this.login.is_auth_register = parseInt(res.data.is_auth_register) @@ -60,11 +67,6 @@ const useConfigStore = defineStore('config', { this.login.desc = res.data.desc // 描述 }) }, - async getTabbarConfig() { - await getTabbarList({}).then((res: any) => { - this.tabbarList = res.data; - }) - }, // 获取主色调 getThemeColor() { let themeColorStorage = uni.getStorageSync('current_theme_color'); diff --git a/uni-app/src/stores/member.ts b/uni-app/src/stores/member.ts index d9df312b5..49da20915 100644 --- a/uni-app/src/stores/member.ts +++ b/uni-app/src/stores/member.ts @@ -1,6 +1,6 @@ import { defineStore } from 'pinia' import { setToken, removeToken, redirect } from '@/utils/common' -import { getMemberInfo as getMemberInfoApi, getMemberLevel, bindMobile as bindMobileApi } from '@/app/api/member' +import { getMemberInfo as getMemberInfoApi, bindMobile as bindMobileApi } from '@/app/api/member' import { logout } from '@/app/api/auth' import useConfigStore from '@/stores/config' import { useLogin } from '@/hooks/useLogin' @@ -73,11 +73,6 @@ const useMemberStore = defineStore('member', { isRedirect && redirect({ url: '/app/pages/index/index', mode: 'switchTab' }) }) }, - getMemberLevel() { - getMemberLevel().then((res: any) => { - this.levelList = res.data - }) - }, // 一键绑定手机号 bindMobile(e: any) { if (e.detail.errMsg == 'getPhoneNumber:ok') { diff --git a/uni-app/src/stores/system.ts b/uni-app/src/stores/system.ts index 9d64edab6..bbd0a4202 100644 --- a/uni-app/src/stores/system.ts +++ b/uni-app/src/stores/system.ts @@ -1,5 +1,8 @@ import { defineStore } from 'pinia' -import { getSiteInfo, getMap } from '@/app/api/system' +import { getInitInfo, getSiteInfo } from '@/app/api/system' +import useConfigStore from '@/stores/config' +import useMemberStore from '@/stores/member' +import { isWeixinBrowser } from '@/utils/common' interface System { site: AnyObject | null, @@ -7,7 +10,10 @@ interface System { siteAddons: string[], currRoute: string, location: Object | null, // 定位信息 - mapConfig: any + mapConfig: any, + initStatus: any, // 初始化状态 + menuButtonInfo: any, // 如果是小程序，获取右上角胶囊的尺寸信息 + shareCallback: any // 分享回调 } const useSystemStore = defineStore('system', { @@ -21,10 +27,78 @@ const useSystemStore = defineStore('system', { mapConfig: { is_open: 1, valid_time: 0 - } + }, + initStatus: 'wait', + menuButtonInfo: { + height: '', + top: '', + right: '', + width: '' + }, + shareCallback: null } }, actions: { + // 获取初始化数据信息 + getInitFn(callback: any) { + + let url = ''; + // #ifdef H5 + if (isWeixinBrowser()) { + url = uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : location.href + } + // #endif + + getInitInfo({ + url + }).then((res: any) => { + if (res.data) { + let data = res.data; + + // 底部导航 + const configStore = useConfigStore() + configStore.tabbarList = data.tabbar_list; + + // 地图配置 + this.mapConfig.is_open = data.map_config.is_open; + this.mapConfig.valid_time = data.map_config.valid_time; + uni.setStorageSync('mapConfig', this.mapConfig); + + // 站点信息 + this.site = data.site_info + this.siteApps = data.site_info.app + this.siteAddons = data.site_info.site_addons.map((item: AnyObject) => { + return item.key + }) + + // 会员等级 + const memberStore = useMemberStore(); + memberStore.levelList = data.member_level; + + // 登录注册配置 + configStore.login.is_username = data.login_config.is_username + configStore.login.is_mobile = data.login_config.is_mobile + configStore.login.is_auth_register = parseInt(data.login_config.is_auth_register) + configStore.login.is_bind_mobile = parseInt(data.login_config.is_bind_mobile) + configStore.login.agreement_show = parseInt(data.login_config.agreement_show) + configStore.login.bg_url = data.login_config.bg_url // 背景图 + configStore.login.logo = data.login_config.logo //logo + configStore.login.desc = data.login_config.desc // 描述 + uni.setStorageSync('login_config', configStore.login) + + this.initStatus = 'finish'; // 初始化完成 + if (callback) callback() + } + }) + + this.getMenuButtonInfoFn(); + }, + getMenuButtonInfoFn() { + // 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容) + // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ + this.menuButtonInfo = uni.getMenuButtonBoundingClientRect(); + // #endif + }, async getSiteInfoFn() { await getSiteInfo().then((res: any) => { this.site = res.data @@ -35,14 +109,6 @@ const useSystemStore = defineStore('system', { }).catch((err) => { }) }, - async getMapFn() { - // 获取地图配置 - await getMap().then((res: any) => { - this.mapConfig.is_open = res.data.is_open; - this.mapConfig.valid_time = res.data.valid_time; - uni.setStorageSync('mapConfig', this.mapConfig); - }) - }, setLocation(value: any) { var date = new Date(); date.setSeconds(60 * this.mapConfig.valid_time); diff --git a/uni-app/src/styles/common.scss b/uni-app/src/styles/common.scss index 4192f8f55..581f4bb40 100644 --- a/uni-app/src/styles/common.scss +++ b/uni-app/src/styles/common.scss @@ -474,4 +474,64 @@ button[type='primary'],uni-button[type='primary']{ .mescroll-upwarp{ opacity: 0; } -/******************** mescroll state **********************/ \ No newline at end of file +/******************** mescroll state **********************/ + +/******************** 商品列表 state **********************/ +.brand-tag{ + position: relative; + top: -2rpx; + display: inline; + line-height: 38rpx; + padding: 4rpx 8rpx; + border-radius: 4rpx; + margin-right: 8rpx; + background: red; + vertical-align: middle; + font-size: 18rpx; + color: #fff; + &.middle{ + padding: 4rpx 8rpx; + border-radius: 8rpx; + font-size: 20rpx; + margin-right: 6rpx; + } +} + +.base-tag { + display: flex; + justify-content: center; + align-items: center; + height: 34rpx; + font-size: 18rpx; + padding: 0 8rpx; + color: #333; + border-radius: 4rpx; + background-color: #fff; + margin-right: 8rpx; + box-sizing: border-box; + margin-top: 8rpx; + border: 2rpx solid transparent; + &.middle{ + height: 40rpx; + padding: 0 12rpx; + border-radius: 8rpx; + font-size: 20rpx; + margin-right: 16rpx; + } +} + +.img-tag { + display: block; + height: 34rpx; + width: auto; + border-radius: 4rpx; + margin-right: 14rpx; + box-sizing: border-box; + margin-top: 8rpx; + &.middle{ + height: 38rpx; + border-radius: 8rpx; + margin-right: 16rpx; + } +} +/******************** 商品列表 end **********************/ diff --git a/uni-app/src/styles/iconfont.css b/uni-app/src/styles/iconfont.css index 846b1cd35..474e1f7f6 100644 --- a/uni-app/src/styles/iconfont.css +++ b/uni-app/src/styles/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3952239 */ - src: url('//at.alicdn.com/t/c/font_3952239_urcc1eq7dmn.woff2?t=1726020629322') format('woff2'), - url('//at.alicdn.com/t/c/font_3952239_urcc1eq7dmn.woff?t=1726020629322') format('woff'), - url('//at.alicdn.com/t/c/font_3952239_urcc1eq7dmn.ttf?t=1726020629322') format('truetype'); + src: url('//at.alicdn.com/t/c/font_3952239_cci6ogjyld.woff2?t=1729334583603') format('woff2'), + url('//at.alicdn.com/t/c/font_3952239_cci6ogjyld.woff?t=1729334583603') format('woff'), + url('//at.alicdn.com/t/c/font_3952239_cci6ogjyld.ttf?t=1729334583603') format('truetype'); } .iconfont { @@ -13,6 +13,22 @@ -moz-osx-font-smoothing: grayscale; } +.iconbiaoqianV6xx2:before { + content: "\e824"; +} + +.iconxinrenV6xx:before { + content: "\e821"; +} + +.iconhuodongV6xx:before { + content: "\e820"; +} + +.iconxuanzhongde-miaobian:before { + content: "\e81e"; +} + .iconshengyinpc:before { content: "\e7d1"; } diff --git a/uni-app/src/uni_modules/uni-popup/changelog.md b/uni-app/src/uni_modules/uni-popup/changelog.md deleted file mode 100644 index decd775ae..000000000 --- a/uni-app/src/uni_modules/uni-popup/changelog.md +++ /dev/null @@ -1,84 +0,0 @@ -## 1.9.1（2024-04-02） -- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法) -## 1.9.0（2024-03-28） -- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正 -## 1.8.9（2024-03-20） -- 修复 uni-popup-dialog 数据输入时修正为双向绑定 -## 1.8.8（2024-02-20） -- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug -## 1.8.7（2024-02-02） -- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦 -## 1.8.6（2024-01-30） -- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数 -## 1.8.5（2024-01-26） -- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示 -## 1.8.4（2023-11-15） -- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close` -## 1.8.3（2023-04-17） -- 修复 uni-popup 重复打开时的 bug -## 1.8.2（2023-02-02） -- uni-popup-dialog 组件新增 inputType 属性 -## 1.8.1（2022-12-01） -- 修复 nvue 下 v-show 报错 -## 1.8.0（2022-11-29） -- 优化 主题样式 -## 1.7.9（2022-04-02） -- 修复 弹出层内部无法滚动的bug -## 1.7.8（2022-03-28） -- 修复 小程序中高度错误的bug -## 1.7.7（2022-03-17） -- 修复 快速调用open出现问题的Bug -## 1.7.6（2022-02-14） -- 修复 safeArea 属性不能设置为false的bug -## 1.7.5（2022-01-19） -- 修复 isMaskClick 失效的bug -## 1.7.4（2022-01-19） -- 新增 cancelText \ confirmText 属性 ，可自定义文本 -- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色 -- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题 -## 1.7.3（2022-01-13） -- 修复 设置 safeArea 属性不生效的bug -## 1.7.2（2021-11-26） -- 优化 组件示例 -## 1.7.1（2021-11-26） -- 修复 vuedoc 文字错误 -## 1.7.0（2021-11-19） -- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) -- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup) -## 1.6.2（2021-08-24） -- 新增 支持国际化 -## 1.6.1（2021-07-30） -- 优化 vue3下事件警告的问题 -## 1.6.0（2021-07-13） -- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) -## 1.5.0（2021-06-23） -- 新增 mask-click 遮罩层点击事件 -## 1.4.5（2021-06-22） -- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug -## 1.4.4（2021-06-18） -- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug -## 1.4.3（2021-06-08） -- 修复 错误的 watch 字段 -- 修复 safeArea 属性不生效的问题 -- 修复 点击内容，再点击遮罩无法关闭的Bug -## 1.4.2（2021-05-12） -- 新增 组件示例地址 -## 1.4.1（2021-04-29） -- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题 -## 1.4.0 （2021-04-29） -- 新增 type 属性的 left\right 值，支持左右弹出 -- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗 -- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色 -- 新增 safeArea 属性，是否适配底部安全区 -- 修复 App\h5\微信小程序底部安全区占位不对的Bug -- 修复 App 端弹出等待的Bug -- 优化 提升低配设备性能，优化动画卡顿问题 -- 优化 更简单的组件自定义方式 -## 1.2.9（2021-02-05） -- 优化 组件引用关系，通过uni_modules引用组件 -## 1.2.8（2021-02-05） -- 调整为uni_modules目录规范 -## 1.2.7（2021-02-05） -- 调整为uni_modules目录规范 -- 新增 支持 PC 端 -- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端 diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js deleted file mode 100644 index 6ef26a262..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js +++ /dev/null @@ -1,45 +0,0 @@ -// #ifdef H5 -export default { - name: 'Keypress', - props: { - disable: { - type: Boolean, - default: false - } - }, - mounted () { - const keyNames = { - esc: ['Esc', 'Escape'], - tab: 'Tab', - enter: 'Enter', - space: [' ', 'Spacebar'], - up: ['Up', 'ArrowUp'], - left: ['Left', 'ArrowLeft'], - right: ['Right', 'ArrowRight'], - down: ['Down', 'ArrowDown'], - delete: ['Backspace', 'Delete', 'Del'] - } - const listener = ($event) => { - if (this.disable) { - return - } - const keyName = Object.keys(keyNames).find(key => { - const keyName = $event.key - const value = keyNames[key] - return value === keyName || (Array.isArray(value) && value.includes(keyName)) - }) - if (keyName) { - // 避免和其他按键事件冲突 - setTimeout(() => { - this.$emit(keyName, {}) - }, 0) - } - } - document.addEventListener('keyup', listener) - this.$once('hook:beforeDestroy', () => { - document.removeEventListener('keyup', listener) - }) - }, - render: () => {} -} -// #endif diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue deleted file mode 100644 index 08707d41b..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue +++ /dev/null @@ -1,316 +0,0 @@ - - - - - diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni-app/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue deleted file mode 100644 index 91370a829..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni-app/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue deleted file mode 100644 index f7e667c4c..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json deleted file mode 100644 index 7f1bd06a0..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "uni-popup.cancel": "cancel", - "uni-popup.ok": "ok", - "uni-popup.placeholder": "pleace enter", - "uni-popup.title": "Hint", - "uni-popup.shareTitle": "Share to" -} diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js deleted file mode 100644 index de7509c87..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import en from './en.json' -import zhHans from './zh-Hans.json' -import zhHant from './zh-Hant.json' -export default { - en, - 'zh-Hans': zhHans, - 'zh-Hant': zhHant -} diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json deleted file mode 100644 index 5e3003cab..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "uni-popup.cancel": "取消", - "uni-popup.ok": "确定", - "uni-popup.placeholder": "请输入", - "uni-popup.title": "提示", - "uni-popup.shareTitle": "分享到" -} diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json deleted file mode 100644 index 13e39eba1..000000000 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "uni-popup.cancel": "取消", - "uni-popup.ok": "確定", - "uni-popup.placeholder": "請輸入", - "uni-popup.title": "提示", - "uni-popup.shareTitle": "分享到" -} diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/popup.js b/uni-app/src/uni_modules/uni-popup/components/uni-popup/popup.js index c4e5781dd..e1db1816c 100644 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup/popup.js +++ b/uni-app/src/uni_modules/uni-popup/components/uni-popup/popup.js @@ -1,4 +1,3 @@ - export default { data() { return { diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue index 8349e9944..e48701f5c 100644 --- a/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue +++ b/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue @@ -1,10 +1,8 @@