jufubao-takeorder 1.0.2-beta5 → 1.0.2-beta6
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
|
@@ -332,9 +332,12 @@ export default {
|
|
|
332
332
|
page_size: this.page_size, // 每页数量
|
|
333
333
|
};
|
|
334
334
|
|
|
335
|
-
//
|
|
335
|
+
// 只有当有选择时,才添加筛选参数,如果选择了 'all' 则不传
|
|
336
336
|
if (this.selectedProvs && this.selectedProvs.length > 0) {
|
|
337
|
-
|
|
337
|
+
// 如果只有一个选项且为 'all',则不传 province_codes
|
|
338
|
+
if (!(this.selectedProvs.length === 1 && this.selectedProvs[0] === 'all')) {
|
|
339
|
+
params.province_codes = this.selectedProvs;
|
|
340
|
+
}
|
|
338
341
|
}
|
|
339
342
|
if (this.selectedCity && this.selectedCity.length > 0) {
|
|
340
343
|
params.city_codes = this.selectedCity;
|
|
@@ -196,7 +196,7 @@
|
|
|
196
196
|
:key="index"
|
|
197
197
|
>
|
|
198
198
|
<view class="voucher-item-image">
|
|
199
|
-
<image :src="item.
|
|
199
|
+
<image :src="item.report_voucher_preview_url" />
|
|
200
200
|
<view>凭证图</view>
|
|
201
201
|
</view>
|
|
202
202
|
<view>
|
|
@@ -509,7 +509,7 @@ export default {
|
|
|
509
509
|
};
|
|
510
510
|
},
|
|
511
511
|
quotePriceTotal() {
|
|
512
|
-
return this.quotePrice
|
|
512
|
+
return this.$xdUniHelper.multiplyFloatNumber(this.quotePrice, this.info.product_total);
|
|
513
513
|
},
|
|
514
514
|
},
|
|
515
515
|
watch: {
|
|
@@ -864,7 +864,8 @@ export default {
|
|
|
864
864
|
.then((res1) => {
|
|
865
865
|
console.log("event.getImagePreview", res);
|
|
866
866
|
let obj = {
|
|
867
|
-
report_voucher:
|
|
867
|
+
report_voucher: files[0].url,
|
|
868
|
+
report_voucher_preview_url: res1.preview_url,
|
|
868
869
|
code_list: res.list.map((item) => {
|
|
869
870
|
if (item.show_type === "qrcode") {
|
|
870
871
|
let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
|