jufubao-mall 2.0.35-beta3 → 2.0.35-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.
@@ -0,0 +1,242 @@
1
+ 'use strict';
2
+
3
+
4
+ import {dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
5
+ import more from "./more";
6
+ import brand from "./brand";
7
+ import tab from "./tab";
8
+
9
+ export default function (data, gValue, gColor, oldData) {
10
+ return [
11
+ {
12
+ ele: 'title',
13
+ label: '常规',
14
+ size: 'small',
15
+ groupKey:'style',
16
+ },
17
+ {
18
+ label: '外边距',
19
+ ele: 'xd-radio',
20
+ groupKey: 'style',
21
+ valueKey: 'marginStatus',
22
+ value: statusDataVal({data, key:'marginStatus', fields:['margin'],gValue}),
23
+ labelInline:true,
24
+ list: [
25
+ {label: '默认', value: 'D'},
26
+ {label: '自定义', value: 'C'},
27
+ ]
28
+ },
29
+ {ele: 'group_start'},
30
+ {
31
+ label: '',
32
+ ele: 'xd-margin-padding',
33
+ groupKey:'style',
34
+ valueKey: 'margin',
35
+ value: dataVal({
36
+ data,
37
+ key:'margin',
38
+ dValue:(gValue.isAdd && gValue.isFirst? ({top:0, left:0, right:0,bottom:16}) : {top:0, left:0, right:0,bottom:20}),
39
+ gValue,
40
+ isPM: true,
41
+ }),
42
+ hidden: !statusShow({data, key: 'marginStatus', fields:['margin'], gValue}),
43
+ setting: {
44
+ type: 'margin',
45
+ },
46
+ },
47
+ {ele: 'group_end'},
48
+ {
49
+ label: '內边距',
50
+ ele: 'xd-radio',
51
+ groupKey: 'style',
52
+ valueKey: 'bgImagePaddingStatus',
53
+ value: statusDataVal({data, key:'bgImagePaddingStatus', fields:['bgImagePadding'],gValue}),
54
+ labelInline:true,
55
+ list: [
56
+ {label: '默认', value: 'D'},
57
+ {label: '自定义', value: 'C'},
58
+ ]
59
+ },
60
+ {ele: 'group_start'},
61
+ {
62
+ label: '',
63
+ ele: 'xd-margin-padding',
64
+ valueKey: 'bgImagePadding',
65
+ value: dataVal({
66
+ data,
67
+ key:'bgImagePadding',
68
+ dValue:(gValue.isAdd && gValue.isFirst? ({top:0, left:0, right:0,bottom:16}) : {top:0, left:0, right:0,bottom:20}),
69
+ gValue,
70
+ isPM: true,
71
+ }),
72
+ hidden: !statusShow({data, key: 'bgImagePaddingStatus', fields:['bgImagePadding'], gValue}),
73
+ groupKey: 'style',
74
+ setting: {
75
+ type: 'padding',
76
+ },
77
+ placeholder: '请填充设置',
78
+ inline: false,
79
+ notice: `设置内填充,<span style="color: red">单位:像素</span>。默认值:<span style="color:red">${data['listLayout'] === 'slide'?32:0}</span>像素`,
80
+ },
81
+ {ele: 'group_end'},
82
+ {
83
+ label: '背景',
84
+ ele: 'xd-radio',
85
+ groupKey: 'style',
86
+ valueKey: 'bodyStatus',
87
+ value: statusDataVal({data, key:'bodyStatus', fields:['outBgColor'],gValue}),
88
+ labelInline:true,
89
+ list: [
90
+ {label: '默认', value: 'D'},
91
+ {label: '自定义', value: 'C'},
92
+ ]
93
+ },
94
+ {ele: 'group_start'},
95
+ {
96
+ label: '背景色',
97
+ ele: 'xd-color',
98
+ valueKey: 'outBgColor',
99
+ value: dataVal({data, key:'outBgColor', dValue:'#fff', gValue}),
100
+ hidden: !statusShow({data, key: 'bodyStatus', fields:['outBgColor'], gValue}),
101
+ placeholder: '请选择背景色',
102
+ classNmae: 'input80',
103
+ groupKey: 'style',
104
+ labelInline: true,
105
+ setting: {
106
+ showAlpha: true
107
+ }
108
+ },
109
+ {ele: 'group_end'},
110
+ {
111
+ label: '圆角',
112
+ ele: 'xd-radio',
113
+ groupKey: 'style',
114
+ valueKey: 'mainNewRadiusStatus',
115
+ value: statusDataVal({data, key:'mainNewRadiusStatus',cValue:'N', fields:['mainNewRadius'],gValue}),
116
+ labelInline:true,
117
+ list: [
118
+ {label: '默认', value: 'D'},
119
+ {label: '无圆角', value: 'N'},
120
+ {label: '自定义', value: 'C'},
121
+ ]
122
+ },
123
+ {ele: 'group_start'},
124
+ {
125
+ label: "",
126
+ groupKey: 'style',
127
+ ele: 'xd-slider',
128
+ valueKey: "mainRadius",
129
+ value: data['mainRadius'] === undefined?0:data['mainRadius'],
130
+ className: "input80",
131
+ labelInline: true,
132
+ hidden: false,
133
+ setting:{
134
+ min: 0,//最小值
135
+ max: 60, //最小值
136
+ step:1, //步长
137
+ showStops:false,//显示间断点
138
+ showInput:false,//显示输入框
139
+ }
140
+ },
141
+ {
142
+ label: '',
143
+ ele: 'xd-site-select-list',
144
+ labelInline: true,
145
+ valueKey: 'mainNewRadius',
146
+ value: dataVal({data, key:'mainNewRadius', dValue:'10', gValue}), //默认0
147
+ hidden: !statusShow({data, key: 'mainNewRadiusStatus', fields:['mainNewRadius'], gValue}),
148
+ placeholder: '请选择圆角',
149
+ multiple: false,
150
+ className: 'input80',
151
+ groupKey:'style',
152
+ handleCustom({action, data}) {
153
+ XdBus.getParentApi('getOptionsSettingList')({
154
+ setting_id: 'edtix_style_radius',
155
+ key: Date.now()
156
+ })
157
+ .then(res => {
158
+ res.list = res.list.filter(item=>{
159
+ return item.label !== '无';
160
+ });
161
+ data.cb(res.list)
162
+ })
163
+ .catch(error => {
164
+ console.error(error);
165
+ });
166
+ },
167
+ },
168
+ {ele: 'group_end'},
169
+ {
170
+ ele: 'title',
171
+ label: '內容区',
172
+ size: 'small',
173
+ groupKey:'style',
174
+ },
175
+ {
176
+ label: '内容区背景',
177
+ ele: 'xd-radio',
178
+ groupKey: 'style',
179
+ valueKey: 'contBgColorStatus',
180
+ value: statusDataVal({data, key:'contBgColorStatus', fields:['contBgColor'],gValue}),
181
+ labelInline:true,
182
+ list: [
183
+ {label: '默认', value: 'D'},
184
+ {label: '自定义', value: 'C'},
185
+ ]
186
+ },
187
+ {ele: 'group_start'},
188
+ {
189
+ label: '背景色',
190
+ ele: 'xd-color',
191
+ valueKey: 'contBgColor',
192
+ value: dataVal({data, key:'contBgColor', dValue:'', gValue}),
193
+ hidden: !statusShow({data, key: 'contBgColorStatus', fields:['contBgColor'], gValue}),
194
+ placeholder: '请选择背景色',
195
+ classNmae: 'input80',
196
+ groupKey: 'style',
197
+ labelInline: true,
198
+ setting: {
199
+ showAlpha: true
200
+ }
201
+ },
202
+ {ele: 'group_end'},
203
+ {
204
+ label: '内容区边距',
205
+ ele: 'xd-radio',
206
+ groupKey: 'style',
207
+ valueKey: 'itemPaddingStatus',
208
+ value: statusDataVal({data, key:'itemPaddingStatus', fields:['itemPadding'],gValue}),
209
+ labelInline:true,
210
+ list: [
211
+ {label: '默认', value: 'D'},
212
+ {label: '自定义', value: 'C'},
213
+ ]
214
+ },
215
+ {ele: 'group_start'},
216
+ {
217
+ label: '填充设置:',
218
+ ele: 'xd-margin-padding',
219
+ valueKey: 'itemPadding',
220
+ value: dataVal({
221
+ data,
222
+ key:'itemPadding',
223
+ dValue:20,
224
+ gValue,
225
+ isPM: true,
226
+ }),
227
+ hidden: !statusShow({data, key: 'itemPaddingStatus', fields:['itemPadding'], gValue}),
228
+ groupKey: 'style',
229
+ setting: {
230
+ type: 'padding',
231
+ },
232
+ placeholder: '请填充设置',
233
+ inline: false,
234
+ notice: `设置内填充,<span style="color: red">单位:像素</span>。默认值:<span style="color:red">${data['listLayout'] !== 'carousel'?'32,0,0,0':'20'}</span>像素`,
235
+ },
236
+ {ele: 'group_end'},
237
+ ...tab(data, gValue, gColor, oldData),
238
+ ...brand(data, gValue, gColor, oldData),
239
+ ...more(data, gValue, gColor, oldData),
240
+ ]
241
+ }
242
+
@@ -0,0 +1,275 @@
1
+ 'use strict';
2
+
3
+ import {
4
+ dataVal,
5
+ statusDataVal,
6
+ statusShow,
7
+ clone,
8
+ cRaBorShadow,
9
+ isDefStatus,
10
+ oldTonNewBorAndSha
11
+ } from "@/utils/AttrTools";
12
+
13
+ export default (data, gValue, gColor, oldData={})=>{
14
+
15
+ return [
16
+ {
17
+ ele: 'title',
18
+ label: '选项样式',
19
+ size: 'small',
20
+ groupKey:'style',
21
+ },
22
+ {
23
+ label: '列间距',
24
+ ele: 'xd-radio',
25
+ groupKey: 'style',
26
+ valueKey: 'tabSpacingStatus',
27
+ value: statusDataVal({data, key:'tabSpacingStatus', fields:['tabSpacing'],gValue}),
28
+ labelInline:true,
29
+ list: [
30
+ {label: '默认', value: 'D'},
31
+ {label: '自定义', value: 'C'},
32
+ ]
33
+ },
34
+ {ele: 'group_start'},
35
+ {
36
+ label: "",
37
+ groupKey: 'style',
38
+ ele: 'xd-slider',
39
+ valueKey: "tabSpacing",
40
+ value: dataVal({data, key:'tabSpacing', dValue:0, gValue}),
41
+ hidden: !statusShow({data, key: 'tabSpacingStatus', fields:['tabSpacing'], gValue}),
42
+ className: "input80",
43
+ labelInline: true,
44
+ setting:{
45
+ min: 0,//最小值
46
+ max: 80, //最小值
47
+ step:1, //步长
48
+ showStops:false,//显示间断点
49
+ }
50
+ },
51
+ {ele: 'group_end'},
52
+ {
53
+ label: '背景',
54
+ ele: 'xd-radio',
55
+ groupKey: 'style',
56
+ valueKey: 'tabBgColorStatus',
57
+ value: statusDataVal({data, key:'tabBgColorStatus', fields:['tabBgColor'],gValue}),
58
+ labelInline:true,
59
+ list: [
60
+ {label: '默认', value: 'D'},
61
+ {label: '自定义', value: 'C'},
62
+ ]
63
+ },
64
+ {ele: 'group_start'},
65
+ {
66
+ label: '',
67
+ ele: 'xd-color',
68
+ valueKey: 'tabBgColor',
69
+ value: dataVal({data, key:'tabBgColor', dValue:'rgba(0,0,0,0)', gValue}),
70
+ hidden: !statusShow({data, key: 'tabBgColorStatus', fields:['tabBgColor'], gValue}),
71
+ placeholder: '请选择背景',
72
+ classNmae: 'input60',
73
+ groupKey: 'style',
74
+ labelInline: true,
75
+ setting: {
76
+ showAlpha: true
77
+ }
78
+ },
79
+ {ele: 'group_end'},
80
+ {
81
+ label: '圆角',
82
+ ele: 'xd-radio',
83
+ groupKey: 'style',
84
+ valueKey: 'tabNewRadiusStatus',
85
+ value: statusDataVal({data, key:'tabNewRadiusStatus',cValue: 'N', fields:['tabNewRadius'],gValue}),
86
+ labelInline:true,
87
+ list: [
88
+ {label: '默认', value: 'D'},
89
+ {label: '无圆角', value: 'N'},
90
+ {label: '自定义', value: 'C'},
91
+ ]
92
+ },
93
+ {ele: 'group_start'},
94
+ {
95
+ label: "圆角设置:",
96
+ groupKey: 'style',
97
+ ele: 'xd-slider',
98
+ valueKey: "tabRadius",
99
+ value: data['tabRadius']===undefined?0:data['tabRadius'],
100
+ className: "input80",
101
+ labelInline: true,
102
+ setting:{
103
+ min: 0,//最小值
104
+ max: 80, //最小值
105
+ step:1, //步长
106
+ showStops:false,//显示间断点
107
+ }
108
+ },
109
+ {
110
+ label: '',
111
+ ele: 'xd-site-select-list',
112
+ labelInline: true,
113
+ valueKey: 'tabNewRadius',
114
+ value: dataVal({data, key:'tabNewRadius', dValue:'10', gValue}),
115
+ hidden: !statusShow({data, key: 'tabNewRadiusStatus', fields:['tabNewRadius'], gValue}),
116
+ placeholder: '请选择更多圆角',
117
+ multiple: false,
118
+ className: 'input80',
119
+ groupKey:'style',
120
+ handleCustom({action, data}) {
121
+ XdBus.getParentApi('getOptionsSettingList')({
122
+ setting_id: 'edtix_style_radius',
123
+ key: Date.now()
124
+ })
125
+ .then(res => {
126
+ debugger
127
+ res.list = res.list.filter(item=>{
128
+ return item.label !== '无';
129
+ });
130
+ data.cb(res.list)
131
+ })
132
+ .catch(error => {
133
+ console.error(error);
134
+ });
135
+ },
136
+ },
137
+ {ele: 'group_end'},
138
+ {
139
+ label: '内边距',
140
+ ele: 'xd-radio',
141
+ groupKey: 'style',
142
+ valueKey: 'tabPaddingStatus',
143
+ value: statusDataVal({data, key:'tabPaddingStatus', fields:['tabPadding'],gValue}),
144
+ labelInline:true,
145
+ list: [
146
+ {label: '默认', value: 'D'},
147
+ {label: '自定义', value: 'C'},
148
+ ]
149
+ },
150
+ {ele: 'group_start'},
151
+ {
152
+ label: '',
153
+ ele: 'xd-margin-padding',
154
+ groupKey:'style',
155
+ valueKey: 'tabPadding',
156
+ value: dataVal({
157
+ data,
158
+ key:'tabPadding',
159
+ dValue:0,
160
+ gValue,
161
+ isPM: true,
162
+ }),
163
+ hidden: !statusShow({data, key: 'tabPaddingStatus', fields:['tabPadding'], gValue}),
164
+ setting: {
165
+ type: 'padding',
166
+ },
167
+ },
168
+ {ele: 'group_end'},
169
+
170
+
171
+ //废弃样式(不可删除)
172
+ {
173
+ label: '背景颜色:',
174
+ ele: 'xd-color',
175
+ hidden:false,
176
+ valueKey: 'titleBackgroundColor',
177
+ value: data['titleBackgroundColor'] || '',
178
+ placeholder: '请选择背景颜色',
179
+ classNmae: 'input80',
180
+ groupKey: 'style',
181
+ },
182
+ {
183
+ label: '选中背景颜色:',
184
+ hidden:false,
185
+ ele: 'xd-color',
186
+ valueKey: 'titleActBackgroundColor',
187
+ value: data['titleActBackgroundColor'] || '',
188
+ placeholder: '请选择选中背景颜色',
189
+ classNmae: 'input80',
190
+ groupKey: 'style',
191
+ },
192
+ {
193
+ label: '文字颜色:',
194
+ ele: 'xd-color',
195
+ hidden:false,
196
+ valueKey: 'titleTextColor',
197
+ value: data['titleTextColor'] || '',
198
+ placeholder: '请选择文字颜色',
199
+ classNmae: 'input80',
200
+ groupKey: 'style',
201
+ },
202
+ {
203
+ label: '选中文字颜色:',
204
+ hidden:false,
205
+ ele: 'xd-color',
206
+ valueKey: 'titleActTextColor',
207
+ value: data['titleActTextColor'] || '',
208
+ placeholder: '请选择选中文字颜色',
209
+ classNmae: 'input80',
210
+ groupKey: 'style',
211
+ },
212
+ //废弃样式(不可删除)
213
+
214
+ // {
215
+ // ele: 'title',
216
+ // label: '标题设置',
217
+ // size: 'small',
218
+ // groupKey: 'style',
219
+ // },
220
+ // {
221
+ // ele: 'line',
222
+ // label: '选项设置',
223
+ // size: 'small',
224
+ // groupKey: 'style',
225
+ // },
226
+ // {
227
+ // label: '背景色:',
228
+ // ele: 'xd-color',
229
+ // valueKey: 'tabBgColor',
230
+ // value: data['tabBgColor'] || '',
231
+ // placeholder: '请选择背景色',
232
+ // classNmae: 'input80',
233
+ // groupKey: 'style',
234
+ // labelInline: true,
235
+ // setting: {
236
+ // showAlpha: true
237
+ // }
238
+ // },
239
+ {
240
+ label: '选项样式设置:',
241
+ ele: 'xd-text-and-bgc',
242
+ groupKey:'style',
243
+ valueKey: 'tabStyle',
244
+ value: data['tabStyle'] || null,
245
+ setting: {
246
+ fontSize: true,
247
+ weight:true,
248
+ bgColor:true,
249
+ selected:true,
250
+ default:{
251
+ color: '#999',
252
+ fontSize: '28rpx',
253
+ fontWeight:'normal',
254
+ bgColor:'',
255
+ actColor: '#fff',
256
+ actFontSize: '28rpx',
257
+ actFontWeight:'normal',
258
+ actBgColor:''
259
+ }
260
+ },
261
+ handleCustom({action, data}) {
262
+ XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
263
+ .then(res => {
264
+ data.cb(res.list)
265
+ })
266
+ .catch(error => {
267
+ console.error(error);
268
+ data.cb([])
269
+ });
270
+ },
271
+ },
272
+
273
+ ].filter(i=>i)
274
+ }
275
+
@@ -8,6 +8,7 @@ export default {
8
8
  style: [],
9
9
  advanced: [],
10
10
  content: (data, gValue, gColor, oldData={})=>{
11
+ debugger
11
12
  console.log(data['row_num'],"data['row_num']");
12
13
 
13
14
  let defContShadow = oldTonNewBorAndSha(
@@ -108,7 +108,7 @@
108
108
  v-for="item in nearbyShopList"
109
109
  :key="item.key"
110
110
  :id="`scroll-${item.resource_shop_id}`"
111
- @click="handleToEvent(item, 'shop')"
111
+ @click.shop="handleToEvent(item, 'shop')"
112
112
  >
113
113
  <view class="shop_list-item-title">
114
114
  <view class="title">
@@ -148,7 +148,6 @@
148
148
  import { gCPVal } from "@/utils/xd.base";
149
149
  import componentsMixins from "@/mixins/componentsMixins";
150
150
  import getServiceUrl from "@/common/getServiceUrl";
151
- import CusShops from "./CusShops.vue"
152
151
  // #ifdef H5
153
152
  import XdBaiduMap from "./XdBaiduMap"
154
153
  // #endif
@@ -161,7 +160,6 @@
161
160
  components: {
162
161
  XdNoData,
163
162
  XdFontIcon,
164
- CusShops,
165
163
  // #ifdef H5
166
164
  XdBaiduMap,
167
165
  // #endif