cmy 1 year ago
parent
commit
1e7a502503

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "神英优选",
     "appid" : "__UNI__70BC0AE",
     "description" : "神英优选商城",
-    "versionName" : "2.8.3",
-    "versionCode" : 283,
+    "versionName" : "2.8.4",
+    "versionCode" : 284,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 33 - 24
pages/users/user_address/index.vue

@@ -212,32 +212,41 @@
 			// 获取选中位置
 			chooseLocation: function() {
 				let self = this;
-				uni.chooseLocation({
-					success: (res) => {
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						this.latitude = res.latitude
-						this.longitude = res.longitude
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							const data = res.data; 
-							getCityList(data.address_component.province+'/'+data.address_component.city+'/'+data.address_component.district+'/'+(!data.address_reference.town ? '' : data.address_reference.town.title)).then(res=>{
-								self.addressInfo = res.data;
-								self.userAddress.detail = data.formatted_addresses.recommend;
-							}).catch(err => {
-								self.$util.Tips({
-									title: err
-								});
-							});
-						})
-					},
-					fail: (err)=>{
-						console.log(err)
+				uni.showModal({
+					title: "定位权限申请",
+					content: "是否允许使用系统定位功能?",
+					success(res) {
+						if (res.confirm) {
+							uni.chooseLocation({
+								success: (res) => {
+									let latitude, longitude;
+									latitude = res.latitude.toString();
+									longitude = res.longitude.toString();
+									this.latitude = res.latitude
+									this.longitude = res.longitude
+									getGeocoder({
+										lat: latitude,
+										long: longitude
+									}).then(res => {
+										const data = res.data; 
+										getCityList(data.address_component.province+'/'+data.address_component.city+'/'+data.address_component.district+'/'+(!data.address_reference.town ? '' : data.address_reference.town.title)).then(res=>{
+											self.addressInfo = res.data;
+											self.userAddress.detail = data.formatted_addresses.recommend;
+										}).catch(err => {
+											self.$util.Tips({
+												title: err
+											});
+										});
+									})
+								},
+								fail: (err)=>{
+									console.log(err)
+								}
+							})
+						}
 					}
 				})
+				
 			},
 			// 自动定位
 			selfLocation() {

+ 16 - 8
pages/users/user_cash/index.vue

@@ -257,15 +257,23 @@
 			 */
 			uploadpic: function(type) {
 				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					if (type === 'W') {
-						that.qrcodeUrlW = res.data.url;
-					} else if(type=="Z"){
-						that.qrcodeUrlZ = res.data.url;
-					}else if(type=="P"){
-						that.qrcodeUrPZ = res.data.url;
+				uni.showModal({
+					title: "相机权限申请",
+					content: "是否允许访问相机及存储空间用于上传凭证?",
+					success(res) {
+						if (res.confirm) {
+							that.$util.uploadImageOne('upload/image', function(res) {
+								if (type === 'W') {
+									that.qrcodeUrlW = res.data.url;
+								} else if(type=="Z"){
+									that.qrcodeUrlZ = res.data.url;
+								}else if(type=="P"){
+									that.qrcodeUrPZ = res.data.url;
+								}
+							});
+						}
 					}
-				});
+				})
 			},
 			/**
 			 * 删除图片

+ 8 - 8
pages/users/user_integral/integral.vue

@@ -3,9 +3,9 @@
 	<view>
 		<view class='integral-details' :style="colorStyle">
 			<view class='header'>
-				<view class='currentScore'>总资金</view>
-				<view class="scoreNum">{{userInfo.award_lack}}</view>
-				<view class='line'></view>
+				<!-- <view class='currentScore'>总资金</view>
+				<view class="scoreNum">{{userInfo.award_lack}}</view> -->
+				<!-- <view class='line'></view> -->
 				<view class='nav acea-row'>
 					<view class='item'>
 						<view class='num'>{{userInfo.action_integral}}</view>
@@ -15,10 +15,10 @@
 						<view class='num'>{{userInfo.static_integral}}</view>
 						<view>消费分</view>
 					</view>
-					<view class='item'>
+					<!-- <view class='item'>
 						<view class='num'>{{userInfo.integral_price}}</view>
 						<view>参考值</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class='wrapper'>
@@ -277,9 +277,9 @@
 				font-size: 22rpx;
 				color: rgba(255, 255, 255, 0.8);
 				flex: 1;
-				margin-top: 35rpx;
+				margin-top: 94rpx;s
 				.item {
-					width: 33.33%;
+					width: 50%;
 					text-align: center;
 					.num {
 						color: #fff;
@@ -344,7 +344,7 @@
 					}
 				}
 				.item {
-					height: 124rpx;
+					min-height: 124rpx;
 					border-bottom: 1rpx solid #eee;
 					font-size: 24rpx;
 					color: #999;