no message

api/express.js

@@ -0,0 +1,11 @@
+import {request} from '../service/ajax.js'
+
+const newsUrl = '/api/express/'
+// 获取站点
+export const getExpressSite = (data) => request(newsUrl + 'site', 'post', { ...data },false)
+// 获取服务列表
+export const getExpressServe = (data) => request(newsUrl + 'serve', 'post', { ...data },false)
+// 代取优惠卷
+export const getExpressCoupon = (data) => request(newsUrl + 'coupon', 'post', { ...data },false)
+// 创建订单
+export const getExpressCreate = (data) => request(newsUrl + 'create', 'post', { ...data },false)

api/shopping.js

@@ -0,0 +1,14 @@
+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)
+
+// 购物车列表
+export const getShopIngList = (data) => request(newsUrl + 'list', 'post', { ...data },false)

pages-takeout/replace-mod/select-site.vue

@@ -3,16 +3,16 @@
 		<Nav title='选择站点'></Nav>
 		
 		<scroll-view class="scroll-view-css box-border-box p-24" scroll-y="true" @scrolltolower="scrolltolower">
-			<view class="list-item" :class="id == item.id?'s-b':''"
+			<view class="list-item" :class="site_id == item.site_id?'s-b':''"
 			v-for="(item,i) in list" :key="i" @click="selectFun(item)">
 				<view class="list-item-s">
-					<image v-if="id == item.id" src="@/static/img/common/y-select.png" mode=""></image>
+					<image v-if="site_id == item.site_id" src="@/static/img/common/y-select.png" mode=""></image>
 					<image v-else src="@/static/img/common/n-select.png" mode=""></image>
 				</view>
-				<image class="img-1" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+				<image class="img-1" :src="item.logo" mode="aspectFill"></image>
 				<view class="w-490">
-					<view class="fs-32 fw-600 fc-0">菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站</view>
-					<view class="fs-26 fw-400 fc-9">菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站</view>
+					<view class="fs-32 fw-600 fc-0">{{item.name}}</view>
+					<view class="fs-26 fw-400 fc-9">{{item.city_name}} {{item.address}}</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -20,26 +20,38 @@
 </template>
 
 <script>
