diff --git a/apis/add-paper.js b/apis/add-paper.js
index aeced67..40df537 100644
--- a/apis/add-paper.js
+++ b/apis/add-paper.js
@@ -44,3 +44,11 @@ export function productStatus(data) {
data
})
}
+// 编辑店铺、
+export function updataStore(data) {
+ return http.post({
+ url: '/base-paper-trading/update/store?mallSupplierId='+data.mallSupplierId,
+ data
+ })
+}
+
diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue
index f266425..d5cddc5 100644
--- a/pages/add-paper/index.vue
+++ b/pages/add-paper/index.vue
@@ -14,7 +14,7 @@
纸品名称
-
+
@@ -25,7 +25,7 @@
是否主营
-
+
@@ -281,11 +281,11 @@
-
-
diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue
index 2667869..442287f 100644
--- a/pages/my-offer/index.vue
+++ b/pages/my-offer/index.vue
@@ -140,10 +140,7 @@ export default {
//跳转我的报价详情
myPriceInfo(item) {
- console.log(item)
- uni.navigateTo({
- url: '/pages/quotation-details/index'
- })
+ go2('quotation-details',item)
}
}
}
diff --git a/pages/paper-detail/index.vue b/pages/paper-detail/index.vue
index f7221f2..63aba38 100644
--- a/pages/paper-detail/index.vue
+++ b/pages/paper-detail/index.vue
@@ -32,19 +32,19 @@
- 克重
- 规格
+ 克重
+
售价
库存
- 是否特价
+ 是否特价
{{item.weight}}
- 779*1092
+
{{item.listPrice}}元
{{item.stock}}张
- {{item.isPromoting === ture ?'是':'否'}}
+ {{item.isPromoting === true ?'是':'否'}}
@@ -99,10 +99,10 @@ export default {
//获取详情
getDteailList(option) {
var params = {
- mallSupplierIds : option.id,
- productId : null
+ mallSupplierIds : this.$store.state.supplierInfo.supplierId,
+ productId : option.id
}
- this.getSupplierDteail(params).then(res => {
+ getSupplierDteail(params).then(res => {
if (res) {
this.form = res
this.skuList = res.skuList
diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue
index db34eb0..f3eef36 100644
--- a/pages/quotation-details/index.vue
+++ b/pages/quotation-details/index.vue
@@ -28,12 +28,12 @@
- {{ items.brandName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }}
+ {{ items.brandName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }}
重量(吨)：
- 1.6544
+ {{ items.wight }}
单价(元/吨)：
@@ -51,18 +51,18 @@
其他费用：
- ¥ 80.00
+ ¥ {{ upDataObj.otherFee }}
合计：
- ¥ 13800.32
+ ¥ {{ upDataObj.totalAllPrice }}
有效时间：
- 24小时
+ {{ upDataObj.enquiryValidTime }}
@@ -91,46 +91,36 @@ export default {
value: '',
visible: true,
title: 'picker-view',
- upDataObj:{
- belongEnterpriseName:'东莞市隆兴纸业有限公司',
- deliveryArea:'广东省/广州市/天河区',
- deliveryDay:'2021/12/29 12:30',
- enquiryValidTime:[12,11,10],
- itemList:[
- {
- brandName:'丽品白卡',
- categoryName:"",
- gramWeight:'200g',
- length:'787',
- quantity:'5000张',
- width:'1092',
- unitFee:'1000',
- totalPrice:'1202'
- },
- {
- brandName:'丽品白卡',
- categoryName:"",
- gramWeight:'200g',
- length:'787',
- quantity:'5000张',
- width:'1092',
- unitFee:'1000',
- totalPrice:'1202'
- }
- ]
- },
+ upDataObj: {
+ belongEnterpriseName: '东莞市隆兴纸业有限公司',
+ deliveryArea: '广东省/广州市/天河区',
+ deliveryDay: '2021/12/29 12:30',
+ enquiryValidTime: [12, 11, 10],
+ itemList: []
+ }
}
},
+ onLoad(Option) {
+ this.getDetail(Option.id)
+ },
methods: {
back,
// 获取详情
- getDetail(id){
- this.enquiryReplyDetail(id)
- .then(({ list, total }) => {
- this.$refs.orderRef.loadSuccess({ list, total })
+ getDetail(id) {
+ enquiryReplyDetail(id)
+ .then(res => {
+ if (res) {
+ this.upDataObj = res
+ var timeb = this.upDataObj.enquiryValidTime.split(' ')
+ var timeabs = timeb[1].split(':')
+ this.$set(this.upDataObj, 'enquiryValidTimeSplit', timeabs)
+ this.$set(this.upDataObj, 'otherFee', 0)
+ this.$set(this.upDataObj, 'totalAllPrice', 0)
+ this.priceFree()
+ }
})
- .catch(() => {
- this.$refs.orderRef.loadFail()
+ .catch(err => {
+ reject(err)
})
},
// 商品操作按钮
@@ -150,6 +140,14 @@ export default {
bindChange(e) {
console.log(e.detail.value)
},
+ priceFree() {
+ for (let i = 0; i < this.upDataObj.itemList.length; i++) {
+ var totalAllPrice = parseFloat(this.upDataObj.totalAllPrice) + parseFloat(this.upDataObj.itemList[i].totalPrice)
+ this.upDataObj.totalAllPrice = totalAllPrice.toFixed(2)
+ var otherFee = parseFloat(this.upDataObj.otherFee) + parseFloat(this.upDataObj.itemList[i].otherFee)
+ this.upDataObj.otherFee = otherFee.toFixed(2)
+ }
+ },
close() {
this.$refs.popup.close()
this.$refs.popupPrice.close()
@@ -168,13 +166,12 @@ export default {
this.$refs.popupTime.close()
},
// 修改报价按钮
- editPrice(){
- var params= {
- title:"修改报价"
+ editPrice() {
+ var params = {
+ title: '修改报价'
}
- go2('submit-quotation', params)
- },
-
+ go2('submit-quotation', params)
+ }
}
}
@@ -557,16 +554,16 @@ export default {
padding: 32rpx;
line-height: 42rpx;
}
- .edit-price{
+ .edit-price {
font-size: 28rpx;
- color: #007AFF;
+ color: #007aff;
text-align: right;
line-height: 40prx;
font-weight: 500;
}
- .price-tips{
+ .price-tips {
font-size: 30rpx;
- color: #FF5368;
+ color: #ff5368;
letter-spacing: 0;
text-align: right;
font-weight: 500;
diff --git a/pages/store-settings/index.vue b/pages/store-settings/index.vue
index ba305a1..62e3d91 100644
--- a/pages/store-settings/index.vue
+++ b/pages/store-settings/index.vue
@@ -24,7 +24,7 @@
店铺logo
-
+
建议尺寸：200*200像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面
@@ -45,7 +44,7 @@
背景图片
-
+
建议尺寸：750*370像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面
@@ -53,18 +52,21 @@
-
+