From cc27ddd0f900631bdec003d88a197b37f0ded1b3 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 18 Nov 2023 11:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 4 ++-- manifest.json | 15 +++++++++--- pages.json | 2 +- pages/guide/guide.vue | 4 ++-- pages/guide/judge.vue | 1 - pages/nongKe/supply_chain/supplierB.vue | 2 +- utils/uniMP.js | 32 ++++++++++++++++++------- 7 files changed, 42 insertions(+), 18 deletions(-) diff --git a/config/app.js b/config/app.js index 351524e..8ec16c4 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) { diff --git a/manifest.json b/manifest.json index 61af32e..d834f3d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.5.9", - "versionCode" : 159, + "versionName" : "1.6.0", + "versionCode" : 160, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -165,7 +165,16 @@ }, "splashscreen" : { "useOriginalMsgbox" : true, - "androidStyle" : "common" + "androidStyle" : "common", + "iosStyle" : "common", + "ios" : { + "storyboard" : "C:/Users/ghf/Downloads/CustomStoryboard.zip" + }, + "android" : { + "hdpi" : "static/images/guide.png", + "xhdpi" : "static/images/guide.png", + "xxhdpi" : "static/images/guide.png" + } } }, "nativePlugins" : { diff --git a/pages.json b/pages.json index 6c1f031..f1c2448 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,6 @@ { "pages": [ - //#ifdef APP-PLUS + //#ifdef APP-PLUS //启动页 { "path": "pages/guide/judge", diff --git a/pages/guide/guide.vue b/pages/guide/guide.vue index 63cdbba..27381fa 100644 --- a/pages/guide/guide.vue +++ b/pages/guide/guide.vue @@ -35,8 +35,8 @@ data() { return { //修改图片,文字描述 - imageList: [{ - + imageList: [ + { src: '/static/images/guide.png' } diff --git a/pages/guide/judge.vue b/pages/guide/judge.vue index 3bc1292..5bebc7e 100644 --- a/pages/guide/judge.vue +++ b/pages/guide/judge.vue @@ -15,7 +15,6 @@ var launchFlag = uni.getStorageSync('launchFlag'); // console.log("launchFlag:" + launchFlag); if (launchFlag) { //判断本地缓存跳转首页 - uni.switchTab({ url:'/pages/index/index' }) diff --git a/pages/nongKe/supply_chain/supplierB.vue b/pages/nongKe/supply_chain/supplierB.vue index 83c2a4c..23775d0 100644 --- a/pages/nongKe/supply_chain/supplierB.vue +++ b/pages/nongKe/supply_chain/supplierB.vue @@ -91,7 +91,7 @@ - {{item.cate_name}} diff --git a/utils/uniMP.js b/utils/uniMP.js index ef1c3c7..3cc129e 100644 --- a/utils/uniMP.js +++ b/utils/uniMP.js @@ -56,7 +56,7 @@ const loadMP = async (id) => { mask: true }) else uni.showLoading({ - title: '初始化中...100%', + title: '初始化中...99%', mask: true }) }, 600) @@ -65,7 +65,11 @@ const loadMP = async (id) => { success(res) { wgtFile = res.tempFilePath; console.log('初始化完成', wgtFile); - installMP(); + setTimeout(()=>{ + installMP(); + clearInterval(timer); + timer = null; + }, 700) }, fail(res) { clearInterval(timer); @@ -117,7 +121,7 @@ const loadMPx = async (id) => { mask: true }) else uni.showLoading({ - title: '初始化中...100%', + title: '初始化中...99%', mask: true }) }, 600) @@ -127,7 +131,11 @@ const loadMPx = async (id) => { success(res) { wgtFile = res.tempFilePath; console.log('初始化完成', wgtFile); - installMP(); + setTimeout(()=>{ + installMP(); + clearInterval(timer); + timer = null; + }, 700) }, fail(res) { clearInterval(timer); @@ -178,7 +186,7 @@ const loadMPurl = async (e) => { mask: true }) else uni.showLoading({ - title: '初始化中...100%', + title: '初始化中...99%', mask: true }) }, 600) @@ -187,7 +195,11 @@ const loadMPurl = async (e) => { success(res) { wgtFile = res.tempFilePath; console.log('初始化完成', wgtFile); - installMP(); + setTimeout(()=>{ + installMP(); + clearInterval(timer); + timer = null; + }, 700) }, fail(res) { clearInterval(timer); @@ -231,7 +243,7 @@ const loadMPdns = async (e) => { mask: true }) else uni.showLoading({ - title: '初始化中...100%', + title: '初始化中...99%', mask: true }) }, 600) @@ -240,7 +252,11 @@ const loadMPdns = async (e) => { success(res) { wgtFile = res.tempFilePath; console.log('初始化完成', wgtFile); - installMP(); + setTimeout(()=>{ + installMP(); + clearInterval(timer); + timer = null; + }, 700) }, fail(res) { clearInterval(timer);