diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue index 8c69c14..98968db 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -144,42 +144,42 @@ - - - - - -

{{item.mer_name}}

- - - - {{item.service_phone}} - - - - - - {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}} - - -
+ + + + + +

{{item.mer_name}}

+ + + + {{item.service_phone}} + - - - -

- {{item.mer_address}} -

-
- - - -

- {{item.mer_info}} -

-
+ + + + {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}} + -
+
+
+ + + +

+ {{item.mer_address}} +

+
+ + + +

+ {{item.mer_info}} +

+
+
+
@@ -242,10 +242,10 @@ - - - - + + + +
@@ -419,8 +419,8 @@ merList: [], //商户分类 mTop: 0, activeIndex: 0, - show:false, //质资弹出层 - image:''//图片 + show: false, //质资弹出层 + image: '' //图片 }; }, onLoad: function(options) { @@ -877,23 +877,23 @@ uni.navigateTo({ url: `/pages/store/home/index?id=${id}` }) - }else if(this.storeList.type_id == 12){ + } else if (this.storeList.type_id == 12) { uni.navigateTo({ - url: `/pages/nongKe/supply_chain/merchant?id=${id}` + url: `/pages/nongKe/supply_chain/merchant?id=${id}` }) } }, - qctail(item){ + qctail(item) { console.log(item); - if(item.mer_certificate == '' ){ + if (item.mer_certificate == '') { return } - this.show=true - this.image=item.mer_certificate[0] + this.show = true + this.image = item.mer_certificate[0] console.log(this.show); }, - close(){ - this.show=false + close() { + this.show = false } }, onPullDownRefresh() { @@ -1503,7 +1503,7 @@ .store-item { margin: 20rpx auto; // padding: 40rpx 20rpx; - background-color: #fff; + // background-color: #fff; .head { display: flex; @@ -1523,7 +1523,7 @@ .head_conent_l { width: 70%; - + .conent_l_top { display: flex; @@ -1533,7 +1533,7 @@ width: 80px; height: 180rpx; background-size: cover; - margin: 10px 0 0 10px; + margin: 10px 0 10px 10px; border-radius: 10px; } @@ -1541,7 +1541,7 @@ margin: 10px 0 0 15px; .text { - margin-top: 10rpx; + margin: 12.5rpx 0px; display: flex; span { @@ -1560,8 +1560,14 @@ } p { - font-size: 24px; + font-size: 31rpx; font-weight: 700; + width: 160px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + -o-text-overflow: ellipsis; + margin-bottom: 30rpx; } @@ -1570,13 +1576,14 @@ } .conent_l_bom { - padding-top: 10px; + margin-top: 40rpx; .text { display: flex; + p { width: 190px; - margin: 10rpx 0 10px 0; + margin: 10rpx 0 10Rpx 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -1595,6 +1602,7 @@ } .head_conent_r { + height: 200px; width: 30%; .miniban { @@ -1719,12 +1727,14 @@ } } } - .guanbi{ - width: 20px ; + + .guanbi { + width: 20px; height: 20px; margin: 30px auto; } - .pop{ + + .pop { z-index: 1; } \ No newline at end of file diff --git a/pages/product/addGoods/modifyPrice.vue b/pages/product/addGoods/modifyPrice.vue index 1687952..e44f7c9 100644 --- a/pages/product/addGoods/modifyPrice.vue +++ b/pages/product/addGoods/modifyPrice.vue @@ -188,7 +188,8 @@ export default { volume: '', // 体积 extension_one: '', // 一级佣金 extension_two: '' //二级拥挤 - } + }, + a:{} }; }, onLoad(opt) { @@ -207,6 +208,15 @@ export default { } }, deep: true + }, + batchData:{ + handler(val){ + console.log(val); + // this.multiSpecificationList + // setStorage('attrValue', this.multiSpecificationList); + }, + deep:true, + } }, methods: { @@ -230,9 +240,11 @@ export default { }); }, clk(index) { + setStorage('attrValue', this.multiSpecificationList); let avatar = this.$refs.avatar; this.index = index; avatar.fChooseImg(1,{selWidth: '350upx', selHeight: '350upx', inner: true}); + }, doUpload(rsp) { console.log(rsp);