From dbf2da56e431c51b762c3f902706bd35100ddb24 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Mon, 25 Dec 2023 16:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shortPopup.vue | 3 ++- pages/gather/gather.vue | 2 ++ pages/nongKe/cloud_entrepot/indexh.vue | 2 +- pages/order_addcart/order_addcart.vue | 6 +++++- pages/store/settled/index.vue | 27 ++++++++++++++++---------- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/components/shortPopup.vue b/components/shortPopup.vue index e34c339..b353eab 100644 --- a/components/shortPopup.vue +++ b/components/shortPopup.vue @@ -122,9 +122,10 @@ setDatas(datas, goodsNum) { getProductDetail(datas.product_id).then((res)=>{ this.attr = res.data.attr; - this.attr.forEach((item, index)=>{ + if(this.attr.length>0) this.attr.forEach((item, index)=>{ this.changeAttr(index, 0); }) + else this.changeSkuKey = ''; }) this.goodsNum = goodsNum; this.datas = datas; diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index f614135..f32397e 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -237,6 +237,8 @@ name: '种植溯源', icon: '/static/applet/icons.png', data: { + // id: "__UNI__9B6D67A", + // url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/ce21c202312251443415370.wgt", id: "__UNI__D087881", url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/3b1b1202312230957197588.wgt", }, diff --git a/pages/nongKe/cloud_entrepot/indexh.vue b/pages/nongKe/cloud_entrepot/indexh.vue index a55a894..ca913a8 100644 --- a/pages/nongKe/cloud_entrepot/indexh.vue +++ b/pages/nongKe/cloud_entrepot/indexh.vue @@ -742,7 +742,7 @@ delete query.category_id; } else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid - else query.category_id = this.storeParam.category_id; // 否则查询二级分类 + else query.cate_id = this.storeParam.category_id; // 否则查询二级分类 cloudWarehouse(query).then(res => { // res.data.list = res.data.list.map(item=>{ // item.product = item; diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue index bcdf449..4af6335 100644 --- a/pages/order_addcart/order_addcart.vue +++ b/pages/order_addcart/order_addcart.vue @@ -686,7 +686,11 @@ // 购物车列表 getCartList: function(isChange) { let that = this; - getCartList({product_type: this.product_type}).then(res => { + let query = { + product_type: this.product_type, + } + if(this.source) query.source = this.source; + getCartList(query).then(res => { res.data.list.forEach((item, index) => { item.allCheck = true item.list.forEach((goods, j) => { diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 2454eb6..ca9a23a 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -20,7 +20,7 @@ - + 申请记录 @@ -449,8 +449,7 @@ import { Toast } from '../../../libs/uniApi'; this.getGoodsDetails(options.mer_i_id) }) } - this.getArea() - + else this.getArea() this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45; }, onShow() { @@ -532,27 +531,34 @@ import { Toast } from '../../../libs/uniApi'; getVillage({ street_code: e }).then(res => { - self.$set(self.business, 2, res.data) + self.$set(self.business, 2, res.data); + if(self.mer_i_id&&!this.business_name){ + let area = self.business[0].find(item=>item.code==self.area_id)?.name; + let street = self.business[1].find(item=>item.code==self.street_id)?.name; + let village = self.business[2].find(item=>item.id==self.village_id)?.name; + // console.log(area, street, village); + this.business_name = `${area} ${street} ${village}` + } }) }, //获取镇 - getStreet(e) { + getStreet(e, street) { const self = this; getStreet({ area_code: e }).then(res => { self.$set(self.business, 1, res.data) - self.getVillage(self.business[1][0].code) + self.getVillage(street?street:self.business[1][0].code) }) }, //获取区 - getArea() { + getArea(code=null, street=null) { getArea({ city_code: 510500 }).then(res => { this.business[0] = res.data; - this.code1 = this.business[0][0].code; - this.getStreet(this.code1) + this.code1 = code ? code : this.business[0][0].code; + this.getStreet(this.code1, street) }) }, //商圈数据变化 @@ -606,13 +612,14 @@ import { Toast } from '../../../libs/uniApi'; this.street_id = resData.street_id this.mer_storeType = resData.mer_storeType this.village_id = resData.village_id - }) this.business_license = resData.images[0]; resData.images.shift(); this.pics = resData.images; this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array) this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr) + this.business_name = ''; + this.getArea(this.area_id, this.street_id); if(resData.mer_type_id!=12){ this.shoplist('mer_services_agree') }else{