|
@@ -40,7 +40,8 @@ export default {
|
|
|
globalScrollTopOldPlace:0,
|
|
globalScrollTopOldPlace:0,
|
|
|
globalIsRequesting:false,
|
|
globalIsRequesting:false,
|
|
|
globalCgMyCharge:0,
|
|
globalCgMyCharge:0,
|
|
|
- globalLookStock:0
|
|
|
|
|
|
|
+ globalLookStock:0,
|
|
|
|
|
+ globalDefaultClassId:0
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
onLoad(options) {
|
|
onLoad(options) {
|
|
@@ -146,6 +147,7 @@ export default {
|
|
|
if(res.code == 1){
|
|
if(res.code == 1){
|
|
|
that.globalClassData = res.data.class ? res.data.class : []
|
|
that.globalClassData = res.data.class ? res.data.class : []
|
|
|
that.globalClassDataIndex = res.data.classIndex ? res.data.classIndex : []
|
|
that.globalClassDataIndex = res.data.classIndex ? res.data.classIndex : []
|
|
|
|
|
+ that.globalDefaultClassId = res.data.defaultClassId?res.data.defaultClassId:0
|
|
|
if(that.globalClassData[0]){
|
|
if(that.globalClassData[0]){
|
|
|
that.globalClassId = that.globalClassData[0].id
|
|
that.globalClassId = that.globalClassData[0].id
|
|
|
//保存到仓库
|
|
//保存到仓库
|
|
@@ -183,10 +185,24 @@ export default {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
- sorts_fun(arr) {
|
|
|
|
|
|
|
+ sorts_fun(arr, lastValue = null) {
|
|
|
return function(a, b) {
|
|
return function(a, b) {
|
|
|
var v1 = a[arr];
|
|
var v1 = a[arr];
|
|
|
var v2 = b[arr];
|
|
var v2 = b[arr];
|
|
|
|
|
+
|
|
|
|
|
+ // 如果两个都是要排到最后的值
|
|
|
|
|
+ if (v1 === lastValue && v2 === lastValue) {
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ }
|
|
|
|
|
+ // 如果 a 是要排到最后的值,就排后面
|
|
|
|
|
+ if (v1 === lastValue) {
|
|
|
|
|
+ return 1;
|
|
|
|
|
+ }
|
|
|
|
|
+ // 如果 b 是要排到最后的值,就排后面
|
|
|
|
|
+ if (v2 === lastValue) {
|
|
|
|
|
+ return -1;
|
|
|
|
|
+ }
|
|
|
|
|
+ // 其他情况正常升序排列
|
|
|
return v1 - v2;
|
|
return v1 - v2;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -204,7 +220,7 @@ export default {
|
|
|
//修改数据需要复制一份,否则不会生效
|
|
//修改数据需要复制一份,否则不会生效
|
|
|
that.globalItemData = copyObject(that.globalItemData);
|
|
that.globalItemData = copyObject(that.globalItemData);
|
|
|
|
|
|
|
|
- that.globalItemData = that.globalItemData.sort(this.sorts_fun('classId'))
|
|
|
|
|
|
|
+ that.globalItemData = that.globalItemData.sort(this.sorts_fun('classId', that.globalDefaultClassId))
|
|
|
let hasExists = []
|
|
let hasExists = []
|
|
|
for (let i=0;i<that.globalItemData.length;i++){
|
|
for (let i=0;i<that.globalItemData.length;i++){
|
|
|
let currentProduct = that.globalItemData[i]
|
|
let currentProduct = that.globalItemData[i]
|