diff --git a/components/guide/index.vue b/components/guide/index.vue index ba233c8..33061b2 100644 --- a/components/guide/index.vue +++ b/components/guide/index.vue @@ -101,7 +101,13 @@ url: `/pages/annex/web_view/index?url=${url}` }); } else { - if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index', '/pages/plant_grass/index'].indexOf(url) == -1) { + if ([ + '/pages/goods_cate/goods_cate', + '/pages/order_addcart/order_addcart', + '/pages/user/index', + '/pages/index/index', + // '/pages/plant_grass/index' + ].indexOf(url) == -1) { uni.navigateTo({ url: url }) @@ -189,4 +195,4 @@ height: 100%; } } - \ No newline at end of file + diff --git a/pages.json b/pages.json index f5c9072..fe61bbd 100644 --- a/pages.json +++ b/pages.json @@ -30,13 +30,13 @@ "navigationBarTitleText": "购物车" } }, - { - "path": "pages/plant_grass/index", - "style": { - // "navigationStyle": "custom", - "navigationBarTitleText": "种草社区" - } - }, +// { +// "path": "pages/plant_grass/index", +// "style": { +// // "navigationStyle": "custom", +// "navigationBarTitleText": "种草社区" +// } +// }, { "path": "pages/user/index", "style": { @@ -910,12 +910,12 @@ "navigationBarTitleText": "内容发布" } }, - { - "path": "plant_show/index", - "style": { - "navigationBarTitleText": "种草秀" - } - }, +// { +// "path": "plant_show/index", +// "style": { +// "navigationBarTitleText": "种草秀" +// } +// }, { "path": "plant_topic/index", "style": { @@ -1052,13 +1052,13 @@ "navigationStyle": "custom" } }, - { - "path": "liveBroadcast/index", - "style": { - "navigationBarTitleText": "直播列表", - "navigationBarBackgroundColor": "#F2F2F2" - } - }, +// { +// "path": "liveBroadcast/index", +// "style": { +// "navigationBarTitleText": "直播列表", +// "navigationBarBackgroundColor": "#F2F2F2" +// } +// }, { "path": "presell/index", "style": { @@ -1492,12 +1492,12 @@ "selectedIconPath": "static/images/2-002.png", "text": "分类" }, - { - "pagePath": "pages/plant_grass/index", - "iconPath": "static/images/5-001.png", - "selectedIconPath": "static/images/5-002.png", - "text": "逛逛" - }, +// { +// "pagePath": "pages/plant_grass/index", +// "iconPath": "static/images/5-001.png", +// "selectedIconPath": "static/images/5-002.png", +// "text": "逛逛" +// }, { "pagePath": "pages/order_addcart/order_addcart", "iconPath": "static/images/3-001.png", diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue index 7e02e71..080f0e2 100644 --- a/pages/activity/combination_details/index.vue +++ b/pages/activity/combination_details/index.vue @@ -688,8 +688,11 @@ }, //下拉导航页面跳转 linkPage(url) { - if (['/pages/index/index', '/pages/order_addcart/order_addcart', - '/pages/user/index', '/pages/plant_grass/index' + if ([ + '/pages/index/index', + '/pages/order_addcart/order_addcart', + '/pages/user/index', + // '/pages/plant_grass/index' ].indexOf(url) > -1) { uni.switchTab({ url diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue index bb153f2..2d8d366 100644 --- a/pages/activity/goods_seckill_details/index.vue +++ b/pages/activity/goods_seckill_details/index.vue @@ -594,7 +594,8 @@ //下拉导航页面跳转 linkPage(url) { if (['/pages/index/index', '/pages/order_addcart/order_addcart', - '/pages/user/index', '/pages/plant_grass/index' + '/pages/user/index', + // '/pages/plant_grass/index' ].indexOf(url) > -1) { uni.switchTab({ url diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue index 3e974a2..65fd03f 100644 --- a/pages/activity/presell_details/index.vue +++ b/pages/activity/presell_details/index.vue @@ -667,7 +667,8 @@ //下拉导航页面跳转 linkPage(url) { if (['/pages/index/index', '/pages/order_addcart/order_addcart', - '/pages/user/index', '/pages/plant_grass/index' + '/pages/user/index', + // '/pages/plant_grass/index' ].indexOf(url) > -1) { uni.switchTab({ url diff --git a/pages/annex/vip_center/index.vue b/pages/annex/vip_center/index.vue index 739ef54..11e4cc7 100644 --- a/pages/annex/vip_center/index.vue +++ b/pages/annex/vip_center/index.vue @@ -275,7 +275,9 @@ location.href = url // #endif }else{ - if(['/pages/goods_cate/goods_cate','/pages/order_addcart/order_addcart','/pages/user/index','/pages/plant_grass/index'].indexOf(url) == -1){ + if(['/pages/goods_cate/goods_cate','/pages/order_addcart/order_addcart','/pages/user/index', + // '/pages/plant_grass/index' + ].indexOf(url) == -1){ uni.navigateTo({ url:url }) diff --git a/pages/annex/vip_paid/index.vue b/pages/annex/vip_paid/index.vue index cad9b19..3cea874 100644 --- a/pages/annex/vip_paid/index.vue +++ b/pages/annex/vip_paid/index.vue @@ -221,10 +221,12 @@ location.href = url // #endif }else{ - if(['/pages/goods_cate/goods_cate','/pages/order_addcart/order_addcart','/pages/user/index','/pages/plant_grass/index'].indexOf(url) == -1){ + if(['/pages/goods_cate/goods_cate','/pages/order_addcart/order_addcart','/pages/user/index', + // '/pages/plant_grass/index' + ].indexOf(url) == -1){ uni.navigateTo({ url:url - }) + }) }else{ uni.switchTab({ url:url @@ -292,7 +294,7 @@ this.loading = false; this.page += 1; }).catch(err => { - + }); }, checkType(svip,index) { @@ -399,7 +401,7 @@ that.payClose(); uni.navigateTo({ url: '/pages/order_pay_back/index?keyCode='+callback_key+'&url='+jsConfig, - }) + }) return; break; // #ifndef MP @@ -491,7 +493,7 @@ }, fail: function(e) { uni.hideLoading(); - that.payClose(); + that.payClose(); return that.$util.Tips({ title: '取消支付' }); @@ -648,7 +650,7 @@ margin-top: -60rpx; .section-hd { padding-top: 34rpx; - padding-bottom: 34rpx; + padding-bottom: 34rpx; .title { width: 543rpx; font-size: 28rpx; diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 5fa0179..e17fa03 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -781,7 +781,8 @@ //下拉导航页面跳转 linkPage(url) { if (['/pages/index/index', '/pages/order_addcart/order_addcart', - '/pages/user/index', '/pages/plant_grass/index' + '/pages/user/index', + // '/pages/plant_grass/index' ].indexOf(url) > -1) { uni.switchTab({ url diff --git a/pages/index/component/plantList.vue b/pages/index/component/plantList.vue index bfccd55..35a4ee1 100644 --- a/pages/index/component/plantList.vue +++ b/pages/index/component/plantList.vue @@ -4,17 +4,17 @@ - - 好物分享 - - + + + + - - -import { HTTP_REQUEST_URL } from '@/config/app'; + +import { HTTP_REQUEST_URL } from '@/config/app'; import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'; import { graphicLstData } from '@/api/api.js'; import { openPlantGrass } from "@/config/app.js"; diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue index 9a089eb..fff0574 100644 --- a/pages/plantGrass/plant_detail/index.vue +++ b/pages/plantGrass/plant_detail/index.vue @@ -158,7 +158,7 @@ 内容不存在，可能被删除了哦~ - 返回首页 + @@ -298,7 +298,7 @@ scene: scene, type: 0, href: `${HTTP_REQUEST_URL}${curRoute}`, - + title: data.title || '', summary: data.content || '', imageUrl: data.image[0] || '', @@ -307,10 +307,10 @@ title: '分享成功', icon: 'success' }) - uni.hideLoading(); + uni.hideLoading(); }, fail: function(err) { - uni.hideLoading(); + uni.hideLoading(); uni.showToast({ title: '分享失败', icon: 'none', diff --git a/pages/points_mall/index.vue b/pages/points_mall/index.vue index 4c7d4cb..3cc0836 100644 --- a/pages/points_mall/index.vue +++ b/pages/points_mall/index.vue @@ -43,7 +43,7 @@ {{item.title}} - + @@ -68,11 +68,11 @@ 暂无商品，去看点别的吧 - + {{loadTitle}} - + @@ -124,7 +124,7 @@ if(options.spread) spread(options.spread, this.isLogin) }, watch: { - + }, onShow(){ @@ -222,7 +222,9 @@ location.href = url // #endif } else { - if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index','/pages/plant_grass/index'] + if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index', + // '/pages/plant_grass/index' + ] .indexOf(url) == -1) { uni.navigateTo({ url: url +'?delta=0' @@ -358,7 +360,7 @@ .body-title { .navTabBox { color: #282828; - position: relative; + position: relative; .longTab { display: flex; .longItem { @@ -384,7 +386,7 @@ font-weight: bold; color: var(--view-theme); } - } + } } } } @@ -428,7 +430,7 @@ top: 5rpx; left: 5rpx; } - + } } image { diff --git a/pages/user/index.vue b/pages/user/index.vue index ce039b3..54d20a5 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -603,7 +603,9 @@ location.href = url // #endif }else{ - if(['/pages/goods_cate/goods_cate','/pages/order_addcart/order_addcart','/pages/user/index','/pages/plant_grass/index'].indexOf(url) == -1){ + if(['/pages/goods_cate/goods_cate','/pages/order_addcart/order_addcart','/pages/user/index', + // '/pages/plant_grass/index' + ].indexOf(url) == -1){ uni.navigateTo({ url:url }) diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue index 0871b99..cf27c89 100644 --- a/pages/users/login/index.vue +++ b/pages/users/login/index.vue @@ -66,7 +66,7 @@
没有账号? 立即注册 -
+ @@ -136,11 +136,11 @@
- 我已同意《用户协议》与《隐私政策》 + 我已同意《用户协议》与《隐私政策》
注册
-
+
已有账号? 立即登录
@@ -160,7 +160,7 @@ - +
@@ -169,7 +169,7 @@
用户协议与隐私政策
- + @@ -191,7 +191,7 @@ - 我已同意《用户协议》与《隐私政策》 + 我已同意《用户协议》与《隐私政策》 @@ -293,7 +293,7 @@ let copy = this.copyright.status == -1 ? this.copyright.year+" "+this.copyright.url : this.copyright.Copyright return copy; } - }, + }, watch: { formItem: function(nval, oVal) { if (nval == 1) { @@ -315,7 +315,7 @@ }, mounted: function() { this.getVersion(); - + }, onReady(){ let that = this @@ -333,7 +333,7 @@ }, methods: { // #ifdef MP - getPhoneNumber(e) { + getPhoneNumber(e) { let that = this; if(!that.isAgree){ return that.$util.Tips({ @@ -356,10 +356,11 @@ }); that.$store.commit("SETUID", data.user.uid); that.$store.commit('UPDATE_USERINFO', data.user); - + let method let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate', - '/pages/user/index','/pages/plant_grass/index' + '/pages/user/index', + // '/pages/plant_grass/index' ] if (indexPat.includes(this.getPath(backUrl))) { method = 'switchTab' @@ -382,7 +383,7 @@ }); }); } - + }, // #endif goCopyUrl() { @@ -479,10 +480,11 @@ }); that.$store.commit("SETUID", data.result.user.uid); that.$store.commit('UPDATE_USERINFO', data.result.user); - + let method let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate', - '/pages/user/index','/pages/plant_grass/index' + '/pages/user/index', + // '/pages/plant_grass/index' ] if (indexPat.includes(this.getPath(backUrl))) { method = 'switchTab' @@ -568,7 +570,8 @@ that.$store.commit('UPDATE_USERINFO', data.result.user); let method let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate', - '/pages/user/index','/pages/plant_grass/index' + '/pages/user/index', + // '/pages/plant_grass/index' ] if (indexPat.includes(this.getPath(backUrl))) { method = 'switchTab' @@ -634,7 +637,7 @@ if (!that.isAgree) return that.$util.Tips({ title: '请勾选用户协议与隐私政策' }); - + loginMobile({ auth_token: uni.getStorageSync('auth_token'), phone: that.account, @@ -728,10 +731,10 @@ 'time': res.data.exp }); that.$store.commit("SETUID", res.data.user.uid); - that.$store.commit('UPDATE_USERINFO', res.data.user); + that.$store.commit('UPDATE_USERINFO', res.data.user); uni.switchTab({ url: '/pages/user/index' - }) + }) }) .catch(res => { that.$util.Tips({ @@ -836,7 +839,7 @@ } uni[method]({ url: backUrl - }); + }); }) .catch(e => { that.$util.Tips({ @@ -882,31 +885,31 @@ text-align: center; margin-top: 55rpx; } - + .ChangePassword .list { width: 580rpx; margin: 53rpx auto 0 auto; } - + .ChangePassword .list .item { width: 100%; height: 110rpx; border-bottom: 2rpx solid #f0f0f0; } - + .ChangePassword .list .item input { width: 100%; height: 100%; font-size: 32rpx; } - + .ChangePassword .list .item .placeholder { color: #b9b9bc; } - + .ChangePassword .list .item input.codeIput { width: 240rpx; - + } /deep/.uni-input-wrapper,/deep/.uni-input-input{ // width: 240rpx; @@ -916,11 +919,11 @@ background-color: #fff; color: var(--view-theme); } - + .ChangePassword .list .item .code.on { color: #b9b9bc; } - + .ChangePassword .confirmBnt { font-size: 32rpx; width: 580rpx; @@ -932,14 +935,14 @@ line-height: 90rpx; background-color: var(--view-theme); } - + .ChangePassword .confirmBnt.back{ background-color: #FFFFFF; border: 1px solid var(--view-theme); color: var(--view-theme); margin-top: 30rpx; } - + .getPhoneBtn{ font-size: 32rpx; width: 580rpx; @@ -995,12 +998,12 @@ .content { height: 900rpx; overflow-y: scroll; - + /deep/ p { font-size: 13px; line-height: 22px; } - + /deep/ img { max-width: 100%; } @@ -1012,7 +1015,7 @@ position: absolute; top: 15rpx; right: 15rpx; - + } .settlementAgreement .setAgCount .title { color: #333; @@ -1044,22 +1047,22 @@ justify-content: center; align-items: center; font-size: 24rpx; - color: #B4B4B4; + color: #B4B4B4; .line { width: 68rpx; height: 1rpx; background: #CCCCCC; - } + } p { margin: 0 20rpx; } - } + } .btn-wrapper { display: flex; align-items: center; justify-content: center; margin-top: 30rpx; - + .btn { display: flex; align-items: center; @@ -1067,12 +1070,12 @@ width: 68rpx; height: 68rpx; border-radius: 50%; - + + .btn { margin-left: 30rpx; } } - + .apple-btn { display: flex; align-items: center; @@ -1083,19 +1086,19 @@ background: #EAEAEA; border-radius: 34rpx; font-size: 24rpx; - + .icon-s-pingguo { color: #333; margin-right: 10rpx; font-size: 34rpx; } } - + .iconfont { font-size: 40rpx; color: #fff; } - + .wx { // margin-right: 30rpx; background-color: #61C64F; @@ -1104,33 +1107,33 @@ background-color: #333; } } - + .mima { background-color: #28B3E9; } - + .yanzheng { background-color: #F89C23; } - + } } - + .code img { width: 100%; height: 100%; } - + .acea-row.row-middle { input { margin-left: 20rpx; display: block; } } - + .login-wrapper { padding: 30rpx; - + .shading { display: flex; align-items: center; @@ -1140,38 +1143,38 @@ margin-top: 50rpx; /* #endif */ /* #ifndef APP-VUE */ - + margin-top: 200rpx; /* #endif */ - - + + image { width: 180rpx; height: 180rpx; } } - + .whiteBg { margin-top: 100rpx; - + .list { border-radius: 16rpx; overflow: hidden; - + .item { border-bottom: 1px solid #F0F0F0; background: #fff; - + .row-middle { position: relative; padding: 16rpx 45rpx; - + input { flex: 1; font-size: 28rpx; height: 80rpx; } - + .code { color: #E93323; font-size: 26rpx; @@ -1180,7 +1183,7 @@ } } } - + .logon { display: flex; align-items: center; @@ -1193,7 +1196,7 @@ color: #FFFFFF; font-size: 30rpx; } - + .tips { margin: 30rpx; text-align: center; @@ -1210,7 +1213,7 @@ font-size: 20rpx; line-height: 28rpx; color: #FFFFFF; - + .cell { // margin-left: 6rpx; font-size: 20rpx; diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue index f6eae9e..8900ef5 100644 --- a/pages/users/user_cash/index.vue +++ b/pages/users/user_cash/index.vue @@ -18,7 +18,7 @@ - + + + + + 个人账户 + 企业账户 + + +
+ + + + + 提现 + + + + + + 当前可提现金额: ￥{{userInfo.brokerage_price}},冻结佣金：￥{{userInfo.lock_brokerage}} + + + 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 + + + 提现手续费为: {{ withdraw_commission.toFixed(2) }}% + + + 实际到账：{{ (extract_price - (extract_price * withdraw_commission / 100)).toFixed(2) }}； + 手续费: {{ (extract_price * withdraw_commission / 100).toFixed(2) }} + + @@ -97,11 +174,17 @@ + + 提现手续费为: {{ withdraw_commission.toFixed(2) }}% + + + 实际到账：{{ (extract_price - (extract_price * withdraw_commission / 100)).toFixed(2) }}； + 手续费: {{ (extract_price * withdraw_commission / 100).toFixed(2) }} + -
@@ -134,6 +217,13 @@ 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 + + 提现手续费为: {{ withdraw_commission.toFixed(2) }}% + + + 实际到账：{{ (extract_price - (extract_price * withdraw_commission / 100)).toFixed(2) }}； + 手续费: {{ (extract_price * withdraw_commission / 100).toFixed(2) }} + @@ -148,13 +238,7 @@ diff --git a/utils/util.js b/utils/util.js index 671269b..0147f26 100644 --- a/utils/util.js +++ b/utils/util.js @@ -15,7 +15,7 @@ export default { * 字符串截取 * @obj 传入的数据 * @state 0 某个参数之前 1某个参数之后 - * + * * * **/ stringIntercept: function(obj, state, type) { @@ -127,7 +127,7 @@ export default { * @param int index 需要移除的数组的键值 * @param string | int 值 * @return array - * + * */ ArrayRemove: function(array, index, value) { const valueArray = []; @@ -146,7 +146,7 @@ export default { * 生成海报获取文字 * @param string text 为传入的文本 * @param int num 为单行显示的字节长度 - * @return array + * @return array */ textByteLength: function(text, num) { let strLength = 0; @@ -180,8 +180,8 @@ export default { * @param string store_name 素材文字 * @param string price 价格 * @param function successFn 回调函数 - * - * + * + * */ PosterCanvas: function(arr2, store_name, price, successFn, errFun) { let that = this; @@ -189,9 +189,9 @@ export default { ctx.clearRect(0, 0, 0, 0); /** * 只能获取合法域名下的图片信息,本地调试无法获取 - * + * */ - uni.getImageInfo({ + uni.getImageInfo({ src: arr2[0], success: function(res) { console.log(res, 'getImageInfo') @@ -258,8 +258,8 @@ export default { * @param string store_name 素材文字 * @param string price 价格 * @param function successFn 回调函数 - * - * + * + * */ goodsPosterCanvas: function(arr2, store_name, price, site_name, ot_price, successFn, errFun) { let that = this; @@ -267,9 +267,9 @@ export default { ctx.clearRect(0, 0, 0, 0); /** * 只能获取合法域名下的图片信息,本地调试无法获取 - * + * */ - uni.getImageInfo({ + uni.getImageInfo({ src: arr2[0], success: function(res) { console.log(res, 'getImageInfo') @@ -282,7 +282,7 @@ export default { let cx = 555; let cy = 910; let ux = 50; - let uy = 50; + let uy = 50; ctx.arc(cx + r, cy + r, r, 0, 2 * Math.PI); that.handleBorderRect(ctx, 30, 30, 50, 50, 25); ctx.clip(); @@ -301,7 +301,7 @@ export default { contentRows = 2; let textArray = contentArray.slice(0, 2); textArray[textArray.length - 1] = textArray[textArray.length - 1].slice(0,textArray[textArray.length - 1].length-1) - textArray[textArray.length - 1] += '…'; + textArray[textArray.length - 1] += '…'; contentArray = textArray; } ctx.setFontSize(32); @@ -359,8 +359,8 @@ export default { * @param string store_name 素材文字 * @param string price 价格 * @param function successFn 回调函数 - * - * + * + * */ videoPosterCanvas: function(arr2, content, nickname, successFn, errFun) { let that = this; @@ -368,9 +368,9 @@ export default { ctx.clearRect(0, 0, 0, 0); /** * 只能获取合法域名下的图片信息,本地调试无法获取 - * + * */ - uni.getImageInfo({ + uni.getImageInfo({ src: arr2[0], success: function(res) { const WIDTH = res.width; @@ -408,11 +408,11 @@ export default { contentArray = textArray; } ctx.setTextAlign('left'); - ctx.font = 'bold 32px Arial'; + ctx.font = 'bold 32px Arial'; let contentHh = 32 * 1.3; for (let m = 0; m < contentArray.length; m++) { ctx.fillText(contentArray[m], 55, 850 + contentHh * m); - } + } ctx.draw(true, function() { uni.canvasToTempFilePath({ canvasId: 'myCanvas', @@ -466,7 +466,7 @@ export default { ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI); ctx.lineTo(x, y + r); ctx.lineTo(x + r, y); - + ctx.fill(); ctx.closePath(); }, @@ -476,8 +476,8 @@ export default { * @param string nickname 昵称 * @param string sitename 价格 * @param function successFn 回调函数 - * - * + * + * */ userPosterCanvas: function(arr2, nickname, sitename, index, w, h, successFn) { let that = this; @@ -485,7 +485,7 @@ export default { ctx.clearRect(0, 0, 0, 0); /** * 只能获取合法域名下的图片信息,本地调试无法获取 - * + * */ uni.getImageInfo({ src: arr2[1], @@ -532,7 +532,7 @@ export default { fail: function(err) { console.log(err) uni.hideLoading(); - + } }) },1000)) @@ -550,8 +550,8 @@ export default { /* * 单图上传 * @param object opt - * @param callable successCallback 成功执行方法 data - * @param callable errorCallback 失败执行方法 + * @param callable successCallback 成功执行方法 data + * @param callable errorCallback 失败执行方法 */ uploadImageOne: function(opt, successCallback, errorCallback) { let that = this; @@ -567,9 +567,9 @@ export default { uploadUrl = opt.url || '', inputName = opt.name || 'field'; uni.chooseImage({ - count: count, //最多可以选择的图片总数 - sizeType: sizeType, // 可以指定是原图还是压缩图，默认二者都有 - sourceType: sourceType, // 可以指定来源是相册还是相机，默认二者都有 + count: count, //最多可以选择的图片总数 + sizeType: sizeType, // 可以指定是原图还是压缩图，默认二者都有 + sourceType: sourceType, // 可以指定来源是相册还是相机，默认二者都有 success: async (res)=> { let image = []; let filesLen = res.tempFiles.length; @@ -655,8 +655,8 @@ export default { /** * 小程序头像获取上传 * @param uploadUrl 上传接口地址 - * @param filePath 上传文件路径 - * @param successCallback success回调 + * @param filePath 上传文件路径 + * @param successCallback success回调 * @param errorCallback err回调 */ uploadImgs(uploadUrl, filePath, successCallback, errorCallback) { @@ -726,7 +726,7 @@ export default { * @param string k 整体分割符 默认为：& * @param string p 单个分隔符 默认为：= * @return object - * + * */ // #ifdef MP getUrlParams: function(param, k, p) { @@ -982,7 +982,9 @@ export default { url: `/pages/annex/web_view/index?url=${url}` }); } else { - if (['/pages/goods_cate/goods_cate','/pages/plant_grass/index','/pages/order_addcart/order_addcart','/pages/user/index' + if (['/pages/goods_cate/goods_cate', + // '/pages/plant_grass/index', + '/pages/order_addcart/order_addcart','/pages/user/index' ] .indexOf(url) == -1) { uni.navigateTo({