diff --git a/api/uniMP.js b/api/uniMP.js new file mode 100644 index 0000000..06f8b85 --- /dev/null +++ b/api/uniMP.js @@ -0,0 +1,18 @@ +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- +import request from "@/utils/request.js"; + +/** + * 获取供销平台版本信息 + */ +export function getGXconfig(data) { + return request.get("global/config", data); +} + diff --git a/manifest.json b/manifest.json index be06e5e..a7ebb6d 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,10 @@ "Geolocation" : {}, "Payment" : {}, "Share" : {}, - "OAuth" : {} + "OAuth" : {}, + "UniMP" : { + "description" : "uni小程序" + } }, "safearea" : { "bottom" : { diff --git a/pages.json b/pages.json index 357c9ce..ea9e65f 100644 --- a/pages.json +++ b/pages.json @@ -94,8 +94,16 @@ "navigationStyle": "custom" } - } - ], + }, { + "path" : "pages/moreProject/moreProject", + "style" : + { + "navigationBarTitleText": "更多功能", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [{ "root": "pages/goods_cate", "name": "goods_cate", diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 314e6be..d962b34 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -17,244 +17,42 @@ - - - - 市级供应链 - - - - 在售管理 - - - - 财务管理 - - - - - 入库管理 - - - - 商户设置 - - - - - 商品管理 - - - - - 提现管理 - - - - - 订单核销 - - - - - - - - - - - - 我的店铺 - - - - - 供货采购 - - - - 进货管理 - - - - - 扫码出库 - - - - - 入库管理 - - - - - 提现管理 - - - - - - 客服记录 - - - - - 订单核销 - - - - - 订单管理 - - - - - 商品管理 - - - - - 商户设置 - - - - - - - - - - - - - - - - 里海云仓 - - - - 供货采购 - - - - 进货管理 - - - - - 扫码出库 - - - - - 入库管理 - - - - - 提现管理 - - - - - - 客服记录 - - - - - 订单核销 - - - - - 订单管理 - - - - - 商品管理 - - - - - 商户设置 - - - - - - - - - - - - - + + + 更多功能 + {{editFlag?'完成':'编辑'}} + + + + + + + + + {{item.name}} + + + + 还没有应用,点我添加应用 + + + + + 编辑功能 + 完成 + + + + + + + + {{item.name}} + + + + + @@ -293,8 +91,9 @@ } from '@/libs/uniApi'; import { getDiy - } from '@/api/api.js' - + } from '@/api/api.js'; + import uniMP from '@/utils/uniMP.js'; + export default { components: { mTabbar, @@ -316,6 +115,25 @@ isShow: false, bgColor: '', isFshow: false, + street:'', + // 编辑中标记 + editFlag: false, + // 所有菜单的按钮 + AllMenuList: [ + { + name: '商户平台', + icon: 'spgl.png', + data: '/pages/moreProject/moreProject', + type: 2, + }, + { + name: '供销平台', + icon: 'shsz.png', + data: '__UNI__B5B1EDD', + type: 1, + }, + ], + nowMenuList: [] street: '', showPicker: false, columnData: [] @@ -327,7 +145,9 @@ created() {}, onLoad() { this.Area() + this.initMenu(); }, + onShow() { if (this.isLogin) { this.emptyText = '暂无可用应用' @@ -350,7 +170,7 @@ // 监听页面滚动事件 window.addEventListener("scroll", this.scrolling); // #endif - + }, // #ifdef APP-PLUS @@ -367,6 +187,55 @@ // #endif methods: { + // 初始化菜单 + initMenu(){ + let all = uni.getStorageSync('gatherAllMenuList'); + let now = uni.getStorageSync('gatherNowMenuList'); + if(all){ + this.AllMenuList = JSON.parse(all); + } + if(now){ + this.nowMenuList = JSON.parse(now); + } + }, + clickMenu(e, data){ + switch(e){ + case 1: this.getUniMp(data);break; + case 2: this.navigator(data);break; + } + }, + // 添加菜单 + pushMenu(data){ + this.nowMenuList.push(data); + this.AllMenuList = this.AllMenuList.filter((item)=>{ + return item.name!=data.name; + }) + }, + // 移除菜单 + removeMenu(data){ + this.AllMenuList.push(data); + this.nowMenuList = this.nowMenuList.filter((item)=>{ + return item.name!=data.name; + }) + }, + // 编辑完成 + editComfirm(){ + this.editFlag = false; + uni.setStorageSync('gatherAllMenuList', JSON.stringify(this.AllMenuList)); + uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList)); + }, + getUniMp(appid){ + console.log('点击供销平台'); + // #ifdef APP-PLUS + uniMP.loadMP(appid); + return ; + // #endif + uni.showToast({ + icon: 'none', + title: 'H5不支持打开小程序' + }) + }, + appLocation() { changeHandler(e) { const { columnIndex, @@ -382,7 +251,8 @@ this.$refs.uPicker.setColumnValues(1, res.data); }); } - }, + } + }, Area() { getArea({ city_code: 510500 @@ -608,6 +478,24 @@ font-weight: 700; margin-bottom: 38.6rpx; } + + .project{ + display: flex; + justify-content: space-between; + align-items: flex-end; + .edit{ + font-size: 26rpx; + font-weight: 400; + &::after{ + content: '>'; + margin-left: 10rpx; + } + } + .edit2{ + font-size: 26rpx; + font-weight: 400; + } + } .content { display: flex; @@ -622,12 +510,19 @@ flex-direction: column; justify-content: center; align-items: center; + position: relative; // margin: 0 0 33.33rpx 33.33rpx !important; .icon_img { width: 63.16rpx; height: 63.16rpx; } + + .icon{ + position: absolute; + top: 0rpx; + right: 25rpx; + } .text { font-size: 26.32rpx; @@ -659,4 +554,9 @@ } } } + + .edit_card{ + background-color: #fff; + padding-top: 28rpx; + } \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue new file mode 100644 index 0000000..112e06f --- /dev/null +++ b/pages/moreProject/moreProject.vue @@ -0,0 +1,584 @@ + + + + \ No newline at end of file diff --git a/utils/uniMP.js b/utils/uniMP.js new file mode 100644 index 0000000..3b09d3e --- /dev/null +++ b/utils/uniMP.js @@ -0,0 +1,126 @@ +import { getGXconfig } from "@/api/uniMP.js"; +const mp = uni.requireNativePlugin('uniMP'); + +let appid = ''; // 应用id +let wgtFile = ''; // 应用文件地址 + +// 比较版本号大小 +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; +} + +// 加载小程序 +const loadMP = async (id) => { + appid = id; + uni.showLoading({ + title: '加载中', + mask: true + }) + let info = await getGXconfig(); + console.log('最新版本', info.data); + console.log(mp, uni); + // return ; + mp.getUniMPVersion(id, (ret) => { + console.log('当前版本', ret); + if (0!=ret.code||compareVersions(info.data.version, ret.versionInfo.name) == 1||true) { + uni.downloadFile({ + url: info.data.version_info?.dow_url, + success(res) { + wgtFile = res.tempFilePath; + console.log('下载完成', wgtFile); + installMP(); + } + }) + } else { + open() + } + }); +}; +// 小程序版本信息 +const getVersion = (id) => { + appid = id; + return new Promise((resolve, reject) => { + mp.getUniMPVersion(appid, (ret) => { + console.log('供销', ret); + }); + }) +} +// 安装小程序 +const installMP = () => { + mp.getUniMPVersion(appid, (ret) => { + console.log('安装:供销', ret); + doInstallMP(); + // if (0 != ret.code) { //获取失败时安装应用 + // doInstallMP(); + // } else { + // uni.showModal({ + // title: '提示', + // content: 'uni小程序已安装，是否覆盖？', + // success: res => { + // res.confirm && doInstallMP(); + // } + // }); + // } + console.log('getUniMPVersion: ' + JSON.stringify(ret)); + }); +}; +const doInstallMP = () => { + mp.installUniMP({ + appid: appid, + wgtFile: wgtFile + }, (r) => { + if (0 == r.code) { + // uni.showToast({ + // title: '安装成功' + // }); + console.log('小程序安装成功'); + open(); + } else { + uni.hideLoading(); + uni.showModal({ + title: '安装失败', + content: JSON.stringify(r), + showCancel: false + }); + } + console.log('安装供销: ' + JSON.stringify(r)); + }); +}; + +const open = (id = null) => { + mp.openUniMP({ + appid: id || appid, + extraData: { + uniMP: true + } + }, (ret) => { + uni.hideLoading(); + if (0 != ret.code) { + uni.showModal({ + title: '启动失败', + content: JSON.stringify(ret), + showCancel: false + }); + } + console.log('openUniMP: ' + JSON.stringify(ret)); + }); +} + +export default { + loadMP, + installMP, + doInstallMP, + getVersion, + open +} \ No newline at end of file