1

components/Authorize.vue

@@ -2,9 +2,9 @@
 	<view>
 		<view class='mask' v-if='isShowAuth && code' @click='close'></view>
 		<view class='Popup' v-if='isShowAuth && code' :style="'top:'+top+'px;'">
-			<view class="logo-auth">
+			<!-- <view class="logo-auth">
 				<image class="image" :src='routine_logo' mode="aspectFit"></image>
-			</view>
+			</view> -->
 			<!--#ifdef H5-->
 			<text v-if="isWeixin" class='title'>授权提醒</text>
 			<text v-else class='title'>{{title}}</text>
@@ -25,6 +25,10 @@
 			<!--#ifdef MP-->
 			<text class='tip'>{{info}}</text>
 			<!--#endif-->
+			<checkbox-group class="checkgroup" @change='isAgree=!isAgree' style="padding: 0 12px;margin-top: 20px;font-size:12px;text-align: center;">
+				<checkbox class="checkbox" :checked="isAgree ? true : false" />
+				<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
+			</checkbox-group>
 			<view class='bottom flex'>
 				<text class='item' @click='close'>随便逛逛</text>
 				<!-- #ifdef MP -->
@@ -96,6 +100,7 @@
 		},
 		data() {
 			return {
+				isAgree: false,
 				title: '用户登录',
 				info: '请登录，将为您提供更好的服务！',
 				//#ifdef H5
@@ -134,6 +139,16 @@
 			this.getCode(this.isShowAuth)
 		},
 		methods: {
+			userAgree(){
+				uni.navigateTo({
+					url: '/pages/users/user_about/index?from=sys_user_agree'
+				})
+			},
+			userPrivacyAgree(){
+				uni.navigateTo({
+					url: '/pages/users/user_about/index?from=sys_userr_privacy'
+				})
+			},
 			// #ifdef MP
 			editSuccess() {
 				this.editModal = false
@@ -184,7 +199,13 @@
 				toLogin(true);
 			},
 			getUserProfile() {
+				
 				let self = this;
+				if (!self.isAgree){
+					return self.$util.Tips({
+						title: '请勾选用户协议与隐私政策'
+					});
+				}
 				Routine.getUserProfile()
 					.then(res => {
 						let userInfo = res.userInfo;
@@ -255,11 +276,11 @@
 		flex: 1;
 		align-items: center;
 		justify-content: center;
-		width: 500rpx;
+		width: 80%;
 		background-color: #fff;
 		position: fixed;
 		top: 500rpx;
-		left: 125rpx;
+		left: 10%;
 		z-index: 1000;
 	}
 	.Popup {
@@ -304,7 +325,7 @@
 		justify-content: center;
 	}
 	.Popup .bottom .item {
-		width: 250rpx;
+		width: 50%;
 		height: 80rpx;
 		background-color: #eeeeee;
 		text-align: center;

pages/columnGoods/goods_search_con/index.vue

@@ -1340,7 +1340,8 @@
 			position: fixed;
 			left: 0;
 			// top: 238rpx;
-			top: 434rpx;
+			top: 27%;
+			// top: 434rpx;
 			width: 100%;
 			padding: 0 40rpx 28rpx 74rpx;
 			background-color: #F8F8F8;

pages/order_details/index.vue

@@ -90,7 +90,7 @@
 					</view>
 					<view class="line2">{{orderInfo.take.mer_take_address}}</view>
 				</view>
-				<view v-if="orderInfo.take" class="take-info">
+				<!-- <view v-if="orderInfo.take" class="take-info">
 					<view class="take-msg">
 						<view class="left">
 							<view class="title">
@@ -111,7 +111,7 @@
 							</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 				<view class="merchant" v-if="orderInfo.merchant && orderInfo.order_type != 1" @click="goStore(orderInfo.mer_id)">
 					{{orderInfo.merchant.mer_name}}
 					<text class="iconfont icon-xiangyou"></text>

pages/shop/shop.vue

@@ -197,9 +197,10 @@
 				activeIndex: 0,
 			};
 		},
-		onLoad: function(options) {
+		onLoad(options) {
 			console.log(this.basePicPath)
 			this.getStoreType();
+			this.searchSubmit()
 			
 		},
 		onReady() {

pages/shop/shop1.vue

@@ -200,6 +200,7 @@
 		onLoad: function(options) {
 		
 			this.getStoreType();
+			this.searchSubmit()
 			
 		},
 		onReady() {