jufubao-mall 2.0.17 → 2.0.18

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMallShop/JfbMallShop.vue +2 -2
  3. package/src/components/JfbMallShop/cusAttr/content.js +6 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.17",
3
+ "version": "2.0.18",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallShop/JfbMallShop.vue CHANGED
@@ -51,8 +51,8 @@
51
51
  <view class="addr_detail">{{getAddress(shopInfo)}}</view>
52
52
  <view class="addr_foot">
53
53
  <view>
54
- <template v-if="shopInfo.timeStr">
55
- 营业时间：<text>{{ shopInfo.timeStr }}</text>
54
+ <template v-if="shopInfo.business_time_name">
55
+ 营业时间：<text>{{ shopInfo.business_time_name }}</text>
56
56
  </template>
57
57
  </view>
58
58
  <view class="p_n_box">
package/src/components/JfbMallShop/cusAttr/content.js CHANGED
@@ -9,7 +9,9 @@ import {
9
9
  } from "@/utils/AttrTools";
10
10
 
11
11
  export default function (data, gValue,gColor,oldData){
12
- let isShowCashier = data.isShowCashier || "Y";
12
+ let isShowCashier = data.isShowCashier || "";
13
+ let isShowExchange = data.isShowExchange || "";
14
+ let oldShowCashier = isShowCashier || isShowExchange;
13
15
  let showOtherEnter = "N";
14
16
  if(gValue.isAdd === true && gValue.isFirst) {
15
17
  showOtherEnter = "Y";
@@ -88,7 +90,7 @@ export default function (data, gValue,gColor,oldData){
88
90
  label: '聚好兑',
89
91
  ele: 'xd-cus-switch',
90
92
  valueKey: 'showExchange',
91
- value: dataVal({ data, key: 'showExchange', dValue: isShowCashier, gValue }),
93
+ value: dataVal({ data, key: 'showExchange', dValue: oldShowCashier, gValue }),
92
94
  className: 'input100',
93
95
  labelInline: true,
94
96
  groupKey: 'content',
@@ -131,7 +133,7 @@ export default function (data, gValue,gColor,oldData){
131
133
  label: '扫一扫',
132
134
  ele: 'xd-cus-switch',
133
135
  valueKey: 'showScan',
134
- value: dataVal({ data, key: 'showScan', dValue: isShowCashier, gValue }),
136
+ value: dataVal({ data, key: 'showScan', dValue: oldShowCashier, gValue }),
135
137
  className: 'input100',
136
138
  labelInline: true,
137
139
  groupKey: 'content',
@@ -174,7 +176,7 @@ export default function (data, gValue,gColor,oldData){
174
176
  label: '快捷码',
175
177
  ele: 'xd-cus-switch',
176
178
  valueKey: 'showTake',
177
- value: dataVal({ data, key: 'showTake', dValue: isShowCashier, gValue }),
179
+ value: dataVal({ data, key: 'showTake', dValue: oldShowCashier, gValue }),
178
180
  className: 'input100',
179
181
  labelInline: true,
180
182
  groupKey: 'content',