gxd-uni-library-editx 1.0.87-beta2 → 1.0.87-beta4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/XdCardPay/XdCardPay.vue +7 -3
- package/src/components/XdCardPayChose/XdCardPayChose.vue +5 -1
- package/src/components/XdContentXss/XdContentXss.vue +26 -1
- package/src/components/XdNoData/XdNoData.vue +6 -1
- package/src/components/XdSelect/XdSelect.vue +3 -8
- package/src/install.js +12 -0
- package/src/utils/xdWxLog.js +3 -1
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
<view class="column_label">
|
|
11
11
|
订单总额
|
|
12
12
|
</view>
|
|
13
|
-
<view class="column_value text-gray">
|
|
13
|
+
<view v-if="is_not_show_price !== 'Y'" class="column_value text-gray">
|
|
14
14
|
<xd-unit
|
|
15
15
|
:price="total_price"
|
|
16
16
|
:isOld="false"
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
仍需支付
|
|
25
25
|
<view class="label_sub">（可使用多张票券支付）</view>
|
|
26
26
|
</view>
|
|
27
|
-
<view class="column_value text-primary">
|
|
27
|
+
<view v-if="is_not_show_price !== 'Y'" class="column_value text-primary">
|
|
28
28
|
<xd-unit
|
|
29
29
|
:price="needPayPrice"
|
|
30
30
|
:isOld="false"
|
|
@@ -252,9 +252,13 @@ export default {
|
|
|
252
252
|
default: false
|
|
253
253
|
},
|
|
254
254
|
payThird: { //是否支持补差
|
|
255
|
-
|
|
255
|
+
type: Boolean,
|
|
256
256
|
default: true
|
|
257
257
|
},
|
|
258
|
+
is_not_show_price: {
|
|
259
|
+
type: String,
|
|
260
|
+
default: "",
|
|
261
|
+
},
|
|
258
262
|
// payChannels: { //三方支付列表
|
|
259
263
|
// type: Array,
|
|
260
264
|
// default: () => {
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
仍需支付
|
|
27
27
|
<view class="label_sub">（可使用多张票券支付）</view>
|
|
28
28
|
</view>
|
|
29
|
-
<view class="column_value text-primary">
|
|
29
|
+
<view v-if="is_not_show_price !== 'Y'" class="column_value text-primary">
|
|
30
30
|
<xd-unit
|
|
31
31
|
:price="needPayPrice"
|
|
32
32
|
:isOld="false"
|
|
@@ -257,6 +257,10 @@ export default {
|
|
|
257
257
|
},
|
|
258
258
|
hadChoseCard: {
|
|
259
259
|
type: null | Array,
|
|
260
|
+
},
|
|
261
|
+
is_not_show_price: {
|
|
262
|
+
type: String,
|
|
263
|
+
default: ""
|
|
260
264
|
}
|
|
261
265
|
},
|
|
262
266
|
watch: {
|
|
@@ -81,9 +81,34 @@
|
|
|
81
81
|
// #endif
|
|
82
82
|
|
|
83
83
|
// #ifndef H5
|
|
84
|
-
this.vhtml = this.html;
|
|
84
|
+
this.vhtml = this.getMpHtml(this.html);
|
|
85
85
|
// #endif
|
|
86
86
|
}
|
|
87
|
+
},
|
|
88
|
+
methods:{
|
|
89
|
+
getMpHtml(html){
|
|
90
|
+
html = html.replace(/<img[^>]*>/gi, function(match, capture) {
|
|
91
|
+
match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
|
|
92
|
+
match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
|
|
93
|
+
match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
|
|
94
|
+
return match;
|
|
95
|
+
});
|
|
96
|
+
html = html.replace(/style="[^"]+"/gi, function(match, capture) {
|
|
97
|
+
match = match
|
|
98
|
+
.replace(/<p>/gi, '<p class="p_class">')
|
|
99
|
+
.replace(/width:[^;]+;/gi, 'max-width:100%;')
|
|
100
|
+
.replace(/width:[^;]+;/gi, 'max-width:100%;');
|
|
101
|
+
return match;
|
|
102
|
+
});
|
|
103
|
+
html = html.replace(/<br[^>]*\/>/gi, "");
|
|
104
|
+
html = html.replace(/<a>/gi, '<a class="a_class "');
|
|
105
|
+
html= html.replace(/<li>/gi, '<li class="li_class "');
|
|
106
|
+
html = html.replace(/\<p/gi, '<p class="p_class "');
|
|
107
|
+
html= html.replace(/\<span/gi, '<span class="span_class "');
|
|
108
|
+
html = html.replace(/<div/gi, '<div class="div_class "');
|
|
109
|
+
html = html.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"');
|
|
110
|
+
return html;
|
|
111
|
+
}
|
|
87
112
|
}
|
|
88
113
|
}
|
|
89
114
|
</script>
|
|
@@ -41,7 +41,12 @@
|
|
|
41
41
|
paddingBottom: 0,
|
|
42
42
|
uiHeight: 0,
|
|
43
43
|
|
|
44
|
-
|
|
44
|
+
// #ifdef H5
|
|
45
|
+
image: '//img.jufubao.cn/common/nodata.png?v=1',
|
|
46
|
+
//#endif
|
|
47
|
+
//#ifdef MP-WEIXIN
|
|
48
|
+
image: 'https://img.jufubao.cn/common/nodata.png?v=1',
|
|
49
|
+
//#endif
|
|
45
50
|
}
|
|
46
51
|
},
|
|
47
52
|
|
|
@@ -30,7 +30,6 @@
|
|
|
30
30
|
width: width,
|
|
31
31
|
opacity: disabled ? 0.8: 1
|
|
32
32
|
}"
|
|
33
|
-
|
|
34
33
|
@click="bindPickerClick(true)"
|
|
35
34
|
>
|
|
36
35
|
<text
|
|
@@ -39,8 +38,7 @@
|
|
|
39
38
|
'margin': margin,
|
|
40
39
|
'color': color
|
|
41
40
|
}"
|
|
42
|
-
>{{getSelectName}}
|
|
43
|
-
</text>
|
|
41
|
+
>{{getSelectName}}</text>
|
|
44
42
|
<view>
|
|
45
43
|
<slot :status="isUp">
|
|
46
44
|
<xd-font-icon
|
|
@@ -49,7 +47,6 @@
|
|
|
49
47
|
:color="color"
|
|
50
48
|
></xd-font-icon>
|
|
51
49
|
</slot>
|
|
52
|
-
|
|
53
50
|
</view>
|
|
54
51
|
</view>
|
|
55
52
|
</view>
|
|
@@ -225,13 +222,11 @@
|
|
|
225
222
|
list(value) {
|
|
226
223
|
if (this.mode === 'selector') this.init(value);
|
|
227
224
|
if (this.mode === 'multiSelector') this.multiInit(value)
|
|
228
|
-
}
|
|
225
|
+
},
|
|
229
226
|
},
|
|
230
|
-
|
|
227
|
+
|
|
231
228
|
async created() {
|
|
232
229
|
this.styleMainColor = await getParentsStyle(this.$parent, '$mainColor');
|
|
233
|
-
|
|
234
|
-
console.log('flimTypeList', this.mode)
|
|
235
230
|
this.uiColor = this.styleMainColor;
|
|
236
231
|
this.uiFontSize = this.fontSize;
|
|
237
232
|
if (this.borderColor) this.uiColor = this.borderColor;
|
package/src/install.js
CHANGED
|
@@ -39,6 +39,12 @@ const install = (Vue, options = {}) => {
|
|
|
39
39
|
*
|
|
40
40
|
*/
|
|
41
41
|
Vue.prototype.$xdConfirm = (obj) => {
|
|
42
|
+
//#ifdef MP-WEIXIN
|
|
43
|
+
if(obj.$vm !== undefined && helper.checkVarType(obj.$vm) === 'object') {
|
|
44
|
+
if(obj.$vm.styles) obj['styles'] = helper.cloneDeep(obj.$vm.styles);
|
|
45
|
+
obj.$vm = null;
|
|
46
|
+
}
|
|
47
|
+
//#endif
|
|
42
48
|
obj['radius'] = obj['radius'] === undefined ? '10rpx' : obj['radius'];
|
|
43
49
|
store.commit('setXdInputConfirm', obj);
|
|
44
50
|
};
|
|
@@ -64,6 +70,12 @@ const install = (Vue, options = {}) => {
|
|
|
64
70
|
*
|
|
65
71
|
*/
|
|
66
72
|
Vue.prototype.$xdAlert = (obj) => {
|
|
73
|
+
//#ifdef MP-WEIXIN
|
|
74
|
+
if(obj.$vm !== undefined && helper.checkVarType(obj.$vm) === 'object') {
|
|
75
|
+
if(obj.$vm.styles) obj['styles'] = helper.cloneDeep(obj.$vm.styles);
|
|
76
|
+
obj.$vm = null;
|
|
77
|
+
}
|
|
78
|
+
//#endif
|
|
67
79
|
obj['radius'] = obj['radius'] === undefined ? '30rpx' : obj['radius'];
|
|
68
80
|
store.commit('setTips', obj);
|
|
69
81
|
};
|
package/src/utils/xdWxLog.js
CHANGED