no message

api/shopping.js

@@ -3,17 +3,9 @@ import {request} from '../service/ajax.js'
 const newsUrl = '/api/shopping/'
 // 购物车 添加
 export const setShopIngAdd = (data) => request(newsUrl + 'add', 'post', { ...data },false)
-
 // 更新  购物车数量
 export const setShopIngNumber = (data) => request(newsUrl + 'number', 'post', { ...data },false)
 
-
-
-
-
-
-
-
 // 清空 购物车
 export const setShopIngDel = (data) => request(newsUrl + 'del', 'post', { ...data },false)
 

common/css/common.css

@@ -8,11 +8,6 @@ text {
 	color: #333;
 }
 
-image {
-	display: block;
-}
-
-
 /* 隐藏scroll-view 滚动条 */
 ::-webkit-scrollbar {
 	display: none;
@@ -146,6 +141,11 @@ image {
 	align-items: flex-start;
 }
 
+.align-self-flex-end {
+	display: flex;
+	align-self: flex-end;
+}
+
 .flex-wrap-wrap {
 	display: flex;
 	flex-wrap: wrap;
@@ -256,9 +256,11 @@ image {
 .fs-64 {
 	font-size: 64rpx;
 }
-.fs-52{
+
+.fs-52 {
 	font-size: 52rpx
 }
+
 /* 字体下面横线 */
 .text-underline {
 	text-decoration: underline;
@@ -353,9 +355,11 @@ image {
 .fc-96ECFB {
 	color: #96ECFB;
 }
+
 .fc-4495FD {
 	color: #4495FD;
 }
+
 .fc-FD5D05 {
 	color: #FD5D05;
 }
@@ -363,21 +367,27 @@ image {
 .fc-FF6320 {
 	color: #FF6320;
 }
+
 .fc-FB4845 {
 	color: #FB4845;
 }
+
 .fc-FB3D03 {
 	color: #ff3422;
 }
+
 .fc-F6ABAC {
 	color: #F6ABAC;
 }
+
 .fc-ff3939 {
 	color: #ff3939;
 }
+
 .fc-FC4642 {
 	color: #FC4642;
 }
+
 .fc-F93435 {
 	color: #F93435;
 }
@@ -448,12 +458,18 @@ image {
 	background-color: #333;
 }
 
+.bgc-3-6 {
+	background-color: rgba(51, 51, 51, .6);
+}
+
 .bgc-9 {
 	background-color: #999;
 }
+
 .bgc-D9D9D9 {
 	background-color: #D9D9D9;
 }
+
 .bgc-4FB3EF {
 	background-color: #4FB3EF;
 }
@@ -525,27 +541,35 @@ image {
 .bgc-46D1C2 {
 	background-color: #46D1C2;
 }
+
 .bgc-EDF6FF {
 	background-color: #EDF6FF;
 }
+
 .bgc-FD492D {
 	background-color: #FD492D;
 }
+
 .bgc-FF3E5D {
 	background-color: #FF3E5D;
 }
+
 .bgc-EB5127 {
 	background-color: #EB5127;
 }
+
 .bgc-FCEDED {
 	background-color: #FCEDED;
 }
+
 .bgc-FAE5E2 {
 	background-color: #FAE5E2;
 }
+
 .bgc-F5811E {
 	background-color: #F5811E;
 }
+
 .bgc-FFD977 {
 	background-color: #FFD977;
 }
@@ -553,6 +577,7 @@ image {
 .bgc-FDF3EC {
 	background-color: #FDF3EC;
 }
+
 .bgc-16BB5D {
 	background-color: #16BB5D;
 }
@@ -569,9 +594,11 @@ image {
 .bgc-D5EDFB {
 	background-color: #D5EDFB;
 }
+
 .b-t-F9F9F9 {
 	border-top: 1rpx solid #F9F9F9;
 }
+
 .b-b-F9F9F9 {
 	border-bottom: 1rpx solid #F9F9F9;
 }
@@ -587,9 +614,11 @@ image {
 .b-b-EAEAEC {
 	border-bottom: 1rpx solid #EAEAEC;
 }
+
 .b-b-EDEDF1 {
 	border-bottom: 1rpx solid #EDEDF1;
 }
+
 .b-r-ccc {
 	border: 1rpx solid #ccc;
 }
@@ -612,6 +641,14 @@ image {
 	border-radius: 20rpx;
 }
 
+.b-rad-24 {
+	border-radius: 24rpx;
+}
+
+.b-rad-20-20-0-0 {
+	border-radius: 20rpx 20rpx 0 0;
+}
+
 .b-rad-200 {
 	border-radius: 200rpx;
 }
@@ -664,9 +701,11 @@ image {
 .p-t-20 {
 	padding-top: 20rpx;
 }
+
 .pt-15 {
 	padding-top: 15rpx;
 }
+
 .pt-33 {
 	padding-top: 33rpx;
 }
@@ -698,9 +737,11 @@ image {
 .plr-12 {
 	padding: 0 12rpx;
 }
+
 .plr-10 {
 	padding: 0 10rpx;
 }
+
 .plr-24 {
 	padding: 0 24rpx;
 }
@@ -709,6 +750,18 @@ image {
 	padding: 12rpx 30rpx;
 }
 
+.p-40-32 {
+	padding: 40rpx 32rpx;
+}
+
+.p-20-32 {
+	padding: 20rpx 32rpx;
+}
+
+.p-40-32-16 {
+	padding: 40rpx 32rpx 16rpx;
+}
+
 .plr-30 {
 	padding: 0 30rpx;
 }
@@ -716,18 +769,22 @@ image {
 .plr-32 {
 	padding: 0 32rpx;
 }
+
 .ptb-15 {
 	padding: 15rpx 0;
 }
+
+.ptb-22 {
+	padding: 22rpx 0;
+}
+
 .ptb-24 {
 	padding: 24rpx 0;
 }
+
 .ptb-30 {
 	padding: 30rpx 0;
 }
-.ptp-24 {
-	padding: 24rpx 0;
-}
 
 .p-12-24 {
 	padding: 12rpx 24rpx;
@@ -782,9 +839,11 @@ image {
 .ml-2 {
 	margin-left: 2rpx;
 }
+
 .ml-8 {
 	margin-left: 8rpx;
 }
+
 .ml-10 {
 	margin-left: 10rpx;
 }
@@ -852,6 +911,7 @@ image {
 .mr-46 {
 	margin-right: 46rpx;
 }
+
 .mr-50 {
 	margin-right: 50rpx;
 }
@@ -963,4 +1023,8 @@ image {
 
 .b-F5541E {
 	border: 1rpx solid #F5541E;
+}
+
+.b-FFD7CC {
+	border: 2rpx solid #FFD7CC;
 }

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "君子校园",
+    "name" : "振合点餐",
     "appid" : "__UNI__D6BA648",
     "description" : "",
     "versionName" : "1.0.1",

pages-buy/dry-clean.vue

@@ -174,11 +174,11 @@
 			}
 		},
 		onShow() {
-			uni.$once('stationData', data => {
-				this.siteData = data
-			})
-			this.getText();
-			this.getCardList();
+			// uni.$once('stationData', data => {
+			// 	this.siteData = data
+			// })
+			// this.getText();
+			// this.getCardList();
 		},
 		methods: {
 			cardAllDel() {

pages-buy/dry-mod/menu.vue

@@ -85,8 +85,7 @@
 			}
 		},
 		mounted() {
-
-			this.getTypeList();
+			// this.getTypeList();
 		},
 		methods: {
 

pages-buy/save-dry.vue

@@ -135,12 +135,12 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e, '//////////////////////');
-			this.fromData.site_id = e.id;
-			this.siteData_logo = e.siteData_logo
-			this.siteData_name = e.siteData_name
-			this.delivery_money = e.delivery_money
-			this.getCardList();
+			// console.log(e, '//////////////////////');
+			// this.fromData.site_id = e.id;
+			// this.siteData_logo = e.siteData_logo
+			// this.siteData_name = e.siteData_name
+			// this.delivery_money = e.delivery_money
+			// this.getCardList();
 		},
 		methods: {
 			getCardList() {

pages-takeout/confirm-order.vue

@@ -149,19 +149,19 @@
 			}
 		},
 		onLoad(e) {
-			this.type = Number(e.type)
-			if (this.type == 2) {
-				this.fromData.pickup_code = e.pickup_code.split(',').map(String)
-				this.getCard();
-			}
-			this.getAddressDefault();
+			// this.type = Number(e.type)
+			// if (this.type == 2) {
+			// 	this.fromData.pickup_code = e.pickup_code.split(',').map(String)
+			// 	this.getCard();
+			// }
+			// this.getAddressDefault();
 		},
 		onShow() {
-			let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
-			if (isConfirmAddressFlag.flag) {
-				this.selectFun(2, isConfirmAddressFlag);
-			}
-			this.getExpressCoupon()
+			// let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
+			// if (isConfirmAddressFlag.flag) {
+			// 	this.selectFun(2, isConfirmAddressFlag);
+			// }
+			// this.getExpressCoupon()
 		},
 		onUnload() {
 			uni.removeStorageSync('isConfirmAddressFlag')

pages-takeout/goods-order.vue

@@ -190,20 +190,20 @@
 			}
 		},
 		onLoad(e) {
-			if (e) {
-				this.fromData.shop_id = e.shop_id
-				this.getCard(e.shop_id)
-				// this.getDeliveryMoney(e.shop_id)
-			}
-			this.getAddressDefault();
+			// if (e) {
+			// 	this.fromData.shop_id = e.shop_id
+			// 	this.getCard(e.shop_id)
+			// 	// this.getDeliveryMoney(e.shop_id)
+			// }
+			// this.getAddressDefault();
 		},
 		onShow() {
-			let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
-			console.log("支付完后走了咩", isConfirmAddressFlag);
-			if (isConfirmAddressFlag.flag) {
-				this.selectFun(2, isConfirmAddressFlag);
-			}
-			this.shopOrderCoupon()
+			// let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
+			// console.log("支付完后走了咩", isConfirmAddressFlag);
+			// if (isConfirmAddressFlag.flag) {
+			// 	this.selectFun(2, isConfirmAddressFlag);
+			// }
+			// this.shopOrderCoupon()
 		},
 		onUnload() {
 			uni.removeStorageSync('isConfirmAddressFlag')

pages-takeout/replace-take.vue

@@ -200,21 +200,21 @@
 			}
 		},
 		onShow() {
-			this.list = [];
-			// this.pickup_code = [];
-			this.cardData = {
-					goods_list: [],
-					total_num: 0,
-					total_price: 0,
-				},
-				this.schoolData.school_id = uni.getStorageSync('school_id');
-			this.schoolData.school_name = uni.getStorageSync('school_name');
-			this.addressData.site_id = uni.getStorageSync('site_id');
-			this.addressData.site_name = uni.getStorageSync('site_name');
-			this.addressData.site_address = uni.getStorageSync('site_address');
-			this.addressData.site_logo = uni.getStorageSync('site_logo');
-			this.isInitial = true;
-			this.getList();
+			// this.list = [];
+			// // this.pickup_code = [];
+			// this.cardData = {
+			// 		goods_list: [],
+			// 		total_num: 0,
+			// 		total_price: 0,
+			// 	},
+			// 	this.schoolData.school_id = uni.getStorageSync('school_id');
+			// this.schoolData.school_name = uni.getStorageSync('school_name');
+			// this.addressData.site_id = uni.getStorageSync('site_id');
+			// this.addressData.site_name = uni.getStorageSync('site_name');
+			// this.addressData.site_address = uni.getStorageSync('site_address');
+			// this.addressData.site_logo = uni.getStorageSync('site_logo');
+			// this.isInitial = true;
+			// this.getList();
 		},
 		methods: {
 			scroll(e) {

pages-takeout/shop-mod/menu.vue

@@ -197,14 +197,14 @@
 			}
 		},
 		watch: {
-			'shop_id': function() {
-				this.getShopGoods();
-			}
+			// 'shop_id': function() {
+			// 	this.getShopGoods();
+			// }
 		},
 		mounted() {
-			this.operate_id = uni.getStorageSync('operate_id')
-			this.getShopGoods();
-			this.getShopIngList(true);
+			// this.operate_id = uni.getStorageSync('operate_id')
+			// this.getShopGoods();
+			// this.getShopIngList(true);
 		},
 		methods: {
 			setSpecNum(type) {

pages-takeout/shop.vue

@@ -256,28 +256,28 @@
 			}
 		},
 		onShow() {
-			this.getShopIngList()
+			// this.getShopIngList()
 		},
 		onLoad(e) {
-			if (e) {
-				console.log(e, '^^^^^^^');
-				this.shop_id = e.shop_id
-				this.operate_id = uni.getStorageSync('operate_id')
-				const item = {
-					type: Number(e.category_id)
-				}
-				const goodsId = {
-					goodsId: Number(e.goods_id)
-				}
-				console.log(item, goodsId, '00000000000');
-				uni.setStorageSync('category_id', item)
-				uni.setStorageSync('goods_id', goodsId)
-				this.shopInfo()
-			}
+			// if (e) {
+			// 	console.log(e, '^^^^^^^');
+			// 	this.shop_id = e.shop_id
+			// 	this.operate_id = uni.getStorageSync('operate_id')
+			// 	const item = {
+			// 		type: Number(e.category_id)
+			// 	}
+			// 	const goodsId = {
+			// 		goodsId: Number(e.goods_id)
+			// 	}
+			// 	console.log(item, goodsId, '00000000000');
+			// 	uni.setStorageSync('category_id', item)
+			// 	uni.setStorageSync('goods_id', goodsId)
+			// 	this.shopInfo()
+			// }
 		},
 		mounted() {
 			// this.getDomH();
-			this.shopCoupon()
+			// this.shopCoupon()
 		},
 		methods: {
 			mustBut() {

pages.json

@@ -1,43 +1,8 @@
 {
-	"tabBar": {
-		"backgroundColor": "#fff",
-		"selectedColor": "#3BB5FE",
-		"color": "#000",
-		"borderStyle": "white",
-		"fontSize": "20rpx",
-		"iconWidth": "48rpx",
-		"height": "48rpx",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/img/tabBar/business.png",
-				"selectedIconPath": "static/img/tabBar/business-highlight.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/order/index",
-				"iconPath": "static/img/tabBar/home.png",
-				"selectedIconPath": "static/img/tabBar/home-highlight.png",
-				"text": "订单"
-			},
-			{
-				"pagePath": "pages/chat/index",
-				"iconPath": "static/img/tabBar/ai.png",
-				"selectedIconPath": "static/img/tabBar/ai-highlight.png",
-				"text": "Al助手"
-			},
-			{
-				"pagePath": "pages/me/index",
-				"iconPath": "static/img/tabBar/my.png",
-				"selectedIconPath": "static/img/tabBar/my-highlight.png",
-				"text": "我"
-			}
-		]
-	},
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "首页"
 			}
 		}, {
 			"path": "pages/login/index",

pages/index/index.vue

@@ -1,1536 +1,71 @@
 <template>
-	<view class="index-box">
-		<!-- <image class="bg-img" src="@/static/img/index/index-bg.png" mode="scaleToFill"></image> -->
-		<view class="nav-z">
-			<Nav class="" :leftShow='false' :customNav='true' :bgckgroundBox='bgckgroundBox'>
-				<template>
-					<view slot="custom" class="align-items-center" @click="toSelectSchool()">
-						<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
-						<image class="wh-40" src="@/static/img/index/dw.png" mode=""></image>
-						<view class="fs-32 maxw-220 fw-600 ml-10 text-overflow-ellipsis-one">
-							{{schoolData.school_name||''}}
-						</view>
-						<image class="nav-icon ml-10" src="@/static/img/index/index-right.png" mode="aspectFit"></image>
-					</view>
-				</template>
-			</Nav>
-		</view>
-		<!-- 搜索 -->
-		<view class="index-search box-border-box mt-20" @click="toUrl(1)"
-			:style="[{'top': BarH + 'px','background':bgckgroundSearch}]">
-			<view class="index-search-box box-border-box align-items-center bgc-f">
-				<image class="wh27" src="@/static/img/index/ss.png" mode=""></image>
-				<view class="fs-24 fc-a ml-10">搜索店铺名称或商品名称</view>
-				<view class="fs-28 fc-f index-search-box-buttom">搜索</view>
-			</view>
-		</view>
-		<view class="index-box-1">
-			<!-- 轮播 -->
-			<view class="box-border-box plr-24 mb-32">
-				<uni-swiper-dot :info="bannerList" mode="dot" :dotsStyles="dotStyle" :current="current">
-					<swiper class="swiper" @change="change" :autoplay='true' :circular='true' interval="4000">
-						<swiper-item v-for="(item,i) in bannerList" :key="i">
-							<image class="swiper-item" :src="item.image" mode="" @click="bannerClock(item)">
-							</image>
-						</swiper-item>
-					</swiper>
-				</uni-swiper-dot>
-			</view>
-			<!-- 导航 -->
-			<view class="box-border-box mb-22 plr-24">
-				<view class="nav-list align-items-flex-end flex-wrap-wrap box-border-box pt-33 bgc-f b-rad-20">
-					<view class="nav-list-item" v-for="(item,i) in navList" :key="i" @click="toUrl(item.type)"
-						v-show="item.appletAudit == 0">
-						<button v-if="item.type === 9" class="item-box-button" :plain="true" open-type="contact"
-							:bindcontact="handleContact"></button>
-						<view class="flex-direction align-items-center title-img-box">
-							<image class="title-img mb-16" :src="item.img" mode="scaleToFill"></image>
-							<view class="fs-24 fc-0 text-align-center">{{item.name}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 通知 -->
-			<view class="box-border-box plrb-24">
-				<view class="msg-box align-items-center box-border-box">
-					<image class="rb-bg" src="@/static/img/index/rb-bg.png" mode=""></image>
-					<image @click="toUrl(7)" class="xyrb-img mr-30 z-2" src="@/static/img/index/xyrb.png" mode="">
-					</image>
-					<view class="flex-direction flex-justify-space z-2 h-100">
-						<view class="align-items-center" v-for="(item,i) in noticeList" :key="i"
-							@click="toNoticeDet(item)">
-							<view class="serial-num mr-10 fs-18 fc-f text-align-center"
-								:class="i + 1 === 1?'bgc-F5541E':i + 1 === 2?'bgc-FF5555':'bgc-4db8ff'">
-								{{ i + 1}}
-							</view>
-							<view class="fs-24 fc-0 text-overflow-ellipsis-one max-w-358">
-								{{item.content}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 明星店铺 -->
-			<view class="plr-30 box-border-box mb-20 align-items-center flex-justify-space">
-				<view class="flex-1 mr-20 b-rad-20 mxdq-box box-border-box">
-					<image class="tj-bg" src="@/static/img/index/tj-bg.png" mode=""></image>
-					<image class="mxdp mb-24 z-2" src="@/static/img/index/mxdp.png" mode=""></image>
-					<view class="align-items-center flex-wrap-wrap z-2">
-						<image v-for="(item,index) in shopHomeData" class="tj-item mr-12 mb-12 b-rad-12"
-							:src="item.shop_logo" mode="" @click="toShop(item)"></image>
-					</view>
-				</view>
-				<image class="xzkn-img" src="@/static/img/index/xzkn.png" mode="" @click="toUrl(4)"></image>
-			</view>
-			<!-- 限时秒杀 -->
-			<view class="spike-box box-border-box mb-20" v-if="seckillGoodsList.length > 0">
-				<view class="xsms-box box-border-box">
-					<image class="tj-bg" src="@/static/img/index/tj-bg.png" mode=""></image>
-					<view class="align-items-center flex-justify-space z-2 mb-26 pr-24 box-border-box">
-						<image class="xsms-img" src="@/static/img/index/xsms.png" mode=""></image>
-						<view class="align-items-center" @click="goAllSeckill">
-							<view class="fs-24 fc-9 mr-6">
-								更多
-							</view>
-							<uni-icons type="right" size="17" color="#999"></uni-icons>
-						</view>
-					</view>
-					<swiper class="ms-swiper" circular :indicator-dots="false" :autoplay="true">
-						<swiper-item>
-							<view class="flex-wrap-wrap">
-								<view class="w-31 mr-14 mb-32" v-for="(item,index) in seckillGoodsList" :key="index"
-									@click="toShop(item)" v-show="index + 1 < 7">
-									<view class="" v-if="index + 1 < 7">
-										<image class="xsms-item-img mb-18 b-rad-12" :src="item.goods_image"
-											mode="aspectFill"></image>
-										<view class="max-w-200 fs-24 fc-0 text-overflow-ellipsis-one">
-											{{item.goods_name}}
-										</view>
-										<view class="display-flex flex-justify-space">
-											<view class="align-items-center">
-												<view class="fs-24 fc-F43D04 mr-8">
-													￥ <text class="fs-28 fc-F43D04">{{item.seckill_money}}</text>
-												</view>
-												<view class="fs-20 fc-a text-line-through">
-													￥{{item.line_price}}
-												</view>
-											</view>
-											<image class="b-img" src="@/static/img/index/b.png" mode=""></image>
-										</view>
-									</view>
-								</view>
-							</view>
-						</swiper-item>
-						<swiper-item>
-							<view class="flex-wrap-wrap">
-								<view class="w-31 mr-14 mb-32" v-for="(item,index) in seckillGoodsList" :key="index"
-									@click="toShop(item)" v-show="index + 1 > 6">
-									<view class="" v-if="index + 1 > 6">
-										<image class="xsms-item-img mb-18 b-rad-12" :src="item.goods_image"
-											mode="aspectFill"></image>
-										<view class="max-w-200 fs-24 fc-0 text-overflow-ellipsis-one">
-											{{item.goods_name}}
-										</view>
-										<view class="display-flex flex-justify-space">
-											<view class="align-items-center">
-												<view class="fs-24 fc-F43D04 mr-8">
-													￥ <text class="fs-28 fc-F43D04">{{item.seckill_money}}</text>
-												</view>
-												<view class="fs-20 fc-a text-line-through">
-													￥{{item.line_price}}
-												</view>
-											</view>
-											<image class="b-img" src="@/static/img/index/b.png" mode=""></image>
-										</view>
-									</view>
-								</view>
-							</view>
-						</swiper-item>
-					</swiper>
-				</view>
-			</view>
-			<!-- 全网最低/优质团购 -->
-			<view class="spike-box box-border-box b-rad-20" v-if="group_goods_List.length > 0">
-				<view class="yztg-box p-30 box-border-box">
-					<image class="tj-bg" src="@/static/img/index/tj-bg.png" mode=""></image>
-					<image class="qwzd-img z-2" src="@/static/img/index/qwzd.png" mode=""></image>
-					<view class="z-2 ptp-24 b-b-F0 align-items-center flex-justify-space mb-12"
-						v-for="(item,index) in group_goods_List" :key="index" @click="goGroup(item)">
-						<view class="align-items-center">
-							<image v-show="index === 0" class="pm-img mr-20" src="@/static/img/index/1.png" mode="">
-							</image>
-							<image v-show="index === 1" class="pm-img mr-20" src="@/static/img/index/2.png" mode="">
-							</image>
-							<image v-show="index === 2" class="pm-img mr-20" src="@/static/img/index/3.png" mode="">
-							</image>
-							<view class="zk-box text-align-center mr-10">
-								<image class="zk-img" src="@/static/img/index/zk-img.png" mode=""></image>
-								<view class="fs-20 fc-f z-2">
-									{{((Number(item.seckill_money)/Number(item.line_price))*10).toFixed(1)}}折
-								</view>
-							</view>
-							<view class="fs-24 fc-0 max-w-252 text-overflow-ellipsis-one">
-								{{item.title}}
-							</view>
-						</view>
-						<view class="align-items-center">
-							<view class="fs-24 fc-F43D04 fw-b mr-10">
-								￥ <text class="fs-28 fc-F43D04 fw-b">{{item.seckill_money}}</text>
-							</view>
-							<view class="fs-20 fc-a text-line-through">
-								￥{{item.line_price}}
-							</view>
-						</view>
-					</view>
-					<view class="text-align-center fs-24 fc-9 z-2" @click="goTogrup">
-						查看更多
-					</view>
-				</view>
-			</view>
-			<!-- 类型选择 -->
-			<view class="type-list-box box-border-box display-flex"
-				:style="{'top': (BarH+indexSearchHeight) + 'px','background':bgckgroundType}">
-				<view class="type-item-box view-nowrap" v-for="(item,i) in typeList" :key="i"
-					@click="selectType(item.id)">
-					<view class="" :class="category_id==item.id?'fs-32 fc-3BB5FE fw-b':'fc-94969A fs-28'">
-						{{item.name}}
-					</view>
-					<view class="type-list-hr" v-show="category_id==item.id"></view>
-				</view>
-			</view>
-			<!-- 商品列表 -->
-			<view class="" v-if="goodsList.length<=0">
-				<enBlankVue></enBlankVue>
-			</view>
-			<view class="bot-list-box box-border-box" v-else>
-				<view class="goos-list-box box-border-box" v-for="(item,i) in goodsList" :key="i" @click="toShop(item)">
-					<view class="display-flex p-b-20 mb-26 b-b-EFF2F5">
-						<view class="left-img-box mr-24">
-							<image class="left-img" :src="item.shop_logo" mode="aspectFill"></image>
-							<view class="status-box fc-f" v-if="item.status != 1">
-								休息中
-							</view>
-						</view>
-						<view class="flex-1">
+	<view class="flex-common-css">
+		<Nav :leftShow='false' :customNav='true' title="" bgckgroundBox='#EF1F0C'></Nav>
+		<view class="flex-1 flex-direction iPhone-bottom box-border-box">
+			<image class="qd-bg" src="@/static/img/order-food/qd-bg.png" mode=""></image>
+			<view class="order-food-box p-0-32 box-border-box">
+				<view class="order-food p-32 box-border-box bgc-f b-rad-24" @click="goToUrl(1)">
+					<view class="b-FFD7CC bc-FFEDE9-FFF1EE b-rad-24 p-20-32 box-border-box align-items-center flex-justify-space">
+						<view class="flex-direction">
 							<view class="align-items-center mb-8">
-								<view class="right-box-title fs-28 fw-b text-overflow-ellipsis-one">{{item.shop_name}}
+								<view class="fs-36 fc-3 fw-600">
+									堂食扫码点餐
 								</view>
-								<image class="right-box-title-img" src="@/static/img/toRight.png" mode=""></image>
+								<image class="right-h" src="@/static/img/order-food/right-h.png" mode=""></image>
 							</view>
-							<view class="align-items-center mb-12">
-								<image class="img-x mr-8" src="@/static/img/index/index-x.png" mode=""></image>
-								<view class="fs-24 fw-600 fc-FD5D05 mr-18">{{item.shop_score}}</view>
-								<view class="fc-0 fs-24 mr-12">预计{{item.delivery_time}}分钟 | </view>
-								<view class="fc-0  fs-24 mr-12">{{item.shop_sales}}人购买</view>
-							</view>
-							<view class="align-items-center flex-wrap-wrap">
-								<view class="quan-list b-F5541E box-border-box bgc-f align-items-center b-rad-5 mr-10"
-									v-for="(info1,index1) in item.coupon" :key="index1">
-									<image class="quan-list-1" src="@/static/img/index/q.png" mode=""></image>
-									<view class="quan-list-2 fs-24 fc-F5531E">{{info1.money}}元</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="goods-items-list display-flex">
-						<view class="goods-items-list-box" v-for="(info2,index2) in item.goods" :key="index2">
-							<view v-show="info2.label === 3" class="label-box text-align-center bgc-F5811E fs-24 fc-f">
-								推荐</view>
-							<view v-show="info2.label === 2" class="label-box text-align-center bgc-FF5555 fs-24 fc-f">
-								新品</view>
-							<view v-show="info2.label === 1" class="label-box text-align-center bgc-48D3C5 fs-24 fc-f">
-								折扣</view>
-							<view v-show="info2.label === 4" class="label-box text-align-center bgc-4db8ff fs-24 fc-f">
-								招牌</view>
-							<image class="mb-18 goods-items-img b-rad-20" :src="info2.goods_image" mode="">
-							</image>
-							<view class="mb-12 fw-600 text-overflow-ellipsis-one fs-24">{{info2.goods_name}}</view>
-							<view class="">
-								<span class="fs-24 fc-FD5D05 fw-b">￥</span>
-								<span class="fs-32 fc-FD5D05 fw-b">{{info2.price}}</span>
+							<view class="fs-28 fc-9">
+								自助下单方便快捷
 							</view>
 						</view>
-					</view>
-				</view>
-				<view class="pt-40 flex-direction align-items-center" v-if="goodsList.length === total">
-					<view class="fs-32 fc-0 fw-b">
-						小主都到这里了
-					</view>
-					<view class="fs-32 fc-0 fw-b mb-26">
-						还没有找到满意的店铺吗？
-					</view>
-					<view class="fs-24 fc-0 mb-32">
-						可以提交你意见与反馈哟。我们一定尽快努力达成！
-					</view>
-					<view class="list-but align-items-center flex-justify-center bgc-5CC2FF" @click="goFeedback">
-						<view class="fs-28 fc-f mr-10">
-							去提交
-						</view>
-						<view class="sj-fff"></view>
+						<image class="zh-img" src="@/static/img/order-food/zh-img.png" mode=""></image>
 					</view>
 				</view>
 			</view>
 		</view>
-		<uni-popup ref="popup" type="center" border-radius="10px 10px 10px 10px" :is-mask-click="false">
-			<view class="roll-pop">
-				<!-- <image class="lq-bg" src="@/static/img/index/lq-bg.png" mode=""></image> -->
-				<image class="tc-top" src="@/static/img/index/tc-top.png" mode=""></image>
-				<view class="coupon-box">
-					<image class="tc-content" src="@/static/img/index/tc-content.png" mode=""></image>
-					<view class="item-box display-flex" v-for="(item,index) in couponData" :key="index">
-						<view class="item-right flex-direction flex-justify-center flex-1 bgc-FCE7E2">
-							<view class="fs-28 mb-12 ticket-name text-overflow-ellipsis fc-3 fw-600">
-								{{item.name}}
-							</view>
-							<view class="fs-22 fc-6 mb-12">
-								有效时间：{{item.time_type_str}}
-							</view>
-							<view class="fs-22 fc-6">
-								券类型：{{item.scene == 1?'外卖卷':'代取卷'}}
-							</view>
-						</view>
-						<view class="item-hr"></view>
-						<view class="item-left flex-direction align-items-center flex-justify-center bgc-FCE7E2">
-							<view class="align-items-center">
-								<view class="fs-24 fw-600 fc-FB3D03">￥</view>
-								<view class="fs-48 fw-600 fc-FB3D03">{{item.money}}</view>
-							</view>
-							<view class="fs-22 fc-6 mb-4">
-								需满{{item.full_money}}元
-							</view>
-							<view class="but-box fs-26 fc-f" @click="receive(item,index)">立即领取</view>
-							<view class="ball"></view>
-							<view class="ball-two"></view>
-						</view>
-					</view>
-				</view>
-				<image class="tc-bot" src="@/static/img/index/tc-bot.png" mode=""></image>
-				<uni-icons @click="gbPOp" class="pop-gb" color='#fff' type="close" size="30"></uni-icons>
-			</view>
-		</uni-popup>
-		<uni-popup ref="popupNotice" type="center" border-radius="10px 10px 10px 10px" :is-mask-click="false">
-			<view class="p-20 box-sizing-border bgc-f b-rad-20 w-80-vw h-60-vh flex-direction">
-				<view class="text-align-center fw-600 fs-30 mb-20">
-					公告通知
-				</view>
-				<scroll-view :scroll-y="true" class="scroll-view-css mb-24" @scrolltolower="scrolltolower">
-					<view class="fs-28" v-html="pop_notice.content"></view>
-				</scroll-view>
-				<view class="align-items-center">
-					<view class="flex-1 but mr-24 fs-30 fc-f b-rad-200 text-align-center bgc-41ABF5"
-						@click="goToNotice">
-						查看详情
-					</view>
-					<view class="flex-1 but fs-30 fc-3 b-rad-200 text-align-center b-r-ccc" @click="gbNoticePop">
-						我知道了
-					</view>
-				</view>
-			</view>
-		</uni-popup>
 	</view>
 </template>
+
 <script>
-	import {
-		alumniHeatList
-	} from '@/api/alumni.js'
-	import enBlankVue from "@/components/en-utils/en-blank/en-blank.vue";
-	import tools from "@/service/tools";
-	import {
-		getNotice,
-		getBanner,
-		commonApplet,
-		commonPopNotice
-	} from '@/api/common.js';
-	import {
-		getSeckillGoods,
-		seckillGroupGoods
-	} from '@/api/seckill.js'
-	import {
-		getTakeaway
-	} from '@/api/category.js';
-	import {
-		getGoodsList
-	} from '@/api/goods.js';
-	import {
-		couponHome,
-		receiveCoupon
-	} from '@/api/coupon.js'
-	import {
-		shopInfo,
-		shopHome
-	} from "@/api/shop.js"
-	import {
-		membeRmessage
-	} from "@/api/member.js"
 	export default {
-		components: {
-			enBlankVue
-		},
+		components: {},
 		data() {
-			return {
-				BarH: 0,
-				bgckgroundBox: 'transparent',
-				bgckgroundSearch: '',
-				bgckgroundType: '',
-				navList: [{
-						name: "外卖",
-						img: require('@/static/img/index/index-wm.png'),
-						type: 2
-					},
-					{
-						name: "快递代取",
-						img: require('@/static/img/index/index-dq.png'),
-						type: 3
-					},
-					{
-						name: "校友圈",
-						img: require('@/static/img/index/index-xyq.png'),
-						type: 7
-					},
-					{
-						name: "特价团购",
-						img: require('@/static/img/index/index-tg.png'),
-						type: 5
-					},
-					{
-						name: "领券中心",
-						img: require('@/static/img/index/index-lqzx.png'),
-						type: 6
-					},
-					{
-						name: "跑腿代拿",
-						img: require('@/static/img/index/index-ptdn.png'),
-						type: 10
-					},
-					{
-						name: "实习岗位",
-						img: require('@/static/img/index/index-sxgw.png'),
-						type: 8
-					},
-					{
-						name: "平台客服",
-						img: require('@/static/img/index/index-ptkf.png'),
-						type: 9
-					},
-				],
-				schoolData: {
-					school_name: '',
-				},
-				noticeList: [],
-				bannerList: [],
-				seckillGoodsList: [], // 秒杀商品
-				group_goods_List: [], //团购秒杀
-				typeList: [], //分类数组
-				category_id: 0, //分类id
-				goodsList: [],
-				total: 0,
-				page: 1,
-				couponData: [],
-				indexSearchHeight: '',
-				dotStyle: {
-					width: 6,
-					bottom: 6,
-					backgroundColor: 'rgba(51, 51, 51,0.3)',
-					border: '1px rgba(0,0,0,0) solid',
-					color: '#fff',
-					selectedBackgroundColor: 'rgba(79, 179, 239,0.9)',
-					selectedBorder: '1px rgba(0,0,0,0) solid'
-				},
-				current: 0,
-				pop_notice: {
-					content: '' // 公告通知
-				},
-				popType: true,
-				shopHomeData: {},
-				typeListTop: ''
-			}
-		},
-
-		onShow() {
-			let lon = uni.getStorageSync('lon');
-			let lat = uni.getStorageSync('lat');
-			if (!lon || !lat) {
-				uni.getLocation({
-					type: "gcj02",
-					success: (res) => {
-						if (res.errMsg === 'getLocation:ok') {
-							uni.setStorageSync('lon', res.longitude);
-							uni.setStorageSync('lat', res.latitude);
-						} else {
-							tools.error('位置授权失败，请检查是否开始授权')
-						}
-					},
-					fail: (res) => {
-						tools.error('位置授权失败，请检查是否开始授权')
-					},
-				})
-			}
-			let school_id = uni.getStorageSync('school_id');
-			let operate_id = uni.getStorageSync('operate_id');
-			let school_name = uni.getStorageSync('school_name');
-			if (!school_id || !operate_id) {
-				setTimeout(() => {
-					uni.reLaunch({
-						url: '/pages-address/select-school?type=1'
-					})
-				}, 1000)
-			} else {
-				this.schoolData.school_name = school_name;
-			}
-			this.commonApplet()
-			this.getBanner();
-			// this.getNotice();
-			this.alumniHeatList()
-			this.getSeckillGoods();
-			this.seckillGroupGoods()
-			this.getTakeaway();
-			let userToken = uni.getStorageSync('token')
-			if (userToken) {
-				this.commonPopNotice()
-				this.membeRmessage()
-				// this.couponHome()
-			}
-			uni.removeStorageSync('orderInfoType')
-		},
-		onLoad(data) {
-			// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
-			let scene = decodeURIComponent(data.scene)
-			scene = scene.split('&')
-			scene.forEach(item => {
-				let arr = item.split('=')
-				if (arr.length === 2) {
-					uni.setStorageSync(arr[0], arr[1])
-				}
-			})
-			this.page = 1;
-			this.goodsList = [];
-			this.getGoodsList();
-			this.shopHome()
-		},
-		mounted() {
-			this.getHeight()
-		},
-		onPageScroll(e) {
-			if (e.scrollTop > 1) {
-				this.bgckgroundBox = '#fff';
-				this.bgckgroundSearch = '#fff';
-				// if (e.scrollTop > 500) {
-				// 	this.bgckgroundType = '#fff';
-				// } else {
-				// 	this.bgckgroundType = '';
-				// }
-			} else {
-				this.bgckgroundBox = 'transparent';
-				this.bgckgroundSearch = '';
-				// this.bgckgroundType = '';
-			}
-			if (e.scrollTop > (this.BarH+this.typeListTop+this.indexSearchHeight+45)) {
-				this.bgckgroundType = '#fff';
-			} else {
-				this.bgckgroundType = 'transparent';
-			}
-		},
-		onReachBottom() {
-			if (this.goodsList.length < this.total) {
-				this.page += 1;
-				this.getGoodsList();
-			}
-		},
-		created() {
-			uni.getSystemInfo({
-				success: (e) => {
-					let statusBarH = e.statusBarHeight + 10
-					let custom = 0;
-					custom = wx.getMenuButtonBoundingClientRect()
-					let customBarH = custom.height;
-					this.BarH = statusBarH + customBarH;
-				}
-			})
+			return {}
 		},
+		onLoad(data) {},
+		mounted() {},
 		methods: {
-			goGroup(item) {
-				uni.navigateTo({
-					url: '/pages-buy/group-goods-info?shop_id=' + item.shop_id + '&goods_id=' + item.goods_id +
-						'&shop_name=' + item.shop_name
+			goToUrl(shop_id) {
+				uni.reLaunch({
+					url: '/pages-takeout/shop?shop_id=' + shop_id
 				});
-			},
-			goFeedback() {
-				// 问题反馈
-				uni.navigateTo({
-					url: '/pages-my/feedback'
-				})
-			},
-			shopHome() {
-				shopHome().then((res) => {
-					if (res.code === 1) {
-						this.shopHomeData = res.data
-					}
-				})
-			},
-			membeRmessage() {
-				membeRmessage().then((res) => {
-					if (res.code === 1) {
-						if (res.data.msg_count > 0) {
-							uni.showTabBarRedDot({
-								index: 3
-							})
-						} else {
-							uni.hideTabBarRedDot({
-								index: 3
-							})
-						}
-						setInterval(() => {
-							membeRmessage()
-						}, 60000)
-					}
-				})
-			},
-			commonPopNotice() {
-				let operate_id = uni.getStorageSync('operate_id');
-				let school_id = uni.getStorageSync('school_id');
-				commonPopNotice({
-					operate_id: operate_id,
-					school_id: school_id
-				}).then((res) => {
-					const noticeId = uni.getStorageSync('notice_id');
-					if (res.code === 1) {
-						if (res.data.id) {
-							if (noticeId === res.data.id) {
-								this.popType = true
-								this.couponHome()
-							} else {
-								uni.hideTabBar()
-								this.pop_notice = res.data
-								this.$refs.popupNotice.open()
-								this.popType = false
-							}
-						} else {
-							this.popType = true
-							this.couponHome()
-						}
-					}
-				})
-			},
-			gbNoticePop() {
-				uni.showTabBar()
-				this.$refs.popupNotice.close()
-				this.popType = true
-				this.couponHome()
-			},
-			goToNotice() {
-				uni.setStorageSync('notice_id', this.pop_notice.id);
-				uni.showTabBar()
-				this.$refs.popupNotice.close()
-				this.popType = true
-				uni.navigateTo({
-					url: '/pages-my/notice/info?id=' + this.pop_notice.id
-				})
-			},
-			commonApplet() {
-				commonApplet().then((res) => {
-					if (res.code == 1) {
-						this.navList.forEach((v, k) => {
-							v.appletAudit = 0
-							if (v.type == 8 || v.type == 9 || v.type == 10 || v.type == 11) {
-								v.appletAudit = res.data
-							}
-						})
-					}
-				})
-			},
-			getHeight() {
-				// 创建选择器对象
-				const query = uni.createSelectorQuery().in(this);
-				// 选择我们想要的元素
-				query.select('.index-search').boundingClientRect(data => {
-					// data是选中元素的大小及位置信息
-					if (data) {
-						// 元素的高度
-						// console.log(data, 'e.scrollTop');
-						this.indexSearchHeight = data.height;
-						// console.log('元素的高度:', this.indexSearchHeight);
-					}
-				}).exec(); // 执行选择器查询
-				query.select('.type-list-box').boundingClientRect(data => {
-					// data是选中元素的大小及位置信息
-					if (data) {
-						// 元素的高度
-						this.typeListTop = data.top + data.height
-					}
-				}).exec(); // 执行选择器查询
-			},
-			change(e) {
-				this.current = e.detail.current
-			},
-			bannerClock(item) {
-				if (item.type == 1) {
-					// 外卖首页
-					uni.navigateTo({
-						url: '/pages-takeout/takeout'
-					})
-				} else if (item.type == 2) {
-					if (item.to_id != 0) {
-						// 外卖商家
-						uni.navigateTo({
-							url: '/pages-takeout/shop?shop_id=' + item.to_id
-						})
-					} else {
-						// 外卖首页
-						uni.navigateTo({
-							url: '/pages-takeout/takeout'
-						})
-					}
-				} else if (item.type == 3) {
-					// 代取页
-					uni.navigateTo({
-						url: '/pages-takeout/replace-take'
-					})
-				} else if (item.type === 4) {
-					// 团购页
-					uni.navigateTo({
-						url: '/pages-buy/group'
-					})
-				} else if (item.type === 5) {
-					// 票务页
-					uni.navigateTo({
-						url: '/pages-buy/ticket'
-					})
-				} else if (item.type === 6) {
-					// 干洗页
-					uni.navigateTo({
-						url: '/pages-buy/dry-clean'
-					})
-				} else if (item.type === 7) {
-					// 校友圈
-					uni.navigateTo({
-						url: '/pages-school/school-circle'
-					})
-				} else if (item.type === 8) {
-					// 骑手申请页
-					uni.navigateTo({
-						url: '/pages-my/rider-recruit'
-					})
-				}
-			},
-			goSchool() {
-				uni.navigateTo({
-					url: '/pages-school/school-circle'
-				})
-			},
-			receive(item, index) {
-				receiveCoupon({
-					grant_id: item.grant_id,
-					coupon_id: item.coupon_id
-				}).then((res) => {
-					if (res.code == 1) {
-						tools.success(res.msg)
-						this.couponData.splice(index, 1)
-						if (this.couponData.length <= 0) {
-							this.gbPOp()
-						}
-					} else {
-						tools.error(res.msg)
-						this.couponData.splice(index, 1)
-					}
-				})
-			},
-			couponHome() {
-				let operate_id = uni.getStorageSync('operate_id');
-				couponHome({
-					operate_id: operate_id
-				}).then((res) => {
-					if (res.code == 1) {
-						if (res.data.length > 0) {
-							uni.hideTabBar()
-							this.couponData = res.data
-							this.$refs.popup.open()
-						}
-					}
-				})
-			},
-			gbPOp() {
-				uni.showTabBar()
-				this.$refs.popup.close()
-			},
-			getBanner() {
-				let operate_id = uni.getStorageSync('operate_id');
-				let school_id = uni.getStorageSync('school_id');
-				getBanner({
-					operate_id: operate_id,
-					school_id: school_id
-				}).then((res) => {
-					if (res.code === 1) {
-						this.bannerList = res.data;
-					}
-				})
-			},
-			alumniHeatList() {
-				let school_id = uni.getStorageSync('school_id');
-				alumniHeatList({
-					school_id: school_id
-				}).then((res) => {
-					if (res.code === 1) {
-						this.noticeList = res.data;
-					}
-				})
-			},
-			getNotice() {
-				let operate_id = uni.getStorageSync('operate_id');
-				let school_id = uni.getStorageSync('school_id');
-				getNotice({
-					operate_id: operate_id,
-					school_id: school_id
-				}).then((res) => {
-					if (res.code === 1) {
-						this.noticeList = res.data;
-					}
-				})
-			},
-			getSeckillGoods() {
-				let operate_id = uni.getStorageSync('operate_id');
-				getSeckillGoods({
-					operate_id: operate_id
-				}).then((res) => {
-					if (res.code === 1) {
-						this.seckillGoodsList = res.data
-					}
-				})
-			},
-			seckillGroupGoods() {
-				seckillGroupGoods().then((res) => {
-					if (res.code === 1) {
-						if (res.code === 1) {
-							this.group_goods_List = res.data
-						}
-					}
-				})
-			},
-			getTakeaway() {
-				getTakeaway().then((res) => {
-					if (res.code === 1) {
-						this.typeList = res.data;
-						this.typeList.unshift({
-							name: "全部",
-							id: 0
-						})
-					}
-				})
-			},
-			getGoodsList() {
-				let operate_id = uni.getStorageSync('operate_id');
-				getGoodsList({
-					page: this.page,
-					operate_id: operate_id,
-					category_id: this.category_id
-				}).then((res) => {
-					if (res.code === 1) {
-						this.goodsList = [...this.goodsList, ...res.data.items];
-						this.total = res.data.total;
-						console.log(this.total, 'this.total');
-					}
-				})
-			},
-			selectType(id) {
-				if (this.category_id != id) {
-					this.category_id = id;
-					this.page = 1;
-					this.goodsList = [];
-					this.getGoodsList();
-				}
-			},
-			toUrl(type) {
-				if (type === 1) {
-					// 去搜索
-					uni.navigateTo({
-						url: '/pages/index/search-record'
-					})
-				} else if (type === 2) {
-					// 去外卖
-					uni.navigateTo({
-						url: '/pages-takeout/takeout'
-					})
-				} else if (type === 3) {
-					// 去代取
-					uni.navigateTo({
-						url: '/pages-takeout/replace-take'
-					})
-				} else if (type === 4) {
-					// 君子帮选
-					uni.navigateTo({
-						// url: '/pages-takeout/help-choose'
-						url: '/pages-takeout/1212'
-					})
-				} else if (type === 5) {
-					// 去团购
-					uni.navigateTo({
-						url: '/pages-buy/group'
-					})
-				} else if (type === 6) {
-					// 领券中心
-					uni.navigateTo({
-						url: '/pages-my/ticket-centre'
-					})
-				} else if (type === 7) {
-					// 去校友圈
-					uni.navigateTo({
-						url: '/pages-school/school-circle'
-					})
-				} else if (type === 8) {
-					// 去实习岗位
-					uni.navigateTo({
-						url: '/pages-position/Internship-position'
-					})
-				} else if (type === 9) {
-					// 平台客服
-				} else if (type === 10) {
-					// 跑腿代拿
-					uni.navigateTo({
-						url: '/pages-takeout/run-errands'
-					})
-				} else {
-					tools.error('暂未开放')
-				}
-			},
-			toSelectSchool() {
-				uni.navigateTo({
-					url: '/pages-address/select-school?type=1'
-				})
-			},
-			goTogrup() {
-				uni.navigateTo({
-					url: '/pages-takeout/group-goods'
-				})
-			},
-			goAllSeckill() {
-				uni.navigateTo({
-					url: '/pages-takeout/seckill'
-				})
-			},
-			toShop(item) {
-				const operate_id = uni.getStorageSync('operate_id')
-				shopInfo({
-					operate_id: operate_id,
-					shop_id: item.shop_id
-				}).then((res) => {
-					if (res.code == 1) {
-						uni.navigateTo({
-							url: '/pages-takeout/shop?shop_id=' + item.shop_id + '&category_id=' + item
-								.category_id + '&goods_id=' + item.goods_id
-						})
-					} else {
-						tools.error(res.msg)
-					}
-				})
-			},
-			toNoticeDet(item) {
-				uni.navigateTo({
-					url: '/pages-school/circle-info?news_id=' + item.news_id
-				})
-			},
-		},
-	}
-</script>
-<style lang="scss" scoped>
-	.list-but {
-		width: 140rpx;
-		height: 48rpx;
-		line-height: 48rpx;
-		border-radius: 24rpx;
-	}
-
-	.sj-fff {
-		width: 0;
-		height: 0;
-		border-top: 8rpx solid transparent;
-		border-right: 8rpx solid transparent;
-		border-left: 8rpx solid #fff;
-		border-bottom: 8rpx solid transparent;
-	}
-
-	.bot-list-box {
-		padding: 0 24rpx 24rpx;
-	}
-
-	.zk-box {
-		width: 67rpx;
-		height: 31rpx;
-		line-height: 28rpx;
-		position: relative;
-	}
-
-	.zk-img {
-		width: 100%;
-		height: 100%;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-
-	.pm-img {
-		width: 31rpx;
-		height: 43rpx;
-	}
-
-	.qwzd-img {
-		width: 295rpx;
-		height: 28rpx;
-	}
-
-	.yztg-box {
-		width: 100%;
-		height: auto;
-		position: relative;
-	}
-
-	.b-img {
-		width: 39rpx;
-		height: 41rpx;
-	}
-
-	.w-31 {
-		width: 31%;
-	}
-
-	.max-w-200 {
-		max-width: 200rpx;
-	}
-
-	.xsms-item-img {
-		width: 200rpx;
-		height: 200rpx;
-	}
-
-	.xsms-box {
-		width: 100%;
-		height: 730rpx;
-		padding: 25rpx 0rpx 1rpx 30rpx;
-		position: relative;
-	}
-
-	.ms-swiper {
-		width: 100%;
-		height: 100%;
-	}
-
-	.xsms-img {
-		width: 139rpx;
-		height: 31rpx;
-	}
-
-	.tj-item {
-		width: 108rpx;
-		height: 108rpx;
-	}
-
-	.mxdp {
-		width: 317rpx;
-		height: 31rpx;
-	}
-
-	.mxdq-box {
-		min-height: 342rpx;
-		position: relative;
-		padding: 25rpx 17rpx 18rpx 30rpx;
-	}
-
-	.tj-bg {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-	}
-
-	.xzkn-img {
-		width: 139rpx;
-		height: 343rpx;
-		border-radius: 20rpx;
-	}
-
-	.h-100 {
-		height: 100%;
-	}
-
-	.max-w-358 {
-		max-width: 358rpx;
-	}
-
-	.serial-num {
-		width: 25rpx;
-		height: 22rpx;
-		line-height: 22rpx;
-		border-radius: 10rpx 2rpx 10rpx 2rpx;
-	}
-
-	.z-2 {
-		position: relative;
-		z-index: 2;
-	}
-
-	.w-10 {
-		width: 10rpx;
-	}
-
-	.rebang-box {
-		width: 160rpx;
-		height: 130rpx;
-		background: #53C4FD;
-		border-radius: 20rpx 0 0 20rpx;
-		padding: 0 10rpx 0 0;
-		position: relative;
-	}
-
-	.sj-box {
-		width: 0;
-		height: 0;
-		border-top: 20rpx solid transparent;
-		border-right: 20rpx solid #F3F3F3;
-		border-left: 20rpx solid transparent;
-		border-bottom: 20rpx solid transparent;
-		position: absolute;
-		right: -2rpx;
-		top: calc(50% - 20rpx);
-	}
-
-	.rebang {
-		width: 64rpx;
-	}
-
-	.h-60-vh {
-		max-height: 60vh;
-	}
-
-	.w-80-vw {
-		width: 80vw;
-	}
-
-	.plrb-24 {
-		padding: 0 24rpx 24rpx;
-	}
-
-	.spike-box {
-		padding: 0 24rpx;
-	}
-
-	.wh27 {
-		width: 27rpx;
-		height: 27rpx;
-	}
-
-	.nav-z {
-		position: relative;
-		z-index: 3 !important;
-		background: linear-gradient(-90deg, #3BB5FE, #62C4FF);
-	}
-
-	.wh-40 {
-		width: 40rpx;
-		height: 40rpx;
-	}
-
-	.item-box {
-		margin-bottom: 20rpx;
-	}
-
-	.item-box:last-child {
-		margin: 0;
-	}
-
-	.roll-pop {
-		position: relative;
-		width: 100vw;
-		z-index: 999999;
-		// height: 1000rpx;
-
-		.tc-top {
-			width: 100%;
-			height: 202rpx;
-			position: relative;
-			z-index: 999999;
-		}
-
-		.tc-bot {
-			width: 100%;
-			height: 178rpx;
-		}
-
-		.pop-gb {
-			width: 56rpx;
-			height: 56rpx;
-			position: absolute;
-			bottom: -65rpx;
-			left: calc((100% - 28rpx) / 2);
-		}
-	}
-
-	.coupon-box {
-		width: 100%;
-		// min-height: 590rpx;
-		padding: 0 82rpx 0 92rpx;
-		box-sizing: border-box;
-		position: relative;
-
-		.tc-content {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.index-box {
-		.maxw-220 {
-			max-width: 220rpx;
-		}
-
-		position: relative;
-
-		.bg-img {
-			width: 100%;
-			height: 930rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: -2;
-		}
-
-		.nav-icon {
-			width: 32rpx;
-			height: 32rpx;
-		}
-
-		.index-box-1 {
-			width: 100%;
-
-			// height: 3000rpx;
-			.swiper {
-				width: 702rpx;
-				height: 280rpx;
-				border-radius: 20rpx;
-
-				.swiper-item {
-					width: 702rpx;
-					height: 280rpx;
-					border-radius: 20rpx;
-				}
-			}
-
-			.nav-list {
-				// padding: 0 22rpx;
-
-				.nav-list-item {
-					width: 25%;
-					margin-bottom: 35rpx;
-					position: relative;
-
-					.item-box-button {
-						position: absolute;
-						width: 100%;
-						height: 100%;
-						top: 0;
-						left: 0;
-						z-index: 0;
-						background: transparent;
-						border-width: 0;
-					}
-
-					.title-img-box {
-						.title-img {
-							width: 80rpx;
-							height: 76rpx;
-						}
-					}
-				}
-
-				.nav-list-item:nth-child(3) {
-					.title-img-box {
-						.title-img {
-							width: 92rpx;
-							height: 82rpx;
-						}
-					}
-				}
-
-				.nav-list-item:nth-child(4) {
-					.title-img-box {
-						.title-img {
-							width: 82rpx;
-							height: 73rpx;
-						}
-					}
-				}
-
-				.nav-list-item:nth-child(5) {
-					.title-img-box {
-						.title-img {
-							width: 79rpx;
-							height: 86rpx;
-						}
-					}
-				}
-
-				.nav-list-item:nth-child(6) {
-					.title-img-box {
-						.title-img {
-							width: 93rpx;
-							height: 99rpx;
-						}
-					}
-				}
-
-				.nav-list-item:nth-child(7) {
-					.title-img-box {
-						.title-img {
-							width: 106rpx;
-							height: 84rpx;
-						}
-					}
-				}
-
-				.nav-list-item:nth-child(8) {
-					.title-img-box {
-						.title-img {
-							width: 81rpx;
-							height: 88rpx;
-						}
-					}
-				}
-			}
-
-			.msg-box {
-				width: 100%;
-				height: 180rpx;
-				border-radius: 12rpx;
-				padding: 30rpx 40rpx;
-				position: relative;
-			}
-
-			.rb-bg {
-				position: absolute;
-				left: 0;
-				bottom: 0;
-				width: 100%;
-				height: 100%;
-			}
-
-			.xyrb-img {
-				width: 108rpx;
-				height: 123rpx;
-			}
-
-			.type-list-box {
-				// width: calc(100% - 24rpx);
-				position: sticky;
-				left: 0;
-				// top: calc(var(BarH)px + 93rpx);
-				// top: calc(86px + 93rpx);
-				padding: 24rpx;
-				overflow-x: scroll;
-				z-index: 50;
-
-				.type-item-box {
-					margin-right: 16rpx;
-					padding: 0 24rpx;
-					position: relative;
-				}
-
-				.type-item-box:last-child {
-					margin-right: 0;
-				}
-
-				.type-list-hr {
-					position: absolute;
-					left: 15%;
-					bottom: 0;
-					width: 70%;
-					height: 6rpx;
-					background: linear-gradient(-90deg, #ffffff, #3BB5FE);
-					border-radius: 3rpx;
-				}
-			}
-
-			.goos-list-box {
-				width: 100%;
-				min-height: 100rpx;
-				padding: 28rpx 30rpx 35rpx;
-				background: #FFFFFF;
-				box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(51, 51, 51, 0.1);
-				border-radius: 20rpx;
-				margin-bottom: 20rpx;
-
-				.goods-items-list {
-					width: 100%;
-					overflow-y: scroll;
-
-					.goods-items-list-box {
-						width: 208rpx;
-						margin-right: 13rpx;
-						position: relative;
-
-						.label-box {
-							position: absolute;
-							left: 0;
-							top: 0;
-							width: 66rpx;
-							height: 31rpx;
-							line-height: 31rpx;
-							border-radius: 10rpx 2rpx 10rpx 2rpx;
-						}
-
-						.goods-items-img {
-							width: 208rpx;
-							height: 200rpx;
-							overflow: hidden;
-						}
-					}
-				}
-
-				.left-img-box {
-					width: 120rpx;
-					height: 120rpx;
-					position: relative;
-
-					.left-img {
-						width: 120rpx;
-						height: 120rpx;
-						border-radius: 12rpx;
-					}
-
-					.status-box {
-						position: absolute;
-						bottom: 0;
-						left: 0;
-						width: 100%;
-						padding: 4rpx 0;
-						text-align: center;
-						background: rgba(0, 0, 0, 0.5);
-						font-size: 17rpx;
-						border-radius: 0 0 12rpx 12rpx;
-					}
-				}
-
-
-				.img-x {
-					width: 16rpx;
-					height: 16rpx;
-				}
-
-				.right-box-title {
-					width: 438rpx;
-				}
-
-				.right-box-title-img {
-					width: 32rpx;
-					height: 32rpx;
-					margin-left: auto;
-				}
-
-				.quan-list {
-					min-width: 88rpx;
-					height: 28rpx;
-					line-height: 28rpx;
-
-					.quan-list-1 {
-						width: 38rpx;
-						height: 28rpx;
-					}
-				}
 			}
 		}
-
-		.index-search {
-			position: sticky;
-			left: 0;
-			z-index: 10;
-			padding: 0 24rpx 20rpx 24rpx;
-
-			.index-search-box {
-				width: 100%;
-				height: 72rpx;
-				padding: 0 6rpx 0 24rpx;
-				border-radius: 200rpx;
-
-				.index-search-box-buttom {
-					width: 120rpx;
-					height: 60rpx;
-					background: linear-gradient(-90deg, #3BB5FE, #62C4FF);
-					border-radius: 200rpx;
-					margin-left: auto;
-					line-height: 60rpx;
-					text-align: center;
-				}
-			}
-		}
-	}
-
-	.item-hr {
-		width: 0px;
-		height: auto;
-		border-right: 1rpx dashed #FB7850;
-	}
-
-	.item-hr-two {
-		width: 0px;
-		height: auto;
-		border-right: 1rpx dashed #999;
-	}
-
-	.item-left {
-		width: 171rpx;
-		height: auto;
-		padding: 20rpx 18rpx;
-		box-sizing: border-box;
-		position: relative;
-		border-radius: 0 20rpx 20rpx 0;
-	}
-
-	.ball {
-		width: 24rpx;
-		height: 24rpx;
-		border-radius: 50%;
-		position: absolute;
-		top: -12rpx;
-		left: -12rpx;
-		background: #fff;
-		z-index: 2;
-	}
-
-	.ball-two {
-		width: 24rpx;
-		height: 24rpx;
-		border-radius: 50%;
-		position: absolute;
-		background: #fff;
-		z-index: 10;
-		bottom: -12rpx;
-		left: -12rpx;
-	}
-
-	.item-right {
-		padding: 24rpx;
-		box-sizing: border-box;
-		border-radius: 20rpx 0 0 20rpx;
-		position: relative;
-	}
-
-	.but-box {
-		width: 136rpx;
-		height: 48rpx;
-		line-height: 48rpx;
-		text-align: center;
-		background: linear-gradient(225deg, #FB3D03 0%, #FF6901 100%);
-		border-radius: 200rpx;
-	}
-
-	.but {
-		width: 100%;
-		height: 60rpx;
-		line-height: 60rpx;
 	}
+</script>
 
-	.rd-img {
-		width: 40rpx;
-		height: 40rpx;
-	}
+<style lang="scss" scoped>
+.qd-bg{
+	width: 100%;
+	height: 696rpx;
+}
+.order-food-box{
+	position: relative;
+}
+.order-food{
+	width: calc(100% - 64rpx);
+	position: absolute;
+	left: 32rpx;
+	top: -90rpx;
+}
+.bc-FFEDE9-FFF1EE{
+	background: linear-gradient( 90deg, #FFEDE9 0%, #FFF1EE 100%);
+}
+.zh-img {
+	width: 148rpx;
+	height: 148rpx;
+}
+.right-h{
+	width: 40rpx;
+	height: 40rpx;
+}
 </style>

pages/login/index.vue

@@ -1,63 +1,21 @@
 <template>
-	<view class="permission">
-		<Nav :leftShow='false' :customNav='true' title="君子校园">
-			<template>
-				<view slot="custom" class="text-align-center fs-36 fw-600">
-					授权登录/注册
+	<view class="flex-common-css">
+		<Nav :leftShow='false' :customNav='true' title="" bgckgroundBox='rgba(51,51,51,0.6)'></Nav>
+		<view class="bgc-3-6 flex-1 flex-direction authorization iPhone-bottom">
+			<view
+				class="authorization-box flex-direction flex-justify-end bgc-f b-rad-20-20-0-0 p-40-32 box-border-box">
+				<view class="text-align-center fs-36 fc-3 mb-30 fw-500">
+					服务协议与隱私政策概
 				</view>
-			</template>
-		</Nav>
-		<view class="user-permission">
-			<view class="head">
-				<view class="head-button">
-					<image src="@/static/img/logo/logo.png" class="head-img" mode=""></image>
-					<view class="head-text">君子校园</view>
+				<view class="authorization-text mb-24 fs-28 fc-6">
+					感谢您使用喜茶小程序。我们非常重视您的个人信息和隐私保护，我们深知个人信息对您的重要性，因此，我们将竭尽全力保障您的隐私信息安全。我们承诺，未经您的同意，不会从第三方获取，共享或向第三方提供您的隐私信息。我们致力于维护您对我们的信任，将按业界成熟的安全标准，采取各种安全保护措施及配套的管理体制来保护您的个人信息。所提供的产品及服务分为基础业务和拓展业务。我们产品及服务中关于点单、外卖配送的功能为基础业务，即通过喜茶GO
+					App或小程序完成点 二、我们产品或服务中一部分的拓展业务是基于手机账号实现．当您使用点单、外卖基础业务及除点单、外卖以外的坏屏防能叶面西林但你的垣和土林收佳个人信自
 				</view>
-			</view>
-
-			<!-- 			<view class="hint-box">
-				<view class="hint-title">该程序将获取以下授权：</view>
-				<view class="hint-info">获取你的公开信息（昵称，头像等）</view>
-				<view class="hint-info">获取你的小程序唯一标示用于账户授权登陆</view>
-			</view> -->
-			<view class="phone-box mb-22">
-				<image class="icons" src="@/static/img/my/yzm-icons.png" mode=""></image>
-				<input v-model="from.phone" type="number" class="uni-input b-rad-200" maxlength="11" focus
-					placeholder="请输入手机号" />
-			</view>
-			<view class="flex-justify-space mb-40">
-				<view class="phone-box mr-24 common-view-css">
-					<image class="icons" src="@/static/img/my/yzm-icons.png" mode=""></image>
-					<input v-model="from.sms_code" type="number" class="uni-input b-rad-200" placeholder="请输入验证码" />
-				</view>
-				<view class="get-code-box" @click="getCode()">
-					<view class="get-but fc-57CAFF fs-32 text-align-center b-rad-200">
-						{{codeNUm == 0?codeText:codeNUm + 's'}}
-					</view>
-				</view>
-			</view>
-			<view class="hint">
-				<view class="hint-left-circle" @click.stop="isFlag = !isFlag">
-					<view v-if="!isFlag" class="hint-circle"></view>
-					<image v-else class="hint-img" src="@/static/img/common/y-select.png" mode=""></image>
+				<view class="but-box mb-8 ptb-22 text-align-center but-c fs-32 fc-f b-rad-200" @click="login">
+					同意
 				</view>
-				<view class="hint-text-1" @click.stop="isFlag = !isFlag">我已阅读并同意</view>
-				<view class="hint-text-2" @click="openPop(0)">《用户服务》</view>
-				<view class="hint-text-2" @click="openPop(1)">《隐私协议》</view>
-			</view>
-
-			<view class="button">
-				<view class="common permission-login" @click="login">授权登录/注册</view>
-				<view class="common permission-cancel" @click="noLogin">暂不登录</view>
-			</view>
-		</view>
-
-		<view v-if="isPop" class="pop-view">
-			<view class="pop-view-box">
-				<view class="pop-info" v-html="html"></view>
-				<view class="pop-botton">
-					<view style="background-color: #3169FA;color: white;" class=" " @click="setCheck(1)">确定</view>
-					<view style="color: #3169FA;" class="" @click="setCheck()">取消</view>
+				<view class="but-box ptb-22 text-align-center fs-32 fc-6" @click="refuse">
+					不同意
 				</view>
 			</view>
 		</view>
@@ -96,77 +54,32 @@
 				agreementData: []
 			};
 		},
-		onLoad() {},
-		mounted() {
-			this.getPrivacyInfo()
-			this.getType()
+		onLoad(data) {
+			console.log(data);
 		},
+		mounted() {},
 		methods: {
-			openPop(index) {
-				this.html = this.agreementData[index].content
-				this.isPop = true
-			},
-			getCode() {
-				if (!this.from.phone) {
-					return tools.error('请输入手机号')
-				}
-				if (this.isCode) {
-					return
-				}
-				this.isCode = true;
-				commonRegisterSms({
-					phone: this.from.phone,
-				}).then((res) => {
-					if (res.code === 1) {
-						this.codeNUm = 60;
-						let timer = setInterval(() => {
-							this.codeNUm -= 1;
-							if (this.codeNUm <= 0) {
-								clearInterval(timer);
-								this.isCode = false;
-								this.codeText = '获取验证码'
-							}
-						}, 1000);
-					} else {
-						this.isCode = false;
-						tools.error('获取验证码失败，请稍后重试')
-					}
-				})
-			},
-			getPrivacyInfo() {
-				getAgreement().then((res) => {
-					if (res.code === 1) {
-						this.agreementData = res.data
-					}
-				})
-			},
-			getType() {
-				let that = this
-				uni.getProvider({
-					service: 'oauth',
-					success: function(res) {
-						if (res.provider[0] === 'weixin') {
-							that.from.system_type = 2
-						} else if (res.provider[0] === 'qq') {
-							that.from.system_type = 3
-						} else {
-							that.from.system_type = 1
-						}
-						uni.setStorageSync('system_type', that.from.system_type)
-					}
+			refuse() {
+				// #ifdef MP-WEIXIN
+				// 微信小程序平台
+				wx.exitMiniProgram({
+					success: (res) => {}
 				});
+				// #endif
+				// #ifdef MP-ALIPAY
+				// 支付宝小程序
+				my.exitMiniProgram({
+					success: (res) => {}
+				});
+				// #endif
 			},
-			setCheck(type) {
-				if (type === 1) {
-					this.isFlag = false
-				}
-				this.isPop = false
-			},
-
 			login() {
-				if (!this.isFlag) {
-					return tools.error("请先勾选协议");
-				}
+				uni.setStorageSync('token', 165165165156)
+				uni.setStorageSync('m_id', 88)
+				uni.reLaunch({
+					url: "/pages/index/index",
+				});
+				return
 				if (this.isAjax) {
 					return false;
 				}
@@ -180,7 +93,6 @@
 					//#endif
 					success: (loginRes) => {
 						this.from.code = loginRes.code;
-						this.getUserInfo();
 					},
 					fail: (loginRes) => {
 						this.isAjax = false;
@@ -215,234 +127,30 @@
 </script>
 
 <style scoped lang="scss">
-	.permission {
-		width: 100vw;
-		height: 100vh;
-		background-color: #fff;
+	.authorization {
 		position: relative;
-
-		.hint {
-			margin-top: 20rpx;
-			display: flex;
-			height: 34rpx;
-
-			.hint-left-circle {
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 18rpx;
-
-				.hint-circle {
-					width: 30rpx;
-					height: 30rpx;
-					border-radius: 50%;
-					background-color: #fff;
-					border: 2rpx solid #D9D9D9;
-				}
-
-				.hint-img {
-					width: 32rpx;
-					height: 32rpx;
-					border-radius: 50%;
-				}
-			}
-
-			.hint-text-1,
-			.hint-text-2 {
-				font-size: 24rpx;
-				font-weight: 400;
-			}
-
-			.hint-text-1 {
-				color: #999999;
-			}
-
-			.hint-text-2 {
-				color: #ED301D;
-			}
-		}
-
-		.hint-box {
-			margin-top: 140rpx;
-			margin-bottom: 20rpx;
-
-			.hint-title {
-				font-size: 28rpx;
-			}
-
-			.hint-info {
-				font-size: 24rpx;
-				color: #6f6f6f;
-				margin-top: 12rpx;
-			}
-		}
-
-		.pop-view {
-			width: 100%;
-			height: 100vh;
-			position: absolute;
-			top: 0;
-			left: 0;
-			background: rgba(0, 0, 0, 0.5);
-
-			.pop-view-box {
-				display: flex;
-				flex-direction: column;
-
-				margin: 400rpx auto;
-				width: 80vw;
-				height: 50vh;
-				overflow: scroll;
-				background-color: #fff;
-				border-radius: 10rpx;
-				box-sizing: border-box;
-				padding: 20rpx 40rpx;
-
-				.pop-info {
-					flex: 1;
-					overflow: auto;
-				}
-
-				.pop-botton {
-					display: flex;
-					justify-content: space-between;
-					margin-top: 20rpx;
-					box-sizing: border-box;
-					padding: 0 130rpx;
-
-					view {
-						width: 100rpx;
-						height: 50rpx;
-						line-height: 50rpx;
-						text-align: center;
-						font-size: 30rpx;
-						border: 2rpx solid #3169FA;
-						border-radius: 10rpx;
-						margin: 0 10rpx;
-					}
-				}
-			}
-		}
-
-
-		.user-permission {
-			position: absolute;
-			top: 40%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-			width: 100%;
-			padding: 0 36rpx;
-			box-sizing: border-box;
-
-			.head {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				margin-bottom: 40rpx;
-
-				button::after {
-					border-color: #fff !important;
-				}
-
-				.head-button {
-					background-color: #fff;
-					padding: 0;
-				}
-
-				.head-text {
-					text-align: center;
-					margin-top: 16rpx;
-					font-weight: 400;
-					color: #333333;
-					font-size: 28rpx;
-				}
-
-				.head-img {
-					width: 120rpx;
-					height: 120rpx;
-					border-radius: 50%;
-					margin: 0 auto;
-				}
-			}
-
-			.user-name-view {
-				display: flex;
-				margin-top: 100rpx;
-
-				.user-name {
-					font-weight: 400;
-					color: #333333;
-					font-size: 32rpx;
-				}
-
-				.user-input {
-					width: 568rpx;
-					border-bottom: 1rpx solid #D9D9D9;
-					font-size: 32rpx;
-					padding-bottom: 16rpx;
-				}
-			}
-
-			.button {
-				margin-top: 60rpx;
-
-				.common {
-					width: 100%;
-					height: 88rpx;
-					line-height: 88rpx;
-					text-align: center;
-					border-radius: 200rpx;
-				}
-
-				.permission-login {
-					background: #41ABF5;
-					color: #fff;
-
-					&:active {
-						background-color: #41ABF5;
-					}
-				}
-
-				.permission-cancel {
-					margin-top: 40rpx;
-					background: rgb(247, 247, 247);
-
-					&:active {
-						background-color: rgb(238, 238, 238);
-					}
-				}
-			}
-		}
 	}
 
-	.phone-box {
-		position: relative;
-	}
-
-	.uni-input {
-		// width: 100%;
-		background: #F6F6F6;
-		height: 80rpx;
-		line-height: 80rpx;
-		padding: 0 0 0 68rpx;
-	}
-
-	.icons {
+	.authorization-box {
+		width: 100%;
+		height: auto;
+		max-height: 69%;
 		position: absolute;
-		top: 30rpx;
-		left: 24rpx;
-		width: 32rpx;
-		height: 32rpx;
+		left: 0;
+		bottom: 0;
 	}
 
-	.get-code-box {
-		width: 208rpx;
+	.authorization-text {
+		width: 100%;
+		max-height: 62%;
+		overflow: auto;
 	}
 
-	.get-but {
+	.but-box {
 		width: 100%;
-		height: 80rpx;
-		line-height: 80rpx;
-		border: 2rpx solid #57CAFF;
-		box-sizing: border-box;
+	}
+
+	.but-c {
+		background: linear-gradient(270deg, #FF3333 0%, #FE6122 100%);
 	}
 </style>

service/router.js

@@ -22,26 +22,25 @@ const router = createRouter({
 	routes: [...ROUTES]
 });
 //全局路由前置守卫
-const whiteList = ['/pages/login/index', '/pages/index/index', '/pages/order/index', '/pages/me/index',
-	'/pages-address/select-school'
-]
+const whiteList = ['/pages/login/index']
 
 router.beforeEach((to, from, next) => {
 	let userToken = uni.getStorageSync('token')
-	let school_id = uni.getStorageSync('school_id');
-	let operate_id = uni.getStorageSync('operate_id');
+	// let school_id = uni.getStorageSync('school_id');
+	// let operate_id = uni.getStorageSync('operate_id');
 	if (whiteList.indexOf(to.path) < 0 && !userToken) {
 		next('/pages/login/index')
 	} else {
-		if (!school_id && !operate_id) {
-			if (whiteList.indexOf(to.path) > 0) {
-				next()
-			} else {
-				next('/pages-address/select-school')
-			}
-		} else {
-			next()
-		}
+		// if (!school_id && !operate_id) {
+		// 	if (whiteList.indexOf(to.path) > 0) {
+		// 		next()
+		// 	} else {
+		// 		next('/pages-address/select-school')
+		// 	}
+		// } else {
+		// 	next()
+		// }
+		next()
 	}
 });
 // 全局路由后置守卫

yarn.lock

@@ -3,132 +3,132 @@
 
 
 "@babel/parser@^7.18.4":
-  "integrity" "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw=="
-  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz"
-  "version" "7.19.0"
+  version "7.19.0"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz"
+  integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==
 
 "@types/html5plus@1.0.2":
-  "integrity" "sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag=="
-  "resolved" "https://registry.npmjs.org/@types/html5plus/-/html5plus-1.0.2.tgz"
-  "version" "1.0.2"
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/@types/html5plus/-/html5plus-1.0.2.tgz"
+  integrity sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag==
 
 "@types/uni-app@1.4.4":
-  "integrity" "sha512-ZTXnrCTblZyoLIoKbTv1Whz1nxrTcM7vg0qGXzDpXP8m9MqdjKt48N3FffQT1IsJWNkxbvJ1Eg5UHDaq+k+oBQ=="
-  "resolved" "https://registry.npmjs.org/@types/uni-app/-/uni-app-1.4.4.tgz"
-  "version" "1.4.4"
+  version "1.4.4"
+  resolved "https://registry.npmjs.org/@types/uni-app/-/uni-app-1.4.4.tgz"
+  integrity sha512-ZTXnrCTblZyoLIoKbTv1Whz1nxrTcM7vg0qGXzDpXP8m9MqdjKt48N3FffQT1IsJWNkxbvJ1Eg5UHDaq+k+oBQ==
   dependencies:
-    "vue" "^2.6.8"
+    vue "^2.6.8"
 
 "@vue/compiler-sfc@2.7.10":
-  "integrity" "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="
-  "resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"
-  "version" "2.7.10"
+  version "2.7.10"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"
+  integrity sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==
   dependencies:
     "@babel/parser" "^7.18.4"
-    "postcss" "^8.4.14"
-    "source-map" "^0.6.1"
-
-"crypto-js@^4.1.1":
-  "integrity" "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
-  "resolved" "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"
-  "version" "4.1.1"
-
-"csstype@^3.1.0":
-  "integrity" "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
-  "resolved" "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz"
-  "version" "3.1.0"
-
-"js-base64@^2.6.4":
-  "integrity" "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
-  "resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz"
-  "version" "2.6.4"
-
-"js-base64@3.7.2":
-  "integrity" "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
-  "resolved" "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz"
-  "version" "3.7.2"
-
-"jweixin-module@^1.6.0":
-  "integrity" "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
-  "resolved" "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz"
-  "version" "1.6.0"
-
-"matter-js@^0.20.0":
-  "integrity" "sha512-iC9fYR7zVT3HppNnsFsp9XOoQdQN2tUyfaKg4CHLH8bN+j6GT4Gw7IH2rP0tflAebrHFw730RR3DkVSZRX8hwA=="
-  "resolved" "https://registry.npmmirror.com/matter-js/-/matter-js-0.20.0.tgz"
-  "version" "0.20.0"
-
-"nanoid@^3.3.4":
-  "integrity" "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
-  "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
-  "version" "3.3.4"
-
-"picocolors@^1.0.0":
-  "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-  "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
-  "version" "1.0.0"
-
-"postcss@^8.4.14":
-  "integrity" "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="
-  "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"
-  "version" "8.4.16"
+    postcss "^8.4.14"
+    source-map "^0.6.1"
+
+crypto-js@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"
+  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
+
+csstype@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz"
+  integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
+
+js-base64@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz"
+  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
+
+js-base64@3.7.2:
+  version "3.7.2"
+  resolved "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz"
+  integrity sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==
+
+jweixin-module@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz"
+  integrity sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==
+
+matter-js@^0.20.0:
+  version "0.20.0"
+  resolved "https://registry.npmmirror.com/matter-js/-/matter-js-0.20.0.tgz"
+  integrity sha512-iC9fYR7zVT3HppNnsFsp9XOoQdQN2tUyfaKg4CHLH8bN+j6GT4Gw7IH2rP0tflAebrHFw730RR3DkVSZRX8hwA==
+
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+postcss@^8.4.14:
+  version "8.4.16"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"
+  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
   dependencies:
-    "nanoid" "^3.3.4"
-    "picocolors" "^1.0.0"
-    "source-map-js" "^1.0.2"
-
-"source-map-js@^1.0.2":
-  "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
-  "resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
-  "version" "1.0.2"
-
-"source-map@^0.6.1":
-  "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
-  "version" "0.6.1"
-
-"uni-read-pages@1.0.5":
-  "integrity" "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
-  "resolved" "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
-  "version" "1.0.5"
-
-"uni-simple-router@2.0.7":
-  "integrity" "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA=="
-  "resolved" "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
-  "version" "2.0.7"
-
-"uniapp-qrcode@^1.0.2":
-  "integrity" "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
-  "resolved" "https://registry.npmjs.org/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz"
-  "version" "1.0.2"
-
-"uploading-oss@1.0.3":
-  "integrity" "sha512-aqHh5NCOBcrA4d8yCIKR7B9GrKzH88X7gL8BSvIw18pi79AgWnhDkCoyjQmDqzTvjQqYfKwyFTEgnafzMx/GbQ=="
-  "resolved" "https://registry.npmjs.org/uploading-oss/-/uploading-oss-1.0.3.tgz"
-  "version" "1.0.3"
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+uni-read-pages@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
+  integrity sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==
+
+uni-simple-router@2.0.7:
+  version "2.0.7"
+  resolved "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-2.0.7.tgz"
+  integrity sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==
+
+uniapp-qrcode@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz"
+  integrity sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g==
+
+uploading-oss@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/uploading-oss/-/uploading-oss-1.0.3.tgz"
+  integrity sha512-aqHh5NCOBcrA4d8yCIKR7B9GrKzH88X7gL8BSvIw18pi79AgWnhDkCoyjQmDqzTvjQqYfKwyFTEgnafzMx/GbQ==
   dependencies:
-    "crypto-js" "^4.1.1"
-    "js-base64" "^2.6.4"
-
-"uqrcodejs@^4.0.7":
-  "integrity" "sha512-84+aZmD2godCVI+93lxE3YUAPNY8zAJvNA7xRS7R7U+q57KzMDepBSfNCwoRUhWOfR6eHFoAOcHRPwsP6ka1cA=="
-  "resolved" "https://registry.npmmirror.com/uqrcodejs/-/uqrcodejs-4.0.7.tgz"
-  "version" "4.0.7"
-
-"vue-waterfall-easy@2.4.4":
-  "integrity" "sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g=="
-  "resolved" "https://registry.npmjs.org/vue-waterfall-easy/-/vue-waterfall-easy-2.4.4.tgz"
-  "version" "2.4.4"
-
-"vue@^2.6.8":
-  "integrity" "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="
-  "resolved" "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"
-  "version" "2.7.10"
+    crypto-js "^4.1.1"
+    js-base64 "^2.6.4"
+
+uqrcodejs@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.npmmirror.com/uqrcodejs/-/uqrcodejs-4.0.7.tgz"
+  integrity sha512-84+aZmD2godCVI+93lxE3YUAPNY8zAJvNA7xRS7R7U+q57KzMDepBSfNCwoRUhWOfR6eHFoAOcHRPwsP6ka1cA==
+
+vue-waterfall-easy@2.4.4:
+  version "2.4.4"
+  resolved "https://registry.npmjs.org/vue-waterfall-easy/-/vue-waterfall-easy-2.4.4.tgz"
+  integrity sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g==
+
+vue@^2.6.8:
+  version "2.7.10"
+  resolved "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"
+  integrity sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==
   dependencies:
     "@vue/compiler-sfc" "2.7.10"
-    "csstype" "^3.1.0"
+    csstype "^3.1.0"
 
-"wecomjsdk@1.0.2":
-  "integrity" "sha512-nPbrTcA5P8IOY/gQJJ3/AtXE2zSqJIQB156RUAQ2+RvwvJmcR66p7hpZtCjbtKefvyDO0LJBdEFqfjRR72zjIw=="
-  "resolved" "https://registry.npmmirror.com/wecomjsdk/-/wecomjsdk-1.0.2.tgz"
-  "version" "1.0.2"
+wecomjsdk@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/wecomjsdk/-/wecomjsdk-1.0.2.tgz"
+  integrity sha512-nPbrTcA5P8IOY/gQJJ3/AtXE2zSqJIQB156RUAQ2+RvwvJmcR66p7hpZtCjbtKefvyDO0LJBdEFqfjRR72zjIw==