From d0257b52be9ebc34dcb4aa6a5fced6884796629c Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Sun, 8 Oct 2023 09:39:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=20=E7=AD=89=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods_details/index.vue | 29 +++++++++++++------ pages/moreProject/moreProject.vue | 14 ++++----- pages/product/addGoods/commodity.vue | 2 +- pages/product/addGoods/index.vue | 6 ++-- pages/product/addGoods/secound.vue | 14 ++++----- pages/product/components/inputGoodsDetils.vue | 16 +++++----- pages/users/login/login_copy.vue | 24 ++++++++++----- 7 files changed, 64 insertions(+), 41 deletions(-) diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 153c189..cad92c0 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -287,11 +287,11 @@ v-html="description.content.replace(//ig, '')"> - - {{description.content.title}} + + {{description.content.title}} - - + + @@ -704,11 +704,6 @@ that.getConfig(); uni.hideLoading(); }, - - onHide() { - - this.CartCount = 0 - }, /** * 用户点击右上角分享 */ @@ -2525,4 +2520,20 @@ } } } + + .product_content{ + background-color: #fff; + &_title{ + width: 100%; + height: auto; + line-height: 50rpx; + padding: 28rpx; + word-wrap: break-word; + text-align: center; + } + image{ + width: 750rpx; + height: 750rpx; + } + } \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 421d4e0..e7ea853 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -63,7 +63,7 @@ + @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,2)"> 商品管理 @@ -167,7 +167,7 @@ + @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)"> 客服记录 @@ -185,7 +185,7 @@ 订单管理 + @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,2)"> 商品管理 @@ -287,7 +287,7 @@ + @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)"> 客服记录 @@ -354,7 +354,7 @@ + @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`,2)"> 客服记录 @@ -372,7 +372,7 @@ 订单管理 + @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`,2)"> 商品管理 @@ -902,7 +902,7 @@ } } } else { - if (t == '商品管理') { + if (t == 2) { uni.switchTab({ url: url }) diff --git a/pages/product/addGoods/commodity.vue b/pages/product/addGoods/commodity.vue index d7ba2dd..39eaa20 100644 --- a/pages/product/addGoods/commodity.vue +++ b/pages/product/addGoods/commodity.vue @@ -224,7 +224,7 @@ if (this.product_id) { // editGoodsDetils = getStorage('editGoodsDetils'); editGoodsDetils = this.$store.state.storage.storage; - console.log(editGoodsDetils); + // console.log('ss',editGoodsDetils.content); // editGoodsDetils = getStorage('editGoodsDetils'); // console.log('初始化商品详情',editGoodsDetils); Object.keys(this.addGoodsSecoundData).forEach(item => { diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue index 97e62b7..3d8aa8f 100644 --- a/pages/product/addGoods/index.vue +++ b/pages/product/addGoods/index.vue @@ -163,7 +163,7 @@ --> - @@ -437,6 +437,8 @@ // this.getDeliveryType(); if (this.product_id) { this.initDataEditData(); + }else { + setStorage('editCommodity',{}); } }, onBackPress() { @@ -584,6 +586,7 @@ } productDetail(this.merId, this.product_id).then(res => { setStorage('editGoodsDetils', res.data); + if(res.data.content_arr) res.data.content = res.data.content_arr; this.$store.commit('setStorage', res.data); let editGoodsDetils = res.data; Object.keys(this.setFormData).forEach(item => { @@ -627,7 +630,6 @@ let that = this; that.$util.uploadImageOne('upload/image', function(res) { that.setFormData.imageList.push(res.data.path); - }); }, clk() { diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue index d51a1e0..bc78a48 100644 --- a/pages/product/addGoods/secound.vue +++ b/pages/product/addGoods/secound.vue @@ -264,15 +264,15 @@ postData[key]=info[key]; }) postData.stock = postData.attrValue[0].stock; - console.log(postData); - if(postData.store_name.trim().length<=0)return Toast('请输入商品名称'); - if(postData.imageList.length<=0)return Toast('请上传商品图片'); - if(postData.cate_name.trim().length<=0)return Toast('请选择平台分类'); - if(postData.unit_name.trim().length<=0)return Toast('请输入商品单位'); + // console.log(postData); + if(!postData.store_name||postData.store_name?.trim().length<=0)return Toast('请输入商品名称'); + if(!postData.imageList||postData.imageList.length<=0)return Toast('请上传商品图片'); + if(postData.cate_name?.trim().length<=0)return Toast('请选择平台分类'); + if(postData.unit_name?.trim().length<=0)return Toast('请输入商品单位'); if(!postData.attrValue[0].price||postData.attrValue[0].price<0)return Toast('价格不能小于0'); if(!postData.stock||postData.stock<0)return Toast('库存不能小于0'); - if(postData.content.title.trim().length<=0)return Toast('请输入商品详情'); - if(postData.content.image.length<=0)return Toast('请上传商品图片'); + if(!postData.content.title||postData.content.title?.trim().length<=0)return Toast('请输入商品详情'); + if(!postData.content.image||postData.content.image?.length<=0)return Toast('请上传商品图片'); // return Toast('通过'); if (getStorage('addGoodsFormData').spec_type == 0) { // postData.attr = [getStorage('singleSpecification')]; diff --git a/pages/product/components/inputGoodsDetils.vue b/pages/product/components/inputGoodsDetils.vue index 5f5368f..c43097a 100644 --- a/pages/product/components/inputGoodsDetils.vue +++ b/pages/product/components/inputGoodsDetils.vue @@ -1,7 +1,7 @@