diff --git a/api/api.js b/api/api.js index f5545dc..acb74a7 100644 --- a/api/api.js +++ b/api/api.js @@ -293,20 +293,20 @@ export function brigade(data) { } /* - 生产 -- 获取商户保证金信息支付接口 + 生产 -- 获取商户押金信息支付接口 */ export function paymerchant() { return request.post(`user/margin`,{}); } /* - 生产 -- 获取商户保证金信息接口 + 生产 -- 获取商户押金信息接口 */ export function merchant(data) { return request.get(`store/merchant/margin`, data); } -//获取保证金缴纳列表 +//获取押金缴纳列表 export function marginlist(data) { return request.get(`user/margin/list`,data); } diff --git a/pages.json b/pages.json index 279c9de..605727c 100644 --- a/pages.json +++ b/pages.json @@ -72,19 +72,25 @@ }, "tabBar": { "color": "#282828", - "selectedColor": "#0122C7", + "selectedColor": "#E93323", "borderStyle": "white", "backgroundColor": "#ffffff", "list": [{ "pagePath": "pages/index/index", + "iconPath": "static/tabbar_icon/a.png", + "selectedIconPath": "static/tabbar_icon/a-a.png", "text": "首页" }, { "pagePath": "pages/center/center", + "iconPath": "static/tabbar_icon/b.png", + "selectedIconPath": "static/tabbar_icon/b-a.png", "text": "控制台" }, { "pagePath": "pages/my/my", + "iconPath": "static/tabbar_icon/e.png", + "selectedIconPath": "static/tabbar_icon/e-a.png", "text": "个人" } ] diff --git a/pages/center/center.vue b/pages/center/center.vue index bee39cf..794d25a 100644 --- a/pages/center/center.vue +++ b/pages/center/center.vue @@ -1,23 +1,504 @@ + + @keyframes fadeIn { + from { + opacity: 0; + } + + to { + opacity: 1; + } + } + + .top_box { + // padding-top: 180rpx; + background: linear-gradient(#36a2ff, #fff); + } + + .com { + margin-left: 50%; + transform: translate(-50%); + } + + .business { + width: 694.74rpx; + // margin-bottom: 175rpx; + } + + .special_work { + // padding: 17.54rpx; + width: 694.74rpx; + margin-top: 10rpx; + border-radius: 17.54rpx; + // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16); + + .title { + font-size: 31.58rpx; + 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; + align-content: center; + flex-wrap: wrap; + // justify-content: space-between; + + .examine { + margin-bottom: 35rpx; + width: 173.68rpx; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + position: relative; + // margin: 0 0 33.33rpx 33.33rpx !important; + + .icon_img { + width: 83.16rpx; + height: 83.16rpx; + } + + .icon { + position: absolute; + top: -5rpx; + right: 25rpx; + } + + .text { + font-size: 26.32rpx; + margin-top: 21.05rpx; + color: #000; + } + } + + .text { + font-size: 29.82rpx; + color: #a4a4a4; + } + } + + .cont_jus { + margin-top: 56.14rpx; + justify-content: flex-start; + + &:first-child { + // margin-right: 33rpx; + } + + .examine { + margin-right: 48rpx; + + &:first-child { + margin-right: 48rpx; + } + } + } + } + + .edit_card { + background-color: #fff; + padding-top: 28rpx; + } + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 1fb6918..725b0e6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,8 +1,6 @@ @@ -18,20 +16,6 @@ }, methods: { - test() { - // mp.loadMPlocalhost({ - // id: '__UNI__3A527D1', - // file: '/static/wgt/__UNI__3A527D1.wgt' - // }) - mp.loadMPlocalhost({ - id: '__UNI__9EDFE40', - file: '/static/wgt/__UNI__9EDFE40.wgt' - }) - // mp.loadMPlocalhost({ - // id: '__UNI__1EE148C', - // file: '/static/wgt/__UNI__1EE148C.wgt' - // }) - } } } diff --git a/pages/my/my.vue b/pages/my/my.vue index 7760b68..b9183f2 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -155,6 +155,7 @@ computed: configMap({ open_update_info: 0 }, mapGetters(['isLogin', 'viewColor', 'keyColor'])), onLoad() { this.version = uni.getSystemInfoSync().appVersion; + console.log(uni.getSystemInfoSync().appVersion); if (this.isLogin) { this.getUserInfo(); } else { diff --git a/static/applet/dp.png b/static/applet/dp.png new file mode 100644 index 0000000..00494f3 Binary files /dev/null and b/static/applet/dp.png differ diff --git a/static/applet/fl.png b/static/applet/fl.png new file mode 100644 index 0000000..be4db3d Binary files /dev/null and b/static/applet/fl.png differ diff --git a/static/applet/gx_app.png b/static/applet/gx_app.png new file mode 100644 index 0000000..91c8468 Binary files /dev/null and b/static/applet/gx_app.png differ diff --git a/static/applet/icons.png b/static/applet/icons.png new file mode 100644 index 0000000..b191596 Binary files /dev/null and b/static/applet/icons.png differ diff --git a/static/applet/jy.png b/static/applet/jy.png new file mode 100644 index 0000000..413ff87 Binary files /dev/null and b/static/applet/jy.png differ diff --git a/static/applet/ny.png b/static/applet/ny.png new file mode 100644 index 0000000..ee5221b Binary files /dev/null and b/static/applet/ny.png differ diff --git a/static/applet/qg.png b/static/applet/qg.png new file mode 100644 index 0000000..2d31ebe Binary files /dev/null and b/static/applet/qg.png differ diff --git a/static/applet/shop_app.png b/static/applet/shop_app.png new file mode 100644 index 0000000..a3388c6 Binary files /dev/null and b/static/applet/shop_app.png differ diff --git a/static/applet/yz.png b/static/applet/yz.png new file mode 100644 index 0000000..e7e8d33 Binary files /dev/null and b/static/applet/yz.png differ diff --git a/static/applet/zz.png b/static/applet/zz.png new file mode 100644 index 0000000..500c1b0 Binary files /dev/null and b/static/applet/zz.png differ diff --git a/static/empty/nopage.png b/static/empty/nopage.png new file mode 100644 index 0000000..181dc93 Binary files /dev/null and b/static/empty/nopage.png differ diff --git a/static/empty/permission.png b/static/empty/permission.png new file mode 100644 index 0000000..8142421 Binary files /dev/null and b/static/empty/permission.png differ diff --git a/utils/uniMP.js b/utils/uniMP.js index 142a975..4c9900d 100644 --- a/utils/uniMP.js +++ b/utils/uniMP.js @@ -28,7 +28,7 @@ function compareVersions(version1, version2) { return 0; } -// 加载小程序 +// 加载供销小程序 const loadMP = async (id) => { appid = id; let info = await getGXconfig(); @@ -149,7 +149,7 @@ const loadMPx = async (id) => { }); }; -// 按URL加载小程序 +// 按信息接口加载小程序 const loadMPurl = async (e) => { appid = e.id; let FURL = e.url; @@ -216,15 +216,46 @@ const loadMPurl = async (e) => { }; -// 加载本地自带小程序 -const loadMPlocalhost = async (e) => { +// 按远程文件地址加载小程序 +const loadMPdns = async (e) => { appid = e.id; - wgtFile = e.file; + let FURL = e.url; uni.showLoading({ title: '初始化中...', mask: true }) - installMP(); + let count = 0; + timer = setInterval(() => { + if (count < 100) uni.showLoading({ + title: `初始化中... ${count}%`, + mask: true + }) + else uni.showLoading({ + title: '初始化中...100%', + mask: true + }) + }, 600) + let downloadTask = uni.downloadFile({ + url: FURL, + success(res) { + wgtFile = res.tempFilePath; + console.log('初始化完成', wgtFile); + installMP(); + }, + fail(res) { + clearInterval(timer); + timer = null; + uni.hideLoading(); + } + }); + downloadTask.onProgressUpdate((res) => { + // console.log('初始化进度' + res.progress); + if (res.progress > count) count += 10; + if (count >= 90) { + clearInterval(timer); + timer = null; + } + }); }; @@ -296,7 +327,7 @@ export default { loadMP, loadMPurl, loadMPx, - loadMPlocalhost, + loadMPdns, installMP, doInstallMP, getVersion,