diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue
index 8eb31c0..624bd5c 100644
--- a/pages/add-paper/index.vue
+++ b/pages/add-paper/index.vue
@@ -96,7 +96,7 @@
纸品售价{{ index + 1 }}
- 删除
+ 删除
@@ -128,7 +128,7 @@
库存单位:
- {{ item.stockUnit === '1' ? '张' : '吨' }}
+ {{ item.stockUnit === 1 ? '张' : '吨' }}
@@ -146,7 +146,7 @@
text="right"
placeholder="请输入账期售价"
>
- 元/{{ item.stockUnit === '1' ? '张' : '吨' }}
+ 元/{{ item.stockUnit === 1 ? '张' : '吨' }}
@@ -163,7 +163,7 @@
text="right"
placeholder="请输入纸品库存"
>
- {{ item.stockUnit === '1' ? '张' : '吨' }}
+ {{ item.stockUnit === 1 ? '张' : '吨' }}
@@ -181,7 +181,7 @@
:maxlength="9999999999"
placeholder="请输入最低起送量"
>
- {{ item.stockUnit === '1' ? '张' : '吨' }}
+ {{ item.stockUnit === 1 ? '张' : '吨' }}
@@ -334,15 +334,25 @@ export default {
searchList: [
{
name: '张',
- id: '1'
+ id: 1
},
{
name: '吨',
- id: '2'
+ id: 2
}
],
paperList: [],
- skuList: [],
+ skuList: [
+ {
+ isPromoting: 1,
+ listPrice: null,
+ minimum: null,
+ stock: null,
+ stockUnit: 2,
+ weight: null,
+ categoryName: null
+ }
+ ],
imgList: [],
priceIndex: 0,
eidtFor: 0,
@@ -418,7 +428,8 @@ export default {
var params = {
name: 'text',
extname: 'text',
- url: res.imgList[i]
+ url: res.imgList[i],
+ pathUrl: res.imgList[i],
}
this.imgList.push(params)
}
@@ -433,7 +444,7 @@ export default {
listPrice: null,
minimum: null,
stock: null,
- stockUnit: '2',
+ stockUnit: 2,
weight: null,
categoryName: null
})
@@ -473,6 +484,13 @@ export default {
console.log(this.imgList)
},
uploadPrice() {
+ if(this.skuList.length === 0){
+ uni.showToast({
+ title: '请添加纸品售价',
+ icon: 'none'
+ })
+ return
+ }
for (let i = 0; i < validateFields.length; i++) {
if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') {
uni.showToast({
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 098de0b..ffa6620 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -117,7 +117,7 @@ export default {
pageSize: 10,
storeId: null,
name: null,
- supplierId: this.$store.state.supplierInfo.supplierId
+ supplierId: this.$store.state.supplierInfo.supplierId,
},
listData: [],
logo: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif',
diff --git a/pages/message/system-message.vue b/pages/message/system-message.vue
index 673b363..ae813be 100644
--- a/pages/message/system-message.vue
+++ b/pages/message/system-message.vue
@@ -1,116 +1,144 @@
-
-
-
-
-
- 客户下单
-
-
- {{item.createTime}}
-
- {{item.content}}
-
-
-
-
+
+
+
+
+
+ {{ item.messageType | meesageTypeFilter }}
+
+
+ {{ item.createTime }}
+
+ {{ item.content }}
+
+
+
-
+
diff --git a/static/imgs/mall/edit.png b/static/imgs/mall/edit.png
new file mode 100644
index 0000000..d080a12
Binary files /dev/null and b/static/imgs/mall/edit.png differ