diff --git a/App.vue b/App.vue index 4996cd9..951f3f5 100644 --- a/App.vue +++ b/App.vue @@ -244,19 +244,7 @@ // #endif }, mounted() { - uni.onTabBarMidButtonTap((e) => { - // console.log("点击了", e); - uni.switchTab({ - url: '/pages/plant_release/index' - }) - // uni.navigateTo({ - // url: '/pages/plant_release/index' - // }) - - }); - uni.setTabBarItem((e) => { - console.log("点击了", e) - }); + }, methods: { @@ -267,11 +255,8 @@ if (res.isConnected) { - uni.reLaunch({ - url: '/pages/index/index' - }) } else { @@ -301,9 +286,7 @@ // #ifdef H5 uni.navigateTo({ - url: '/pages/users/login/login_copy' - }) // #endif diff --git a/api/public.js b/api/public.js index 250bb47..723b7d3 100644 --- a/api/public.js +++ b/api/public.js @@ -24,6 +24,7 @@ export function getWechatConfig() { ); } + /** * 获取微信sdk配置 * @returns {*} diff --git a/config/app.js b/config/app.js index f083eab..5b88400 100644 --- a/config/app.js +++ b/config/app.js @@ -9,8 +9,8 @@ let httpApiThree // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' // 测试 if (process.env.NODE_ENV === "development") { - // httpApi = 'https://shop.lihaink.cn' // 生产 - httpApi = "https://crmeb-test.shop.lihaink.cn" + httpApi = 'https://shop.lihaink.cn' // 生产 + // httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "http://192.168.0.222" // httpApi = "http://192.168.0.108:8325" // httpApi = 'http://192.168.0.108:8325' @@ -20,7 +20,7 @@ if (process.env.NODE_ENV === "development") { // #endif // #ifdef H5 // httpApiTwo = "baseUrl" // h5跨域配置 - httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 + httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 // httpApiThree = 'baseUrlTest' // h5跨域配置 // #endif } else if (process.env.NODE_ENV === 'production') { diff --git a/manifest.json b/manifest.json index abe0f2c..92ddd3b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.3.1", - "versionCode" : 131, + "versionName" : "1.3.5", + "versionCode" : 135, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index 0a85f08..4d4d325 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -146,7 +146,7 @@ - + 同意 diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 9a5671c..7168af5 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -91,9 +91,11 @@ 我的店铺 - - + 供货采购 @@ -101,7 +103,7 @@ @click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')"> 进货管理 - + --> diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index f9e2eec..40cfd21 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -133,10 +133,10 @@ - + 先货后款结算周期： @@ -146,7 +146,7 @@ 先货后款结算利率： - *利率结算范围为:0.01 ~ 0.1 利率单位为:% + diff --git a/store/modules/app.js b/store/modules/app.js index f0cfc17..e860d7a 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -126,7 +126,7 @@ const actions = { if (Object.keys(res.data.appInfo).length > 0) { - uni.showLoading({ + if(res.data.appInfo.version) uni.showLoading({ title: '检查更新中' })