+	import tools from "@/service/tools";
+	import {getExpressSite} from '@/api/express.js';
 	export default {
 		data(){
 			return{
-				id:'',
-				list:[
-					{id:1},{id:2},
-				]
+				site_id:'',
+				list:[],
 			}
 		},
 		onLoad(e) {
-			this.id = Number(e.id);
+			this.site_id = Number(e.site_id);
+			this.getExpressSite();
 		},
 		methods:{
-			scrolltolower(){
-				console.log('触底');
+			getExpressSite(){
+				let school_id = uni.getStorageSync('school_id');
+				getExpressSite({school_id:school_id}).then((res)=>{
+					if(res.code === 1){
+						this.list = res.data
+					}
+				})
 			},
 			selectFun(item){
-				this.id = item.id;
+				this.site_id = item.site_id;
+				
+				uni.setStorageSync('site_id',item.site_id)
+				uni.setStorageSync('site_name',item.name)
+				uni.setStorageSync('site_address', item.city_name + item.address)
+				uni.setStorageSync('site_logo', item.logo)
+				
 				uni.reLaunch({
-					url:'/pages-takeout/replace-take?id=' + this.id
+					url:'/pages-takeout/replace-take'
 				})
 			},
 		},

pages-takeout/replace-take.vue

@@ -7,12 +7,12 @@
 				<template>
 					<view slot="custom" class="align-items-center">
 						<uni-icons type="left" size="20" @click="toBack()"></uni-icons>
-						<view class="w-390 text-overflow-ellipsis-one fs-36 fw-400">代重庆邮电大学邮电大代重庆邮电大学邮电大</view>
+						<view class="w-390 text-overflow-ellipsis-one fs-36 fw-400">{{schoolData.school_name}}</view>
 					</view>
 				</template>
 			</Nav>
 			<view :class="addressData.id?'bottom-124':''" class="address-box align-items-center box-border-box plr-24" @click="selectFun()">
-				<view v-if="!addressData.id" class="address-1 flex-justify-space align-items-center">
+				<view v-if="!addressData.site_id" class="address-1 flex-justify-space align-items-center">
 					<view class="align-items-center">
 						<image class="qu-image" src="@/static/img/takeout/qu-icon.png" mode=""></image>
 						<view class="fw-600 fs-40">请选择站点</view>
@@ -21,10 +21,10 @@
 				</view>
 				<view v-else class="address-2 flex-justify-space align-items-center">
 					<view class="display-flex">
-						<image class="address-img mr-20" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+						<image class="address-img mr-20" :src="addressData.site_logo" mode="scaleToFill"></image>
 						<view class="">
-							<view class="w-474 fs-40 fw-600 mb-4">菜鸟驿站</view>
-							<view class="w-474 fw-400 fs-26 fc-9">兴科大道252号兴科大道252号兴科大道252号</view>
+							<view class="w-474 fs-40 fw-600 mb-4">{{addressData.site_name}}</view>
+							<view class="w-474 fw-400 fs-26 fc-9">{{addressData.site_address}}</view>
 						</view>
 					</view>
 					<image class="address-box-right" src="@/static/img/toRight.png" mode=""></image>
@@ -38,22 +38,22 @@
 			
 			<view class="list-box-b mb-48">
 				<view class="fs-36 fw-600 mb-22">快递类型</view>
-				<view class="list-item flex-justify-space" v-for="(item,i) in 6" :key="i">
-					<image src="@/static/img/my/bg.png" mode="scaleToFill"></image>
-					<view class="flex-1 ">
-						<view class="fs-32 fw-600 mb-4">小件(轻薄衣物，小1111111物品11) 1小件(轻薄衣物，小1111111物品11) 1</view>
-						<view class="fs-24 fw-400 mb-4 fc-9">规格规格规格规格规格</view>
-						<view class="fs-24 fw-400 mb-4 fc-9">销量2801</view>
+				<view class="list-item flex-justify-space" v-for="(item,i) in list" :key="i">
+					<image :src="item.serve_image" mode="scaleToFill"></image>
+					<view class="flex-1">
+						<view class="fs-32 fw-600 mb-32 ">{{item.serve_name}}</view>
+						<view class="fs-24 fw-400 mb-32 fc-9">{{item.serve_desc}}</view>
+						<!-- <view class="fs-24 fw-400 mb-4 fc-9">销量2801</view> -->
 						<view class="flex-justify-space">
 							<view class="">
 								<span class="fw-4 fc-FB3D03 fs-24">￥</span>
-								<span class="fw-b fc-FB3D03 fs-40">3.9</span>
+								<span class="fw-b fc-FB3D03 fs-40">{{item.price}}</span>
 								<span class="fw-400 fc-9 fs-24">/份</span>
 							</view>
 							<view class="display-flex align-items-center">
-								<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f">-</view>
-								<view class="right-only-right-2 text-align-center fs-28 fw-400">1</view>
-								<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f">+</view>
+								<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click="redNumber(item)">-</view>
+								<view class="right-only-right-2 text-align-center fs-28 fw-400">{{item.num}}</view>
+								<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click="addNumber(item)">+</view>
 							</view>
 						</view>
 					</view>
@@ -61,9 +61,9 @@
 			</view>
 			
 			<view class="">
-				<view class="fs-36 fw-600 mb-22">取件码（6）</view>
-				<view class="mb-20" v-for="(item,i) in 6" :key="i">
-					<input class="input-num" type="text" placeholder="未输入取件码" placeholder-class="input-p">
+				<view class="fs-36 fw-600 mb-22">取件码（{{pickup_code.length}}）</view>
+				<view class="mb-20" v-for="(item,i) in pickup_code" :key="i">
+					<input class="input-num" v-model="item.code" type="text" placeholder="未输入取件码" placeholder-class="input-p">
 				</view>
 			</view>
 		</view>
@@ -71,10 +71,10 @@
 		<view class="shop-buttom-money box-border-box" @click="openBuyCrad()">
 			<view class="shop-buttom-money-1 flex-justify-space align-items-center">
 				<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
-				<view class="shop-buttom-num fs-24 fc-f text-align-center">3</view>
+				<view class="shop-buttom-num fs-24 fc-f text-align-center">{{cardData.total_num}}</view>
 				<view class="">
 					<span class="fw-600 fs-24 fc-f">￥</span>
-					<span class="fw-600 fs-44 fc-f">19.26</span>
+					<span class="fw-600 fs-44 fc-f">{{cardData.total_price||0}}</span>
 				</view>
 				<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600">去结算</view>
 			</view>
@@ -87,13 +87,12 @@
 				<view class="buy-card-top box-border-box plr-32 flex-justify-space align-items-center">
 					<view class="">
 						<span class="fs-32 fc-3 mr-12">已选商品</span>
-						<span class="fs-32 fc-9">(打包费<span class="fs-32 fc-FB3D03">8元</span>)</span>
 					</view>
 					<view class="fs-28 fw-400 fc-9 align-items-center">
 						<view class="">
 							<uni-icons type="trash" size="18" color="#999"></uni-icons>
 						</view>
-						<view class="fs-28 fw-400 fc-9">清空</view>
+						<view class="fs-28 fw-400 fc-9" @click="cardAllDel()">清空</view>
 					</view>
 				</view>
 				<view class="scroll-view-css box-border-box p-32">
@@ -109,9 +108,9 @@
 									<span class="fs-40 fc-FB3D03 fw-b">3.99</span>
 								</view>
 								<view class="display-flex align-items-center">
-									<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f">-</view>
-									<view class="right-only-right-2 text-align-center fs-28 fw-400">1</view>
-									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f">+</view>
+									<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f" >-</view>
+									<view class="right-only-right-2 text-align-center fs-28 fw-400">0</view>
+									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" >+</view>
 								</view>
 							</view>
 						</view>
@@ -128,7 +127,6 @@
 								<span class="fw-600 fs-44 fc-f">19.26</span>
 							</view>
 						</view>
-						<!-- <view class="fs-32 fw-600 fc-f mr-30">20元起送</view> -->
 						<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600">去结算</view>
 					</view>
 				</view>
@@ -140,41 +138,144 @@
 
 <script>
 	import tools from "@/service/tools";
+	import {getExpressServe} from '@/api/express.js';
+	import {setShopIngAdd,setShopIngNumber,setShopIngDel,getShopIngList} from '@/api/shopping.js'
+	
 	export default {
 		data(){
 			return{
+				schoolData:{
+					school_id:'',
+					school_name:'',
+				},
 				addressData:{
-					id:'',
-					name:'',
+					site_id:'',
+					site_name:'',
+					site_address:'',
+					site_logo:'',
+				},
+				list:[],
+				
+				isAJAX:false,
+				
+				pickup_code:[],
+				
+				cardData:{
+					goods_list:[],
+					total_num:0,
+					total_price:0,
 				},
 			}
 		},
-		onLoad(e) {
-			if(e.id){
-				this.addressData.id = Number(e.id);
-			}
+		onShow() {
+			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.getList();
 		},
 		methods:{
+			getList(){
+				getExpressServe().then((res)=>{
+					if(res.code === 1){
+						this.list = res.data;
+						this.list.forEach((v)=>{
+							v.num = 0
+						})
+						this.getCard();
+					}
+				})
+			},
+			getCard(){
+				getShopIngList({type:2}).then((res)=>{
+					if(res.code === 1){
+						this.cardData = res.data;
+						if(this.cardData.total_num > 0){
+							this.cardData.goods_list.forEach(v=>{
+								this.list.forEach(t=>{
+									if(v.goods_id === t.id){
+										t.num = v.number
+									}
+								})
+							})
+							for (let i = 0; i < this.cardData.total_num; i++) {
+								let obj = {code:''};
+								this.pickup_code.push(obj);
+							}
+							console.log(this.pickup_code);
+						}
+					}
+				})
+			},
 			toBack(){
 				tools.leftClick()
 			},
 			selectFun(){
 				uni.navigateTo({
-					url:'pages-takeout/replace-mod/select-site?id=' + this.addressData.id
+					url:'pages-takeout/replace-mod/select-site?site_id=' + this.addressData.site_id
 				})
 			},
 			openBuyCrad(){
-				this.$refs.popupBuy.open()
+				console.log(this.pickup_code);
+				// this.$refs.popupBuy.open()
 			},
 			createOrder(){
 				
 			},
+			
+			addNumber(item){
+				if(this.isAJAX){
+					return
+				}
+				this.isAJAX = true;
+				setShopIngAdd({type:2,goods_id:item.id}).then((res)=>{
+					if(res.code === 1){
+						this.isAJAX = false;
+						item.num += 1;
+						this.$forceUpdate();
+					}else{
+						this.isAJAX = false;
+						tools.error('添加操作失败')
+					}
+				})
+			},
+			redNumber(item){
+				if(item.num > 0){
+					if(this.isAJAX){
+						return
+					}
+					this.isAJAX = true;
+					setShopIngNumber({type:2,goods_id:item.id,operation:2}).then((res)=>{
+						if(res.code === 1){
+							this.isAJAX = false;
+							item.num -= 1;
+							this.$forceUpdate();
+						}else{
+							this.isAJAX = false;
+							tools.error('减少操作失败')
+						}
+					})
+				}else{
+					tools.error('已无可减少商品')
+				}
+			},
+			cardAllDel(){
+				
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 	.replace-take-box{
+		.h-80{
+			width: 470rpx;
+			height: 88rpx;
+		}
 		.right-only-right-red{
 			width: 44rpx;
 			height: 44rpx;
@@ -331,7 +432,7 @@
 			}
 			.list-item{
 				width: 100%;
-				min-height: 200rpx;
+				min-height: 100rpx;
 				margin-bottom: 50rpx;
 				
 				image{

pages/index/search-list.vue

@@ -14,32 +14,32 @@
 
 		
 		<scroll-view scroll-y="true" class="scroll-view-css seacrh-info box-border-box p-24" @scrolltolower="scrolltolower">
-			<view class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in 10">
-				<image class="left-img" src="../../static/img/my/bg.png" mode="scaleToFill"></image>
+			<view class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in list" :key="i" @click="toShop(item)">
+				<image class="left-img" :src="item.shop_logo" mode="aspectFill"></image>
 				<view class="flex-1">
 					<view class="align-items-center mb-8">
-						<view class="right-box-title fs-32 fw-600 text-overflow-ellipsis-one">蜜雪冰城（重工页店）122332323232323232323232</view>
+						<view class="right-box-title fs-32 fw-600 text-overflow-ellipsis-one">{{item.shop_name}}</view>
 						<image class="right-box-title-img" src="@/static/img/toRight.png" mode=""></image>
 					</view>
 					<view class="align-items-center mb-8">
 						<image class="img-x mr-12" src="@/static/img/my/wdpj.png" mode=""></image>
-						<view class="fs-26 fw-600 fc-FF7F00 mr-12">4.5分</view>
-						<view class="fc-6 fs-24 mr-12">| 预计38分钟 |</view>
-						<view class="fc-6 fs-24 mr-12">855人购买</view>
+						<view class="fs-26 fw-600 fc-FF7F00 mr-12">{{item.shop_score}}分</view>
+						<view class="fc-6 fs-24 mr-12">| 预计{{item.delivery_time}}分钟 |</view>
+						<view class="fc-6 fs-24 mr-12">{{item.shop_sales}}人购买</view>
 					</view>
 					<view class="align-items-center flex-wrap-wrap">
-						<view class="quan-list display-flex mr-12 mb-12" v-for="(item,i) in 3" :key="i">
+						<view class="quan-list display-flex mr-12 mb-12" v-for="(info1,index1) in item.coupon" :key="index1">
 							<view class="quan-list-1 fs-24 fc-f">券</view>
-							<view class="quan-list-2 fs-24 fc-FB3D03">10元</view>
+							<view class="quan-list-2 fs-24 fc-FB3D03">{{info1.money}}元</view>
 						</view>
 					</view>
 					<view class="goods-items-list display-flex">
-						<view class="goods-items-list-box" v-for="(info,i) in 10">
-							<image class="mb-12" src="@/static/img/my/bg.png" mode=""></image>
-							<view class="mb-8 fw-600 text-overflow-ellipsis-one fs-26">AAAAAAAAAAAAAA</view>
+						<view class="goods-items-list-box" v-for="(info2,index2) in item.goods" :key="index2">
+							<image class="mb-12" :src="info2.goods_image" mode="aspectFill"></image>
+							<view class="mb-8 fw-600 text-overflow-ellipsis-one fs-26">{{info2.goods_name}}</view>
 							<view class="">
 								<span class="fs-24 fc-FB3D03">￥</span>
-								<span class="fs-32 fc-FB3D03 fw-b">3.99</span>
+								<span class="fs-32 fc-FB3D03 fw-b">{{info2.price}}</span>
 							</view>
 						</view>
 					</view>
@@ -91,6 +91,11 @@
 					this.getList();
 				}
 			},
+			toShop(item){
+				uni.navigateTo({
+					url:'/pages-takeout/shop?shop_id=' + item.shop_id
+				})
+			},
 		},
 	}
 </script>
@@ -107,6 +112,7 @@
 			left: 0;
 			width: 100%;
 			height: 376rpx;
+			filter: blur(80rpx);
 			background-image: linear-gradient(to right, #C9F7FC,#F9F6E0,#F6F5F3);
 			z-index: -1;
 		}
@@ -151,7 +157,7 @@
 		
 		.goos-list-box{
 			width: 100%;
-			min-height: 428rpx;
+			min-height: 100rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(51,51,51,0.1);
 			border-radius: 20rpx;

pages/index/search-record.vue

@@ -127,6 +127,7 @@
 			left: 0;
 			width: 100%;
 			height: 376rpx;
+			filter: blur(80rpx);
 			background-image: linear-gradient(to right, #C9F7FC,#F9F6E0,#F6F5F3);
 			z-index: -1;
 		}