diff --git a/App.vue b/App.vue index 1e230fb..b8f3608 100644 --- a/App.vue +++ b/App.vue @@ -52,10 +52,16 @@ }, async bindCode(options, code) { if (!options.query) return - if (options.query.path == 'goods_details') return + // if (options.query.path == 'goods_details') return let invite_code = options.query.invite_code || strToParams(decodeURIComponent(options.query.scene)) .invite_code + let source = options.query.source || '' + if (invite_code) { + if (uni.getLaunchOptionsSync().scene == 1154 && source == 'pyq') { + //朋友圈单页不走登录 + return + } uni.setStorageSync('invite_code', invite_code) const { data, diff --git a/api/store.js b/api/store.js index 1a4eab0..e51ffb2 100644 --- a/api/store.js +++ b/api/store.js @@ -211,6 +211,10 @@ export function searchGoods(params) { return request.get('goods/searchByName', {params}); } +export function getYearList(params) { + return request.get('goods/yearList', {params}); +} + export function getHotList(params) { return request.get('goods/hotList', {params}); } diff --git a/bundle_b/pages/local_settled/index.vue b/bundle_b/pages/local_settled/index.vue index 4ecd609..23e1b1d 100644 --- a/bundle_b/pages/local_settled/index.vue +++ b/bundle_b/pages/local_settled/index.vue @@ -44,17 +44,6 @@ - - - - - - - - - - @@ -76,6 +65,16 @@ + + + + + + + + + + @@ -119,11 +118,7 @@ - - - - - + @@ -135,6 +130,10 @@ + + + + @@ -431,9 +430,9 @@ title: '请填写联系电话' }) - if (!selfPhoto) return this.$toast({ - title: '请上传自拍照' - }) + // if (!selfPhoto) return this.$toast({ + // title: '请上传自拍照' + // }) if (!idFront) return this.$toast({ title: '请上传身份证人像面' @@ -455,9 +454,9 @@ // title: '请填写社会信用代码' // }) - if (bankType == 1 && !largeNumber) return this.$toast({ - title: '请输入大额卡号' - }) + // if (bankType == 1 && !largeNumber) return this.$toast({ + // title: '请输入大额卡号' + // }) if (bankType != 1 && !bank_user_name) return this.$toast({ title: '请输入户名' diff --git a/bundle_b/pages/local_shop/local_pay.vue b/bundle_b/pages/local_shop/local_pay.vue index ed960d6..0dcaf8f 100644 --- a/bundle_b/pages/local_shop/local_pay.vue +++ b/bundle_b/pages/local_shop/local_pay.vue @@ -493,7 +493,7 @@ this.payMoney = this.money if (result === 'success') { - if (data.acc_cust_id > 0) { + if (data && data.acc_cust_id && data.acc_cust_id > 0) { checkOrder({ post: data }) diff --git a/bundle_b/pages/panic_buying/index.vue b/bundle_b/pages/panic_buying/index.vue index 316ab4a..b15c807 100644 --- a/bundle_b/pages/panic_buying/index.vue +++ b/bundle_b/pages/panic_buying/index.vue @@ -27,7 +27,7 @@ 服务 - {{item}} + {{item}} diff --git a/components/cate-two/cate-two.vue b/components/cate-two/cate-two.vue index d407e12..e19e1c7 100644 --- a/components/cate-two/cate-two.vue +++ b/components/cate-two/cate-two.vue @@ -61,7 +61,10 @@ - {{item.name}} + + 【预售】 + {{item.name}} + diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index a49e999..c3a0129 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -11,7 +11,10 @@ - {{item.name}} + + 【预售】 + {{item.name}} + 零售价: - {{item.name}} + + 【预售】 + {{item.name}} + 零售价: - {{item.name}} + + 【预售】 + {{item.name}} @@ -126,7 +134,10 @@ - {{item.name}} + + 【预售】 + {{item.name}} + 零售价: - {{item.name}} + + 【预售】 + {{item.name}} + - {{item.name}} + + 【预售】 + {{item.name}} + @@ -264,7 +281,10 @@ - {{item.name}} + + 【预售】 + {{item.name}} + {{item.views}}浏览量 diff --git a/components/index-home/index-home.vue b/components/index-home/index-home.vue index d11c216..2d8c0fe 100644 --- a/components/index-home/index-home.vue +++ b/components/index-home/index-home.vue @@ -35,24 +35,27 @@ - - - + + + 年货超值购 - + - + - {{item.name}} + + 【预售】 + {{item.name}} + @@ -187,6 +190,9 @@ hotListGoods() { return this.homeData.hot_list || [] }, + yearGoods() { + return this.homeData.year_goods || [] + }, newGoods() { return this.homeData.news || [] }, diff --git a/config/app.js b/config/app.js index ff61e54..6103884 100644 --- a/config/app.js +++ b/config/app.js @@ -17,10 +17,9 @@ const IS_H5 = false /** S API BaseURL **/ const baseURLMap = { // 开发环境 - development: 'https://dlh.stnav.com', + development: 'https://dlh.hainings.com', // 生产环境 production: IS_H5 ? location.origin : 'https://dlh.hainings.com', - //app https://dlh.zjeloong.com } const baseURL = SWITCH_DEVELOPMENT ? baseURLMap['development'] : baseURLMap[process.env.NODE_ENV] diff --git a/pages.json b/pages.json index 90d7a56..cd69bd5 100644 --- a/pages.json +++ b/pages.json @@ -239,16 +239,16 @@ "subPackages": [{ "root": "bundle", "pages": [ - { - "path": "pages/community/community", - "meta": { - "auth": false, - "keepScroll": true - }, - "style": { - "navigationBarTitleText": "种草" - } - }, + // { + // "path": "pages/community/community", + // "meta": { + // "auth": false, + // "keepScroll": true + // }, + // "style": { + // "navigationBarTitleText": "种草" + // } + // }, { "path": "pages/shop_street/shop_street", "name": "shop_street", diff --git a/pages/active_list/active_list.vue b/pages/active_list/active_list.vue index 3edb220..21ff22d 100644 --- a/pages/active_list/active_list.vue +++ b/pages/active_list/active_list.vue @@ -11,9 +11,13 @@ + 年货超值购 热销榜单 新品推荐 + + + @@ -27,6 +31,7 @@