diff --git a/App.vue b/App.vue index b76125b..4ea2351 100644 --- a/App.vue +++ b/App.vue @@ -118,9 +118,9 @@ if (this.$store.state.app.token) { // 浏览记录 // #ifdef H5 - history({ - page: location.pathname + location.search, - }).then(() => {}); + // history({ + // page: location.pathname + location.search, + // }).then(() => {}); //#endif }; // #ifndef H5 @@ -232,9 +232,9 @@ $route(n) { if (this.$store.state.app.token) { // 浏览记录 - history({ - page: location.pathname + location.search, - }).then(() => {}); + // history({ + // page: location.pathname + location.search, + // }).then(() => {}); } }, } diff --git a/androidPrivacy.json b/androidPrivacy.json index dc05560..4075d05 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -3,12 +3,12 @@ "prompt" : "template", "title" : "服务协议与隐私政策", "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\r -\t你可以阅读 《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。", +\t你可以阅读 《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。", "buttonAccept" : "同意并接受", "buttonRefuse" : "暂不同意", "second" : { "title" : "确认提示", - "message" : "进入应用前，你需先同意《用户协议》 与 《隐私政策》，否则将退出应用。", + "message" : "进入应用前，你需先同意《用户协议》 与 《隐私政策》，否则将退出应用。", "buttonAccept" : "同意并继续", "buttonRefuse" : "退出应用" }, diff --git a/api/user.js b/api/user.js index 17692cc..df750ac 100644 --- a/api/user.js +++ b/api/user.js @@ -420,6 +420,12 @@ export function feedback(data) { export function feedbackList(data) { return request.get("user/feedback/list", data); } +/** + * 中奖列表 + */ +export function signEntityLog() { + return request.get("user/sign/entity_log"); +} /** * 反馈列表 */ @@ -607,6 +613,14 @@ export function cacheInfo(key) { export function userOut(data) { return request.post(`user/cancel`, data) } +/** + * 地址 + * @param object data + * + */ +export function signAddress(data) { + return request.post(`user/sign/address`, data) +} /** * 获取聊天用户信息 * @param object data diff --git a/components/PriceChange/index.vue b/components/PriceChange/index.vue index f65e2d1..ed264d1 100644 --- a/components/PriceChange/index.vue +++ b/components/PriceChange/index.vue @@ -2,7 +2,8 @@ - {{ status == 0 ? "一键改价" : status == 1 ? "订单备注" : "立即退款" }} + {{ status == 1 ? "订单备注" : "立即退款" }} + diff --git a/components/blindBox/blindBox.vue b/components/blindBox/blindBox.vue index 019706b..308722e 100644 --- a/components/blindBox/blindBox.vue +++ b/components/blindBox/blindBox.vue @@ -18,18 +18,24 @@ - + 恭喜您获得 - {{drawInfo.text}} + {{drawInfo.text}}铸源星 开心收下 + + + 恭喜您获得 + {{this.prize.name}} + 填写地址 + - 很遗憾,差一点就中奖了 + 谢谢参与 期待您下次再来 我知道了 @@ -58,6 +64,11 @@ }, popShow:false, list:[], + prize:{ + name:'', + id:'', + image:'' + }, drawInfo:{ img:'', text:'', @@ -72,20 +83,23 @@ async openBlindBox(val){ this.actionIndex=val; if(val/2){ + // this.popShow=true; + // this.blind=true; await setBlind().then(res=>{ if(res.status == 200){ setTimeout(()=>{ this.popShow=true; + this.prize = res.data.prize || {name:'',image:'',id:'',draw_time:''} this.drawInfo.text = res.data.integral; - this.blind=!!res.data.integral; + this.blind=!!res.data.integral || !!this.prize.name; },1500) }else{ return this.$util.Tips({title:err}) } - }).catch(err=>{ // this.close(); - // return this.$util.Tips({title:err}) + return this.$util.Tips({title:err}) + // return this.$util.Tips({title:err.message}) }); }else{ setTimeout(()=>{ @@ -97,6 +111,13 @@ }, init(){ }, + writeAddress(){ + let {id,draw_time,image,name} = this.prize + uni.navigateTo({ + url: `/pages/users/winning_confirm/index?id=${id}&draw_time=${draw_time}&image=${image}&name=${name}`, + }); + this.closePop() + }, closePop(){ this.popShow=false; this.blindShow=false; @@ -142,7 +163,7 @@ height: 100vh; position: fixed; background-color: rgba(0,0,0,.9); - z-index: 10000; + z-index: 998; top: 0; display: flex; align-items: center; @@ -270,9 +291,9 @@ margin: 20rpx 0; line-height: 54rpx; text-align: center; - background: url('https://store.tropjoin.com/images/mh-title.png') no-repeat; - background-size: 100% 100%; - background-position: center; + // background: url('https://store.tropjoin.com/images/mh-title.png') no-repeat; + // background-size: 100% 100%; + // background-position: center; } .blind-box{ width: 100%; diff --git a/components/jyf-parser/jyf-parser.vue b/components/jyf-parser/jyf-parser.vue index 91d752b..e032d37 100644 --- a/components/jyf-parser/jyf-parser.vue +++ b/components/jyf-parser/jyf-parser.vue @@ -19,7 +19,7 @@
- + @@ -57,6 +57,7 @@ return { // #ifdef APP-PLUS loadVideo: false, + // imgLoad:false, // #endif // #ifdef H5 uid: this._uid, @@ -80,6 +81,10 @@ // #endif props: { 'html': null, + 'previewImg':{ + type: Boolean, + default: true + }, // #ifndef MP-ALIPAY 'autopause': { type: Boolean, @@ -317,7 +322,7 @@ var preview = true; this.ignore = () => preview = false; _ts.$emit('imgtap', this); - if (preview) { + if (preview && _ts.previewImg) { uni.previewImage({ current: this.i, urls: _ts.imgList @@ -689,7 +694,7 @@ var preview = true; data.img.ignore = () => preview = false; this.$emit('imgtap', data.img); - if (preview) + if (preview && this.previewImg) uni.previewImage({ current: data.img.i, urls: this.imgList diff --git a/components/jyf-parser/libs/trees.vue b/components/jyf-parser/libs/trees.vue index fe31dbe..ad95b82 100644 --- a/components/jyf-parser/libs/trees.vue +++ b/components/jyf-parser/libs/trees.vue @@ -142,7 +142,10 @@ lazyLoad: Boolean, // #endif // #ifdef APP-PLUS - loadVideo: Boolean + loadVideo: Boolean, + imgLoads:{ + type: Boolean + } // #endif }, mounted() { @@ -181,7 +184,7 @@ }; global.Parser.onImgtap && global.Parser.onImgtap(data); this.top.$emit('imgtap', data); - if (preview) { + if (preview && this.imgLoads) { var urls = this.top.imgList, current = urls[attrs.i] ? parseInt(attrs.i) : (urls = [attrs.src], 0); uni.previewImage({ diff --git a/components/payment/index.vue b/components/payment/index.vue index bc0f66c..fa902f1 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -15,8 +15,6 @@ ￥ {{ item.number }} - - {{item.title}} @@ -109,6 +107,7 @@ }); }, goPay: function(number, paytype,password) { + console.log(paytype) this.number=number; if (this.isCall) { return this.$emit('onChangeFun', { @@ -141,6 +140,10 @@ // #ifdef MP type = 'alipayQr'; // #endif + }else if(paytype == 'sand'){ + type = 'sand' + }else if(paytype == 'sandCard'){ + type = 'sandCard' } if (!that.order_id) return that.$util.Tips({ title: '请选择要支付的订单' @@ -376,9 +379,25 @@ location.href = locations; }, 100); break; + case 'sand': + case 'sandCard': + setTimeout(() => { + location.href = jsConfig; + }, 100); + break; // #endif // #ifdef APP-PLUS + case 'sand': + case 'sandCard': + console.log(jsConfig); + if (plus.os.name === 'iOS') { + plus.runtime.openURL(jsConfig); + } else if (plus.os.name === 'Android') { + console.log(jsConfig); + plus.runtime.openURL(jsConfig); + } + break; case 'alipayApp': uni.requestPayment({ provider: 'alipay', diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index d7ceab0..2cfd08c 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -13,7 +13,7 @@ 预售价 ￥{{ attr.productSelect.price }} - + 可用抵扣 {{attr.productSelect.coupon}}券 @@ -34,7 +34,7 @@ ￥{{ attr.productSelect.price }} - + 可用抵扣 {{attr.productSelect.coupon}}券 @@ -167,7 +167,7 @@ value: '' } }, - computed: mapGetters(['viewColor']), + computed: mapGetters(['viewColor','globalData']), data() { return { }; @@ -227,6 +227,7 @@ //获取被选中属性； getCheckedValue: function() { let productAttr = this.attr.productAttr; + console.log(this.attr.productAttr); let value = []; for (let i = 0; i < productAttr.length; i++) { for (let j = 0; j < productAttr[i].attr_values.length; j++) { diff --git a/components/treasureBox/index.vue b/components/treasureBox/index.vue index 84bf270..3ac99f6 100644 --- a/components/treasureBox/index.vue +++ b/components/treasureBox/index.vue @@ -2,7 +2,7 @@ - + @@ -28,12 +28,12 @@ - 很遗憾,差一点就中奖了 + 谢谢参与 期待您下次再来 我知道了 继续开盲盒 - + @@ -72,8 +72,8 @@ this.blind=false; this.close(); }, - async openBox(){ - await setSignIntegral().then(res=>{ + openBox(){ ; + setSignIntegral().then(res=>{ this.drawInfo.text = res.data.integral; this.drawInfo.wheel=res.data.wheel; this.gifShow=true; @@ -84,12 +84,13 @@ },1500) }).catch(err=>{ // this.close(); - // return this.$util.Tips({title:err}) + return this.$util.Tips({title:err}) }); }, goBlind(){ this.blindShow=true; + this.popShow=false; }, close(){ this.$emit('closeTreasureBox') @@ -104,11 +105,11 @@ height: 100vh; position: fixed; top: 0; - z-index: 1000; + z-index: 996; padding-top: 200rpx; background-color: rgba(0,0,0,1); .coupon_popups{ - z-index: 999; + z-index: 997; position: fixed; left: 0; top: 0; @@ -127,7 +128,7 @@ .con{ position: absolute; left: 50%; - top: 50%; + top: 48%; transform: translate(-50%,-50%); width: 680rpx; height: 900rpx; @@ -219,8 +220,8 @@ .top{ width: 488rpx; height: 140rpx; - background-image: url('https://store.tropjoin.com/images/box-title.png'); - background-size: 100% 100%; + // background-image: url('https://store.tropjoin.com/images/box-title.png'); + // background-size: 100% 100%; margin: 0 auto; } .lucky-draw{ diff --git a/config/app.js b/config/app.js index 0b23215..9622ad1 100644 --- a/config/app.js +++ b/config/app.js @@ -6,12 +6,12 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user` let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https -let httpApi = 'http://192.168.1.107:8080' //测试 -// let httpApi = 'https://api.tropjoin.com' //生产 +// let httpApi = 'http://192.168.1.50:8080' //测试 +let httpApi = 'https://api.tropjoin.com' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net -let wsApi = 'ws://192.168.1.107:8080' -// let wsApi = 'wss://ws.tropjoin.com' +// let wsApi = 'ws://192.168.1.50:8080' +let wsApi = 'wss://ws.tropjoin.com' module.exports = { // 请求域名 格式： https://您的域名 diff --git a/main.js b/main.js index d4987fe..d62bf84 100644 --- a/main.js +++ b/main.js @@ -4,7 +4,6 @@ import App from './App' import store from './store' import Cache from './utils/cache' import util from 'utils/util' -import fq from 'utils/fq' import { HTTP_REQUEST_URL } from '@/config/app'; import skeleton from './components/skeleton/index.vue' import BaseMoney from './components/BaseMoney.vue'; @@ -13,7 +12,6 @@ Vue.component('skeleton', skeleton) Vue.component('BaseMoney', BaseMoney) Vue.prototype.$util = util; Vue.prototype.$Cache = Cache; -Vue.prototype.$fq = fq; Vue.prototype.$eventHub = new Vue(); Vue.config.productionTip = false // Vue.use(uvUI); diff --git a/manifest.json b/manifest.json index 53d5bf9..88e0d8f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "铸源商城", + "name" : "铸源优品", "appid" : "__UNI__496DF55", "description" : "", - "versionName" : "1.0.3", - "versionCode" : 130, + "versionName" : "1.0.6", + "versionCode" : 133, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index e7329d7..c95425d 100644 --- a/pages.json +++ b/pages.json @@ -381,6 +381,12 @@ "style": { "navigationBarTitleText": "提交订单" } + }, + { + "path": "winning_confirm/index", + "style": { + "navigationBarTitleText": "奖品记录" + } }, { "path": "promoter-list/index", diff --git a/pages/activity/rank/index.vue b/pages/activity/rank/index.vue index 936c41a..1ff8cf8 100644 --- a/pages/activity/rank/index.vue +++ b/pages/activity/rank/index.vue @@ -110,7 +110,7 @@ // 获取设备宽度 uni.getSystemInfo({ success(e) { - that.isWidth = e.windowWidth / 6; + // that.isWidth = e.windowWidth / 6; that.windowHeight = e.windowHeight; // that.swiperHeight = that.windowHeight - 205 that.$set(that, 'swiperHeight', that.windowHeight-150); @@ -126,13 +126,19 @@ methods: { spuTop(cate_id) { spuTop().then(res => { + console.log(cate_id); + this.categoryList = [...this.categoryList, ...res.data] this.cate_name = this.getCate(cate_id,this.categoryList) || '' + this.getSpuTopList(cate_id) this.$nextTick(() => { - this.getSpuTopList(cate_id) - this.active = cate_id && this.cate_name ? cate_id : 0 + console.log('xxx'); + // this.getSpuTopList(cate_id) + // this.active = cate_id && this.cate_name ? cate_id : 0 + this.active = 0 this.scrollInto = `cate${cate_id}`; let tabLeft = (this.swiperCur - 2) * this.isWidth; //设置下划线位置 + console.log(tabLeft); this.$set(this, 'tabLeft', tabLeft); }); }) @@ -142,7 +148,9 @@ spuTopList({ cate_pid: cate_id }).then(res => { + console.log(res); this.spuTopList = (res.data[0] && res.data[0]['list']) || [] + console.log(this.spuTopList); }) }, swiperChange(e) { diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index caf97b6..da95cb4 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -155,9 +155,9 @@ - + 立即退款 diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index c285641..f4128da 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -135,9 +135,9 @@ - + 订单备注 去发货 去核销 diff --git a/pages/columnGoods/HotNewGoods/index.vue b/pages/columnGoods/HotNewGoods/index.vue index edd5bef..9c67fa4 100644 --- a/pages/columnGoods/HotNewGoods/index.vue +++ b/pages/columnGoods/HotNewGoods/index.vue @@ -51,14 +51,14 @@ import { toLogin } from '@/libs/login.js'; const typeData = { best:{ desc:'新品抢先购', - name:'精品推荐' + name:'品牌好物' }, hot:{ desc:'剁手必备指南', name:'热门榜单' }, new:{ - desc:'发现品质好物', + desc:'惊喜折扣价', name:'首发新品' }, good:{ @@ -147,7 +147,7 @@ export default { this.name = ''; this.desc = ''; }else{ - let name = (typeData[this.type]||{}).name || '精品推荐'; + let name = (typeData[this.type]||{}).name || '品牌好物'; let url = this.$route ? this.$route.fullPath : ('/' + util.getNowUrl()); this.hotData.forEach(data=>{ if(data.url == url) name = data.title; diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue index f5b16eb..f98dd48 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -13,7 +13,7 @@ - + @@ -285,11 +285,11 @@ key: 2, order: 'rate' }, - { - title: '距离', - key: 3, - order: 'location' - } + // { + // title: '距离', + // key: 3, + // order: 'location' + // } ], price: 0, stock: 0, @@ -373,7 +373,7 @@ success: (res) => { if (res.data.mer_location == 1) { this.mer_location = res.data.mer_location - this.selfLocation() + // this.selfLocation() } } }); diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 8dd1bba..27eb60e 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -26,7 +26,7 @@ ￥{{storeInfo.price}} - + 可用抵扣 {{skuCoupon}}券 @@ -42,9 +42,11 @@ + 特惠 {{storeInfo.merchant.type_name}} 自营 {{storeInfo.store_name}} +
收藏 @@ -60,7 +62,7 @@ ￥ {{storeInfo.price}} - + 可用抵扣 {{skuCoupon}}券 @@ -98,6 +100,7 @@ 包邮 + 特惠 {{storeInfo.merchant.type_name}} 自营 {{storeInfo.store_name || ''}} @@ -144,7 +147,7 @@ 运费： - {{shippingValue}} + 运费说明 @@ -389,10 +392,10 @@ - + + { - that.$util.Tips({ - title: res.message, - icon: 'success' - }); - setTimeout(()=>{ - uni.switchTab({ - url: '/pages/user/index' - }) - },500) - }).catch(msg => { - return that.$util.Tips({ - title: msg || '保存失败，您并没有修改' - }); + this.$util.Tips({ + title: '退出中...' }); + setTimeout(()=>{ + uni.switchTab({ + url: '/pages/user/index' + }) + },500) + // let that = this, + // value = e.detail.value; + // if (!value.nickname) return that.$util.Tips({ + // title: '用户姓名不能为空' + // }); + // value.avatar = this.userInfo.avatar; + // for (var i = 0; i < that.userInfo.extend_info.length; i++) { + // let data = that.userInfo.extend_info[i] + // if (data.is_require || data.value) { + // if (data.type === 'date' || data.type === 'address') { + // if (!data.value) { + // return that.$util.Tips({ + // title: `${data.msg}` + // }); + // } + // } + // if(data.type === 'input'){ + // if (!data.value.trim()) { + // return that.$util.Tips({ + // title: `${data.msg}` + // }); + // } + // } + // if (data.type === 'int') { + // if (data.value <= 0) { + // return that.$util.Tips({ + // title: `${data.msg}` + // }); + // } + // } + // if (data.type === 'email') { + // if (data.is_require) { + // if (!data.value) { + // return that.$util.Tips({ + // title: `${data.msg}` + // }); + // } + // } + // if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(data.value)) { + // return that.$util.Tips({ + // title: '请填写正确的邮箱' + // }); + // } + // } + // if (data.type === 'phone') { + // if (data.is_require) { + // if (!data.value) { + // return that.$util.Tips({ + // title: `${data.msg}` + // }); + // } + // } + // if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(data.value)) { + // return that.$util.Tips({ + // title: `${data.msg}` + // }); + // } + // } + // if (data.type === 'id_card') { + // if (data.is_require) { + // if (!data.value) { + // return that.$util.Tips({ + // title: `${data.msg}` + // }); + // } + // } + // if (!/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/i.test(data.value)) { + // return that.$util.Tips({ + // title: '请填写正确的身份证号码' + // }); + // } + // } + // } + // } + // value.extend_info = that.userInfo.extend_info; + // userSettingEdit(value).then(res => { + // that.$util.Tips({ + // title: res.message, + // icon: 'success' + // }); + // setTimeout(()=>{ + // uni.switchTab({ + // url: '/pages/user/index' + // }) + // },500) + // }).catch(msg => { + // return that.$util.Tips({ + // title: msg || '保存失败，您并没有修改' + // }); + // }); } } } diff --git a/pages/users/user_sgin/index.vue b/pages/users/user_sgin/index.vue index ccce155..2906e56 100644 --- a/pages/users/user_sgin/index.vue +++ b/pages/users/user_sgin/index.vue @@ -7,24 +7,32 @@ {{userInfo.nickname}} - 积分: {{userInfo.integral ? userInfo.integral : 0}} + 铸源星: {{userInfo.integral ? userInfo.integral : 0}} - - - 明细 + + + 说明 + + + + {{item}} + + + {{item.value.sign_day}} - + + - +
@@ -39,20 +47,32 @@ {{signCount[3] || 0}} 天 - 据说连续签到第7天可获得超额积分，一定要坚持签到哦~~~ + 据说连续签到第7天可获得更多惊喜，一定坚持签至哦到~~ + + + + {{item.name}} + {{item.draw_time}} + + + 去查看 + + + + {{item.title}} {{item.create_time}} - +{{item.number}} + +{{item.number}} 点击加载更多 - + @@ -69,13 +89,13 @@ \ No newline at end of file diff --git a/static/images/1353901.png b/static/images/1353901.png deleted file mode 100644 index 88d5b86..0000000 Binary files a/static/images/1353901.png and /dev/null differ diff --git a/static/images/gagag.jpg b/static/images/gagag.jpg deleted file mode 100644 index 85570cb..0000000 Binary files a/static/images/gagag.jpg and /dev/null differ diff --git a/static/images/img_2.JPG b/static/images/img_2.JPG deleted file mode 100644 index cb30426..0000000 Binary files a/static/images/img_2.JPG and /dev/null differ diff --git a/static/images/img_3.JPG b/static/images/img_3.JPG deleted file mode 100644 index f5ed617..0000000 Binary files a/static/images/img_3.JPG and /dev/null differ diff --git a/static/images/img_4.JPG b/static/images/img_4.JPG deleted file mode 100644 index 22af98a..0000000 Binary files a/static/images/img_4.JPG and /dev/null differ diff --git a/static/images/img_5.JPG b/static/images/img_5.JPG deleted file mode 100644 index 3dfc5d1..0000000 Binary files a/static/images/img_5.JPG and /dev/null differ diff --git a/static/images/prize.png b/static/images/prize.png new file mode 100644 index 0000000..ec8b478 Binary files /dev/null and b/static/images/prize.png differ diff --git a/static/images/wallhaven-vqv3ml.jpg b/static/images/wallhaven-vqv3ml.jpg deleted file mode 100644 index 99282bb..0000000 Binary files a/static/images/wallhaven-vqv3ml.jpg and /dev/null differ diff --git a/utils/util.js b/utils/util.js index 0d0a46d..f58c52f 100644 --- a/utils/util.js +++ b/utils/util.js @@ -9,6 +9,7 @@ import { } from '@/plugin/image-tools/index.js'; // #ifdef APP-PLUS import permision from "./permission.js" +import prompt from "./prompt.js" // #endif export default { @@ -861,7 +862,11 @@ export default { * @param callable successCallback 成功执行方法 data * @param callable errorCallback 失败执行方法 */ - uploadImageOne: function(opt, successCallback, errorCallback) { + uploadImageOne: async function(opt, successCallback, errorCallback) { + // #ifdef APP-PLUS + let res = await prompt.requestPermissions(['CAMERA','WRITE_EXTERNAL_STORAGE']) + if(res!==1) return + // #endif let that = this; if (typeof opt === 'string') { let url = opt;