diff --git a/pages.json b/pages.json index 46c064d..8347c95 100644 --- a/pages.json +++ b/pages.json @@ -1427,7 +1427,7 @@ "pages": [{ "path": "list/index", "style": { - "navigationBarTitleText": "商品管理13", + "navigationBarTitleText": "商品管理", "enablePullDownRefresh": true, "app-plus": { "scrollIndicator": false, //禁用原生导航栏 diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue index e12e7fc..fee9768 100644 --- a/pages/admin/goods_details/index.vue +++ b/pages/admin/goods_details/index.vue @@ -186,70 +186,73 @@ ￥ {{storeInfo.price}}/瓶 + style="font-size: 40rpx;color:#777777 ;">/{{storeInfo.unit_name}} {{storeInfo.store_name ? storeInfo.store_name : ''}} - - + + - 书海性sdsd + 等级 - 阿萨德 + {{product_attribute.leval}} - + + + + 产地 + + + {{product_attribute.address.substring(0,3)}} + + + + + + + + 包装 + + + {{product_attribute.pack}} + + + + + + + + {{item.label}} + + + {{item.value}} + + + + + - - - - - {{attrTxt}}： {{attrValue}} - 1件 + 1{{storeInfo.unit_name}} @@ -261,13 +264,6 @@ - - @@ -491,7 +487,8 @@ itemNew: [], indicatorDots: false, preview_key: '', - comForm: '' // 页面打开的途径，admin代表时后台的预览 + comForm: '', // 页面打开的途径，admin代表时后台的预览 + product_attribute: {} }; }, computed: configMap(['hide_mer_status'], mapGetters(['isLogin', 'uid'])), @@ -691,8 +688,6 @@ } that.$set(that, 'storeInfo', storeInfo); that.$set(that, 'description', storeInfo.content); - // that.description - console.log(that.description, 'sd') if (typeof that.description.content == 'string') { try { that.description.content = JSON.parse(that.description.content); @@ -758,6 +753,7 @@ getPreviewProDetail(params).then(res => { uni.hideLoading(); let storeInfo = res.data; + this.product_attribute = res.data.product_attribute if (storeInfo.video_link && storeInfo.slider_image.length > 1) { this.videoCoverImg = storeInfo.slider_image[0] storeInfo.slider_image.splice(0, 1) diff --git a/pages/index/index.vue b/pages/index/index.vue index 11ef8e8..c028023 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -862,7 +862,7 @@ uni.$on('diverIndexSubEmit', () => { this.subNVue.hide() uni.navigateTo({ - url: '/pages/product/list/index?diver=1' + url: '/pages/product/list/index' }) }) diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue index 552bb43..cb1d372 100644 --- a/pages/index/subnvue/concat.nvue +++ b/pages/index/subnvue/concat.nvue @@ -229,7 +229,7 @@ .next-btn { position: absolute; - bottom: 100rpx; + bottom: 100px; left: 375rpx; transform: translateX(-50%); width: 240rpx; diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue index fd58428..ce009af 100644 --- a/pages/product/addGood/addGood.vue +++ b/pages/product/addGood/addGood.vue @@ -440,17 +440,15 @@ if (this.import == 1) { uni.$emit('importAttrValueOK', this.setFormData.import_id); uni.navigateBack(); - } else uni.redirectTo({ - url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6` - }) + } else { + uni.navigateBack(); + } }).catch(() => { - uni.redirectTo({ - url: `/pages/product/list/index?mer_id=${this.mer_id}&type=2` - }) + uni.navigateBack(); }) }) .catch(rej => { - // Toast(rej); + Toast(rej); }); }, async submit() { diff --git a/pages/product/addGoodDetail/addGoodDetail.vue b/pages/product/addGoodDetail/addGoodDetail.vue index b5a90ed..28d924a 100644 --- a/pages/product/addGoodDetail/addGoodDetail.vue +++ b/pages/product/addGoodDetail/addGoodDetail.vue @@ -686,9 +686,11 @@ if (this.import == 1) { uni.$emit('importAttrValueOK', this.setFormData.import_id); uni.navigateBack(); - } else uni.redirectTo({ - url: `/pages/product/list/index?mer_id=${that.mer_id}&type=6` - }) + } else { + uni.redirectTo({ + url: `/pages/product/list/index?mer_id=${that.mer_id}&type=6` + }) + } }).catch(() => { uni.navigateBack() }) @@ -704,9 +706,11 @@ uni.redirectTo({ url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6` }) - } else uni.redirectTo({ - url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6` - }) + } else { + uni.redirectTo({ + url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6` + }) + } }).catch(() => { uni.redirectTo({ url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6` diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 21e16cd..6c83b74 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -9,8 +9,7 @@ - + @@ -43,35 +42,32 @@ - - - + 删除 - 修改库存 - 修改库存 - - 下架 - 上架 - + 编辑商品 @@ -347,22 +343,27 @@ this.getList(this.mer_id, false); }, onShow() { - if (!this.newUser) return - let that = this - setTimeout(() => { - const query = uni.createSelectorQuery().in(this); - query - .select(".wcnm") - .boundingClientRect((data) => { - let info = JSON.stringify(data) - console.log(data) - that.elInfo = data - // #ifdef APP-PLUS - that.openDiver() - // #endif - }) - .exec(); - }, 500) + let userInfo = JSON.parse(uni.getStorageSync('USER_INFO')) + isNewMer(userInfo.uid, userInfo.service?.mer_id).then(res => { + if (res.data == 'true') { + let that = this + setTimeout(() => { + const query = uni.createSelectorQuery().in(this); + query + .select(".wcnm") + .boundingClientRect((data) => { + let info = JSON.stringify(data) + console.log(data) + that.elInfo = data + // #ifdef APP-PLUS + that.openDiver() + // #endif + }) + .exec(); + }, 500) + } + }) + }, methods: { diff --git a/pages/product/list/subnvue/concat.nvue b/pages/product/list/subnvue/concat.nvue index 80f3def..cd8bec5 100644 --- a/pages/product/list/subnvue/concat.nvue +++ b/pages/product/list/subnvue/concat.nvue @@ -1,6 +1,6 @@