jufubao-mall 2.0.115 → 2.0.116
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
CHANGED
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
<view :style="[item.descStyle]" class="exchange_desc">{{ item.desc }}</view>
|
|
77
77
|
</view>
|
|
78
78
|
<view class="shop_wrap-exchange_btn">
|
|
79
|
-
<xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ item.btnName }}</xd-button>
|
|
79
|
+
<xd-button @click="handleToExchange(item.type)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ item.btnName }}</xd-button>
|
|
80
80
|
</view>
|
|
81
81
|
</view>
|
|
82
82
|
</template>
|
|
@@ -693,7 +693,7 @@
|
|
|
693
693
|
this.takeBtnName = gCPVal(container, 'takeBtnName', '去提货');
|
|
694
694
|
this.takeName = getContainerPropsValue(container, 'content.takeName', '快捷提货');
|
|
695
695
|
}else{
|
|
696
|
-
this.showTake = gCPVal(container, 'showTake', 'Y');
|
|
696
|
+
this.showTake = oldShowCashier || gCPVal(container, 'showTake', 'Y');
|
|
697
697
|
}
|
|
698
698
|
console.log("this.showTake",this.takeBtnName,this.takeName, this.showTake)
|
|
699
699
|
this.takeRemark = getContainerPropsValue(container, 'content.takeRemark', '');
|