diff --git a/api/store.js b/api/store.js index 000a408..3a76c03 100644 --- a/api/store.js +++ b/api/store.js @@ -13,8 +13,8 @@ import request from "@/utils/request.js"; * @param int id * */ -export function getProductDetail(id) { - return request.get('store/product/detail/' + id, {}, { +export function getProductDetail(id, data) { + return request.get('store/product/detail/' + id, data, { noAuth: true }); } @@ -23,8 +23,8 @@ export function getProductDetail(id) { * @param int id * */ -export function getProductParmas(id) { - return request.get('store/product/show/' + id, {}, { +export function getProductParmas(id, data) { + return request.get('store/product/show/' + id, data, { noAuth: true }); } @@ -33,8 +33,8 @@ export function getProductParmas(id) { * @param int id * */ -export function getStoreRecommend(id) { - return request.get('store/product/good_list/' + id, {}, { +export function getStoreRecommend(id, data) { + return request.get('store/product/good_list/' + id, data, { noAuth: true }); } diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 32c8193..7020042 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -212,10 +212,10 @@ - @@ -245,7 +245,7 @@ 店铺推荐 - + 查看更多 @@ -307,7 +307,7 @@ - + 店铺 @@ -1066,7 +1066,9 @@ mask: true }); let that = this; - getProductDetail(that.id).then(res => { + getProductDetail(that.id,{ + sale_type: this.sale_type + }).then(res => { uni.hideLoading(); let storeInfo = res.data; if (storeInfo.video_link && storeInfo.slider_image.length > 1) { diff --git a/pages/index/index.vue b/pages/index/index.vue index 5bd3915..5c2261c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -939,6 +939,7 @@ let that = this; getUserInfo().then(res => { that.userInfo = res.data; + this.$store.commit('SET_USERINFO', res.data); }); }, // 记录会员访问 diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue index 13ad4b6..cbbca8b 100644 --- a/pages/order_addcart/order_addcart.vue +++ b/pages/order_addcart/order_addcart.vue @@ -191,6 +191,9 @@ import { getNavigation } from "@/api/public"; + import { + getUserInfo + } from '@/api/user.js'; import customTab from '@/components/customTab'; import { getCartList, @@ -287,6 +290,10 @@ currSku: '', newData: {}, activeRouter: '', + userInfo: {}, + mer_info: { + mer_settlement_agree_status: 0 + } }; }, computed: configMap({ @@ -297,18 +304,20 @@ onReady() {}, mounted: function() {}, onLoad: function(options) { - if(this.$store.state.app.userInfo.mer_info.mer_settlement_agree_status) this.tabsArr.push({ - name: '商户购物车', - val: 2 - }) }, onShow: function() { let that = this let routes = getCurrentPages(); - let curRoute = routes[routes.length - 1].route + let curRoute = routes[routes.length - 1].route; this.activeRouter = '/' + curRoute this.getNav(); + if (this.isLogin == true) { + if(this.$store.state.app.userInfo.mer_info.mer_settlement_agree_status) this.tabsArr.push({ + name: '商户购物车', + val: 2 + }) + else this.getUserInfo(); this.getCartList(); this.getCartNum(); this.goodsHidden = true; @@ -345,6 +354,21 @@ subsecChange(e) { this.subsecCurr = e; }, + + /** + * 获取个人用户信息 + */ + getUserInfo: function() { + let that = this; + getUserInfo().then(res => { + that.userInfo = res.data; + if(res.data.mer_info.mer_settlement_agree_status) this.tabsArr.push({ + name: '商户购物车', + val: 2 + }) + this.$store.commit('SET_USERINFO', res.data); + }); + }, goRouter(item) { var pages = getCurrentPages(); diff --git a/store/modules/app.js b/store/modules/app.js index 7d8e6fd..6d58ea6 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -17,6 +17,12 @@ import { USER_INFO } from '../../config/cache'; import Cache from '../../utils/cache'; +// #ifdef APP-PLUS +import Updater from '@/uni_modules/guyue-updater/index'; +import { Toast } from "../../libs/uniApi.js"; +// #endif + + const state = { location: Cache.get('LOCATION_DATA', true) || {}, token: Cache.get(LOGIN_STATUS) || null, @@ -126,7 +132,7 @@ const actions = { }) await uni.$u.sleep(500) } - const wgt_v = uni.getStorageSync('wgt_version') || '1.0.0'; + // #ifdef APP-PLUS let os = uni.getSystemInfoSync(); let apptype; @@ -152,9 +158,7 @@ const actions = { // title: '检查更新中' // }) // 版本更新 - if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 && - compareVersions(res.data.appInfo.version, - wgt_v) == 1) { + if (compareVersions(res.data.appInfo.version, os.appWgtVersion) == 1) { try { let info = res.data.appInfo || {}; let version = { @@ -166,7 +170,6 @@ const actions = { force: info.force == 1 ? true : false, // 是否强制更新 quiet: info.quiet == 1 ? true : false // 是否静默更新 } - Updater.update(version,res.data.appInfo); } catch (e) { console.log(e); @@ -182,6 +185,7 @@ const actions = { if(data) Toast('已经是最新版本了') } }).catch((err) => { + console.log(err); if(data) uni.hideLoading() Toast(err.msg||err.message||err) // console.log(err) @@ -192,6 +196,22 @@ const actions = { } }; +function compareVersions(version1, version2) { + const arr1 = version1.split('.').map(Number); + const arr2 = version2.split('.').map(Number); + for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) { + const num1 = i < arr1.length ? arr1[i] : 0; + const num2 = i < arr2.length ? arr2[i] : 0; + + if (num1 > num2) { + return 1; + } else if (num1 < num2) { + return -1; + } + } + return 0; +} + export default { state, mutations, diff --git a/uni_modules/guyue-updater/assets/bg1.png b/uni_modules/guyue-updater/assets/bg1.png new file mode 100644 index 0000000..5478a73 Binary files /dev/null and b/uni_modules/guyue-updater/assets/bg1.png differ diff --git a/uni_modules/guyue-updater/assets/bg1_1.png b/uni_modules/guyue-updater/assets/bg1_1.png new file mode 100644 index 0000000..5eef28e Binary files /dev/null and b/uni_modules/guyue-updater/assets/bg1_1.png differ diff --git a/uni_modules/guyue-updater/assets/bg2.png b/uni_modules/guyue-updater/assets/bg2.png new file mode 100644 index 0000000..31ca5f1 Binary files /dev/null and b/uni_modules/guyue-updater/assets/bg2.png differ diff --git a/uni_modules/guyue-updater/assets/close.png b/uni_modules/guyue-updater/assets/close.png new file mode 100644 index 0000000..020cdf5 Binary files /dev/null and b/uni_modules/guyue-updater/assets/close.png differ diff --git a/uni_modules/guyue-updater/changelog.md b/uni_modules/guyue-updater/changelog.md new file mode 100644 index 0000000..c757be8 --- /dev/null +++ b/uni_modules/guyue-updater/changelog.md @@ -0,0 +1,6 @@ +## 1.0.2（2023-06-02） +修复部分bug，新增条件编译，仅限app平台调用 +## 1.0.1（2023-06-02） +去除ts，使用js进行开发，兼容性更好 +## 1.0.0（2023-05-04） +完成初始功能，支持apk安装以及wgt升级，支持显示弹窗升级、静默更新以及强制更新，支持进度显示，支持覆盖原生tabbar、原生导航栏 \ No newline at end of file diff --git a/uni_modules/guyue-updater/index.js b/uni_modules/guyue-updater/index.js new file mode 100644 index 0000000..4359740 --- /dev/null +++ b/uni_modules/guyue-updater/index.js @@ -0,0 +1,25 @@ + +import { download, install } from "./updater"; + +export default class Updater { + static async update(options ) { + // #ifdef APP-PLUS + // 静默更新 + console.log('更新'); + if (options.quiet) { + download({ + url: options.downUrl, + onSuccess(filePath) { + install(filePath, false, options.versionName); + }, + }); + } else if (options.downUrl) { + uni.navigateTo({ + url: `/uni_modules/guyue-updater/pages/updater?data=${encodeURIComponent(JSON.stringify(options))}`, + animationType: "fade-in", + animationDuration: 200, + }); + } + // #endif + } +} \ No newline at end of file diff --git a/uni_modules/guyue-updater/interface.ts b/uni_modules/guyue-updater/interface.ts new file mode 100644 index 0000000..a2898b1 --- /dev/null +++ b/uni_modules/guyue-updater/interface.ts @@ -0,0 +1,12 @@ +export type UpdateParams = { + content: string; // 必填，更新内容，内容中使用 \n 进行换行 + downUrl: string; // 必填，wgt热更新请给出 .wgt 的文件地址，APK整包更新请设置下载apk地址，ios请设置苹果商店的连接地址; + title?: string; // 用于显示弹窗标题，默认 发现新版本 + versionName?: string; // 版本名，用于显示更新版本，如 1.0.0 + quiet?: boolean; // 是否是静默更新，开启后，不会有弹窗，会在后台下载更新文件，在下次启动APP时使用更新 + force?: boolean; // 是否是强制更新，开启后，弹窗无法被关闭，必须更新 + updateBtnText?: string; // 升级按钮文字，默认 立即升级 + downMsgTip?: string; // 仅android，默认 下载中，请稍后 + downSucTip?: string; // 仅android，默认 下载完成，安装中 + downErrorTip?: string; // 仅android，默认 下载失败，请重试 +} \ No newline at end of file diff --git a/uni_modules/guyue-updater/package.json b/uni_modules/guyue-updater/package.json new file mode 100644 index 0000000..e55784a --- /dev/null +++ b/uni_modules/guyue-updater/package.json @@ -0,0 +1,82 @@ +{ + "id": "guyue-updater", + "displayName": "App版本升级弹框和进度提示", + "version": "1.0.2", + "description": "app热更新模块，支持apk安装以及wgt升级，支持显示弹窗升级、静默更新以及强制更新，支持进度显示，支持覆盖原生tabar，原生导航栏", + "keywords": [ + "热更新", + "进度提示", + "版本升级", + "app自动升级", + "wgt自动升级" +], + "repository": "", + "engines": { + "HBuilderX": "^3.4.9" + }, + "dcloudext": { + "type": "sdk-js", + "sale": { + "regular": { + "price": "9.98" + }, + "sourcecode": { + "price": "16.80" + } + }, + "contact": { + "qq": "2292550932" + }, + "declaration": { + "ads": "无", + "data": "插件不采集任何数据", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "App": {}, + "H5-mobile": { + "Safari": "n", + "Android Browser": "n", + "微信浏览器(Android)": "n", + "QQ浏览器(Android)": "n" + }, + "H5-pc": { + "Chrome": "n", + "IE": "n", + "Edge": "n", + "Firefox": "n", + "Safari": "n" + }, + "小程序": { + "微信": "n", + "阿里": "n", + "百度": "n", + "字节跳动": "n", + "QQ": "n", + "钉钉": "n", + "快手": "n", + "飞书": "n", + "京东": "n" + }, + "快应用": { + "华为": "n", + "联盟": "n" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/guyue-updater/pages/updater.vue b/uni_modules/guyue-updater/pages/updater.vue new file mode 100644 index 0000000..1b161da --- /dev/null +++ b/uni_modules/guyue-updater/pages/updater.vue @@ -0,0 +1,356 @@ + + + + + \ No newline at end of file diff --git a/uni_modules/guyue-updater/readme.md b/uni_modules/guyue-updater/readme.md new file mode 100644 index 0000000..ccb2b01 --- /dev/null +++ b/uni_modules/guyue-updater/readme.md @@ -0,0 +1,65 @@ +# App热更新 + +App热更新模块，支持apk安装以及wgt升级，支持显示弹窗升级、静默更新以及强制更新，支持进度显示，支持覆盖原生tabbar、原生导航栏。 +可用于自建热更新渠道，不依赖于云服务，无云服务费用支出，也可以适配官方更新中心。 + +## 使用说明 +### 1.将此项目导入自己的项目工程 +### 2.在page.json中注册页面，如下 + ```javascript + { + "path": "uni_modules/guyue-updater/pages/updater", + "style": { + "navigationStyle": "custom", + "backgroundColor": "transparent", + "disableScroll": true, + "app-plus": { + "backgroundColorTop": "transparent", + "background": "transparent", + "scrollIndicator": false, + "titleNView": false, + "popGesture": "none", + "bounce": "none", + "animationType": "fade-in", + "animationDuration": 200 + } + } + } + ``` +### 3.将版本检测函数导入需要使用的页面 + 一般在App.vue中的onLaunch导入或者首页导入，需要自行完成热更新检查，一般在APP启动时发起一个请求获取热更新数据，数据获取后，可以调用该组件完成更新。 + ```javascript + import Updater from '@/uni_modules/guyue-updater/index'; + + // 仅在app平台有效，其他平台调用无效 + Updater.update({ + title: '发现新版本', + content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n', + versionName: '1.3.6', + downUrl: 'https://cdn.xxx.cn/mp/__UNI__1F29D65.wgt', + force: false, + }) + ``` +## 参数说明 +```javascript +export type UpdateParams = { + content: string; // 必填，更新内容，内容中使用 \n 进行换行 + downUrl: string; // 必填，wgt热更新请给出 .wgt 的文件地址，APK整包更新请设置下载apk地址，ios请设置苹果商店的连接地址; + title?: string; // 用于显示弹窗标题，默认 发现新版本 + versionName?: string; // 版本名，用于显示更新版本，如 1.0.0 + quiet?: boolean; // 是否是静默更新，开启后，不会有弹窗，会在后台下载更新文件，在下次启动APP时使用更新 + force?: boolean; // 是否是强制更新，开启后，弹窗无法被关闭，必须更新 + updateBtnText?: string; // 升级按钮文字，默认 立即升级 + downMsgTip?: string; // 仅android，默认 下载中，请稍后 + downSucTip?: string; // 仅android，默认 下载完成，安装中 + downErrorTip?: string; // 仅android，默认 下载失败，请重试 +} +``` + +## Android如何跳转到应用市场更新 + +downUrl 设置为应用市场的地址即可，如： market://details?id={这里写你的应用包名} + +## iOS 如何跳转到AppStore + +downUrl 设置为AppStore的地址即可，如： itms-apps://itunes.apple.com/cn/app/hello-uni-app/id1417078253 \ No newline at end of file diff --git a/uni_modules/guyue-updater/updater.js b/uni_modules/guyue-updater/updater.js new file mode 100644 index 0000000..fbdf8b6 --- /dev/null +++ b/uni_modules/guyue-updater/updater.js @@ -0,0 +1,31 @@ + +export const download = ({ url, onProgress, onSuccess, onFail }) => { + const task = uni.downloadFile({ + url, + success(res) { + if (res.statusCode === 200) { + onSuccess && onSuccess(res.tempFilePath); + } + }, + fail() { + onFail && onFail(); + } + }); + task.onProgressUpdate(res => { + onProgress && onProgress(res.progress); + }); +}; + +export const install = (filePath, restart = false, version='') => { + plus.runtime.install(filePath, { + force: true + }, () => { + console.log('install success...'); + if (restart) { + uni.setStorageSync('wgt_version', version); + plus.runtime.restart(); + } + }, (e) => { + console.error('install fail...', e); + }); +}; \ No newline at end of file