diff --git a/components/Authorize.vue b/components/Authorize.vue index 1b17c7b..b69365f 100644 --- a/components/Authorize.vue +++ b/components/Authorize.vue @@ -230,13 +230,13 @@ let pages = getCurrentPages(), currPage = pages[pages.length - 1]; this.$emit('authColse', false); - // if (this.isGoIndex) { - // uni.switchTab({ - // url: '/pages/index/index' - // }); - // } else { - // this.$emit('authColse', false); - // } + if (this.isGoIndex) { + uni.switchTab({ + url: '/pages/index/index' + }); + } else { + this.$emit('authColse', false); + } }, } } diff --git a/components/rightSlider.vue b/components/rightSlider.vue index 4fa0be9..a141f1a 100644 --- a/components/rightSlider.vue +++ b/components/rightSlider.vue @@ -132,11 +132,13 @@ el.check = false }) this.storeTypeList = [ - {name: '全部', value: '',check: true}, + {name: '全部', value: 'trader',check: true}, {name: '自营', value: 'trader',check: false}, {name: '非自营', value: 'trader',check: false} ] this.min = this.max = '' + this.is_trader='' + this.index=0 this.arrFilter() }, confirm(){ @@ -146,7 +148,8 @@ price_on:this.min, price_off:this.max, status:false, - is_trader: this.is_trader + is_trader: this.is_trader, + } this.showBox = false this.$emit('confirm',obj,this.index) diff --git a/config/app.js b/config/app.js index c4a7778..3c22e78 100644 --- a/config/app.js +++ b/config/app.js @@ -22,8 +22,8 @@ if (process.env.NODE_ENV === "development") { // httpApiThree = 'baseUrlTest' // h5跨域配置 // #endif } else if (process.env.NODE_ENV === 'production') { - httpApi = 'https://shop.lihaink.cn' // 生产 - // httpApi = "https://crmeb-test.shop.lihaink.cn" + // httpApi = 'https://shop.lihaink.cn' // 生产 + httpApi = "https://crmeb-test.shop.lihaink.cn" httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 } diff --git a/manifest.json b/manifest.json index 786a1a7..36d2600 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "CRMEB", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.0.9", - "versionCode" : 132, + "versionName" : "1.0.11", + "versionCode" : 134, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 48e8df6..5995e80 100644 --- a/pages.json +++ b/pages.json @@ -948,7 +948,8 @@ { "path": "plant_release/index", "style": { - "navigationBarTitleText": "内容发布" + "navigationBarTitleText": "内容发布", + "enablePullDownRefresh":true } }, { diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index c56c52e..c7c42d9 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -1625,7 +1625,7 @@ }, //#endif async imgToBase(url) { - let res = await imgToBase({ + let res = await imgToBase({ image: url }) return res.data.image diff --git a/pages/plantGrass/plant_release/index.vue b/pages/plantGrass/plant_release/index.vue index 1d28b29..6919eaf 100644 --- a/pages/plantGrass/plant_release/index.vue +++ b/pages/plantGrass/plant_release/index.vue @@ -2,7 +2,7 @@
- + {{item.name}} @@ -186,6 +186,7 @@ // #endif }, onLoad(options) { + console.log(this.community_app_switch); this.id = options.id; this.order_id = options.order_id; this.tabActive = options.type || 1; diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue index 2decee7..7b601ae 100644 --- a/pages/plant_release/index.vue +++ b/pages/plant_release/index.vue @@ -720,11 +720,11 @@ display: flex; align-items: center; justify-content: center; - z-index: 2000; + z-index: 0; .iconfont { color: #ffffff; - font-size: 12rpx; + font-size: 12rpx ; } } diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index 983e510..a6ac6d3 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -235,6 +235,7 @@ methods: { getMerchantInfo(id) { merchantInfoAPI({ id }).then(res => { + console.log(res); this.images[0].img = res.data.mer_banner this.images[1].img = res.data.mer_avatar this.images[2].img = res.data.mini_banner diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index 869e5f5..0e82e89 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -401,7 +401,7 @@ where: { category_id: -1, page: 1, - limit: 5 + limit: 6 }, } },