diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue index 04eb1bd..8c69c14 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -8,12 +8,13 @@ - + - - + + @@ -22,7 +23,8 @@ - + {{downMenu[downKey].title}} @@ -45,12 +47,13 @@ - + {{item.title}} 筛选 - + @@ -61,12 +64,12 @@ - + 已售罄 - + @@ -77,7 +80,8 @@ {{item.price}} - + ¥{{item.svip_price}} @@ -85,9 +89,12 @@ - {{item.merchant.type_name}} - 自营 - {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}} + {{item.merchant.type_name}} + 自营 + {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}} 领券 包邮 @@ -116,7 +123,8 @@ - + {{loadTitle}} @@ -134,32 +142,51 @@ - - - - - {{item.mer_name}} - - {{item.type_name}} - 自营 - - - - - - {{item.product_score}} - - {{item.distance}} - - + + + + + + + +

{{item.mer_name}}

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

+ {{item.mer_address}} +

+
+ + + +

+ {{item.mer_info}} +

+
+
+
+ +
- 进店
- - +
{{loadTitle}} - +
@@ -195,23 +222,30 @@
- + +
- + {{item.title}} - + + + + + @@ -232,19 +266,30 @@ storeMerchantList, getGeocoder } from '@/api/store.js'; - import {initiateAssistApi} from '@/api/activity.js'; + import { + initiateAssistApi + } from '@/api/activity.js'; import recommend from '@/components/recommend'; import rightSlider1 from '@/components/rightSlider.vue'; import rightSlider2 from '@/components/rightSlider/index'; import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue' - import { merClassifly, getStoreTypeApi } from '@/api/store.js'; - import { configMap } from "@/utils"; - import { mapGetters } from "vuex"; + import { + merClassifly, + getStoreTypeApi + } from '@/api/store.js'; + import { + configMap + } from "@/utils"; + import { + mapGetters + } from "vuex"; // #ifndef H5 import passwordPopup from '@/components/passwordPopup'; // #endif import authorize from '@/components/Authorize'; - import { HTTP_REQUEST_URL } from '@/config/app'; + import { + HTTP_REQUEST_URL + } from '@/config/app'; import { goShopDetail } from '@/libs/order.js' @@ -357,7 +402,7 @@ page: 1, limit: 10, order: '', - category_id : '', + category_id: '', type_id: '' }, storeKey: 0, @@ -374,6 +419,8 @@ merList: [], //商户分类 mTop: 0, activeIndex: 0, + show:false, //质资弹出层 + image:''//图片 }; }, onLoad: function(options) { @@ -386,8 +433,7 @@ this.getClassfication(); this.getStoreType(); }, - onReady() { - }, + onReady() {}, mounted() { uni.getStorage({ key: 'GLOBAL_DATA', @@ -411,7 +457,12 @@ } }) }, - ...configMap({margin_ico_switch: 0,margin_ico: '',hide_mer_status:0,recommend_switch: 0},mapGetters(['uid','isLogin','scrollTop','viewColor','keyColor'])), + ...configMap({ + margin_ico_switch: 0, + margin_ico: '', + hide_mer_status: 0, + recommend_switch: 0 + }, mapGetters(['uid', 'isLogin', 'scrollTop', 'viewColor', 'keyColor'])), }, // 滚动监听 onPageScroll() { @@ -429,10 +480,10 @@ this.$wechat.seeLocation({ latitude: Number(lat), longitude: Number(lon) - }).then(res=>{ + }).then(res => { console.log('success'); }) - }else{ + } else { //#endif uni.openLocation({ latitude: parseFloat(lat), @@ -445,7 +496,7 @@ console.log(res) }, }); - // #ifdef H5 + // #ifdef H5 } //#endif }, @@ -543,14 +594,15 @@ order: this.sotreParam.order, category_id: this.sotreParam.category_id, type_id: 10 - + } if (this.latitude) { serachData.location = this.latitude + ',' + this.longitude } storeMerchantList(serachData).then(res => { res.data.list.forEach(item => { - var tempNum = parseFloat(item.product_score) + parseFloat(item.service_score) + parseInt(item.postage_score) + var tempNum = parseFloat(item.product_score) + parseFloat(item.service_score) + + parseInt(item.postage_score) tempNum = tempNum / 3 / 5 * 100 item.allScore = tempNum.toFixed(2) }) @@ -558,6 +610,7 @@ this.storeList = this.storeList.concat(res.data.list) this.count = res.data.count this.loading = false + console.log(this.storeList); }) }, // 店铺排序 @@ -632,7 +685,7 @@ }) }, // 组件确定 - confirm(data,index) { + confirm(data, index) { let arr = [] if (data.brandList.length == 0) { this.where.brand_id = '' @@ -659,11 +712,12 @@ this.price = 0; this.sotreParam.page = 1 this.sotreParam.order = '', - this.rightBox2 = true + this.rightBox2 = true }, // 组件确定 confirm2(data) { - let arr1 = [],arr2 = [] + let arr1 = [], + arr2 = [] if (data.storeTypeArr.length == 0) { this.sotreParam.type_id = '' } else { @@ -752,11 +806,11 @@ that.hotPage++ that.hotScroll = res.data.list.length < that.hotLimit that.hostProduct = that.hostProduct.concat(res.data.list) - if(that.hostProduct.length == res.data.count){ + if (that.hostProduct.length == res.data.count) { uni.showToast({ - title: '推荐商品,加载完毕', - duration: 2000, // 显示时长,单位为毫秒 - icon: 'success' // 提示图标,可选值:success / loading / none + title: '推荐商品,加载完毕', + duration: 2000, // 显示时长,单位为毫秒 + icon: 'success' // 提示图标,可选值:success / loading / none }) } }); @@ -823,7 +877,23 @@ uni.navigateTo({ url: `/pages/store/home/index?id=${id}` }) + }else if(this.storeList.type_id == 12){ + uni.navigateTo({ + url: `/pages/nongKe/supply_chain/merchant?id=${id}` + }) } + }, + qctail(item){ + console.log(item); + if(item.mer_certificate == '' ){ + return + } + this.show=true + this.image=item.mer_certificate[0] + console.log(this.show); + }, + close(){ + this.show=false } }, onPullDownRefresh() { @@ -852,21 +922,22 @@ } } }, - onPullDownRefresh(){ - setTimeout(()=>{ + onPullDownRefresh() { + setTimeout(() => { const newList = this.productList.reverse(); this.productList = newList; uni.stopPullDownRefresh(); - },500) + }, 500) } } + .guanbi{ + width: 20px ; + height: 20px; + margin: 30px auto; + } + .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 155e80c..1687952 100644 --- a/pages/product/addGoods/modifyPrice.vue +++ b/pages/product/addGoods/modifyPrice.vue @@ -258,6 +258,7 @@ export default { }, complete(res) { console.log(res) + console.log(that.multiSpecificationList); } }); }, diff --git a/static/images/clock.png b/static/images/clock.png new file mode 100644 index 0000000..c45580a Binary files /dev/null and b/static/images/clock.png differ diff --git a/static/images/dingwei.png b/static/images/dingwei.png new file mode 100644 index 0000000..9728b98 Binary files /dev/null and b/static/images/dingwei.png differ diff --git a/static/images/guanbi.png b/static/images/guanbi.png new file mode 100644 index 0000000..d86769e Binary files /dev/null and b/static/images/guanbi.png differ diff --git a/static/images/phone.png b/static/images/phone.png new file mode 100644 index 0000000..f259d23 Binary files /dev/null and b/static/images/phone.png differ diff --git a/static/images/shangpu.png b/static/images/shangpu.png new file mode 100644 index 0000000..38035e7 Binary files /dev/null and b/static/images/shangpu.png differ