更新版本提示框, 新增权限
This commit is contained in:
parent
4b5ffc1387
commit
4843d46b80
@ -2,8 +2,8 @@
|
|||||||
"name" : "惠农生活",
|
"name" : "惠农生活",
|
||||||
"appid" : "__UNI__3A527D1",
|
"appid" : "__UNI__3A527D1",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "2.0.16",
|
"versionName" : "2.0.17",
|
||||||
"versionCode" : 2016,
|
"versionCode" : 2017,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
@ -1093,7 +1093,12 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
uploadImg() {
|
async uploadImg() {
|
||||||
|
// #ifdef APP-PLUS
|
||||||
|
let result = await this.$store.dispatch("permission/requestPermissions",
|
||||||
|
'CAMERA')
|
||||||
|
if (result !== 1) return;
|
||||||
|
// #endif
|
||||||
let self = this
|
let self = this
|
||||||
self.$util.uploadImageOne('upload/image', function(res) {
|
self.$util.uploadImageOne('upload/image', function(res) {
|
||||||
if (res.status == 200) {
|
if (res.status == 200) {
|
||||||
|
@ -557,9 +557,9 @@
|
|||||||
that.windowHeight = res.windowHeight;
|
that.windowHeight = res.windowHeight;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.$store.dispatch('INIT_CONFIG');
|
|
||||||
})
|
})
|
||||||
that.pageLoad(options);
|
that.pageLoad(options);
|
||||||
|
this.$store.dispatch('INIT_CONFIG');
|
||||||
},
|
},
|
||||||
created(options) {
|
created(options) {
|
||||||
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
|
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
|
||||||
@ -608,7 +608,6 @@
|
|||||||
uni.reLaunch({
|
uni.reLaunch({
|
||||||
url: "/pages/index/index"
|
url: "/pages/index/index"
|
||||||
});
|
});
|
||||||
|
|
||||||
}, 50)
|
}, 50)
|
||||||
// #endif
|
// #endif
|
||||||
},
|
},
|
||||||
@ -681,7 +680,7 @@
|
|||||||
success: res => {
|
success: res => {
|
||||||
this.errorNetwork = res.networkType === 'none';
|
this.errorNetwork = res.networkType === 'none';
|
||||||
if (!this.errorNetwork) {
|
if (!this.errorNetwork) {
|
||||||
this.pageLoad(this._options);
|
this.pageLoad(this._options);
|
||||||
} else {
|
} else {
|
||||||
// uni.stopPullDownRefresh();
|
// uni.stopPullDownRefresh();
|
||||||
that.overflow = false;
|
that.overflow = false;
|
||||||
|
@ -173,7 +173,12 @@
|
|||||||
* 上传文件
|
* 上传文件
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
uploadpic: function() {
|
uploadpic: async function() {
|
||||||
|
// #ifdef APP-PLUS
|
||||||
|
let result = await this.$store.dispatch("permission/requestPermissions",
|
||||||
|
'CAMERA')
|
||||||
|
if (result !== 1) return;
|
||||||
|
// #endif
|
||||||
let that = this;
|
let that = this;
|
||||||
that.$util.uploadImageOne('upload/image', function(res) {
|
that.$util.uploadImageOne('upload/image', function(res) {
|
||||||
console.log(res, '回调')
|
console.log(res, '回调')
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 32 KiB |
Binary file not shown.
Before Width: | Height: | Size: 34 KiB |
Binary file not shown.
Before Width: | Height: | Size: 13 KiB |
@ -231,7 +231,7 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 36%;
|
top: 36%;
|
||||||
left: 24%;
|
left: 24%;
|
||||||
background-color: #e54139;
|
background-color: #40ae36;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
line-height: 26rpx;
|
line-height: 26rpx;
|
||||||
@ -241,7 +241,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
background-color: #ff6d20;
|
background-color: #40ae36;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-top: 12rpx;
|
margin-top: 12rpx;
|
||||||
@ -263,7 +263,7 @@
|
|||||||
|
|
||||||
.button {
|
.button {
|
||||||
margin: 20rpx 30rpx;
|
margin: 20rpx 30rpx;
|
||||||
background-color: #ff6d20;
|
background-color: #40ae36;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@ -306,7 +306,7 @@
|
|||||||
.bar {
|
.bar {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background-color: #e84116;
|
background-color: #40ae36;
|
||||||
border-top-left-radius: 5rpx;
|
border-top-left-radius: 5rpx;
|
||||||
border-bottom-left-radius: 5rpx;
|
border-bottom-left-radius: 5rpx;
|
||||||
}
|
}
|
||||||
@ -319,7 +319,7 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: -34rpx;
|
top: -34rpx;
|
||||||
left: -50%;
|
left: -50%;
|
||||||
color: #e84116;
|
color: #40ae36;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
@ -327,7 +327,7 @@
|
|||||||
.circle {
|
.circle {
|
||||||
width: 12rpx;
|
width: 12rpx;
|
||||||
height: 12rpx;
|
height: 12rpx;
|
||||||
border: 6rpx solid #e84116;
|
border: 6rpx solid #40ae36;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user