From 70f8c0f286d5425a7fa0a4cf0c16b1ae44e6e711 Mon Sep 17 00:00:00 2001 From: 396316021 <396316021@qq.com> Date: Tue, 8 Oct 2024 20:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- config/config.js | 70 +- config/host.js | 7 +- main.js | 2 + pages/ChatDetail/index.vue | 170 +++-- pages/OrderPage/index.vue | 13 +- uni.scss | 1 + uni_modules/m-view/LICENSE | 21 + uni_modules/m-view/changelog.md | 3 +- .../m-view/components/m-avatar/m-avatar.vue | 125 ++++ .../m-view/components/m-avatar/props.js | 17 + .../m-view/components/m-button/m-button.vue | 106 ++++ .../m-checkbox/m-checkbox-group.vue | 44 ++ .../components/m-checkbox/m-checkbox.vue | 79 +++ .../components/m-form-item/m-form-item.vue | 120 ++++ .../m-view/components/m-form/m-form.vue | 79 +++ .../m-view/components/m-header/m-header.vue | 55 ++ .../m-view/components/m-header/props.js | 17 + .../m-view/components/m-input/m-input.vue | 209 ++++++ .../m-view/components/m-private/m-private.vue | 100 +++ .../m-view/components/m-private/props.js | 17 + .../m-view/components/m-radio/m-radio.vue | 106 +++- .../m-safe-bottom/m-safe-bottom.vue | 41 ++ .../m-view/components/m-safe-bottom/props.js | 17 + .../components/m-safe-top/m-safe-top.vue | 41 ++ .../m-view/components/m-safe-top/props.js | 17 + .../m-view/components/m-sticky/m-sticky.vue | 79 +++ .../m-view/components/m-sticky/props.js | 28 + .../m-view/components/m-text/m-text.vue | 71 +++ uni_modules/m-view/index.js | 26 + uni_modules/m-view/index.scss | 1 + uni_modules/m-view/lib/api.js | 8 + uni_modules/m-view/lib/functions.js | 598 ++++++++++++++++++ uni_modules/m-view/lib/qqmap-wx-jssdk.min.js | 3 + uni_modules/m-view/lib/request.js | 74 +++ uni_modules/m-view/lib/tools.js | 215 +++++++ uni_modules/m-view/package.json | 50 +- uni_modules/m-view/readme.md | 3 - uni_modules/m-view/theme/common.scss | 142 +++++ uni_modules/m-view/theme/theme.scss | 6 + utils/functions.js | 2 +- 41 files changed, 2636 insertions(+), 149 deletions(-) create mode 100644 uni_modules/m-view/LICENSE create mode 100644 uni_modules/m-view/components/m-avatar/m-avatar.vue create mode 100644 uni_modules/m-view/components/m-avatar/props.js create mode 100644 uni_modules/m-view/components/m-button/m-button.vue create mode 100644 uni_modules/m-view/components/m-checkbox/m-checkbox-group.vue create mode 100644 uni_modules/m-view/components/m-checkbox/m-checkbox.vue create mode 100644 uni_modules/m-view/components/m-form-item/m-form-item.vue create mode 100644 uni_modules/m-view/components/m-form/m-form.vue create mode 100644 uni_modules/m-view/components/m-header/m-header.vue create mode 100644 uni_modules/m-view/components/m-header/props.js create mode 100644 uni_modules/m-view/components/m-input/m-input.vue create mode 100644 uni_modules/m-view/components/m-private/m-private.vue create mode 100644 uni_modules/m-view/components/m-private/props.js create mode 100644 uni_modules/m-view/components/m-safe-bottom/m-safe-bottom.vue create mode 100644 uni_modules/m-view/components/m-safe-bottom/props.js create mode 100644 uni_modules/m-view/components/m-safe-top/m-safe-top.vue create mode 100644 uni_modules/m-view/components/m-safe-top/props.js create mode 100644 uni_modules/m-view/components/m-sticky/m-sticky.vue create mode 100644 uni_modules/m-view/components/m-sticky/props.js create mode 100644 uni_modules/m-view/components/m-text/m-text.vue create mode 100644 uni_modules/m-view/index.js create mode 100644 uni_modules/m-view/index.scss create mode 100644 uni_modules/m-view/lib/api.js create mode 100644 uni_modules/m-view/lib/functions.js create mode 100644 uni_modules/m-view/lib/qqmap-wx-jssdk.min.js create mode 100644 uni_modules/m-view/lib/request.js create mode 100644 uni_modules/m-view/lib/tools.js delete mode 100644 uni_modules/m-view/readme.md create mode 100644 uni_modules/m-view/theme/common.scss create mode 100644 uni_modules/m-view/theme/theme.scss diff --git a/App.vue b/App.vue index 5bf65cc..524177d 100644 --- a/App.vue +++ b/App.vue @@ -17,7 +17,7 @@ created() { if(!uni.getStorageSync('sysInfo')){ uni.showLoading({title:'加载中'}); - api.uniSysInfo().then(data => { + uni.$m.uniSysInfo().then(data => { uni.hideLoading(); }).catch(err => { uni.hideLoading(); diff --git a/config/config.js b/config/config.js index 7742e30..6778984 100644 --- a/config/config.js +++ b/config/config.js @@ -4,12 +4,76 @@ import UserCache from "@/config/UserCache"; * 当前环境 * @type {string} */ -const ENV = 'dev'; +export const ENV = 'dev'; /** * 打开日志打印 * @type {boolean} */ -const OPEN_LOG = true; +export const OPEN_LOG = true; -export {OPEN_LOG, ENV, UserCache} +export {UserCache} + +/** + * 首页路径 + * @type {string} + */ +export const INDEX_PATH = '/pages/Index/index'; + +/** + * 登录页路径 + * @type {string} + */ +export const LOGIN_PATH = '/pages/Login/index'; + +/** + * token字段 + * @type {string} + */ +export const TOKEN_FIELD = 'token'; + +/** + * 用户信息字段 + * @type {string} + */ +export const USERINFO_FIELD = ''; + + +/** + * 其他信息字段 + * @type {string} + */ +export const OTHER_FIELD = ''; + +/** + * 页面信息字段 + * @type {string} + */ +export const PAGEINFO_FIELD = 'page_info'; + +/** + * 列表分页数量 + * @type {string} + */ +export const LIMIT = '10'; + +/** + * 默认列表请求数据 + * @type {string} + */ +export const DEFAULT_LIST_PAGE = { + page: 1, + limit: LIMIT, +}; + +/** + * 默认列表请求数据 + * @type {string} + */ +export const UPLOAD_PATH = '/common/upload'; + +/** + * 列表分页数量名称 + * @type {string} + */ +export const LIMIT_FIELD = 'limit'; diff --git a/config/host.js b/config/host.js index cd923c9..2aa1755 100644 --- a/config/host.js +++ b/config/host.js @@ -1,11 +1,14 @@ // const host='http://192.168.2.92:9509/api' -const host='https://weiyang.test.scyp.ink/api' +// const host='https://weiyang.test.scyp.ink/api' +const host='https://wechat.wwxtx.com/api' // const host='https://wechat.wwxtx.com/api' // const host='https://bml.test.scyp.ink/api' // const host='http://192.168.2.92:9503/api' // const imghost='https://weiyang.test.scyp.ink/static/image' const imghost='https://wechat.wwxtx.com/static/image' +const imgHost=imghost +// const imghost='https://wechat.wwxtx.com/static/image' const title = '汪汪行天下' const oss = 'https://pet-feed.'+'oss-cn-chengdu.aliyuncs.com' // const codehost='http://code.baomingle.cn' -export {host,imghost,title,oss} \ No newline at end of file +export {host,imghost,title,oss,imgHost} \ No newline at end of file diff --git a/main.js b/main.js index 9f9c955..fa94ec6 100644 --- a/main.js +++ b/main.js @@ -13,6 +13,7 @@ app.$mount() // #ifdef VUE3 import uviewPlus from 'uview-plus' +import mView from '@/uni_modules/m-view' import { createSSRApp } from 'vue' import { title } from '@/config/host.js' import store from "@/store"; @@ -21,6 +22,7 @@ export function createApp() { const app = createSSRApp(App) app.use(uviewPlus) app.use(store) + app.use(mView) uni.$u.config.unit = 'rpx' return { app diff --git a/pages/ChatDetail/index.vue b/pages/ChatDetail/index.vue index e25ce95..2425ab5 100644 --- a/pages/ChatDetail/index.vue +++ b/pages/ChatDetail/index.vue @@ -4,22 +4,24 @@ backgroundImage:'url('+staticImage.wallpaperBgImage+')' }"> - + - + - + - {{item.user_name}} {{ item.create_time }} + {{ item.user_name }} {{ item.create_time }} {{ item.info }} - + @@ -54,9 +56,7 @@ diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue index 9a99426..3e48d7c 100644 --- a/pages/OrderPage/index.vue +++ b/pages/OrderPage/index.vue @@ -341,9 +341,9 @@ - - - + + + @@ -535,10 +535,13 @@ }, onShow(){ - if(uni.getStorageSync('token')){ - uni.$m.navTo('/pages/Login/index'); + if(!uni.getStorageSync('token')){ + this.navTo('/pages/Login/index'); } + console.log(this.isPay) + console.log(this.sign) if(!this.isPay && this.sign === ''){ + console.log(123123) try { this.getDefaultAddress(); }catch (e){ diff --git a/uni.scss b/uni.scss index 7cbcf71..b8541e5 100644 --- a/uni.scss +++ b/uni.scss @@ -14,6 +14,7 @@ /* 颜色变量 */ @import 'uview-plus/theme.scss'; +@import '@/uni_modules/m-view/theme/theme.scss'; /* 行为相关颜色 */ $uni-color-primary: #007aff; $uni-color-success: #4cd964; diff --git a/uni_modules/m-view/LICENSE b/uni_modules/m-view/LICENSE new file mode 100644 index 0000000..2157266 --- /dev/null +++ b/uni_modules/m-view/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 www.mview.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/uni_modules/m-view/changelog.md b/uni_modules/m-view/changelog.md index cab993e..cf7dc59 100644 --- a/uni_modules/m-view/changelog.md +++ b/uni_modules/m-view/changelog.md @@ -1,2 +1 @@ -## 1.0.0 -m-view +# mview diff --git a/uni_modules/m-view/components/m-avatar/m-avatar.vue b/uni_modules/m-view/components/m-avatar/m-avatar.vue new file mode 100644 index 0000000..0cb2962 --- /dev/null +++ b/uni_modules/m-view/components/m-avatar/m-avatar.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/uni_modules/m-view/components/m-avatar/props.js b/uni_modules/m-view/components/m-avatar/props.js new file mode 100644 index 0000000..c455c0f --- /dev/null +++ b/uni_modules/m-view/components/m-avatar/props.js @@ -0,0 +1,17 @@ +export default { + props: { + // 是否占位 + safeArea: { + type: Boolean, + default: true + }, + type: { + type: String, + default: 'fixed' + }, + offsetTop: { + type: String, + default: '0' + }, + } +} \ No newline at end of file diff --git a/uni_modules/m-view/components/m-button/m-button.vue b/uni_modules/m-view/components/m-button/m-button.vue new file mode 100644 index 0000000..5b1ff5a --- /dev/null +++ b/uni_modules/m-view/components/m-button/m-button.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/uni_modules/m-view/components/m-checkbox/m-checkbox-group.vue b/uni_modules/m-view/components/m-checkbox/m-checkbox-group.vue new file mode 100644 index 0000000..1a307e0 --- /dev/null +++ b/uni_modules/m-view/components/m-checkbox/m-checkbox-group.vue @@ -0,0 +1,44 @@ + + + + diff --git a/uni_modules/m-view/components/m-checkbox/m-checkbox.vue b/uni_modules/m-view/components/m-checkbox/m-checkbox.vue new file mode 100644 index 0000000..acdb602 --- /dev/null +++ b/uni_modules/m-view/components/m-checkbox/m-checkbox.vue @@ -0,0 +1,79 @@ + + + + diff --git a/uni_modules/m-view/components/m-form-item/m-form-item.vue b/uni_modules/m-view/components/m-form-item/m-form-item.vue new file mode 100644 index 0000000..d9dfa47 --- /dev/null +++ b/uni_modules/m-view/components/m-form-item/m-form-item.vue @@ -0,0 +1,120 @@ + + + + + \ No newline at end of file diff --git a/uni_modules/m-view/components/m-form/m-form.vue b/uni_modules/m-view/components/m-form/m-form.vue new file mode 100644 index 0000000..21eaa86 --- /dev/null +++ b/uni_modules/m-view/components/m-form/m-form.vue @@ -0,0 +1,79 @@ + + + + + \ No newline at end of file diff --git a/uni_modules/m-view/components/m-header/m-header.vue b/uni_modules/m-view/components/m-header/m-header.vue new file mode 100644 index 0000000..73b9788 --- /dev/null +++ b/uni_modules/m-view/components/m-header/m-header.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/uni_modules/m-view/components/m-header/props.js b/uni_modules/m-view/components/m-header/props.js new file mode 100644 index 0000000..c455c0f --- /dev/null +++ b/uni_modules/m-view/components/m-header/props.js @@ -0,0 +1,17 @@ +export default { + props: { + // 是否占位 + safeArea: { + type: Boolean, + default: true + }, + type: { + type: String, + default: 'fixed' + }, + offsetTop: { + type: String, + default: '0' + }, + } +} \ No newline at end of file diff --git a/uni_modules/m-view/components/m-input/m-input.vue b/uni_modules/m-view/components/m-input/m-input.vue new file mode 100644 index 0000000..7bee693 --- /dev/null +++ b/uni_modules/m-view/components/m-input/m-input.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/uni_modules/m-view/components/m-private/m-private.vue b/uni_modules/m-view/components/m-private/m-private.vue new file mode 100644 index 0000000..58ff221 --- /dev/null +++ b/uni_modules/m-view/components/m-private/m-private.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/uni_modules/m-view/components/m-private/props.js b/uni_modules/m-view/components/m-private/props.js new file mode 100644 index 0000000..c455c0f --- /dev/null +++ b/uni_modules/m-view/components/m-private/props.js @@ -0,0 +1,17 @@ +export default { + props: { + // 是否占位 + safeArea: { + type: Boolean, + default: true + }, + type: { + type: String, + default: 'fixed' + }, + offsetTop: { + type: String, + default: '0' + }, + } +} \ No newline at end of file diff --git a/uni_modules/m-view/components/m-radio/m-radio.vue b/uni_modules/m-view/components/m-radio/m-radio.vue index f3b6ecf..27f5a4f 100644 --- a/uni_modules/m-view/components/m-radio/m-radio.vue +++ b/uni_modules/m-view/components/m-radio/m-radio.vue @@ -1,29 +1,91 @@ + + - - - + \ No newline at end of file diff --git a/uni_modules/m-view/components/m-safe-bottom/m-safe-bottom.vue b/uni_modules/m-view/components/m-safe-bottom/m-safe-bottom.vue new file mode 100644 index 0000000..82f5517 --- /dev/null +++ b/uni_modules/m-view/components/m-safe-bottom/m-safe-bottom.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/uni_modules/m-view/components/m-safe-bottom/props.js b/uni_modules/m-view/components/m-safe-bottom/props.js new file mode 100644 index 0000000..c455c0f --- /dev/null +++ b/uni_modules/m-view/components/m-safe-bottom/props.js @@ -0,0 +1,17 @@ +export default { + props: { + // 是否占位 + safeArea: { + type: Boolean, + default: true + }, + type: { + type: String, + default: 'fixed' + }, + offsetTop: { + type: String, + default: '0' + }, + } +} \ No newline at end of file diff --git a/uni_modules/m-view/components/m-safe-top/m-safe-top.vue b/uni_modules/m-view/components/m-safe-top/m-safe-top.vue new file mode 100644 index 0000000..d6a1399 --- /dev/null +++ b/uni_modules/m-view/components/m-safe-top/m-safe-top.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/uni_modules/m-view/components/m-safe-top/props.js b/uni_modules/m-view/components/m-safe-top/props.js new file mode 100644 index 0000000..c455c0f --- /dev/null +++ b/uni_modules/m-view/components/m-safe-top/props.js @@ -0,0 +1,17 @@ +export default { + props: { + // 是否占位 + safeArea: { + type: Boolean, + default: true + }, + type: { + type: String, + default: 'fixed' + }, + offsetTop: { + type: String, + default: '0' + }, + } +} \ No newline at end of file diff --git a/uni_modules/m-view/components/m-sticky/m-sticky.vue b/uni_modules/m-view/components/m-sticky/m-sticky.vue new file mode 100644 index 0000000..3974ffc --- /dev/null +++ b/uni_modules/m-view/components/m-sticky/m-sticky.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/uni_modules/m-view/components/m-sticky/props.js b/uni_modules/m-view/components/m-sticky/props.js new file mode 100644 index 0000000..a2606c8 --- /dev/null +++ b/uni_modules/m-view/components/m-sticky/props.js @@ -0,0 +1,28 @@ +export default { + props: { + // 是否占位 + safeArea: { + type: Boolean, + default: true + }, + type: { + type: String, + default: 'fixed' + }, + offset: { + type: String, + default: '0' + }, + zIndex: { + type: String, + default: '997' + }, + mode:{ + type: String, + default: 'top' + }, + top:{ + type: String, + }, + } +} \ No newline at end of file diff --git a/uni_modules/m-view/components/m-text/m-text.vue b/uni_modules/m-view/components/m-text/m-text.vue new file mode 100644 index 0000000..27b26e9 --- /dev/null +++ b/uni_modules/m-view/components/m-text/m-text.vue @@ -0,0 +1,71 @@ + + + + + \ No newline at end of file diff --git a/uni_modules/m-view/index.js b/uni_modules/m-view/index.js new file mode 100644 index 0000000..0a7689b --- /dev/null +++ b/uni_modules/m-view/index.js @@ -0,0 +1,26 @@ +import api from './lib/functions.js' +import tools from './lib/tools.js' +import service from "@/uni_modules/m-view/lib/request"; +const $m = { + ...api, + ...tools, + service +} + +// $m挂载到uni对象上 +uni.$m = $m + +const install = (Vue) => { + // #ifndef APP-NVUE + // 只有vue，挂载到Vue.prototype才有意义，因为nvue中全局Vue.prototype和Vue.mixin是无效的 + Vue.config.globalProperties.$m = $m + // 暂时兼容vue2的$nextTick写法 + Vue.config.globalProperties.$nextTick = (cb) => { + cb(); + } + // #endif +} + +export default { + install +} diff --git a/uni_modules/m-view/index.scss b/uni_modules/m-view/index.scss new file mode 100644 index 0000000..85973c3 --- /dev/null +++ b/uni_modules/m-view/index.scss @@ -0,0 +1 @@ +@import "./theme/common.scss"; \ No newline at end of file diff --git a/uni_modules/m-view/lib/api.js b/uni_modules/m-view/lib/api.js new file mode 100644 index 0000000..b10b5a6 --- /dev/null +++ b/uni_modules/m-view/lib/api.js @@ -0,0 +1,8 @@ +import {host} from "../../../api/config.js"; + +export function getSts(data) { + return uni.$m.service({ + url: `${host}/user/agree-privacy`, + method: "post", + }); +} \ No newline at end of file diff --git a/uni_modules/m-view/lib/functions.js b/uni_modules/m-view/lib/functions.js new file mode 100644 index 0000000..fb9692a --- /dev/null +++ b/uni_modules/m-view/lib/functions.js @@ -0,0 +1,598 @@ +// #ifdef MP-WEIXIN +import log from "../../../utils/log"; + +const QQMapWX = require('./qqmap-wx-jssdk.min.js'); +import * as QQMapwx from './/qqmap-wx-jssdk.min.js'; + +var qqMapSdk; + +// #endif + +// import {getSTS} from "@/api/other"; + +import {imgHost, host, oss} from '@/config/host.js' +import { + INDEX_PATH, + LOGIN_PATH, + OTHER_FIELD, + PAGEINFO_FIELD, + TOKEN_FIELD, + UPLOAD_PATH, + USERINFO_FIELD +} from '@/config/config.js' +import store from "@/store"; +import {LIMIT_FIELD} from "../../../config/config"; +// import store from "@/store"; +// const store = useStore(); +export default { + loginModalState: true, + mapLocation: () => { + + return new Promise((relove, reject) => { + + wx.authorize({ + scope: 'scope.userFuzzyLocation', + success(res) { + if (res.errMsg == 'authorize:ok') { + wx.getFuzzyLocation({ + type: 'wgs84', + success(re) { + console.log(re); + uni.chooseLocation({ + latitude: re.latitude, + longitude: re.longitude, + success: function (data) { + console.log(data); + let obj = { + latitude: data.latitude, + longitude: data.longitude, + address: data.address + } + if (data.errMsg == 'chooseLocation:ok') { + qqMapSdk = new QQMapWX({ + key: 'K65BZ-LULE4-744UV-X4EIA-27RA5-A4FWT' + }) + qqMapSdk.reverseGeocoder({ + location: { + latitude: data.latitude, + longitude: data.longitude + }, + success: function (mapres) { + console.log(mapres); + if (mapres.message == 'query ok') { + obj.name = mapres.result.formatted_addresses.recommend + obj.city = mapres.result.address_component.city + relove(obj) + } + } + }) + } + } + }); + } + }) + } + }, + fail(err) { + reject(err); + } + }) + }) + }, + getLocation(details) { + return new Promise((relove, reject) => { + qqMapSdk = new QQMapWX({ + key: 'K65BZ-LULE4-744UV-X4EIA-27RA5-A4FWT' + }) + qqMapSdk.geocoder({ + //获取表单传入地址 + address: details.activedeta.city + details.activedeta.address, //地址参数，例：固定地址，address: '北京市海淀区彩和坊路海淀西大街74号' + success: function (res) {//成功后的回调 + console.log(res); + relove(res.result) + }, + fail: function (error) { + console.error(error); + }, + complete: function (res) { + console.log(res); + } + }) + }) + }, + urlToObj: (url) => { + let obj = {} + let str = url.slice(url.indexOf('?') + 1) + let arr = str.split('&') + for (let j = arr.length, i = 0; i < j; i++) { + let arr_temp = arr[i].split('=') + obj[arr_temp[0]] = arr_temp[1] + } + return obj + }, + uploadFile: (file) => { + // console.log(file); + return new Promise((resolve, reject) => { + uni.showLoading({ + title: '上传中' + }).then() + uni.uploadFile({ + url: host + UPLOAD_PATH, //仅为示例，非真实的接口地址 + filePath: file, + name: 'file', + success: (uploadFileRes) => { + uni.hideLoading() + resolve(JSON.parse(uploadFileRes.data).data) + }, + fail: (err => { + reject(err); + }) + }); + }) + }, + getImgUrl: (url) => { + if (url) { + if (url.indexOf('http') === -1) { + return imgHost + url + } else { + return url + } + } else { + return '' + } + + }, + getImgUrlToHttps: (url) => { + if (url) { + if (url.indexOf('https') == -1) { + console.log(url.replace('http', 'https')) + return url.replace('http', 'https') + } else { + return url + } + } else { + return '' + } + + }, + /** + * 失败 + */ + error: (msg) => { + + return new Promise((relove, reject) => { + uni.showToast({ + title: msg, + icon: "none" + }) + setTimeout(() => { + relove(); + }, 1500) + }) + + }, + /** + * 成功提示 + */ + success: (msg) => { + + return new Promise((resolve, reject) => { + uni.showToast({ + title: msg, + icon: "success" + }) + setTimeout(() => { + resolve(); + }, 1500) + }) + + }, + /** + * 确认对话框 + * @param {Object} contents + * @param {Object} callback + */ + confirm: (contents) => { + + return new Promise((relove, reject) => { + + uni.showModal({ + title: '提示', + content: contents, + success: function (res) { + if (res.confirm) { + relove(); + } + } + }); + + }) + + }, + payment: (param) => { + + return new Promise((relove, reject) => { + uni.requestPayment({ + provider: 'wxpay', + timeStamp: param.timeStamp, + nonceStr: param.nonceStr, + package: param.package, + signType: param.signType, + paySign: param.paySign, + success: function (res) { + relove(res); + }, + fail: function (err) { + console.log(err); + + api.error("支付失败"); + reject(err); + } + }); + + }) + }, + navHeight: () => { + let system, menu, systemBar, navigationBar, navPaddingTop, navHeight, headerPadding; + //获取系统信息 + try { + wx.getSystemInfo({ + success: res => { + this.system = res + } + }) + // log('res',this.system); + //获取胶囊信息 + this.menu = wx.getMenuButtonBoundingClientRect() + this.systemBar = this.system.statusBarHeight //状态栏高度 + this.navigationBar = (this.menu.top - this.system.statusBarHeight) * 2 + this.menu.height //胶囊高度 + this.navPaddingTop = this.systemBar; + this.navHeight = this.menu.height; + this.headerPadding = (this.menu.top - this.systemBar); + + this.systemBarHeight = (this.navPaddingTop + this.navHeight + (this.headerPadding * 2)) + } catch (e) { + //默认高度，刘海屏 + this.navPaddingTop = 43; + this.navHeight = 32; + this.headerPadding = 4; + } + return { + navPaddingTop: this.navPaddingTop, + navHeight: this.navHeight, + headerPadding: this.headerPadding, + systemBarHeight: this.systemBarHeight, + windowHeihgt: (this.system.windowHeight - this.systemBarHeight) + }; + }, + wxSystemInfo: () => { + let system; + //获取系统信息 + try { + wx.getSystemInfo({ + success: res => { + this.system = res + } + }) + } catch (e) { + + } + return { + system: this.system + }; + }, + uniSysInfo: (flush = false) => { + return new Promise((resolve, reject) => { + if (uni.getStorageSync('sysInfo') && !flush) { + resolve(uni.getStorageSync('sysInfo')); + } else { + //#ifdef MP-WEIXIN + let menuButtonInfo = uni.getMenuButtonBoundingClientRect(); + // #endif + //#ifdef APP-PLUS + let menuButtonInfo = {height:0,top:0}; + // #endif + + let sysInfo = uni.getSystemInfoSync(); + let sysMenuHeight = sysInfo.statusBarHeight; + let sysWindowHeight = sysInfo.windowHeight; + let menuButtonHeight = menuButtonInfo.height + let menuButtonPadding = menuButtonInfo.top - sysMenuHeight; + let sysAndMenuHeight = sysMenuHeight + 44;// (sysMenuHeight+menuButtonHeight+(menuButtonPadding*2)); + let windowHeight = (sysWindowHeight - sysAndMenuHeight); + + let safeAreaInsetBottom = (sysInfo.safeAreaInsets.bottom); + let data = { + sysMenuHeight: sysMenuHeight, + menuButtonHeight: menuButtonHeight, + menuButtonPadding: menuButtonPadding, + sysAndMenuHeight: sysAndMenuHeight, + windowHeight: windowHeight, + safeAreaInsetBottom: safeAreaInsetBottom, + } + uni.setStorageSync('sysInfo', data); + resolve(data); + } + + }) + }, + uploadOssFile: (file) => { + return new Promise((resolve, reject) => { + // getSTS({}).then(res => { + // // const client = new OSS(res.data); + // // console.log(file); + // uni.showLoading({ + // title:'上传中' + // }) + // let timer = new Date(); + // let address = timer.getFullYear() + '' + (timer.getMonth() + 1) + '' + timer.getDate(); + // address = 'upload/' + address + '/'; + // var imageSrc = file; + // let str = file.substr(file.lastIndexOf('.')); + // let nameStr = address + timer.getTime() + str; + // uni.uploadFile({ + // url: `${oss}`, //仅为示例，非真实的接口地址 + // filePath:file, + // name: 'file', + // header: { + // "content-type": "application/json;charset=utf-8", + // }, + // formData:Object.assign({ + // name:nameStr, + // key:nameStr, + // success_action_status: '200', + // },res.data), + // success: (uploadFileRes) => { + // uni.hideLoading() + // resolve ({show_path:oss+'/' + nameStr}); + // // relove(JSON.parse(uploadFileRes.data).data) + // // console.log(JSON.parse(uploadFileRes.data).data); + // }, + // fail:(res) =>{ + // uni.hideLoading() + // console.log(res) + // return {}; + // } + // }); + // }); + }) + }, + logout: (reLaunch = true, confirm = true) => { + return new Promise((resolve, reject) => { + if (confirm) { + uni.$m.confirm('是否退出登录').then(res => { + uni.$m.doLogout(reLaunch) + resolve(); + }) + } else { + uni.$m.doLogout(reLaunch); + resolve(); + } + + }) + }, + doLogout: (reLaunch = true) => { + uni.showLoading({title: '退出中'}).then(); + uni.removeStorageSync('token'); + // store.commit('userInfo',{}); + // store.commit('userExtends',{}); + // uni.$m.uniSysInfo().then(() => { + if (reLaunch) { + uni.reLaunch({url: INDEX_PATH}).then(); + } + uni.hideLoading(); + // }).catch(err => { + // uni.hideLoading(); + // }) + }, + navTo: (url, token = false) => { + uni.$m.checkToken(token, () => { + uni.navigateTo({ + url: url + }).then(); + }); + }, + navBack: () => { + uni.navigateBack({ + delta:1, + success:() => { + console.log('backSuccess') + }, + fail: (err) => { + uni.navigateTo({ + url: INDEX_PATH + }).then() + } + }); + }, + switchTo: (url, token = false) => { + uni.$m.checkToken(token, () => { + uni.switchTab({ + url: url + }).then(); + }); + }, + redTo: (url, token = false) => { + uni.$m.checkToken(token, () => { + uni.redirectTo({ + url: url + }).then(); + }); + }, + checkToken: (token, callback = ()=>{}) => { + if (token) { + if (uni.getStorageSync('token')) { + callback(true) + } else { + uni.navigateTo({ + url: LOGIN_PATH + }).then(); + } + } else { + callback(true) + } + }, + getFileType: (name) => { + let str = name.substr(name.lastIndexOf('.') + 1).toUpperCase(); + const imageType = ['JPG', 'JPEG', 'PNG', 'GIF', 'BMP', 'TIF', 'TGA', 'DDS', 'SVG', 'EPS', 'RAW', 'PSD']; + const videoType = ['MP4', 'MOV', 'WMV', 'FLV', 'AVI', 'AVCHD', 'WEBM', 'MKV']; + if (imageType.indexOf(str) !== -1) { + return 'image'; + } else if (videoType.indexOf(str) !== -1) { + return 'video'; + } else { + return 'none'; + } + }, + sleep: (time) => { + return new Promise((resolve, reject) => { + setTimeout(() => { + resolve(); + }, time); + }); + }, + getDomHeight: (domName) => { + return new Promise((resolve) => { + uni.$m.sleep(10).then(() => { + const info = uni.createSelectorQuery().select(domName); + info.boundingClientRect(function (data) { + console.log(data) + resolve(data.height); + }).exec(function (res) { + }); + }); + }) + }, + isTop: (data) => { + return data.scrollTop <= 20; + }, + //设置用户信息 + setUserInfo: (data) => { + uni.setStorageSync(TOKEN_FIELD, data[TOKEN_FIELD]); + if(USERINFO_FIELD){ + uni.setStorageSync(USERINFO_FIELD, data[USERINFO_FIELD]); + } + if(OTHER_FIELD){ + uni.setStorageSync(OTHER_FIELD, data[OTHER_FIELD]); + } + uni.$emit('userInfoUpdate',data[USERINFO_FIELD]); + store.commit('userInfo', data[USERINFO_FIELD]); + }, + // 获取用户信息 + getUserInfo: (field = null) => { + const user = uni.getStorageSync(USERINFO_FIELD); + return field ? (user[field] || '') : user; + }, + // 获取token + getToken: () => { + return uni.getStorageSync(TOKEN_FIELD); + }, + //微信网页登录 + wechatWeb: (request, params) => { + request(params).then(res => { + uni.$m.setUserInfo(res.data); + uni.$m.success('登录成功') + setTimeout(() => { + if (params.url) { + uni.reLaunch({url: params.url}).then(); + } else { + uni.reLaunch({url: INDEX_PATH}).then(); + } + }, 2000) + }); + }, + setPageInfo: (pageName, data) => { + let pageInfo = uni.getStorageSync(PAGEINFO_FIELD) || {}; + pageInfo[pageName] = data; + uni.setStorageSync(PAGEINFO_FIELD, pageInfo); + }, + getPageInfo: (pageName) => { + let pageInfo = uni.getStorageSync(PAGEINFO_FIELD) || {}; + return pageInfo[pageName]; + }, + list: (request, lists, pages, status) => { + return new Promise((resolve, reject) => { + if (status.value === 'nomore') { + reject(false); + return false; + } + status.value = 'loading'; + resolve(request(pages).then(res => { + if (res.data.length === 0) { + status.value = 'nomore' + return false; + } else { + lists.value = lists.value.concat(res.data) + if (res.data.length < parseFloat(pages[LIMIT_FIELD] + '')) { + status.value = 'nomore' + } else { + status.value = 'loadmore' + } + } + pages.page++; + }).catch((err) => { + status.value = 'loadmore' + })); + }) + }, + copy: (data) => { + return new Promise((resolve, reject) => { + uni.setClipboardData({ + data: data, + success: function () { + resolve(); + }, + fail: function () { + reject(); + } + }); + }) + }, + callPhone: (phone = '') => { + if (!phone) { + uni.$m.error('手机号不能为空'); + return false; + } + uni.makePhoneCall({ + phoneNumber: phone + }); + }, + callPosition: (lat, lng,name) => { + const latitude = parseFloat(lat); + const longitude = parseFloat(lng); + uni.openLocation({ + latitude: latitude, + longitude: longitude, + name: name, + }) + }, + getAddressLocation(address) { + return new Promise((relove, reject) => { + qqMapSdk = new QQMapWX({ + key: 'K65BZ-LULE4-744UV-X4EIA-27RA5-A4FWT' + }) + qqMapSdk.geocoder({ + //获取表单传入地址 + address: address, //地址参数，例：固定地址，address: '北京市海淀区彩和坊路海淀西大街74号' + success: function (res) {//成功后的回调 + console.log(res); + relove(res.result) + }, + fail: function (error) { + console.error(error); + }, + complete: function (res) { + console.log(res); + } + }) + }) + }, + async logoutYW(){ + await uni.$m.confirm('确认退出登录?'); + await uni.showLoading({title: '退出中'}); + await uni.removeStorageSync('token'); + uni.hideLoading(); + uni.reLaunch(LOGIN_PATH) + + } +}; diff --git a/uni_modules/m-view/lib/qqmap-wx-jssdk.min.js b/uni_modules/m-view/lib/qqmap-wx-jssdk.min.js new file mode 100644 index 0000000..b8fbad4 --- /dev/null +++ b/uni_modules/m-view/lib/qqmap-wx-jssdk.min.js @@ -0,0 +1,3 @@ +var ERROR_CONF={KEY_ERR:311,KEY_ERR_MSG:'key格式错误',PARAM_ERR:310,PARAM_ERR_MSG:'请求参数信息有误',SYSTEM_ERR:600,SYSTEM_ERR_MSG:'系统错误',WX_ERR_CODE:1000,WX_OK_CODE:200};var BASE_URL='https://apis.map.qq.com/ws/';var URL_SEARCH=BASE_URL+'place/v1/search';var URL_SUGGESTION=BASE_URL+'place/v1/suggestion';var URL_GET_GEOCODER=BASE_URL+'geocoder/v1/';var URL_CITY_LIST=BASE_URL+'district/v1/list';var URL_AREA_LIST=BASE_URL+'district/v1/getchildren';var URL_DISTANCE=BASE_URL+'distance/v1/';var EARTH_RADIUS=6378136.49;var Utils={location2query(data){if(typeof data=='string'){return data}var query='';for(var i=0;i { + return new Promise((resolve, reject) => { + let token=uni.getStorageSync(TOKEN_FIELD) + + // let token = uni.getStorageSync('token') + // let now = Math.round(new Date() / 1000); + // if(now > token.token_exp){ + // refreshToken(); + // } + uni.request({ + url: params.url, + data: params.data, + method: params.method, + dataType: "json", + header: { + "content-type": "application/json;charset=utf-8", + "Authorization":"Bearer "+ token.token + } + }).then(res => { + if (res.statusCode === 200) { + let data = res.data; + switch (data.code) { + case 200: + resolve(data); + break; + case 202: + if(showToast){ + uni.hideLoading() + uni.$m.error(data.msg).then(() => { + reject(data); + }); + }else{ + reject(data); + } + + break; + case 203: + resolve(data); + break; + case 1001: + uni.setStorageSync('token',data.data) + if(type === 'default'){ + console.log('default') + resolve(service(params)) + }else{ + console.log('refresh') + resolve(); + } + break; + case 1002: + if(showToast){ + uni.hideLoading() + uni.$m.error(data.msg); + } + reject(data); + break; + default: + reject(data); + break; + } + + } else { + uni.$m.error('连接服务器失败') + } + }) + + }) + + + +} +export default service; diff --git a/uni_modules/m-view/lib/tools.js b/uni_modules/m-view/lib/tools.js new file mode 100644 index 0000000..a0e278e --- /dev/null +++ b/uni_modules/m-view/lib/tools.js @@ -0,0 +1,215 @@ +export default { + /** + * 添加单位 + * @param num + * @param unit + * @returns {string} + */ + addUnit(num, unit = 'px') { + return (/px$/.test(num)) ? num : num + unit; + }, + /** + * 转换成px + * 和upx2px区别是可带单位 + * @param num + * @returns {string} + */ + getPx(num, isUnit = true) { + return this.addUnit(( + /(rpx|upx)$/.test(num)) + ? uni.upx2px(parseFloat(num)) + : parseFloat(num), isUnit ? 'px' : ''); + }, + + /** + * 样式转换格式 + * @param customStyle + * @param target + * @returns {{}|*|string|string} + */ + addStyle(customStyle, target = 'object') { + // 字符串转字符串，对象转对象情形，直接返回 + if (this.empty(customStyle) || typeof (customStyle) === 'object' && target === 'object' || target === 'string' && + typeof (customStyle) === 'string') { + return customStyle + } + // 字符串转对象 + if (target === 'object') { + // 去除字符串样式中的两端空格(中间的空格不能去掉，比如padding: 20px 0如果去掉了就错了)，空格是无用的 + customStyle = this.trim(customStyle) + // 根据";"将字符串转为数组形式 + const styleArray = customStyle.split(';') + const style = {} + // 历遍数组，拼接成对象 + for (let i = 0; i < styleArray.length; i++) { + // 'font-size:20px;color:red;'，如此最后字符串有";"的话，会导致styleArray最后一个元素为空字符串，这里需要过滤 + if (styleArray[i]) { + const item = styleArray[i].split(':') + style[this.trim(item[0])] = this.trim(item[1]) + } + } + return style + } + // 这里为对象转字符串形式 + let string = '' + for (const i in customStyle) { + // 驼峰转为中划线的形式，否则css内联样式，无法识别驼峰样式属性名 + const key = i.replace(/([A-Z])/g, '-$1').toLowerCase() + string += `${key}:${customStyle[i]};` + } + // 去除两端空格 + return this.trim(string) + }, + /** + * 判断是否为空 + */ + empty(value) { + switch (typeof value) { + case 'undefined': + return true + case 'string': + if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return true + break + case 'boolean': + if (!value) return true + break + case 'number': + if (value === 0 || isNaN(value)) return true + break + case 'object': + if (value === null || value.length === 0) return true + for (const i in value) { + return false + } + return true + } + return false + }, + /** + * @description 去除空格 + * @param str + * @param pos + */ + trim(str, pos = 'both') { + str = String(str) + if (pos == 'both') { + return str.replace(/^\s+|\s+$/g, '') + } + if (pos == 'left') { + return str.replace(/^\s*/, '') + } + if (pos == 'right') { + return str.replace(/(\s*$)/g, '') + } + if (pos == 'all') { + return str.replace(/\s+/g, '') + } + return str + }, + /** + * @description 格式化时间 + * @param {String|Number} dateTime 需要格式化的时间戳 + * @param {String} fmt 格式化规则 yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合 默认yyyy-mm-dd + * @returns {string} 返回格式化后的字符串 + */ + timeFormat(dateTime = null, formatStr = 'yyyy-mm-dd') { + let date + // 若传入时间为假值，则取当前时间 + if (!dateTime) { + date = new Date() + } + // 若为unix秒时间戳，则转为毫秒时间戳（逻辑有点奇怪，但不敢改，以保证历史兼容） + else if (/^\d{10}$/.test(dateTime.toString().trim())) { + date = new Date(dateTime * 1000) + } + // 若用户传入字符串格式时间戳，new Date无法解析，需做兼容 + else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.trim())) { + date = new Date(Number(dateTime)) + } + // 其他都认为符合 RFC 2822 规范 + else { + // 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间 + date = new Date( + typeof dateTime === 'string' + ? dateTime.replace(/-/g, '/') + : dateTime + ) + } + + const timeSource = { + 'y': date.getFullYear().toString(), // 年 + 'm': (date.getMonth() + 1).toString().padStart(2, '0'), // 月 + 'd': date.getDate().toString().padStart(2, '0'), // 日 + 'h': date.getHours().toString().padStart(2, '0'), // 时 + 'M': date.getMinutes().toString().padStart(2, '0'), // 分 + 's': date.getSeconds().toString().padStart(2, '0') // 秒 + // 有其他格式化字符需求可以继续添加，必须转化成字符串 + } + + for (const key in timeSource) { + const [ret] = new RegExp(`${key}+`).exec(formatStr) || [] + if (ret) { + // 年可能只需展示两位 + const beginIndex = key === 'y' && ret.length === 2 ? 2 : 0 + formatStr = formatStr.replace(ret, timeSource[key].slice(beginIndex)) + } + } + + return formatStr + }, + deepClone(data){ + return JSON.parse(JSON.stringify(data)); + }, + downloadFile(url,name){ + new Promise((resolve, reject) => { + let dTask = plus.downloader.createDownload(url, { + filename: 'file://storage/emulated/0/阅文系统/' + name + }, (d, status) => { + //d为下载的文件对象 + if (status === 200) { + resolve('file://storage/emulated/0/阅文系统/' + name); + } else { + reject(); + } + }) + dTask.start(); + }) + }, + getDirFile(name){ + return new Promise((resolve, reject) => { + plus.io.requestFileSystem(plus.io.PRIVATE_DOC, function (fs) { + fs.root.getDirectory('阅文系统/' + name, {}, function (entry) { + entry.createReader().readEntries(function (entries) { + resolve(entries); + }, function (err) { + console.log('entries', err) + reject(); + }); + }, function (err) { + console.log('entry', err) + reject(); + }); + }, function (err) { + console.log('fs', err) + reject(); + }) + }) + }, + checkFile(name){ + return new Promise((resolve, reject) => { + plus.io.requestFileSystem(plus.io.PRIVATE_DOC, function (fs) { + fs.root.getFile('阅文系统/' + name, {}, function (entry) { + console.log(entry) + resolve(); + }, function (err) { + console.log('entry', err) + reject(); + }); + }, function (err) { + console.log('fs', err) + reject(); + }) + }) + }, +}; + diff --git a/uni_modules/m-view/package.json b/uni_modules/m-view/package.json index 1a59946..fd821c9 100644 --- a/uni_modules/m-view/package.json +++ b/uni_modules/m-view/package.json @@ -1,18 +1,18 @@ { - "id": "m-view", - "displayName": "m-view 卡片", - "version": "1.0.1", - "description": "m-view", + "id": "mview", + "name": "mview", + "displayName": "mview", + "version": "3.1.36", + "description": "mview", "keywords": [ - "卡片" + "mview" ], - "repository": "", + "repository": "no", "engines": { "HBuilderX": "^3.1.0" }, - "dcloudext": { - "type": "component-vue", - "sale": { + "dcloudext": { + "sale": { "regular": { "price": "0.00" }, @@ -21,19 +21,18 @@ } }, "contact": { - "qq": "" + "qq": "1416956117" }, "declaration": { "ads": "无", - "data": "插件不采集任何数据", + "data": "无", "permissions": "无" }, - "npmurl": "" + "npmurl": "no", + "type": "component-vue" }, "uni_modules": { - "dependencies": [ - - ], + "dependencies": [], "encrypt": [], "platforms": { "cloud": { @@ -42,7 +41,7 @@ }, "client": { "Vue": { - "vue2": "y", + "vue2": "n", "vue3": "y" }, "App": { @@ -67,17 +66,20 @@ "阿里": "y", "百度": "y", "字节跳动": "y", - "QQ": "y", - "钉钉": "u", - "快手": "u", - "飞书": "u", - "京东": "u" + "QQ": "y" }, "快应用": { - "华为": "u", - "联盟": "u" + "华为": "y", + "联盟": "y" } } } + }, + "dependencies": { + "clipboard": "^2.0.11", + "dayjs": "^1.11.3" + }, + "publishConfig": { + "registry": "no" } -} \ No newline at end of file +} diff --git a/uni_modules/m-view/readme.md b/uni_modules/m-view/readme.md deleted file mode 100644 index a0584ed..0000000 --- a/uni_modules/m-view/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -## 常用功能封装 - -> **组件名：m-view** \ No newline at end of file diff --git a/uni_modules/m-view/theme/common.scss b/uni_modules/m-view/theme/common.scss new file mode 100644 index 0000000..fca8720 --- /dev/null +++ b/uni_modules/m-view/theme/common.scss @@ -0,0 +1,142 @@ +view,scroll-view{ + box-sizing:border-box; +} +.transition{ + transition-duration: .2s; + transition-timing-function: ease-in-out; + transition-delay: .2s; + + -webkit-transition-duration: .2s; + -webkit-transition-timing-function: ease-in-out; + -webkit-transition-delay: .2s; +} +.body-background{ + position: fixed; + top:0; + left:0; + width:100%; + height:100%; + background:{ + size:100% 100%; + position: center center; + repeat:no-repeat; + } + z-index: -1; +} +.border-box{ + box-sizing: border-box; +} +.flex{ + display:flex; +} +.flex-column{ + flex-direction: column; +} +.row{ + box-sizing: border-box; + width:100%; + display:flex; + flex-wrap: wrap; +} +.col-12{ + box-sizing: border-box; + flex: 0 0 100%; +} +.col-8{ + box-sizing: border-box; + flex: 0 0 66.66%; +} +.col-6{ + box-sizing: border-box; + flex: 0 0 50%; +} +.col-4{ + box-sizing: border-box; + flex: 0 0 33.33%; +} +.col-3{ + box-sizing: border-box; + flex: 0 0 25%; +} +.col-2{ + box-sizing: border-box; + flex: 0 0 16.667%; +} +.col-1{ + box-sizing: border-box; + flex: 0 0 8.333%; +} +.col{ + flex:1; +} +.col-auto{ + flex:auto; +} + +.align-center{ + align-items: center; +} +.justify-center{ + justify-content: center; +} +.justify-between{ + justify-content: space-between; +} +.text-center{ + text-align: center; +} + +@for $i from 1 through 5 { + .mb-#{$i} { + margin-bottom: #{$i}0rpx; + } + .mr-#{$i} { + margin-right: #{$i}0rpx; + } + .ml-#{$i} { + margin-left: #{$i}0rpx; + } + .mt-#{$i} { + margin-top: #{$i}0rpx; + } + .pb-#{$i} { + padding-bottom: #{$i}0rpx; + } + .pr-#{$i} { + padding-right: #{$i}0rpx; + } + .pl-#{$i} { + padding-left: #{$i}0rpx; + } + .pt-#{$i} { + padding-top: #{$i}0rpx; + } +} + +@for $i from 1 through 5 { + .m-line-#{$i} { + /* #ifdef APP-NVUE */ + // nvue下，可以直接使用lines属性，这是weex特有样式 + lines: $i; + text-overflow: ellipsis; + overflow: hidden; + flex: 1; + /* #endif */ + + /* #ifndef APP-NVUE */ + // vue下，单行和多行显示省略号需要单独处理 + @if $i == '1' { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } @else { + display: -webkit-box!important; + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; + -webkit-line-clamp: $i; + -webkit-box-orient: vertical!important; + } + /* #endif */ + } +} \ No newline at end of file diff --git a/uni_modules/m-view/theme/theme.scss b/uni_modules/m-view/theme/theme.scss new file mode 100644 index 0000000..68612c3 --- /dev/null +++ b/uni_modules/m-view/theme/theme.scss @@ -0,0 +1,6 @@ +// 此文件为主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于 +// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大， +// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入 +$m-checkbox-size: 32rpx !default; +$m-main-color: #3c9cff !default; +$m-assistant-color: #398ade !default; \ No newline at end of file diff --git a/utils/functions.js b/utils/functions.js index 9d0fa84..c330ebc 100644 --- a/utils/functions.js +++ b/utils/functions.js @@ -346,7 +346,7 @@ const api = { uni.clearStorageSync(); store.commit('userInfo',{}); store.commit('userExtends',{}); - api.uniSysInfo().then(() => { + uni.$m.uniSysInfo().then(() => { if(reLaunch){ uni.reLaunch({url:'/pages/Index/index'}); }