Skip to content

Commit f475201

Browse files
zhetengbijizhetengbiji
committed
Merge branch 'dev'
# Conflicts: # components/uParse/src/components/wxParseTemplate0.vue # pages/component/progress/progress.vue
2 parents 8b314bb + 1a92a6b commit f475201

66 files changed

Lines changed: 1097 additions & 1398 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎components/im-chat/messageshow.vue‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<view class="m-item" :id="'message'+id">
2+
<view class="m-item" :id="'message'+cid">
33
<view class="m-left">
44
<image class="head_icon" src="https://img-cdn-qiniu.dcloud.net.cn/uniapp/app/homeHL.png" v-if="message.user=='home'"></image>
55
</view>
@@ -16,7 +16,16 @@
1616

1717
<script>
1818
export default {
19-
props: ['message', 'id']
19+
props: {
20+
message: {
21+
type: String,
22+
default: ''
23+
},
24+
cid: {
25+
type: [Number, String],
26+
default: ''
27+
}
28+
}
2029
}
2130
</script>
2231

@@ -26,36 +35,43 @@
2635
flex-direction: row;
2736
padding-top: 40upx;
2837
}
38+
2939
.m-left {
3040
display: flex;
3141
width: 120upx;
3242
justify-content: center;
3343
align-items: flex-start;
3444
}
45+
3546
.m-content {
3647
display: flex;
3748
flex: 1;
3849
flex-direction: column;
3950
justify-content: center;
4051
word-break: break-all;
4152
}
53+
4254
.m-right {
4355
display: flex;
4456
width: 120upx;
4557
justify-content: center;
4658
align-items: flex-start;
4759
}
60+
4861
.head_icon {
4962
width: 80upx;
5063
height: 80upx;
5164
}
65+
5266
.m-content-head {
5367
position: relative;
5468
}
69+
5570
.m-content-head-right {
5671
display: flex;
5772
justify-content: flex-end;
5873
}
74+
5975
.m-content-head-home {
6076
text-align: left;
6177
background: #1482d1;
@@ -64,6 +80,7 @@
6480
padding: 20upx;
6581
color: white;
6682
}
83+
6784
.m-content-head-home:before {
6885
border: 15upx solid transparent;
6986
border-right: 15upx solid #1482d1;
@@ -73,12 +90,14 @@
7390
position: absolute;
7491
content: ' '
7592
}
93+
7694
.m-content-head-customer {
7795
border: 1upx white solid;
7896
background: white;
7997
border-radius: 20upx;
8098
padding: 20upx;
8199
}
100+
82101
.m-content-head-customer:after {
83102
border: 15upx solid transparent;
84103
border-left: 15upx solid white;

‎components/ly-markdown/ly-markdown.vue‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@
3838
components: {
3939
uParse
4040
},
41-
data: function () {
41+
data: function() {
4242
return {
4343
screenHeight: 0,
4444
cursor: 0,
45-
textareaDataSync:this.textareaData,
46-
textareaHtmlSync:this.textareaHtml
45+
textareaDataSync: '',
46+
textareaHtmlSync: ''
4747
}
4848
},
4949
props: {
5050
textareaData: {
5151
type: String,
52-
default: ""
52+
default: ''
5353
},
5454
textareaHtml: {
5555
type: String,
56-
default: ""
56+
default: ''
5757
},
5858
showPreview: {
5959
type: Boolean,
@@ -74,7 +74,7 @@
7474
// #ifdef MP-WEIXIN
7575
uni.setClipboardData({
7676
data: href,
77-
success: function () {
77+
success: function() {
7878
uni.showModal({
7979
content: "网址已复制,请在浏览器中粘贴打开",
8080
showCancel: false
@@ -154,13 +154,17 @@
154154
}
155155
},
156156
watch: {
157-
"textareaDataSync": function (newValue, oldValue) {
157+
"textareaDataSync": function(newValue, oldValue) {
158158
this.textareaHtmlSync = marked(newValue)
159159
this.$emit('update:textareaData', newValue)
160160
this.$emit('update:textareaHtml', this.textareaHtmlSync)
161161
}
162162
},
163-
mounted: function () {
163+
created() {
164+
this.textareaDataSync = this.textareaData;
165+
this.textareaHtmlSync = this.textareaHtml;
166+
},
167+
mounted() {
164168
uni.getSystemInfo({
165169
success: res => {
166170
this.screenHeight = res.screenHeight
@@ -217,4 +221,4 @@
217221
.input-content {
218222
min-height: ;
219223
}
220-
</style>
224+
</style>

‎components/mpvue-echarts/src/echarts.vue‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ import WxCanvas from './wx-canvas';
1616
1717
export default {
1818
props: {
19-
echarts: {
20-
required: true,
21-
type: Object,
22-
default() {
23-
return null;
24-
},
25-
},
2619
onInit: {
2720
required: true,
2821
type: Function,
@@ -47,23 +40,11 @@ export default {
4740
},
4841
// #ifdef H5
4942
mounted() {
50-
if (!this.echarts) {
51-
console.warn('组件需绑定 echarts 变量，例：<ec-canvas id="mychart-dom-bar" '
52-
+ 'canvas-id="mychart-bar" :echarts="echarts"></ec-canvas>');
53-
return;
54-
}
55-
5643
if (!this.lazyLoad) this.init();
5744
},
5845
// #endif
5946
// #ifndef H5
6047
onReady() {
61-
if (!this.echarts) {
62-
console.warn('组件需绑定 echarts 变量，例：<ec-canvas id="mychart-dom-bar" '
63-
+ 'canvas-id="mychart-bar" :echarts="echarts"></ec-canvas>');
64-
return;
65-
}
66-
6748
if (!this.lazyLoad) this.init();
6849
},
6950
// #endif
@@ -75,13 +56,11 @@ export default {
7556
}
7657
7758
const { canvasId } = this;
78-
this.ctx = wx.createCanvasContext(canvasId);
59+
this.ctx = wx.createCanvasContext(canvasId, this);
7960
8061
const canvas = new WxCanvas(this.ctx, canvasId);
8162
82-
this.echarts.setCanvasCreator(() => canvas);
83-
84-
const query = wx.createSelectorQuery();
63+
const query = wx.createSelectorQuery().in(this);
8564
query.select(`#${canvasId}`).boundingClientRect((res) => {
8665
if (!res) {
8766
setTimeout(() => this.init(), 50);

‎components/qrcode/qrcode.vue‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,59 @@
11
<template>
22
<view class="qrcode">
3-
<image class="image" v-if="img != ''" :src="img" :style="{ width: size+'px', height: size + 'px' }"/>
3+
<image class="image" v-if="img" :src="img" :style="{width: sizeSync + 'px', height: sizeSync + 'px'}" />
44
</view>
55
</template>
66
<script>
7-
import QR from "./qrcode.js";
7+
import QR from './qrcode.js';
88
export default {
99
name: 'number-box',
1010
props: {
1111
val: {
1212
type: String,
1313
default: ''
1414
},
15-
size:{
16-
type:Number,
17-
default:100
15+
size: {
16+
type: Number,
17+
default: 100
1818
}
1919
},
20-
data(){
21-
return{
22-
img:''
20+
data() {
21+
return {
22+
img: '',
23+
sizeSync: 100
2324
}
2425
},
25-
onUnload(){
26-
},
2726
methods: {
28-
creatQrcode(){
29-
let val = String(this.val)
30-
if(val == ''){
31-
return false
27+
creatQrcode() {
28+
let val = this.val + '';
29+
if (!val) {
30+
return;
3231
}
3332
let img = QR.createQrCodeImg(val, {
3433
size: parseInt(this.size)
35-
})
34+
});
3635
this.img = img;
3736
},
38-
clearQrcode(){
37+
clearQrcode() {
3938
this.img = '';
4039
}
4140
},
42-
watch:{
43-
size(newVal, oldVal){
44-
if(newVal != oldVal){
45-
this.size = newVal;
46-
this.creatQrcode()
41+
watch: {
42+
size(newVal, oldVal) {
43+
if (newVal != oldVal) {
44+
this.sizeSync = newVal;
45+
this.creatQrcode();
4746
}
4847
}
48+
},
49+
created() {
50+
this.sizeSync = this.size;
4951
}
5052
}
5153
</script>
5254
<style>
53-
.qrcode{
55+
.qrcode {
5456
display: flex;
5557
justify-content: center;
5658
}
57-
</style>
59+
</style>

0 commit comments

Comments
 (0)