diff --git a/components/shortPopup.vue b/components/shortPopup.vue index 751e129..6c7103c 100644 --- a/components/shortPopup.vue +++ b/components/shortPopup.vue @@ -22,7 +22,7 @@ {{leftPrice}}.{{rightPrice}} - 订货价 + {{datas.store_name}} @@ -313,7 +313,7 @@ position: relative; .scroll{ - height: calc(90vh - 150rpx); + height: calc(80vh - 150rpx); } .flex_end { diff --git a/manifest.json b/manifest.json index f459217..c0948a9 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农商户平台", "appid" : "__UNI__1EE148C", "description" : "", - "versionName" : "1.0.8", - "versionCode" : 108, + "versionName" : "1.0.9", + "versionCode" : 109, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 4bae478..70451ba 100644 --- a/pages.json +++ b/pages.json @@ -1414,6 +1414,14 @@ "enablePullDownRefresh" : false } }, + { + "path" : "addGood/addGood_supply", + "style" : + { + "navigationBarTitleText" : "商品设置", + "enablePullDownRefresh" : false + } + }, { "path" : "addGood/specGood", "style" : diff --git a/pages/index/index.vue b/pages/index/index.vue index c558eb8..754fc2f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -102,7 +102,7 @@ {{item.name}} - + diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue index f03efd4..0bf768d 100644 --- a/pages/nongKe/gather/select_warehouse.vue +++ b/pages/nongKe/gather/select_warehouse.vue @@ -355,7 +355,6 @@ } delete item.id; delete item.stock; - console.log({...item}); uni.navigateTo({ url: `/pages/product/addGood/addGood?mer_id=${this.userInfo.service.mer_id}&import=1`, success: (e) => { @@ -730,6 +729,10 @@ // navigateTo(1, '/pages/product/addGood/addGood', { // mer_id: this.mer_id // }); + } else if(this.userInfo.mer_info.type_code=='TypeSupplyChain') { + navigateTo(1, '/pages/product/addGood/addGood_supply', { + mer_id: this.mer_id + }); } else { navigateTo(1, '/pages/product/addGood/addGood', { mer_id: this.mer_id diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue index 8d51d1e..1ca360b 100644 --- a/pages/product/addGood/addGood.vue +++ b/pages/product/addGood/addGood.vue @@ -120,7 +120,7 @@ - + - - + 关键字 - + --> 最少购买件数 diff --git a/pages/product/addGood/addGood_one.vue b/pages/product/addGood/addGood_one.vue index 56a5dd6..0da4791 100644 --- a/pages/product/addGood/addGood_one.vue +++ b/pages/product/addGood/addGood_one.vue @@ -120,7 +120,7 @@ - + - - + 关键字 - + --> + + + + + + 平台分类 + + + {{ setFormData.cate_name }} + 请选择平台分类 + + + + + + 店铺分类 + + + {{ setFormData.mer_cate_name }} + 请选择店铺分类 + + + + + + + + + + + + + + + + + + + + + + + + + + 商品规格 + + + {{ setFormData.spec_type==0?'默认规格':'自定义规格' }} + + + + + + + + + + + + + + + + 设置自定义规格 + ({{setFormData.attrValue.length}}) + + + + + + + + + + + + 最少购买件数 + + + + + 送货方式 + + + + + + + + + + + + 提交 + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/product/addGood/components/price.vue b/pages/product/addGood/components/price.vue index fd51f81..ed831e0 100644 --- a/pages/product/addGood/components/price.vue +++ b/pages/product/addGood/components/price.vue @@ -55,16 +55,16 @@ holder: '请填写库存', disable: true, require: true, - }, { + }, + ], + moreThanList: [{ id: 2, label: '成本价', type: 'digit', holder: '请填写成本价', model: 'cost', - require: true, - }, - ], - moreThanList: [{ + require: false, + },{ id: 6, label: '重量', type: 'digit', diff --git a/pages/product/addGood/components/price_supply.vue b/pages/product/addGood/components/price_supply.vue new file mode 100644 index 0000000..b0e37c2 --- /dev/null +++ b/pages/product/addGood/components/price_supply.vue @@ -0,0 +1,261 @@ + + + + + \ No newline at end of file diff --git a/pages/product/components/selectFormSupply.vue b/pages/product/components/selectFormSupply.vue new file mode 100644 index 0000000..56b1156 --- /dev/null +++ b/pages/product/components/selectFormSupply.vue @@ -0,0 +1,240 @@ + + + +