diff --git a/components/product-list.vue b/components/product-list.vue index 341a078..53dd2f3 100644 --- a/components/product-list.vue +++ b/components/product-list.vue @@ -790,6 +790,8 @@ + + @@ -798,6 +800,7 @@ import uniDrawer from "@/components/uni-drawer.vue"; import uniTag from "@/components/uni-tag/uni-tag.vue"; import { mapMutations, mapState } from "vuex"; import $ from "../helpers/util"; +import loginPopup from "@/components/loginPopup.vue"; export default { props: { @@ -987,12 +990,15 @@ export default { shareTitle: "", chatUrl: "", timer: null, + + showLoginPopup: false, }; }, components: { uniDrawer, uniTag, + loginPopup, }, computed: mapState([ "Config", @@ -1254,6 +1260,10 @@ export default { "getUserInfo", ]), + closeLoginPopup() { + this.showLoginPopup = false; + }, + async init() { await this.$store.dispatch(`getCartList`, (data) => { this.cartList = data.items; @@ -1902,6 +1912,11 @@ export default { //列表购物车 addCart: async function (e) { + if (!this.hasLogin) { + this.showLoginPopup = true; + return; + } + let that = this; let index = e.currentTarget.dataset.index; let step = parseInt(e.currentTarget.dataset.step); diff --git a/components/themes/diy.vue b/components/themes/diy.vue index 3756e4e..9631cd6 100644 --- a/components/themes/diy.vue +++ b/components/themes/diy.vue @@ -304,7 +304,7 @@ :style="{ 'font-size': '30px', color: item.eltm8.fontColor }"> - + + @@ -897,6 +899,7 @@ import diyCountdown from "../../components/themes/diy-countdown"; import guessYouLike from "@/components/product-list.vue"; import storeLists from "@/components/store-lists.vue"; +import loginPopup from "@/components/loginPopup.vue"; import { mapState, mapMutations } from "vuex"; import $ from "../../helpers/util"; @@ -908,6 +911,7 @@ export default { storeLists, wxParse, diyCountdown, + loginPopup, }, props: { BgConfig: { @@ -984,6 +988,7 @@ export default { return { w: 0, //windowWidth loaded: false, + showLoginPopup: false, chatUrl: "", initX: "690", initY: "1336", @@ -1056,12 +1061,21 @@ export default { "showCartNum", ]), + closeLoginPopup() { + this.showLoginPopup = false; + }, + getGoodsStatus (item){ return item?.product_quantity == 0 || item?.item_quantity == 0 }, async addCart(item) { + if (!this.hasLogin) { + this.showLoginPopup = true; + return; + } + if (item?.product_quantity == 0 || item?.item_quantity == 0) { uni.showToast({ icon: 'error', @@ -1116,16 +1130,15 @@ export default { }); }, tplGoToPage: function (e) { - let that = this; - if(this.isLogin){ - if(!this.hasLogin){ - that.$emit("showLogin",true) - return - } - } - debugger; + // if(this.isLogin){ + // if(!this.hasLogin){ + // that.$emit("showLogin",true) + // return + // } + // } + var t = e.currentTarget.dataset; //console.info(t); switch (parseInt(t.type)) { diff --git a/components/themes/shoptheme1.vue b/components/themes/shoptheme1.vue index ff383a5..458bc91 100644 --- a/components/themes/shoptheme1.vue +++ b/components/themes/shoptheme1.vue @@ -1,135 +1,167 @@ - - diff --git a/config/config.js b/config/config.js index adf1455..7c3c038 100644 --- a/config/config.js +++ b/config/config.js @@ -287,6 +287,7 @@ export default { "menu": iu + "?ctl=Store&met=menu&typ=json", // "lists":iu + "?ctl=Store&met=lists&typ=json", "lists": ip + "shop/store/lists", + "category": ip + "shop/store/category", // 附近门店列表 "nearList": ip + 'shop/store/near/list', "listsChain": iu + "?ctl=Chain&met=lists&typ=json", @@ -1115,7 +1116,7 @@ export default { "text": "推荐" }, { - "pagePath": "pages/category/category", + "pagePath": "pages/category/storeCategory", "iconPath": "static/images/tabBar2.png", "selectedIconPath": "static/images/tabBar_sel2.png", "text": "分类" diff --git a/pages.json b/pages.json index d513599..b7cbec1 100644 --- a/pages.json +++ b/pages.json @@ -76,6 +76,16 @@ } } }, + + { + "path": "pages/category/storeCategory", + "style": { + "navigationBarTitleText": "店铺分类", + "app-plus": { + "titleNView": false + } + } + }, /* { @@ -1524,7 +1534,7 @@ "text": "推荐" }, { - "pagePath": "pages/category/category", + "pagePath": "pages/category/storeCategory", "iconPath": "static/images/tabBar2.png", "selectedIconPath": "static/images/tabBar_sel2.png", "text": "分类" diff --git a/pages/category/storeCategory.vue b/pages/category/storeCategory.vue new file mode 100644 index 0000000..eb10d1c --- /dev/null +++ b/pages/category/storeCategory.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/pages/index/image.vue b/pages/index/image.vue index 7b908c4..295bd56 100644 --- a/pages/index/image.vue +++ b/pages/index/image.vue @@ -357,10 +357,10 @@ export default { // item 返回选中 JSON 对象 //console.log(item) - if(!this.hasLogin){ - this.showLoginPopup = true - return - } + // if(!this.hasLogin){ + // this.showLoginPopup = true + // return + // } let url = "/community/community/detail?id=" + item.story_id; diff --git a/pages/product/detail.vue b/pages/product/detail.vue index 0630347..56f0631 100644 --- a/pages/product/detail.vue +++ b/pages/product/detail.vue @@ -1746,16 +1746,16 @@ export default { ispage: false, shareData: { - shareText: "澜驰商城系统，支持原生App、微信小程序，邀请你一起体验！", - shareTitle: "澜驰商城系统，支持原生App、微信小程序，邀请你一起体验！", - href: "https://www.suteshop.com", + shareText: "同城特惠，一站式购买小发精选好物。", + shareTitle: "大型综合体商城，30分钟送货到家", + href: "https://gpxscs.cn/", image: "", price: 0, }, - shareText: "澜驰商城系统，支持原生App、微信小程序，邀请你一起体验！", - shareTitle: "澜驰商城系统，支持原生App、微信小程序，邀请你一起体验！", - href: "https://www.suteshop.com", + shareText: "同城特惠，一站式购买小发精选好物。", + shareTitle: "大型综合体商城，30分钟送货到家", + href: "https://gpxscs.cn/", image: "", shareBoxFlag: 0, diff --git a/pages/product/list.vue b/pages/product/list.vue index 87d76d7..c313bd9 100644 --- a/pages/product/list.vue +++ b/pages/product/list.vue @@ -230,6 +230,7 @@ export default { ptSearchStyle: "z-index: 5;", tpSearchStyle: "z-index: 5;", tpSearchPlaceholder: "", + store_id: 0, }; }, @@ -274,6 +275,7 @@ export default { }); }, async onLoad(options) { + this.store_id = options.store_id ? options.store_id : 0 await this.$onLaunched; this.loaded = true; diff --git a/pagesub/index/components/tabbar.vue b/pagesub/index/components/tabbar.vue index 48de537..70cfad8 100644 --- a/pagesub/index/components/tabbar.vue +++ b/pagesub/index/components/tabbar.vue @@ -142,7 +142,7 @@ export default { bottom: 0; right: 0; left: 0; - z-index: 10; + z-index: 100; display: flex; align-items: center; border-top: 1px solid rgba(0, 0, 0, 0.1); diff --git a/pagesub/index/store.vue b/pagesub/index/store.vue index e1598c8..47254d2 100644 --- a/pagesub/index/store.vue +++ b/pagesub/index/store.vue @@ -573,6 +573,8 @@ + + @@ -640,6 +642,7 @@ import shoptheme6 from "../../components/themes/shoptheme6.vue"; import diy from "../../components/themes/diy.vue"; import uniTag from "@/components/uni-tag/uni-tag.vue"; import MyTabbar from "./components/tabbar.vue"; +import loginPopup from "@/components/loginPopup.vue"; import favorite from "@/helpers/favorite"; @@ -704,7 +707,8 @@ export default { loadStoreCategoryComplete: false, // 加载店铺配置信息完成 isRest:true, showBackTop: false, - scrollThreshold: 600 + scrollThreshold: 600, + showLoginPopup: false, }; }, computed: mapState([ @@ -728,6 +732,7 @@ export default { uniTag, wxParse, MyTabbar, + loginPopup, }, onBackPress({ from }) { @@ -836,6 +841,10 @@ export default { "getStoreInfo", ]), + closeLoginPopup() { + this.showLoginPopup = false; + }, + // 返回顶部 scrollToTop() { uni.pageScrollTo({ @@ -863,6 +872,11 @@ export default { SKU_Id: item.item_id, }; + if (!this.hasLogin) { + this.showLoginPopup = true; + return; + } + if(item?.product_quantity == 0){ uni.showToast({ icon: 'error', @@ -1640,6 +1654,10 @@ export default { @import "../../styles/store_themes.scss"; @import "../../styles/store_tpl.scss"; +.m-listv{ + padding: 0 0 0 14rpx; +} + .u-pabtn { position: static; } @@ -1839,7 +1857,7 @@ export default { .all_shop_tab{ position: sticky; top: -2px; - z-index: 100; + z-index: 2; border-bottom: 1rpx solid #eee; } diff --git a/pagesub/search/search.vue b/pagesub/search/search.vue index da2e5b3..a465a10 100644 --- a/pagesub/search/search.vue +++ b/pagesub/search/search.vue @@ -23,6 +23,7 @@ search_his_list: [], hot_list: [], + store_id: 0, suggest_text: "" } }, @@ -33,6 +34,9 @@ }); var that = this; + + console.log('store_id===', options.store_id); + this.store_id = options.store_id ? options.store_id : 0 that.$.request({ url: this.Config.URL.search_hot_info, @@ -50,7 +54,7 @@ getSearchText(e) { var that = this; that.$.isNull(e) ? that.$.confirm("请输入您要搜索的关键词!") : that.$.golevelToTabBar(that, "../../" + that.route, - "/pages/product/list?pname=" + e) + `/pages/product/list?pname=${e}&store_id=${this.store_id}`) } }, } diff --git a/static/images/logo.png b/static/images/logo.png new file mode 100644 index 0000000..0c15ff6 Binary files /dev/null and b/static/images/logo.png differ