8-15-2

manifest.json

@@ -105,7 +105,8 @@
             "scope.userLocation" : {
                 "desc" : "需要根据你的定位来给你推送最近的门店"
             }
-        }
+        },
+        "requiredPrivateInfos" : [ "getLocation" ]
     },
     "h5" : {
         "title" : "想亮商城",

pages/money/withdrawal.vue

@@ -176,15 +176,6 @@
 					money: this.withdrawal, //金额
 					money_type: 0 //0佣金1余额
 				};
-				if (this.withdrawal % 10 != 0) {
-					uni.showToast({
-						title: '提现金额为10的倍数',
-						duration: 2000,
-						mask: false,
-						icon: 'none'
-					});
-					return;
-				}
 				if (this.withdrawal < this.minPrice) {
 					uni.showToast({
 						title: '提现金额不可少于' + this.minPrice,

pages/order/createOrder.vue

@@ -5,7 +5,7 @@
 		</view> -->
 
 		<!-- 地址 -->
-		<navigator v-if="tabCurrentIndex == 0" url="/pages/set/address?source=1" class="address-section">
+		<!-- <navigator v-if="tabCurrentIndex == 0" url="/pages/set/address?source=1" class="address-section">
 			<view class="order-content" v-if="addressData.real_name">
 				<text class="iconfont iconlocation"></text>
 				<view class="cen">
@@ -26,7 +26,7 @@
 			</view>
 
 			<image class="a-bg" :src="addressImg"></image>
-		</navigator>
+		</navigator> -->
 		<navigator v-if="tabCurrentIndex == 1" url="/pages/shoping/list?type=4" class="address-section">
 			<view class="order-content" v-if="shopAddress.name">
 				<text class="iconfont iconlocation"></text>
@@ -74,7 +74,7 @@
 		</view>
 
 		<!-- 优惠明细 -->
-		<view class="yt-list">
+		<!-- <view class="yt-list">
 			<view class="yt-list-cell b-b" @click="couponListshow ? toggleMask('show') : ''">
 				<view class="cell-icon">券</view>
 				<text class="cell-tit clamp">优惠券</text>
@@ -83,12 +83,7 @@
 				<text class="cell-tip disabled" v-if="!couponListshow && !couponChecked.coupon_price">暂时没有优惠券</text>
 				<text class="cell-more wanjia wanjia-gengduo-d"></text>
 			</view>
-			<!-- <view class="yt-list-cell b-b" v-if="moneyAll.storeFreePostage > 0">
-				<view class="cell-icon hb">减</view>
-				<text class="cell-tit clamp">商家促销</text>
-				<text class="cell-tip disabled">满{{ moneyAll.storeFreePostage }}包邮</text>
-			</view> -->
-		</view>
+		</view> -->
 		<!-- 金额明细 -->
 		<view class="yt-list">
 			<!-- <view class="yt-list-cell b-b">
@@ -400,10 +395,10 @@
 					this.$api.msg('积分商品只可单件购买');
 					return false;
 				}
-				if (!this.addressData.real_name && this.tabCurrentIndex == 0) {
-					this.$api.msg('请选择收货地址');
-					return false;
-				}
+				// if (!this.addressData.real_name && this.tabCurrentIndex == 0) {
+				// 	this.$api.msg('请选择收货地址');
+				// 	return false;
+				// }
 				if (obj.tabCurrentIndex === 1) {
 					if (!obj.pickUpInfo.real_name) {
 						obj.$api.msg('请填写用户名');

pages/order/orderDetail.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="content">
-		<view class="row b-b b-t">
+		<!-- <view class="row b-b b-t">
 			<text class="order-status"
 				@click="item.delivery_type == 'express'?towuliu(item):''">{{ item._status ? item._status._msg : '' }}</text>
-		</view>
+		</view> -->
 		<!-- 快递信息 -->
 		<view class="express-box" @click="expressCheck(item)" v-if="item.delivery_id != null ">
 			<view v-if='item.delivery_id != null' style="width: 100%;padding: 10rpx 20rpx;background: #FFFFFF;">

pages/user/award.vue

@@ -48,7 +48,7 @@
 						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
 							<view class="title-box">
 								<view class="title">
-									<text>{{ item.title }}</text>
+									<text>{{ item.mark }}</text>
 								</view>
 								<view class="time">
 									<text>{{ item.add_time }}</text>

pages/user/hxjl.vue

@@ -8,10 +8,10 @@
 				<view class="hx-status">已核销</view>
 			</view>
 			<view class="hx-info flex">
-				<view class="user-logo"><image src="../../static/error/missing-face.png" mode=""></image></view>
+				<view class="user-logo"><image :src="item.avatar" mode=""></image></view>
 				<view class="user-info">
 					<view class="info-name clamp">{{ item.nickname }}</view>
-					<!-- <view class="info-phone">137****5213</view> -->
+					<view class="info-phone clamp">{{item.coupon_title}}</view>
 					<view class="info-info">实付:￥{{ item.coupon_price }} 数量:1</view>
 				</view>
 			</view>

pages/user/user.vue

@@ -263,11 +263,7 @@
 			};
 		},
 		onShow() {
-			console.log(this.$store.state.baseURL + '/static/image/user-top.png')
 			// 判断是否已经登录
-			if (this.hasLogin) {
-				this.loadBaseData();
-			}
 			this.loadBaseData();
 		},
 		onReady() {

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>想亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.147ed2bc.js></script><script src=/index/static/js/index.30b5cf40.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.147ed2bc.js></script><script src=/index/static/js/index.96ec032b.js></script></body></html>

unpackage/dist/build/mp-weixin/app.json

@@ -89,6 +89,9 @@
             "desc": "需要根据你的定位来给你推送最近的门店"
         }
     },
+    "requiredPrivateInfos": [
+        "getLocation"
+    ],
     "usingComponents": {},
     "sitemapLocation": "sitemap.json"
 }

