diff --git a/components/Loading.vue b/components/Loading.vue index c675451..ac77b4b 100644 --- a/components/Loading.vue +++ b/components/Loading.vue @@ -13,7 +13,7 @@ data() { return { isShow: false, - str: '加载中', + str: '初始化中', timer: null }; }, diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index aca5cf5..e589985 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -231,7 +231,7 @@ width: 102%; height: 133px; border-radius: 30px 30px 0 0; - background-color: #fff; + background-color: #f8f8f8; } .bg-img { diff --git a/config/app.js b/config/app.js index 351524e..65fbab4 100644 --- a/config/app.js +++ b/config/app.js @@ -11,8 +11,8 @@ let httpApiFive let wsApi // 在打包之前请检查当前环境是否正确 -const env = 'dev'; // 开发 -// const env = 'prod'; // 生产 +// const env = 'dev'; // 开发 +const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { @@ -67,6 +67,7 @@ module.exports = { VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL, // #endif openPlantGrass: openPlantGrass, + ENV: env, HEADER: { 'content-type': 'application/json', diff --git a/manifest.json b/manifest.json index eacab8f..c586746 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.6.5", - "versionCode" : 165, + "versionName" : "1.6.6", + "versionCode" : 166, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -36,8 +36,8 @@ }, "Maps" : {}, "Push" : {}, - "Record" : {}, - "LivePusher" : {} + "LivePusher" : {}, + "Record" : {} }, "safearea" : { "bottom" : { @@ -94,7 +94,8 @@ "NSCameraUsageDescription" : "上传用户头像保存分享海报", "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店", - "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店" + "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", + "NSMicrophoneUsageDescription" : "根据用户录音进行语音识别转文字" }, "idfa" : false, "dSYMs" : false diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index d320cc2..e1f7221 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -116,6 +116,9 @@ import { getDiy } from '@/api/api.js'; + import { + ENV + } from "@/config/app.js" // #ifdef APP-PLUS import uniMP from '@/utils/uniMP.js'; // #endif @@ -275,6 +278,11 @@ }, created() {}, onLoad() { + if(ENV=='prod'){ + this.AllMenuList = this.AllMenuList.filter(item=>{ + return item.name!='里海直播'&&item.name!='oa小程序' + }) + } this.showControllerAllLet(); this.Area(); this.initMenu(); @@ -287,7 +295,7 @@ this.emptyText = '请登录' this.jurisdiction = true } - this.getUserInfo() + this.getUserInfo(); }, onPullDownRefresh() {