Merge remote-tracking branch 'origin/dev_store' into dev-plus-max

pages/shop/css/shop.css

@@ -22,6 +22,11 @@
 	display: flex;
 	align-items: center;
 }
+.content .top-tab .tab-sao{
+	font-size: 40rpx;
+	position: absolute;
+	right:28rpx;
+}
 .content .top-tab .tab-location .icon-dingwei{
 	color: blue;
 	font-size: 28rpx;

pages/shop/index.vue

@@ -7,6 +7,7 @@
 				<view class="iconfont icon-dingwei"></view>
 			</view>
 			商家联盟
+			<view class="tab-sao iconfont icon-saoma" @tap='handleBorcode'></view>
 		</view>
 		<view class="content-map" >
 			<map class="map" :latitude="22.547" :longitude="114.085947"></map>
@@ -141,6 +142,16 @@
 				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 				let curRoute = routes[routes.length - 1].route //获取当前页面路由
 				this.activeRouter = '/' + curRoute
+			handleBorcode() {
+				// 从相机和相册扫码
+				// #ifdef APP-PLUS
+				uni.scanCode({
+					scanType:['qrCode'],
+					success: function (res) {
+						console.log('二维码信息：' + res);
+					}
+				});
+				// #endif
 			},
 			selectCurrent(val){
 				this.current=val;

pages/shop_details/index.vue

@@ -90,10 +90,11 @@
 			},
 			openMap() {
 				uni.openLocation({
-					latitude: Number(this.shopInfo.latitude),
+					latitude: Number(22.541211),
-					longitude: Number(this.shopInfo.longitude),
+					longitude: Number(114.118052),
-					name: this.shopInfo.scenicName,
+					name: '深房广场',
-					address: this.shopInfo.address,
+					address: '鲜果自由，等你来哈',
+					// scale:8,
 					success: function () {
 						console.log('success');
 					},

pages/user/index.vue

@@ -120,7 +120,7 @@
 					</view>
 				</view>
 				<!-- 轮播 -->
-				<view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
+<!-- 				<view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
 					<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
 					 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
 						<block v-for="(item,index) in imgUrls" :key="index">
@@ -131,22 +131,7 @@
 							</swiper-item>
 						</block>
 					</swiper>
-				</view>
+				</view> -->
-				<!-- 会员菜单 -->
-				<view class="user-menus" style="margin-top: 20rpx;">
-					<view class="title skeleton-rect">我的服务</view>
-					<view class="menu-box">
-						<block v-for="(item,index) in personalMenu" :key="index">
-							<view v-if="item.isShow" class="item">
-								<view @click="authTo(item.url)" class="item-count">
-									<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
-									<image v-else :src="item.pic"></image>
-									<text>{{item.name}}</text>
-								</view>
-							</view>
-						</block>
-					</view>
-				</view>
 				<view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
 					<view class="item-text">
 						<view class="title">
@@ -185,6 +170,21 @@
 						<view class="image plantform-image" :style="{'background-image':`url(${domain}/static/images/plantform-image.png)`}"></view>
 					</view>
 				</view>
+				<!-- 会员菜单 -->
+				<view class="user-menus" style="margin-top: 20rpx;">
+					<view class="title skeleton-rect">我的服务</view>
+					<view class="menu-box">
+						<block v-for="(item,index) in personalMenu" :key="index">
+							<view v-if="item.isShow" class="item">
+								<view @click="authTo(item.url)" class="item-count">
+									<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
+									<image v-else :src="item.pic"></image>
+									<text>{{item.name}}</text>
+								</view>
+							</view>
+						</block>
+					</view>
+				</view>
 			</view>
 			<view v-if="copyright.status !== -1" class="copy-right">
 				<image class="img-copyright" :src="copyright.image" mode="widthFix"></image>

pages/users/order_confirm/index.vue

@@ -556,6 +556,13 @@
 						title: '线下支付',
 						payStatus: 2,
 					},
+					{
+						"name": "购物券支付",
+						"icon": "icon-yinhangqia",
+						value: 'coupon_pay',
+						title: '购物券支付',
+						payStatus: this.$store.getters.globalData.coupon_pay_open,
+					},
 				],
 				tagStyle: {
 					img: 'width:100%;display:block;',