unpackage/dist/build/mp-weixin/pages/user/hxjl.wxml

@@ -1 +1 @@
-<view class="content"><view style="height:20rpx;"></view><block wx:if="{{list.length===0}}"><empty vue-id="93a3388e-1" bind:__l="__l"></empty></block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__"><view class="hx-wrap"><view class="hx-tit flex"><view class="hx-time">{{"核销时间:"+item.add_time}}</view><view class="hx-status">已核销</view></view><view class="hx-info flex"><view class="user-logo"><image src="../../static/error/missing-face.png" mode></image></view><view class="user-info"><view class="info-name clamp">{{item.nickname}}</view><view class="info-info">{{"实付:￥"+item.coupon_price+" 数量:1"}}</view></view></view></view></block><uni-load-more vue-id="93a3388e-2" status="{{loadingType}}" bind:__l="__l"></uni-load-more><view style="height:3rpx;"></view></view>
+<view class="content"><view style="height:20rpx;"></view><block wx:if="{{list.length===0}}"><empty vue-id="93a3388e-1" bind:__l="__l"></empty></block><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__"><view class="hx-wrap"><view class="hx-tit flex"><view class="hx-time">{{"核销时间:"+item.add_time}}</view><view class="hx-status">已核销</view></view><view class="hx-info flex"><view class="user-logo"><image src="{{item.avatar}}" mode></image></view><view class="user-info"><view class="info-name clamp">{{item.nickname}}</view><view class="info-phone clamp">{{item.coupon_title}}</view><view class="info-info">{{"实付:￥"+item.coupon_price+" 数量:1"}}</view></view></view></view></block><uni-load-more vue-id="93a3388e-2" status="{{loadingType}}" bind:__l="__l"></uni-load-more><view style="height:3rpx;"></view></view>

unpackage/dist/build/mp-weixin/project.config.json

@@ -31,8 +31,7 @@
             "outputPath": ""
         },
         "disableUseStrict": false,
-        "useCompilerPlugins": false,
-        "minifyWXML": true
+        "useCompilerPlugins": false
     },
     "compileType": "miniprogram",
     "libVersion": "2.24.4",