Commit 8629de99 authored by 王博文's avatar 王博文

同步主分支

parent c61a470d
/*
* @Desc: --- ----
* @Date: 2020-04-22 12:29:21
* @LastEditors: 王
* @LastEditTime: 2020-04-22 15:18:39
*/
import Vue from 'vue' import Vue from 'vue'
import App from './App' import App from './App'
...@@ -12,19 +6,18 @@ Vue.config.productionTip = false ...@@ -12,19 +6,18 @@ Vue.config.productionTip = false
App.mpType = 'app' App.mpType = 'app'
// 此处为演示Vue.prototype使用,非uView的功能部分 // 此处为演示Vue.prototype使用,非uView的功能部分
Vue.prototype.vuePrototype = '枣红' Vue.prototype.vuePrototype = '枣红';
// 引入全局uView // 引入全局uView
// Vue.prototype.openShare = true // 是否开启全局分享 import uView from "@/uview";
import uView from '@/uview' Vue.use(uView);
Vue.use(uView)
// 此处为演示vuex使用,非uView的功能部分 // 此处为演示vuex使用,非uView的功能部分
import store from '@/store' import store from '@/store';
// 引入uView提供的对vuex的简写法文件 // 引入uView提供的对vuex的简写法文件
let vuexStore = require('@/store/$u.mixin.js') let vuexStore = require("@/store/$u.mixin.js");
Vue.mixin(vuexStore) Vue.mixin(vuexStore);
const app = new Vue({ const app = new Vue({
store, store,
......
...@@ -4,33 +4,23 @@ ...@@ -4,33 +4,23 @@
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<view class="u-no-demo-here">如果使用text-align: center对齐,数字滚动期间可能会抖动,见文档说明</view> <view class="u-no-demo-here">
如果使用text-align: center对齐,数字滚动期间可能会抖动,见文档说明
</view>
<view class="count-to-demo"> <view class="count-to-demo">
<u-count-to <u-count-to class="count-to" :useEasing="useEasing" ref="uCountTo" :autoplay="autoplay"
class="count-to" :startVal="startVal" :endVal="endVal" :duration="duration" :decimals="decimals"
:useEasing="useEasing" @end="end"></u-count-to>
ref="uCountTo"
:autoplay="autoplay"
:startVal="startVal"
:endVal="endVal"
:duration="duration"
:decimals="decimals"
:fontWeight="fontWeight"
@end="end"
></u-count-to>
</view> </view>
</view> </view>
</view> </view>
<view class="u-config-wrap"> <view class="u-config-wrap">
<view class="u-config-title u-border-bottom">参数配置</view> <view class="u-config-title u-border-bottom">
参数配置
</view>
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">状态</view> <view class="u-item-title">状态</view>
<u-subsection <u-subsection vibrateShort :current="current" :list="['启动', '暂停', '继续', '重置']" @change="statusChange"></u-subsection>
vibrateShort
:current="current"
:list="['启动', '暂停', '继续', '重置']"
@change="statusChange"
></u-subsection>
</view> </view>
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">目标值</view> <view class="u-item-title">目标值</view>
...@@ -44,15 +34,6 @@ ...@@ -44,15 +34,6 @@
<view class="u-item-title">显示小数</view> <view class="u-item-title">显示小数</view>
<u-subsection vibrateShort current="1" :list="['是', '否']" @change="decimalsChange"></u-subsection> <u-subsection vibrateShort current="1" :list="['是', '否']" @change="decimalsChange"></u-subsection>
</view> </view>
<view class="u-config-item">
<view class="u-item-title">字体加粗</view>
<u-subsection
vibrateShort
current="1"
:list="['normal', 'bold', 'bolder','lighter']"
@change="fontWidthChange"
></u-subsection>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -63,14 +44,13 @@ export default { ...@@ -63,14 +44,13 @@ export default {
return { return {
startVal: 0, startVal: 0,
endVal: 608, endVal: 608,
separator: ",", separator: ',',
decimals: 0, decimals: 0,
duration: 2000, duration: 2000,
autoplay: false, autoplay: false,
useEasing: true, useEasing: true,
current: 3, current: 3,
isStop: false, // 如果开没启动前,不允许点击状态选项的"继续"按钮,否则会导致显示NaN isStop: false, // 如果开没启动前,不允许点击状态选项的"继续"按钮,否则会导致显示NaN
fontWeight: 400
}; };
}, },
methods: { methods: {
...@@ -82,20 +62,16 @@ export default { ...@@ -82,20 +62,16 @@ export default {
durationChange(index) { durationChange(index) {
this.duration = index == 0 ? 1000 : index == 1 ? 2000 : 3000; this.duration = index == 0 ? 1000 : index == 1 ? 2000 : 3000;
}, },
fontWidthChange(index) {
let arr = ["normal", "bold", "bolder", "lighter"];
this.fontWeight = arr[index];
},
decimalsChange(index) { decimalsChange(index) {
this.decimals = index == 0 ? 2 : 0; this.decimals = index == 0 ? 2 : 0;
}, },
statusChange(index) { statusChange(index) {
this.current = index; this.current = index;
if (index == 0) { if(index == 0) {
this.start(); this.start();
} else if (index == 1) { } else if(index == 1) {
this.stop(); this.stop();
} else if (index == 2) { } else if(index == 2){
this.resume(); this.resume();
} else { } else {
this.reset(); this.reset();
...@@ -104,9 +80,9 @@ export default { ...@@ -104,9 +80,9 @@ export default {
end() { end() {
this.current = 3; this.current = 3;
this.$refs.uToast.show({ this.$refs.uToast.show({
type: "warning", type: 'warning',
title: "滚动结束" title: '滚动结束'
}); })
}, },
start() { start() {
this.current = 0; this.current = 0;
...@@ -117,15 +93,15 @@ export default { ...@@ -117,15 +93,15 @@ export default {
this.$refs.uCountTo.stop(); this.$refs.uCountTo.stop();
}, },
resume() { resume() {
if (!this.isStop) { if(!this.isStop) {
this.$refs.uToast.show({ this.$refs.uToast.show({
type: "error", type: 'error',
title: "请开始并暂停后才能继续" title: '请开始并暂停后才能继续'
}); })
this.$nextTick(() => { this.$nextTick(() => {
this.current = 3; this.current = 3;
}); })
return; return ;
} }
this.$refs.uCountTo.resume(); this.$refs.uCountTo.resume();
}, },
......
<!--
* @Desc: --- ----
* @Date: 2020-04-22 12:29:21
* @LastEditors: 王
* @LastEditTime: 2020-04-22 18:33:28
-->
<template> <template>
<view class="u-demo"> <view class="u-demo">
<view class="u-demo-wrap"> <view class="u-demo-wrap">
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-gap :bg-color="bgColor" :height="height" :margin="margin"></u-gap> <u-gap :bg-color="bgColor" :height="height"></u-gap>
</view> </view>
</view> </view>
<view class="u-config-wrap"> <view class="u-config-wrap">
<view class="u-config-title u-border-bottom">参数配置</view> <view class="u-config-title u-border-bottom">
参数配置
</view>
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">背景颜色</view> <view class="u-item-title">背景颜色</view>
<u-subsection <u-subsection vibrateShort :list="['default', 'primary', 'error', 'warning', 'success']" @change="bgColorChange"></u-subsection>
vibrateShort
:list="['default', 'primary', 'error', 'warning', 'success']"
@change="bgColorChange"
></u-subsection>
</view> </view>
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">高度</view> <view class="u-item-title">高度</view>
<u-subsection vibrateShort :list="['30', '50', '70']" @change="heightChange"></u-subsection> <u-subsection vibrateShort :list="['30', '50', '70']" @change="heightChange"></u-subsection>
</view> </view>
<view class="u-config-item">
<view class="u-item-title">上下外边距</view>
<u-subsection vibrateShort :list="['30', '50', '70']" @change="marginChange"></u-subsection>
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
height: 30, height: 30,
margin: 0,
bgColor: this.$u.color.bgColor bgColor: this.$u.color.bgColor
}; }
}, },
methods: { methods: {
bgColorChange(index) { bgColorChange(index) {
let color = let color = index == 0 ? 'default' : index == 1 ? 'primary' : index == 2 ? 'error' : index == 3 ? 'warning' : 'success';
index == 0 this.bgColor = color == 'default' ? this.$u.color['bgColor'] : this.$u.color[color];
? "default"
: index == 1
? "primary"
: index == 2
? "error"
: index == 3
? "warning"
: "success";
this.bgColor =
color == "default" ? this.$u.color["bgColor"] : this.$u.color[color];
}, },
heightChange(index) { heightChange(index) {
this.height = index == 0 ? 30 : index == 1 ? 50 : 70; this.height = index == 0 ? 30 : index == 1 ? 50 : 70;
},
marginChange(index) {
this.margin = index == 0 ? 30 : index == 1 ? 50 : 70;
} }
} }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
</style> </style>
<template> <template>
<view <view class="u-count-num" :style="{
class="u-count-num"
:style="{
fontSize: fontSize + 'rpx', fontSize: fontSize + 'rpx',
fontWeight:fontWeight,
color: color color: color
}" }">
>{{ displayValue }}</view> {{ displayValue }}
</view>
</template> </template>
<script> <script>
...@@ -46,28 +44,23 @@ export default { ...@@ -46,28 +44,23 @@ export default {
// 十进制分割 // 十进制分割
decimal: { decimal: {
type: [Number, String], type: [Number, String],
default: "." default: '.'
}, },
// 字体颜色 // 字体颜色
color: { color: {
type: String, type: String,
default: "#303133" default: '#303133'
}, },
// 字体大小 // 字体大小
fontSize: { fontSize: {
type: [Number, String], type: [Number, String],
default: 50 default: 50
}, },
// 字体粗细
fontWeight: {
type: [Number, String],
default: 400
},
// 千位分隔符,类似金额的分割(¥23,321.05中的",") // 千位分隔符,类似金额的分割(¥23,321.05中的",")
separator: { separator: {
type: String, type: String,
default: "" default: ''
} },
}, },
data() { data() {
return { return {
...@@ -159,47 +152,27 @@ export default { ...@@ -159,47 +152,27 @@ export default {
this.remaining = this.localDuration - progress; this.remaining = this.localDuration - progress;
if (this.useEasing) { if (this.useEasing) {
if (this.countDown) { if (this.countDown) {
this.printVal = this.printVal = this.localStartVal - this.easingFn(progress, 0, this.localStartVal - this.endVal, this.localDuration);
this.localStartVal -
this.easingFn(
progress,
0,
this.localStartVal - this.endVal,
this.localDuration
);
} else { } else {
this.printVal = this.easingFn( this.printVal = this.easingFn(progress, this.localStartVal, this.endVal - this.localStartVal, this.localDuration);
progress,
this.localStartVal,
this.endVal - this.localStartVal,
this.localDuration
);
} }
} else { } else {
if (this.countDown) { if (this.countDown) {
this.printVal = this.printVal = this.localStartVal - (this.localStartVal - this.endVal) * (progress / this.localDuration);
this.localStartVal -
(this.localStartVal - this.endVal) *
(progress / this.localDuration);
} else { } else {
this.printVal = this.printVal = this.localStartVal + (this.endVal - this.localStartVal) * (progress / this.localDuration);
this.localStartVal +
(this.endVal - this.localStartVal) *
(progress / this.localDuration);
} }
} }
if (this.countDown) { if (this.countDown) {
this.printVal = this.printVal = this.printVal < this.endVal ? this.endVal : this.printVal;
this.printVal < this.endVal ? this.endVal : this.printVal;
} else { } else {
this.printVal = this.printVal = this.printVal > this.endVal ? this.endVal : this.printVal;
this.printVal > this.endVal ? this.endVal : this.printVal;
} }
this.displayValue = this.formatNumber(this.printVal); this.displayValue = this.formatNumber(this.printVal);
if (progress < this.localDuration) { if (progress < this.localDuration) {
this.rAF = this.requestAnimationFrame(this.count); this.rAF = this.requestAnimationFrame(this.count);
} else { } else {
this.$emit("end"); this.$emit('end');
} }
}, },
// 判断是否数字 // 判断是否数字
...@@ -208,14 +181,14 @@ export default { ...@@ -208,14 +181,14 @@ export default {
}, },
formatNumber(num) { formatNumber(num) {
num = num.toFixed(Number(this.decimals)); num = num.toFixed(Number(this.decimals));
num += ""; num += '';
const x = num.split("."); const x = num.split('.');
let x1 = x[0]; let x1 = x[0];
const x2 = x.length > 1 ? this.decimal + x[1] : ""; const x2 = x.length > 1 ? this.decimal + x[1] : '';
const rgx = /(\d+)(\d{3})/; const rgx = /(\d+)(\d{3})/;
if (this.separator && !this.isNumber(this.separator)) { if (this.separator && !this.isNumber(this.separator)) {
while (rgx.test(x1)) { while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + this.separator + "$2"); x1 = x1.replace(rgx, '$1' + this.separator + '$2');
} }
} }
return x1 + x2; return x1 + x2;
......
<!--
* @Desc: --- ----
* @Date: 2020-04-22 12:29:22
* @LastEditors: 王
* @LastEditTime: 2020-04-22 18:31:36
-->
<template> <template>
<view class="u-gap" :style="[gapStyle]"></view> <view class="u-gap" :style="[gapStyle]">
</view>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
bgColor: { bgColor: {
type: String, type: String,
default: "#f3f4f6" // 也即:rgb(243, 244, 246) default: '#f3f4f6' // 也即:rgb(243, 244, 246)
}, },
// 高度 // 高度
height: { height: {
type: [String, Number], type: [String, Number],
default: 30 default: 30
},
margin: {
type: [String, Number],
default: 0
} }
}, },
computed: { computed: {
gapStyle() { gapStyle() {
return { return {
backgroundColor: this.bgColor, backgroundColor: this.bgColor,
height: this.height + "rpx", height: this.height + 'rpx'
marginTop: this.margin + "rpx", }
marginBttom: this.margin + "rpx" }
};
} }
} }
};
</script> </script>
<style> <style>
......
<template> <template>
<view class="u-search"> <view class="u-search">
<view <view class="u-content" :style="{
class="u-content"
:style="{
backgroundColor: bgColor, backgroundColor: bgColor,
borderRadius: shape == 'round' ? '100rpx' : '10rpx', borderRadius: shape == 'round' ? '100rpx' : '10rpx',
border: borderStyle, border: borderStyle,
height: height + 'rpx' height: height + 'rpx'
}" }">
>
<view class="u-icon-wrap"> <view class="u-icon-wrap">
<u-icon class="u-clear-icon" :size="30" name="search" color="#909399"></u-icon> <u-icon class="u-clear-icon" :size="30" name="search" color="#909399"></u-icon>
</view> </view>
<input <input confirm-type="search" @blur="blur" :value="value" @confirm="search" @input="inputChange" :disabled="disabled" @focus="getFocus" :focus="focus"
confirm-type="search" placeholder-class="u-placeholder-class" :placeholder="placeholder" class="u-input" type="text" :style="{
@blur="blur"
:value="value"
@confirm="search"
@input="inputChange"
:disabled="disabled"
@focus="getFocus"
:focus="focus"
placeholder-class="u-placeholder-class"
:placeholder="placeholder"
class="u-input"
type="text"
:style="{
textAlign: inputAlign textAlign: inputAlign
}" }" />
/>
<view class="u-close-wrap" v-if="keyword && clearabled && focused" @touchstart="clear"> <view class="u-close-wrap" v-if="keyword && clearabled && focused" @touchstart="clear">
<u-icon class="u-clear-icon" name="close" :size="16" color="#fff" @touchstart="clear"></u-icon> <u-icon class="u-clear-icon" name="close" :size="16" color="#fff" @touchstart="clear"></u-icon>
</view> </view>
</view> </view>
<view <view :style="[actionStyle]" class="u-action" :class="[showActionBtn || show ? 'u-action-active' : '']" @tap="custom">
:style="[actionStyle]" {{actionText}}
class="u-action" </view>
:class="[showActionBtn || show ? 'u-action-active' : '']"
@tap="custom"
>{{actionText}}</view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
// 搜索框形状,round-圆形,square-方形 // 搜索框形状,round-圆形,square-方形
shape: { shape: {
type: String, type: String,
default: "round" default: 'round'
}, },
// 搜索框背景色,默认值#f2f2f2 // 搜索框背景色,默认值#f2f2f2
bgColor: { bgColor: {
type: String, type: String,
default: "#f2f2f2" default: '#f2f2f2'
}, },
// 占位提示文字 // 占位提示文字
placeholder: { placeholder: {
type: String, type: String,
default: "请输入关键字" default: '请输入关键字'
}, },
// 是否启用清除控件 // 是否启用清除控件
clearabled: { clearabled: {
...@@ -79,18 +60,18 @@ export default { ...@@ -79,18 +60,18 @@ export default {
actionStyle: { actionStyle: {
type: Object, type: Object,
default() { default() {
return {}; return {}
} }
}, },
// 取消按钮文字 // 取消按钮文字
actionText: { actionText: {
type: String, type: String,
default: "搜索" default: '搜索'
}, },
// 输入框内容对齐方式,可选值为 left|center|right // 输入框内容对齐方式,可选值为 left|center|right
inputAlign: { inputAlign: {
type: String, type: String,
default: "left" default: 'left'
}, },
// 是否启用输入框 // 是否启用输入框
disabled: { disabled: {
...@@ -105,12 +86,12 @@ export default { ...@@ -105,12 +86,12 @@ export default {
// 边框颜色,只要配置了颜色,才会有边框 // 边框颜色,只要配置了颜色,才会有边框
borderColor: { borderColor: {
type: String, type: String,
default: "none" default: 'none'
}, },
// 输入框的初始化内容 // 输入框的初始化内容
value: { value: {
type: String, type: String,
default: "" default: ''
}, },
// 搜索框高度,单位rpx // 搜索框高度,单位rpx
height: { height: {
...@@ -120,21 +101,21 @@ export default { ...@@ -120,21 +101,21 @@ export default {
}, },
data() { data() {
return { return {
keyword: "", keyword: '',
showClear: false, // 是否显示右边的清除图标 showClear: false, // 是否显示右边的清除图标
show: false, show: false,
// 标记input当前状态是否处于聚焦中,如果是,才会显示右侧的清除控件 // 标记input当前状态是否处于聚焦中,如果是,才会显示右侧的清除控件
focused: this.focus focused: this.focus,
// 绑定输入框的值 // 绑定输入框的值
// inputValue: this.value // inputValue: this.value
}; }
}, },
watch: { watch: {
keyword(nVal) { keyword(nVal) {
// 双向绑定值,让v-model绑定的值双向变化 // 双向绑定值,让v-model绑定的值双向变化
this.$emit("input", nVal); this.$emit('input', nVal)
// 触发change事件,事件效果和v-model双向绑定的效果一样,让用户多一个选择 // 触发change事件,事件效果和v-model双向绑定的效果一样,让用户多一个选择
this.$emit("change", nVal); this.$emit('change', nVal)
}, },
value: { value: {
immediate: true, immediate: true,
...@@ -150,8 +131,8 @@ export default { ...@@ -150,8 +131,8 @@ export default {
}, },
// 样式,根据用户传入的颜色值生成,如果不传入,默认为none // 样式,根据用户传入的颜色值生成,如果不传入,默认为none
borderStyle() { borderStyle() {
if (this.borderColor) return `1px solid ${this.borderColor}`; if(this.borderColor) return `1px solid ${this.borderColor}`;
else return "none"; else return 'none';
} }
}, },
methods: { methods: {
...@@ -162,17 +143,17 @@ export default { ...@@ -162,17 +143,17 @@ export default {
// 清空输入 // 清空输入
// 也可以作为用户通过this.$refs形式调用清空输入框内容 // 也可以作为用户通过this.$refs形式调用清空输入框内容
clear() { clear() {
this.keyword = ""; this.keyword = '';
}, },
// 确定搜索 // 确定搜索
search() { search() {
this.$emit("search", this.keyword); this.$emit('search', this.keyword);
// 收起键盘 // 收起键盘
uni.hideKeyboard(); uni.hideKeyboard();
}, },
// 点击右边自定义按钮的事件 // 点击右边自定义按钮的事件
custom() { custom() {
this.$emit("custom", this.keyword); this.$emit('custom', this.keyword);
// 收起键盘 // 收起键盘
uni.hideKeyboard(); uni.hideKeyboard();
}, },
...@@ -188,37 +169,37 @@ export default { ...@@ -188,37 +169,37 @@ export default {
this.show = false; this.show = false;
} }
} }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.u-search { .u-search {
display: flex; display: flex;
align-items: center; align-items: center;
flex: 1; flex: 1;
} }
.u-content { .u-content {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 18rpx; padding: 0 18rpx;
flex: 1; flex: 1;
} }
.u-clear-icon { .u-clear-icon {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.u-input { .u-input {
flex: 1; flex: 1;
font-size: 28rpx; font-size: 28rpx;
line-height: 1; line-height: 1;
margin: 0 10rpx; margin: 0 10rpx;
color: $u-tips-color; color: $u-tips-color;
} }
.u-close-wrap { .u-close-wrap {
width: 34rpx; width: 34rpx;
height: 34rpx; height: 34rpx;
display: flex; display: flex;
...@@ -226,13 +207,13 @@ export default { ...@@ -226,13 +207,13 @@ export default {
justify-content: center; justify-content: center;
background-color: rgb(200, 203, 204); background-color: rgb(200, 203, 204);
border-radius: 50%; border-radius: 50%;
} }
.u-placeholder-class { .u-placeholder-class {
color: $u-tips-color; color: $u-tips-color;
} }
.u-action { .u-action {
font-size: 28rpx; font-size: 28rpx;
color: $u-main-color; color: $u-main-color;
width: 0; width: 0;
...@@ -240,10 +221,10 @@ export default { ...@@ -240,10 +221,10 @@ export default {
transition: all 0.3s; transition: all 0.3s;
white-space: nowrap; white-space: nowrap;
text-align: center; text-align: center;
} }
.u-action-active { .u-action-active {
width: 80rpx; width: 80rpx;
margin-left: 10rpx; margin-left: 10rpx;
} }
</style> </style>
// 引入全局mixin // 引入全局mixin
import mixin from '@/uview/libs/mixin/mixin.js' import mixin from '@/uview/libs/mixin/mixin.js'
import wxshare from '@/uview/libs/mixin/wxshare.js'
// 全局挂载引入http相关请求拦截插件 // 全局挂载引入http相关请求拦截插件
import http from '@/uview/libs/request' import http from "@/uview/libs/request";
function wranning (str) { function wranning(str) {
// 开发环境进行信息输出,主要是一些报错信息 // 开发环境进行信息输出,主要是一些报错信息
// 这个环境的来由是在程序编写时候,点击hx编辑器运行调试代码的时候,详见: // 这个环境的来由是在程序编写时候,点击hx编辑器运行调试代码的时候,详见:
// https://uniapp.dcloud.io/frame?id=%e5%bc%80%e5%8f%91%e7%8e%af%e5%a2%83%e5%92%8c%e7%94%9f%e4%ba%a7%e7%8e%af%e5%a2%83 // https://uniapp.dcloud.io/frame?id=%e5%bc%80%e5%8f%91%e7%8e%af%e5%a2%83%e5%92%8c%e7%94%9f%e4%ba%a7%e7%8e%af%e5%a2%83
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
console.warn(str) console.warn(str);
} }
} }
...@@ -23,41 +23,63 @@ function wranning (str) { ...@@ -23,41 +23,63 @@ function wranning (str) {
// } // }
// post类型对象参数转为get类型url参数 // post类型对象参数转为get类型url参数
import { queryParams } from '@/uview/libs/function/queryParams.js' import {
queryParams
} from '@/uview/libs/function/queryParams.js';
// 路由封装 // 路由封装
import { route } from '@/uview/libs/function/route.js' import {
route
} from '@/uview/libs/function/route.js';
// 时间格式化 // 时间格式化
import { timeFormat } from '@/uview/libs/function/timeFormat.js' import {
timeFormat
} from '@/uview/libs/function/timeFormat.js';
// 时间戳格式化,返回多久之前 // 时间戳格式化,返回多久之前
import { timeFrom } from '@/uview/libs/function/timeFrom.js' import {
timeFrom
} from '@/uview/libs/function/timeFrom.js';
// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制 // 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
import { import {
colorGradient, colorGradient,
hexToRgb, hexToRgb,
rgbToHex rgbToHex
} from '@/uview/libs/function/colorGradient.js' } from '@/uview/libs/function/colorGradient.js';
// 生成全局唯一guid字符串 // 生成全局唯一guid字符串
import { guid } from '@/uview/libs/function/guid.js' import {
guid
} from '@/uview/libs/function/guid.js';
// 主题相关颜色,info|success|warning|primary|default|error,此颜色已在uview.scss中定义,但是为js中也能使用,故也定义一份 // 主题相关颜色,info|success|warning|primary|default|error,此颜色已在uview.scss中定义,但是为js中也能使用,故也定义一份
import { color } from '@/uview/libs/function/color.js' import {
color
} from '@/uview/libs/function/color.js';
// 根据type获取图标名称 // 根据type获取图标名称
import { type2icon } from '@/uview/libs/function/type2icon.js' import {
type2icon
} from '@/uview/libs/function/type2icon.js';
// 打乱数组的顺序 // 打乱数组的顺序
import { randomArray } from '@/uview/libs/function/randomArray.js' import {
randomArray
} from "@/uview/libs/function/randomArray.js";
// 规则检验 // 规则检验
import test from '@/uview/libs/function/test.js' import test from "@/uview/libs/function/test.js";
// 随机数 // 随机数
import { random } from '@/uview/libs/function/random.js' import {
random
} from "@/uview/libs/function/random.js";
// 去除空格 // 去除空格
import { trim } from '@/uview/libs/function/trim.js' import {
trim
} from "@/uview/libs/function/trim.js";
// toast提示,对uni.showToast的封装 // toast提示,对uni.showToast的封装
import { toast } from '@/uview/libs/function/toast.js' import {
toast
} from "@/uview/libs/function/toast.js";
// 配置信息 // 配置信息
import config from '@/uview/libs/config/config.js' import config from "@/uview/libs/config/config.js";
// 各个需要fixed的地方的z-index配置文件 // 各个需要fixed的地方的z-index配置文件
import zIndex from '@/uview/libs/config/zIndex.js' import zIndex from "@/uview/libs/config/zIndex.js";
const $u = { const $u = {
queryParams, queryParams,
...@@ -82,28 +104,24 @@ const $u = { ...@@ -82,28 +104,24 @@ const $u = {
http, http,
toast, toast,
config, // uView配置信息相关,比如版本号 config, // uView配置信息相关,比如版本号
zIndex zIndex,
} }
const install = Vue => { const install = (Vue) => {
Vue.mixin(mixin) Vue.mixin(mixin);
console.log(Vue.prototype.openShare)
if (Vue.prototype.openShare) {
Vue.mixin(wxshare)
}
// Vue.mixin(vuexStore); // Vue.mixin(vuexStore);
// 时间格式化,同时两个名称,date和timeFormat // 时间格式化,同时两个名称,date和timeFormat
Vue.filter('timeFormat', (timestamp, format) => { Vue.filter('timeFormat', (timestamp, format) => {
return timeFormat(timestamp, format) return timeFormat(timestamp, format);
}) })
Vue.filter('date', (timestamp, format) => { Vue.filter('date', (timestamp, format) => {
return timeFormat(timestamp, format) return timeFormat(timestamp, format);
}) })
// 将多久以前的方法,注入到全局过滤器 // 将多久以前的方法,注入到全局过滤器
Vue.filter('timeFrom', (timestamp, format) => { Vue.filter('timeFrom', (timestamp, format) => {
return timeFrom(timestamp, format) return timeFrom(timestamp, format);
}) })
Vue.prototype.$u = $u Vue.prototype.$u = $u;
} }
export default { export default {
......
module.exports = { module.exports = {
data () { data() {
return {} return {}
}, },
onLoad() {
// getRect挂载到$u上,因为这方法需要使用in(this),所以无法把它独立成一个单独的文件导出
this.$u.getRect = this.$uGetRect;
// 设置默认的转发参数
this.$u.mpShare = {
title: '', // 默认为小程序名称
path: '', // 默认为当前页面路径
imageUrl: '' // 默认为当前页面的截图
};
},
onShareAppMessage() {
return this.$u.mpShare;
},
methods: { methods: {
// 查询节点信息 // 查询节点信息
$uGetRect (selector, all) { $uGetRect(selector, all) {
return new Promise(resolve => { return new Promise(resolve => {
uni uni.createSelectorQuery()
.createSelectorQuery() .in(this)[all ? 'selectAll' : 'select'](selector)
.in(this)
[all ? 'selectAll' : 'select'](selector)
.boundingClientRect(rect => { .boundingClientRect(rect => {
if (all && Array.isArray(rect) && rect.length) { if (all && Array.isArray(rect) && rect.length) {
resolve(rect) resolve(rect);
} }
if (!all && rect) { if (!all && rect) {
resolve(rect) resolve(rect);
} }
}) })
.exec() .exec();
}) });
} },
}, },
onReachBottom () { onReachBottom() {
uni.$emit('uOnReachBottom') uni.$emit('uOnReachBottom');
} }
} }
module.exports = {
onLoad () {
// getRect挂载到$u上,因为这方法需要使用in(this),所以无法把它独立成一个单独的文件导出
this.$u.getRect = this.$uGetRect
// 设置默认的转发参数
this.$u.mpShare = {
title: '', // 默认为小程序名称
path: '', // 默认为当前页面路径
imageUrl: '' // 默认为当前页面的截图
}
},
onShareAppMessage () {
return this.$u.mpShare
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment