yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

【订单详情】 

1. 简化 sku 选择的逻辑，默认选择有库存，否则第一个 sku
pull/1/MERGE
YunaiV 2023-06-06 23:18:13 +08:00
parent c8fdda0bb0
commit 9fca18b350
2 changed files with 41 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/productWindow/index.vue
View File

@ -42,13 +42,9 @@
<view class='item num'> <view class='item num'>
<input type="number" v-model="attr.productSelect.cart_num" <input type="number" v-model="attr.productSelect.cart_num"
data-name="productSelect.cart_num" data-name="productSelect.cart_num"
@input="bindCode(attr.productSelect.cart_num)"></input> @input="bindCode(attr.productSelect.cart_num)" />
</view> </view>
<view v-if="iSplus" class="item plus" :class=" <view v-if="iSplus" class="item plus" :class="attr.productSelect.cart_num >= attr.productSelect.stock ? 'on' : ''" @click="CartNumAdd">
attr.productSelect.cart_num >= attr.productSelect.stock
? 'on'
: ''
" @click="CartNumAdd">
+ +
</view> </view>
<view v-else class='item plus' <view v-else class='item plus'
@ -57,7 +53,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="joinBnt bg-color" v-if="iSbnt && attr.productSelect.stock>0 &&attr.productSelect.quota>0" <view class="joinBnt bg-color" v-if="iSbnt && attr.productSelect.stock > 0 && attr.productSelect.quota > 0"
@click="goCat">我要参团</view> @click="goCat">我要参团</view>
<view class="joinBnt on" <view class="joinBnt on"
v-else-if="(iSbnt && attr.productSelect.quota<=0)||(iSbnt &&attr.productSelect.stock<=0)">已售罄</view> v-else-if="(iSbnt && attr.productSelect.quota<=0)||(iSbnt &&attr.productSelect.stock<=0)">已售罄</view>

108
pages/goods_details/index.vue
View File

@ -85,8 +85,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class='attribute acea-row row-between-wrapper mb30 borRadius14' @click="selecAttr"> <view class='attribute acea-row row-between-wrapper mb30 borRadius14' @click="openAttr">
<view class="line1">{{attrTxt}}： <view class="line1">{{ attrValue.length > 0 ? "已选择" : "请选择" }}：
<text class='atterTxt'>{{attrValue}}</text> <text class='atterTxt'>{{attrValue}}</text>
</view> </view>
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
@ -333,8 +333,6 @@
list: [], list: [],
count: [] count: []
}, },
attrTxt: '请选择', //属性页面提示
attrValue: '', //已选属性
animated: false, //购物车动画 animated: false, //购物车动画
id: 0, //商品id id: 0, //商品id
replyCount: 0, //总评论数量 replyCount: 0, //总评论数量
@ -367,8 +365,9 @@
isDown: true, isDown: true,
posters: false, posters: false,
weixinStatus: false, weixinStatus: false,
attr: { // productWindow 组件，使用该属性 attrValue: '', // 已选属性名的拼接，例如说 红色,大 这样的格式
cartAttr: false, // TODO 芋艿，还没搞懂 attr: { // productWindow 组件，使用该属性
cartAttr: false, // 是否打开属性的选择弹出
// ↓↓↓ 属性数组，结构为：id = 属性编号；name = 属性编号的名字；values[].id = 属性值的编号，values[].name = 属性值的名字；index = 选中的属性值的名字 // ↓↓↓ 属性数组，结构为：id = 属性编号；name = 属性编号的名字；values[].id = 属性值的编号，values[].name = 属性值的名字；index = 选中的属性值的名字
properties: [], properties: [],
productSelect: {} // 选中的 SKU productSelect: {} // 选中的 SKU
@ -671,23 +670,16 @@
* @param newSkuKey 新的 skuKey * @param newSkuKey 新的 skuKey
*/ */
ChangeAttr: function(newSkuKey) { ChangeAttr: function(newSkuKey) {
let productSelect = this.skuMap[newSkuKey]; let sku = this.skuMap[newSkuKey];
if (productSelect) { if (!sku) {
this.$set(this.attr.productSelect, "id", productSelect.id); return;
this.$set(this.attr.productSelect, "picUrl", productSelect.picUrl); }
this.$set(this.attr.productSelect, "price", productSelect.price); this.$set(this.attr.productSelect, "id", sku.id);
this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "picUrl", sku.picUrl);
this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this.attr.productSelect, "price", sku.price);
this.$set(this, "attrValue", newSkuKey); this.$set(this.attr.productSelect, "stock", sku.stock);
this.$set(this, "attrTxt", "已选择"); this.$set(this.attr.productSelect, "cart_num", 1);
} else { this.$set(this, "attrValue", newSkuKey);
this.$set(this.attr.productSelect, "image", this.spu.image);
this.$set(this.attr.productSelect, "price", this.spu.price);
this.$set(this.attr.productSelect, "stock", 0);
this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this, "attrValue", "");
this.$set(this, "attrTxt", "请选择");
}
}, },
/** /**
* 领取完毕移除当前页面领取过的优惠券展示 * 领取完毕移除当前页面领取过的优惠券展示
@ -778,12 +770,8 @@
// #ifndef H5 // #ifndef H5
that.downloadFilestoreImage(); that.downloadFilestoreImage();
// #endif // #endif
that.DefaultSelect(); that.selectDefaultSku();
}).catch(err => { }).catch(err => {
console.error(err)
if (true) {
return;
}
//状态异常返回上级页面 //状态异常返回上级页面
return that.$util.Tips({ return that.$util.Tips({
title: err.toString() title: err.toString()
@ -855,59 +843,39 @@
/** /**
* 查找默认选中的 sku，设置到 attr.productSelect 中 * 查找默认选中的 sku，设置到 attr.productSelect 中
*
* 先找有库存的 SKU，否则找第一个 SKU
*/ */
DefaultSelect: function() { selectDefaultSku: function() {
let properties = this.attr.properties; let properties = this.attr.properties;
// 获得选中的属性值的名字，例如说 "黑色,大"，则 skuKey = ["黑色", "大"] // 获得选中的属性值的名字，例如说 "黑色,大"，则 skuKey = ["黑色", "大"]
let skuKey = []; let skuKey = undefined;
for (let key in this.skuMap) { for (let key in this.skuMap) {
if (this.skuMap[key].stock > 0) { if (this.skuMap[key].stock > 0) {
skuKey = this.attr.properties.length ? key.split(",") : []; skuKey = key.split(",");
break; break;
} }
} }
if (!skuKey) { // 如果找不到，则选中第一个
skuKey = Object.keys(this.skuMap)[0].split(",");
}
// 使用 index 属性表示当前选中的，值为属性值的名字 // 使用 index 属性表示当前选中的，值为属性值的名字
for (let i = 0; i < properties.length; i++) { for (let i = 0; i < properties.length; i++) {
this.$set(properties[i], "index", skuKey[i]); this.$set(properties[i], "index", skuKey[i]);
} }
// sort();排序函数:数字-英文-汉字； let sku = this.skuMap[skuKey.join(",")];
let productSelect = this.skuMap[skuKey.join(",")]; if (!sku) {
// 情况一：选中 SKU，并且有规格 return
if (productSelect && properties.length) { }
this.$set(this.attr.productSelect, "spuName", this.spu.name); this.$set(this.attr.productSelect, "spuName", this.spu.name);
this.$set(this.attr.productSelect, "id", productSelect.id); this.$set(this.attr.productSelect, "id", sku.id);
this.$set(this.attr.productSelect, "picUrl", productSelect.picUrl); this.$set(this.attr.productSelect, "picUrl", sku.picUrl);
this.$set(this.attr.productSelect, "price", productSelect.price); this.$set(this.attr.productSelect, "price", sku.price);
this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "stock", sku.stock);
this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this, "attrValue", skuKey.join(",")); this.$set(this, "attrValue", skuKey.join(","));
this.$set(this, "attrTxt", "已选择"); this.$set(this, "attrTxt", "已选择");
// 情况二：未选中 SKU，并且有规格
} else if (!productSelect && properties.length) {
this.$set(this.attr.productSelect, "spuName", this.spu.name);
this.$set(this.attr.productSelect, "id", productSelect.id);
this.$set(this.attr.productSelect, "picUrl", productSelect.picUrl);
this.$set(this.attr.productSelect, "price", productSelect.price);
this.$set(this.attr.productSelect, "stock", 0);
this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this, "attrValue", "");
this.$set(this, "attrTxt", "请选择");
// TODO 芋艿：啥情况会出现呢？
} else if (!productSelect && !properties.length) {
this.$set(this.attr.productSelect, "storeName", this.productInfo.storeName);
this.$set(this.attr.productSelect, "image", this.productInfo.image);
this.$set(this.attr.productSelect, "price", this.productInfo.price);
this.$set(this.attr.productSelect, "stock", this.productInfo.stock);
this.$set(
this.attr.productSelect,
"unique",
this.productInfo.id || ""
);
this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this, "attrValue", "");
this.$set(this, "attrTxt", "请选择");
}
}, },
/** /**
* 获取优惠券 * 获取优惠券
@ -962,9 +930,9 @@
} }
}, },
/** /**
* 打开属性插件 * 打开 SKU 属性的选择
*/ */
selecAttr: function() { openAttr: function() {
this.$set(this.attr, 'cartAttr', true); this.$set(this.attr, 'cartAttr', true);
this.$set(this, 'isOpen', true); this.$set(this, 'isOpen', true);
}, },