新增商家活动配置和商家短信包配置

common/config.js

@@ -1,11 +1,11 @@
-const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";//https://tcwm.xianmaxiong.com  //https://mxys.chuanghai-tech.com/sqx_fast
-// const ROOTPATHA = "https://www.daweilinli.com/sqx_fast";
-const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
-// const ROOTPATHASSS = "https://www.daweilinli.com";
-const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
-const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";
+// const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";//https://tcwm.xianmaxiong.com  //https://mxys.chuanghai-tech.com/sqx_fast
+const ROOTPATHA = "https://www.daweilinli.com/sqx_fast";
+// const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
+const ROOTPATHASSS = "https://www.daweilinli.com";
+// const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
+const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
+// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
+const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";
 const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
 const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
 

common/httpRequest.js

@@ -24,6 +24,55 @@ module.exports = {
 		}
 		return info;
 	},
+	put: function(url, data, header) {
+		header = header || "application/x-www-form-urlencoded";
+		url = this.config("APIHOST") + url;
+		let token = uni.getStorageSync("shopToken");
+		// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMzMwIiwiaWF0IjoxNjQzMTAyNTcyLCJleHAiOjE2NDU2OTQ1NzJ9.UJhS7Nmj495d-CfCNm9VTenuwxV0z4J8Vl9CAlftXt89zrmQtebXDLmS8f25l8He_dnTUxAfjlKVWSsyYnKs6A'
+		return new Promise((succ, error) => {
+			uni.request({
+				url: url,
+				data: data,
+				method: "PUT",
+				header: {
+					"content-type": header,
+					"token": token
+				},
+				success: function(result) {
+					if (result.data.code == 401 && token) {
+						uni.removeStorageSync("token")
+						uni.removeStorageSync("userId")
+						uni.removeStorageSync("phone")
+						uni.removeStorageSync("openid")
+						uni.removeStorageSync("userName")
+						uni.removeStorageSync("relation")
+						uni.removeStorageSync("relation_id")
+						uni.removeStorageSync("isInvitation")
+						uni.removeStorageSync("zhiFuBao")
+						uni.removeStorageSync("zhiFuBaoName")
+	
+						uni.showModal({
+							title: '提示',
+							content: '用户信息失效，请重新登录！',
+							showCancel: false, // 是否显示取消按钮，默认为 true // 是否显示取消按钮，默认为 true
+							success: function(res) {
+								if (res.confirm) {
+									uni.redirectTo({
+										url: '/pages/my/loginphone'
+									})
+								}
+							}
+						});
+	
+					}
+					succ.call(self, result.data)
+				},
+				fail: function(e) {
+					error.call(self, e)
+				}
+			})
+		})
+	},
 	post: function(url, data, header) {
 		header = header || "application/x-www-form-urlencoded";
 		url = this.config("APIHOST") + url;

my/store/hdInfo.vue

@@ -12,7 +12,7 @@
 		<!-- 活动标题 -->
 		<view class="title flex justify-center align-center">
 			<view class="title-box flex align-center">
-				{{info.activityTitle}}
+				{{info.title}}
 			</view>
 		</view>
 		<!-- 活动内容 -->
@@ -21,6 +21,44 @@
 
 			</view>
 		</view>
+		<!-- 活动类型 -->
+		<view class="title flex justify-center align-center">
+			<view class="title-box flex align-center">
+				<span v-if="info.type=='1'">普通活动</span>
+				<span v-if="info.type=='2'">时段优惠</span>
+				<span v-if="info.type=='3'">满额优惠</span>
+				<span v-if="info.type=='4'">全场优惠</span>
+			</view>
+		</view>
+		<!-- 活动内容 时段优惠-->
+		<view class="title flex justify-center align-center" v-if="info.type=='2'">
+			<view class="title-box align-center">
+				<view v-for="(item,index) in info.timeIntervalInfos" :key="index">
+					{{item.startTime}}至{{item.endTime}}打{{item.discountContent}}折
+				</view><br/>
+			</view>
+		</view>
+		<!-- 活动内容 满额优惠-->
+		<view class="title flex justify-center align-center" v-if="info.type=='3'">
+			<view class="title-box flex align-center" v-if="info.fullReductionInfo.type=='1'">
+				订单满{{info.fullReductionInfo.minAmount}}减{{info.fullReductionInfo.discountContent}}元
+			</view>
+			<view class="title-box flex align-center" v-if="info.fullReductionInfo.type=='2'">
+				订单满{{info.fullReductionInfo.minAmount}}打{{info.fullReductionInfo.discountContent}}折
+			</view>
+		</view>
+		<!-- 活动内容 全场优惠-->
+		<view class="title flex justify-center align-center" v-if="info.type=='4'">
+			<view class="title-box flex align-center">
+				全场打{{info.globalDiscountsInfo.discountRate}}折
+			</view>
+		</view>
+		<!-- 活动时间 -->
+		<view class="title flex justify-center align-center">
+			<view class="title-box flex align-center">
+				{{info.startTime}}至{{info.endTime}}
+			</view>
+		</view>
 
 		<!-- 加入按钮 -->
 		<view class="submit flex justify-center align-center">
@@ -49,47 +87,53 @@
 		methods: {
 			//加入活动
 			joinHd() {
-				let data = {
-					activityId: this.activityId,
-					shopId: uni.getStorageSync('shopId')
-				}
-				this.$Request.get("/app/activityManage/shopJoinActivity", data).then(res => {
-					if (res.code == 0) {
-						uni.showModal({
-							title: '提示',
-							content: '确定加入该活动？',
-							complete(ret) {
-								if (ret.confirm) {
-									uni.showToast({
-										title: '加入成功'
-									})
-									setTimeout(() => {
-										uni.navigateBack()
-									}, 1000)
-								}
+				uni.navigateTo({
+					url:'./join_huodong?activityId='+this.activityId
+				})
+				// let data = {
+				// 	activityId: this.activityId,
+				// 	shopId: uni.getStorageSync('shopId')
+				// }
+				// this.$Request.get("/app/activityManage/shopJoinActivity", data).then(res => {
+				// 	if (res.code == 0) {
+				// 		uni.showModal({
+				// 			title: '提示',
+				// 			content: '确定加入该活动？',
+				// 			complete(ret) {
+				// 				if (ret.confirm) {
+				// 					uni.showToast({
+				// 						title: '加入成功'
+				// 					})
+				// 					setTimeout(() => {
+				// 						uni.navigateBack()
+				// 					}, 1000)
+				// 				}
 
-							}
-						})
+				// 			}
+				// 		})
 
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-				});
+				// 	} else {
+				// 		uni.showToast({
+				// 			title: res.msg,
+				// 			icon: 'none'
+				// 		})
+				// 	}
+				// });
 			},
 			//活动详情
 			getInfo() {
-				let data = {
-					activityId: this.activityId
-				}
-				this.$Request.get("/app/activityManage/getActivityInfo", data).then(res => {
-					if (res.code == 0) {
-						this.content = res.data.activityContent.replace(new RegExp("img", "g"),
+				var activityId=this.activityId
+				this.$Request.get(`/admin/activity/${activityId}`).then(res => {
+					if(res.msg=='success'){
+						this.content = res.data.content.replace(new RegExp("img", "g"),
 							'img style="width:100%;height:auto;"')
 						this.info = res.data
-						this.imgs = res.data.activityImage.split(',')
+						this.imgs = res.data.image.split(',')
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
 					}
 				});
 			},

my/store/huodong.vue

@@ -12,19 +12,27 @@
 		</view>
 		<!-- 活动列表 -->
 		<view :style="myhd.length==0?'margin-top: 20rpx;':'margin-top: -40rpx;'" class="list flex justify-center flex-wrap">
-			<view class="list-box flex justify-center" v-if="item.no != '是'" v-for="(item,index) in huodongList" :key="index" @click="item.se!='是'?gotoinfo(item.activityId):''">
+			<view class="list-box flex justify-center" v-if="item.id != 14" v-for="(item,index) in huodongList" :key="index" @click="item.quantity==0 &&item.id != 14?gotoinfo(item.id):''">
 				<view class="list-box-c flex justify-between align-center">
 					<view class="list-box-c-l flex align-center">
-						<image :src="item.activityImage.split(',')[0]" style="width: 100rpx;height: 100rpx;" mode="aspectFill"></image>
+						<image :src="item.image.split(',')[0]" style="width: 100rpx;height: 100rpx;" mode="aspectFill"></image>
 						<view class="list-box-c-l-txt">
-							{{item.activityTitle}}
+							{{item.title}}
 						</view>
 					</view>
-					<view class="list-box-c-r" v-if="item.se!='是'" @click.stop="joinHd(item.activityId)">
+					<view class="list-box-c-r" v-if="item.quantity==0" @click.stop="joinHd(item.id,index)">
 						加入
 					</view>
-					<view class="list-box-c-r" v-else>
-						已加入
+					<view v-else>
+						<!-- <view class="list-box-c-r">
+							已加入
+						</view> -->
+						<view class="list-box-c-t" @click="selectShang(item.activityShopId )" v-if="item.type=='3'">
+							选择商品
+						</view>
+						<view class="list-box-c-t" @click.stop="quitHuo(item.id)">
+							退出
+						</view>
 					</view>
 				</view>
 			</view>
@@ -55,110 +63,135 @@
 					loadmore: '上拉加载更多',
 					loading: '努力加载中',
 					nomore: '实在没有了'
-				}
+				},
 			};
 		},
 		onLoad() {
 			//我参与的活动
 			this.getMyHuoDong()
-			//活动列表
-			this.getHuoDongList();
 		},
 		onShow() {
 			//我参与的活动
 			this.getMyHuoDong()
-			//活动列表
-			this.getHuoDongList();
 		},
 		//加载更多
 		onReachBottom() {
 			if(this.page < this.total){
 				this.page += 1
 				this.status = 'loading'
-				this.getHuoDongList()
+				//我参与的活动
+				this.getMyHuoDong()
 			}
 		},
 		//下拉刷新
 		onPullDownRefresh() {
 			this.page = 1
-			this.getHuoDongList()
 			this.getMyHuoDong()
 		},
 		methods: {
 			//加入活动
-			joinHd(activityId) {
-				let that = this
-				let data = {
-					activityId: activityId,
-					shopId: uni.getStorageSync('shopId')
-				}
-				this.$Request.get("/app/activityManage/shopJoinActivity", data).then(res => {
-					if (res.code == 0) {
-						uni.showModal({
-							title: '提示',
-							content: '加入该活动将自动退出当前活动,确定加入该活动？',
-							complete(ret) {
-								if (ret.confirm) {
+			joinHd(id,index) {
+				uni.navigateTo({
+					url:'./join_huodong?activityId='+id+'&shunxu='+index
+				})
+			},
+			//退出活动
+			quitHuo(row){
+				uni.showModal({
+					title: '提示',
+					content: '确定退出该活动?',
+					success: (res) => {
+						if(res.confirm) {  
+							let data = {
+								"shopId":uni.getStorageSync('shopId'),
+								"activityId": row
+							}
+							this.$Request.put("/admin/activity-shop/quit", data).then(res => {
+								if(res.code==0){
+									uni.showToast({
+										title: '操作成功',
+										icon: 'success'
+									})
+									this.getMyHuoDong()
+								}else{
 									uni.showToast({
-										title: '加入成功'
+										title: res.msg,
+										icon: 'none'
 									})
-									//我参与的活动
-									that.getMyHuoDong()
-									//活动列表
-									that.getHuoDongList();
 								}
-			
-							}
-						})
-			
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
+							});
+						} else {  
+						}  
 					}
-				});
+				})
+			},
+			//选择商品
+			selectShang(activityShopId){
+				uni.navigateTo({
+					url:'./select_shang?actShopid='+activityShopId
+				})
 			},
-			gotoinfo(activityId){
+			//跳转到活动详情
+			gotoinfo(id){
 				uni.navigateTo({
-					url:'./hdInfo?activityId='+activityId
+					url:'./hdInfo?activityId='+id
 				})
 			},
 			// 我参与的活动
 			getMyHuoDong() {
-				let data = {
-					shopId:uni.getStorageSync('shopId')
-				}
-				this.$Request.get("/app/goods/getShopActivity", data).then(res => {
+				var shopId=uni.getStorageSync('shopId')
+				this.$Request.get(`/admin/activity-shop/shop-activity-list/${shopId}`).then(res => {
 					if (res.code == 0) {
-						this.activityId = res.data.activityId
-						this.myhd = res.data.activityImage.split(',')
+						let returnData = res.data
+						// this.activityId = res.data.activityId
+						this.myhd = res.data[0].activityImage.split(',')
+						//活动列表
+						this.getHuoDongList(returnData)
 					}
 				});
 			},
-			getHuoDongList() {
+			getHuoDongList(returnData) {
+				// this.huodongList = []
 				let data = {
 					page: this.page,
 					limit: this.limit
 				}
-				this.$Request.getT("/app/activityManage/getActivityList", data).then(res => {
+				this.$Request.get("/admin/activity/page", data).then(res => {
 					uni.stopPullDownRefresh()
 					if (res.code == 0) {
-						res.data.records.map(item=>{
-							if(item.activityId==14){
-								item.no = '是'
-							}
-							if(item.activityId==this.activityId){
-								item.se = '是'
-							}else{
-								item.se = '否'
+						let returnData2 = res.data
+						const newList =returnData2.list.map(item =>{
+						return{...item,quantity:0}
+						return{...item,activityShopId:0}
+						})
+						var arr = []
+						for(var j in returnData){
+						newList.forEach(item => {
+							if (item.id === returnData[j].activityId) {
+							// 'status'为属性名，'非活动'为修改后的内容
+							item.quantity = 1
+							item.activityShopId = returnData[j].activityShopId
 							}
 						})
-						this.total = res.data.pages
+						}
+						arr=newList
+						// this.huodongData = arr
+												
+						// res.data.list.map(item=>{
+						// 	if(item.id==14){
+						// 		item.no = '是'
+						// 	}
+						// 	if(item.id==this.activityId){
+						// 		item.se = '是'
+						// 	}else{
+						// 		item.se = '否'
+						// 	}
+						// })
+						this.total = res.data.totalCount
 						if (this.page == 1) {
-							this.huodongList = res.data.records
+							this.huodongList = arr
 						} else {
-							this.huodongList = [...this.huodongList, ...res.data.records]
+							this.huodongList = [...this.huodongList, ...arr]
 						}
 						if(this.page == this.total){
 							this.status = 'nomore'
@@ -222,6 +255,16 @@
 				border-radius: 24rpx;
 
 			}
+			//退出
+			.list-box-c-t{
+				background: rgba(252, 126, 126, 1);
+				padding: 10rpx 30rpx 10rpx 30rpx;
+				// color: #ffffff;
+				font-size: 26rpx;
+				border-radius: 24rpx;
+				margin-top: 5px;
+				text-align: center;
+			}
 		}
 	}
 </style>

my/store/index.vue

@@ -456,6 +456,14 @@
 					})
 					return
 				}
+				if (this.shop.businessHours>=this.shop.lockHours) {
+					uni.showToast({
+						title: '开店时间不能大于闭店时间',
+						icon: 'none',
+						duration: 1000
+					})
+					return
+				}
 				// if (!this.shop.detailedAddress) {
 				// 	uni.showToast({
 				// 		title: '请填写店铺地址',

my/store/join_huodong.vue

@@ -0,0 +1,165 @@
+<template>
+	<view class="padding">
+		<view class="text-white padding bg radius">
+			<u-form :model="shop" label-position="top">
+				<!-- <u-form-item label="参与活动的商品：">
+					<view class="list-box-c-r" @click="selectShang">
+						选择
+					</view>
+				</u-form-item> -->
+				<u-form-item label="活动名称：">
+					<text>{{info.title}}</text>
+				</u-form-item>
+				<u-form-item label="活动图片：">
+					<view class="imgs" v-for="(item,index) in info.image.split(',')" :key="index">
+						<img width="100%" class="images" height="100%" :src="item" alt="">
+					</view>
+				</u-form-item>
+				<u-form-item label="活动详情：">
+					<text v-html="info.content"></text>
+				</u-form-item>
+				<u-form-item label="参与活动的优惠：">
+					<text v-if="info.type=='1'">普通活动</text>
+					<text v-if="info.type=='2'">时段优惠</text>
+					<text v-if="info.type=='3'">满额优惠</text>
+					<text v-if="info.type=='4'">全场优惠</text>
+				</u-form-item>
+				<u-form-item label="适用情况：" v-if="info.type=='2' || info.type=='3' || info.type=='4'">
+					<u-radio-group v-model="suitType">
+						<u-radio name='1'>皆适用</u-radio>
+						<u-radio name='2'>仅争对第一次下单</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item label="活动限制：" v-if="info.type=='2' || info.type=='3' || info.type=='4'">
+					<u-radio-group v-model="limitType">
+						<u-radio name='1'>无限制</u-radio>
+						<u-radio name='2'>每天使用</u-radio>
+						<input v-model="limitNum" style="background-color: rgba(128, 128, 128, 0.3);" type="number" />
+						<text>次</text>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item label="活动日期：">
+					<text>{{info.startTime}}至{{info.endTime}}</text>
+				</u-form-item>
+			</u-form>
+		</view>
+
+
+		<u-button @click="submit" class="margin-top" :custom-style="customStyle" shape="square" :hair-line="false">确认
+		</u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				customStyle: {
+					backgroundColor: '#FFCC00',
+					color: '#000000',
+					border: 0
+				},
+				info: {},
+				activityId:'',
+				suitType:'1',//适用情况
+				limitType:'1',//使用限制
+				limitNum:'',
+				actShopid:'',//选择商品的id
+				shunxu:'',
+			}
+		},
+		onLoad(option) {
+			this.activityId = option.activityId
+			this.shunxu=option.shunxu
+			this.getInfo()
+		},
+		methods: {
+			//活动详情
+			getInfo() {
+				var activityId=this.activityId
+				this.$Request.get(`/admin/activity/${activityId}`).then(res => {
+					if(res.msg=='success'){
+						this.content = res.data.content.replace(new RegExp("img", "g"),
+							'img style="width:100%;height:auto;"')
+						this.info = res.data
+						this.imgs = res.data.image.split(',')
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				});
+			},
+			//参与活动
+			submit(){
+				var shopid=[uni.getStorageSync('shopId')]
+				if (this.limitType == '') {
+					uni.showToast({
+						title: '有限制时不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				let data = {
+					"activityId": this.activityId,
+					"limitType": this.limitType,
+					"limitValue": this.limitNum,
+					"shopIds": shopid,
+					"suitType": this.suitType
+				}
+				this.$Request.postJson("/admin/activity-shop/join", data).then(res => {
+					if(res.code==0){
+						this.actShopid=res.data
+						uni.showToast({
+							title: '操作成功',
+							icon: 'success'
+						})
+						uni.navigateBack({
+							delta: 1
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F5F5F5;
+	}
+	
+	.bg {
+		background-color: #FFFFFF;
+	}
+	
+	
+	.tabBox {
+		border: 1rpx solid #999999;
+		padding: 15rpx 20rpx;
+		border-radius: 15rpx;
+		font-size: 28rpx;
+	}
+	
+	.btnnum {
+		color: #005DFF;
+		border: 1rpx solid #005DFF;
+	}
+	.list-box-c-r {
+		width: 120rpx;
+		height: 62rpx;
+		background: #FCD202;
+		line-height: 62rpx;
+		text-align: center;
+		font-size: 26rpx;
+		border-radius: 24rpx;
+
+	}
+</style>

my/store/select_shang.vue

@@ -0,0 +1,310 @@
+<template>
+	<view class="padding">
+		<view class="text-white padding bg radius">
+			<view class="bg padding-lr padding-tb-sm flex align-center" style="background-color: white;">
+				<u-search @change="search" v-model="goodsName" placeholder="请输入商品名称 " bg-color="#F7F7F7"
+					style="width: 100%;" shape="square" :show-action="false"></u-search>
+			</view>
+			<view class="all_circle" v-if="ifallselece" @click="quSelect()" style="background-color:rgba(245, 211, 71, 1);"></view>
+			<view class="all_circle" v-else @click="allSelect()"></view>
+			<view class="quanxuan">全选</view>
+			<view class="all_select" @click="yixuan">已选商品</view>
+			<!-- 商品列表 -->
+			<view style="margin-left: -16px;">
+				<view v-for="(item,index) in shangList" :key="index" class="shang_list">
+					<view class="shang_circle" v-if="item.shangpin==0" @click="qiehuan(item.goodsId)"></view>
+					<view class="shang_circle_select" v-if="item.shangpin==1" @click="qiehuan2(item.goodsId,index)"></view>
+					<image class="shang_image" :src="item.goodsPicture.split(',')[0]"></image>
+					<view class="shang_name">{{item.goodsName}}</view>
+					<view class="shang_time">{{item.createTime}}</view>
+				</view>
+			</view>
+		</view>
+
+
+		<u-button @click="submit" class="margin-top" :custom-style="customStyle" shape="square" :hair-line="false">确认
+		</u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				customStyle: {
+					backgroundColor: '#FFCC00',
+					color: '#000000',
+					border: 0
+				},
+				actShopid:'',
+				page: 1,
+				limit: 10,
+				goodsName:'',
+				shangList:[],
+				shangIds:[],
+				ifallselece:false,
+			}
+		},
+		onLoad(option) {
+			this.actShopid=option.actShopid
+			//已选择的商品
+			this.selectShang()
+		},
+		onShow() {
+			//我参与的活动
+			// this.selectShang()
+		},
+		methods: {
+			//搜索
+			search() {
+				this.selectShang()
+			},
+			//商品全选
+			allSelect(){
+				this.shangList.forEach(item => {
+					// 'status'为属性名，'非活动'为修改后的内容
+					item.shangpin = 1
+					this.shangIds.push(item.goodsId)
+				})
+				this.ifallselece=true
+			},
+			//取消全选
+			quSelect(){
+				this.shangList.forEach(item => {
+					// 'status'为属性名，'非活动'为修改后的内容
+					item.shangpin = 0
+				})
+				this.shangIds=[]
+				this.ifallselece=false
+			},
+			//变成选中状态
+			qiehuan(goodsId){
+				if(this.shangIds.length==this.shangList.length){
+					if(this.ifallselece){
+						this.ifallselece=false
+					}else {
+						this.ifallselece=true
+					}
+				}
+				this.shangList.forEach(item => {
+					if (goodsId===item.goodsId) {
+					// 'status'为属性名，'非活动'为修改后的内容
+					item.shangpin = 1
+					}
+				})
+				this.shangIds.push(goodsId)
+			},
+			//变成不选中
+			qiehuan2(goodsId,index){
+				if(this.shangIds.length==this.shangList.length){
+					if(this.ifallselece){
+						this.ifallselece=false
+					}else {
+						this.ifallselece=true
+					}
+				}
+				this.shangList.forEach(item => {
+					if (goodsId===item.goodsId) {
+					// 'status'为属性名，'非活动'为修改后的内容
+					item.shangpin = 0
+					}
+				})
+				this.shangIds.splice(index, 1);
+				console.log(this.shangIds,'dddd')
+			},
+			//商品加入活动
+			submit(){
+				let data = {
+					"activityShopId": this.actShopid,
+					"goodsIds": this.shangIds
+				}
+				this.$Request.postJson("/admin/activity-goods", data).then(res => {
+					if(res.code==0){
+						uni.showToast({
+							title: '选择成功',
+							icon: 'success'
+						})
+						uni.navigateBack({
+							delta: 1
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				});
+			},
+			//已选择的商品
+			selectShang(){
+				// var shopId=uni.getStorageSync('shopId')
+				this.$Request.get(`/admin/activity-goods/${this.actShopid}`).then(res => {
+					if (res.code == 0) {
+						let returnData = res.data
+						//活动列表
+						this.allShang(returnData)
+					}else{
+						uni.showModal({
+							content:res.msg
+						})
+					}
+				});
+			},
+			//店铺所有商品
+			allShang(returnData){
+				// /ad?page=1&limit=10&goodsName=&classifyId=&shopId=147&status=0
+				let data = {
+					page: this.page,
+					limit: this.limit,
+					goodsName: this.goodsName,
+					shopId: uni.getStorageSync('shopId'),
+					// status: this.tabIndex == 1 ? 2 : (this.tabIndex == 2 ? 1 : this.tabIndex)
+				}
+				this.$Request.getA("/admin/goodsShop/selectGoodsByShopId", data).then(res => {
+					if (res.code == 0) {
+						var total = res.data.totalCount
+						let data2 = {
+							page: this.page,
+							limit: total,
+							goodsName: this.goodsName,
+							shopId: uni.getStorageSync('shopId'),
+							// status: this.tabIndex == 1 ? 2 : (this.tabIndex == 2 ? 1 : this.tabIndex)
+						}
+						this.$Request.getA("/admin/goodsShop/selectGoodsByShopId", data2).then(res => {
+							if (res.code == 0) {
+								uni.hideLoading()
+								let returnData2 = res.data
+								const newList =returnData2.list.map(item =>{
+								return{...item,shangpin:0}
+								})
+								var arr = []
+								if(returnData.length===0){
+									newList.forEach(item => {
+										// 'status'为属性名，'非活动'为修改后的内容
+										item.shangpin = 1
+										this.shangList.forEach(item => {
+											this.shangIds.push(item.goodsId)
+										})
+										this.ifallselece=true
+									})
+									
+								}else{
+									for(var j in returnData){
+										newList.forEach(item => {
+											if (item.goodsId === returnData[j]) {
+											// 'status'为属性名，'非活动'为修改后的内容
+											item.shangpin = 1
+											this.shangIds.push(item.goodsId)
+											}
+										})
+									}
+								}
+								arr=newList
+								this.shangList = arr
+								
+								// if (this.page == 1) {
+								// 	this.shangList = arr
+								// } else {
+								// 	this.shangList = [...this.shangList, ...arr]
+								// }
+								// if(this.page == this.total){
+								// 	this.status = 'nomore'
+								// }else{
+								// 	this.status = 'loadmore'
+								// }
+						}
+						})
+					}
+					uni.stopPullDownRefresh();
+					uni.hideLoading()
+				});
+				
+			},
+			//已选商品
+			yixuan() {
+				uni.navigateTo({
+					url:'./yixuan_shang?actShopid='+this.actShopid
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		/* background-color: #F5F5F5; */
+	}
+	.padding{
+		padding-top: 0px;
+	}
+	.all_circle{
+		margin-top: 20rpx;
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 86rpx;
+		border: 1rpx solid rgba(166, 166, 166, 1);
+	}
+	.quanxuan{
+		margin: -60rpx 0 0 70rpx;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 74rpx;
+		color: rgba(0, 0, 0, 1);
+	}
+	.all_select{
+		margin: -75rpx 0 0 400rpx;
+		width: 137rpx;
+		height: 74rpx;
+		border-radius: 22rpx;
+		background: rgba(245, 211, 71, 1);
+		font-size: 24rpx;
+		line-height: 74rpx;
+		color: rgba(0, 0, 0, 1);
+		text-align: center;
+	}
+	/* 商品列表 */
+	.shang_list{
+		width: 711rpx;
+		height: 160rpx;
+		margin-top: 20rpx;
+		opacity: 1;
+		background: rgba(255, 255, 255, 1);
+	}
+	.shang_circle{
+		position: absolute;
+		margin: 50rpx 0 0 41rpx;
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 86rpx;
+		border: 1rpx solid rgba(166, 166, 166, 1);
+	}
+	.shang_circle_select{
+		position: absolute;
+		margin: 50rpx 0 0 41rpx;
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 86rpx;
+		background-color:rgba(245, 211, 71, 1);
+	}
+	.shang_image{
+		position: absolute;
+		margin: 31rpx 0 0 141rpx;
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 6rpx;
+		/* background: url(https://img.js.design/assets/smartFill/img395164da755928.jpeg), rgba(204, 204, 204, 1); */
+	}
+	.shang_name{
+		position: absolute;
+		margin: 29rpx 0 0 259rpx;
+		font-size: 32rpx;
+		color: rgba(0, 0, 0, 1);
+	}
+	.shang_time{
+		position: absolute;
+		margin: 90rpx 0 0 259rpx;
+		font-size: 24rpx;
+		color: rgba(153, 153, 153, 1);
+	}
+</style>

my/store/yixuan_shang.vue

@@ -0,0 +1,144 @@
+<template>
+	<view class="padding">
+		<view class="text-white padding bg radius">
+			<!-- 商品列表 -->
+			<view style="margin-left: -16px;">
+				<view v-for="(item,index) in shangList" class="shang_list">
+					<image class="shang_image" :src="item.goodsPicture.split(',')[0]"></image>
+					<view class="shang_name">{{item.goodsName}}</view>
+					<view class="shang_time">{{item.createTime}}</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				customStyle: {
+					backgroundColor: '#FFCC00',
+					color: '#000000',
+					border: 0
+				},
+				shangList:[],
+				actShopid:'',
+				page: 1,
+				limit: 10,
+			}
+		},
+		onLoad(option) {
+			this.actShopid=option.actShopid
+			//已选择的商品
+			this.selectShang()
+		},
+		methods: {
+			//已选择的商品
+			selectShang(){
+				// var shopId=uni.getStorageSync('shopId')
+				this.$Request.get(`/admin/activity-goods/${this.actShopid}`).then(res => {
+					if (res.code == 0) {
+						let returnData = res.data
+						//活动列表
+						this.allShang(returnData)
+					}else{
+						uni.showModal({
+							content:res.msg
+						})
+					}
+				});
+			},
+			//店铺所有商品
+			allShang(returnData){
+				let data = {
+					page: this.page,
+					limit: this.limit,
+					shopId: uni.getStorageSync('shopId'),
+				}
+				this.$Request.getA("/admin/goodsShop/selectGoodsByShopId", data).then(res => {
+					if (res.code == 0) {
+						var total = res.data.totalCount
+						let data2 = {
+							page: this.page,
+							limit: total,
+							shopId: uni.getStorageSync('shopId'),
+						}
+						this.$Request.getA("/admin/goodsShop/selectGoodsByShopId", data2).then(res => {
+							if (res.code == 0) {
+								uni.hideLoading()
+								let newList = res.data.list
+								var arr = []
+								for(var j in returnData){
+									newList.forEach(item => {
+										if (item.goodsId === returnData[j]) {
+											arr.push(item)
+										}
+									})
+								}
+								this.shangList = arr
+						}
+						})
+					}
+					uni.stopPullDownRefresh();
+					uni.hideLoading()
+				});
+				
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		/* background-color: #F5F5F5; */
+	}
+	.padding{
+		padding-top: 0px;
+	}
+	/* 商品列表 */
+	.shang_list{
+		width: 711rpx;
+		height: 160rpx;
+		margin-top: 20rpx;
+		opacity: 1;
+		background: rgba(255, 255, 255, 1);
+	}
+	.shang_circle{
+		position: absolute;
+		margin: 50rpx 0 0 41rpx;
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 86rpx;
+		border: 1rpx solid rgba(166, 166, 166, 1);
+	}
+	.shang_circle_select{
+		position: absolute;
+		margin: 50rpx 0 0 41rpx;
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 86rpx;
+		background-color:rgba(245, 211, 71, 1);
+	}
+	.shang_image{
+		position: absolute;
+		margin: 31rpx 0 0 41rpx;
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 6rpx;
+		/* background: url(https://img.js.design/assets/smartFill/img395164da755928.jpeg), rgba(204, 204, 204, 1); */
+	}
+	.shang_name{
+		position: absolute;
+		margin: 29rpx 0 0 159rpx;
+		font-size: 32rpx;
+		color: rgba(0, 0, 0, 1);
+	}
+	.shang_time{
+		position: absolute;
+		margin: 90rpx 0 0 159rpx;
+		font-size: 24rpx;
+		color: rgba(153, 153, 153, 1);
+	}
+</style>

pages.json

@@ -242,6 +242,30 @@
                     "enablePullDownRefresh": true
                 }
                 
+                },{
+                    "path" : "store/join_huodong",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "加入活动",
+                    "enablePullDownRefresh": true
+                }
+                
+                },{
+                    "path" : "store/select_shang",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "选择商品",
+                    "enablePullDownRefresh": true
+                }
+                
+                },{
+                    "path" : "store/yixuan_shang",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "已选商品",
+                    "enablePullDownRefresh": true
+                }
+                
                 }
                 ,{
                     "path" : "store/hdInfo",

pages/order/index.vue

@@ -84,6 +84,17 @@
 								</view>
 
 								<u-line color="#f2f2f2" />
+								<view class="padding-bottom padding-lr margin-top-sm text-gray" style="margin-left: 120px;display: flex;">
+									
+									<view class="flex"
+										v-if="item.status == 3&&item.orderType==2&&item.autoSendOrder ==1">
+										<view class="btn_" @click.stop="duanxinOrder(item)" style="width: 90px;">送达并发短信</view>
+									</view>
+									<view class="flex"
+										v-if="item.status == 3&&item.orderType==2 &&item.deliveryImgs==null">
+										<view class="btn_pai" @click.stop="paiOrder(item)">拍照</view>
+									</view>
+								</view>
 								<view class="flex align-center justify-between padding-tb">
 									<view class="flex  align-center padding-lr-sm">
 										<view class="text-gray text-sm">实收：</view>
@@ -111,6 +122,10 @@
 										<view class="flex" v-if="item.status == 7">
 											<view class="btn_" @click.stop="jiedans(item)">拒绝接单</view>
 										</view>
+										<view class="flex"
+											v-if="item.status == 4&&item.orderType==2 &&item.deliveryImgs==null">
+											<view class="btn_pai" @click.stop="paiOrder(item)">拍照</view>
+										</view>
 										<view class="flex" v-if="item.status == 6||item.status == 3||item.status == 4">
 											<view class="btn_" @click.stop="xiaoPiao(item)">补打小票</view>
 										</view>
@@ -129,7 +144,80 @@
 						</view>
 					</view>
 				</view>
-
+				
+				<!-- 确认收货拍照弹出框 -->
+				<u-popup v-model="alertPhone" mode="center" border-radius="18" :closeable="closeable" close-icon="close-circle"
+					close-icon-size="45" width="680rpx" height="540rpx" @close="onclose">
+					<view class="receipt_code">
+						<view class="phone_title">图片凭证</view>
+						<view class="phone_title2">请上传外卖送达情况</view>
+						<view>
+							<view class="flex" style="overflow: hidden;flex-wrap: wrap;">
+								<view v-if="goodsPicture.length">
+									<view class="margin-top flex margin-right-sm flex-wrap">
+										<view class="flex"
+											style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;"
+											v-for="(image,index) in goodsPicture" :key="index">
+											<image :src="image" style="width: 100%;height: 100%;"></image>
+											<view style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;"
+												@click="removeImg(index,'lb')">
+												<u-icon name="close-circle-fill" color="#FCD202" size="50rpx"></u-icon>
+											</view>
+						
+										</view>
+									</view>
+								</view>
+								<view class="margin-top" @click="addImages(1)" v-if="goodsPicture.length<=1">
+									<view style="width: 200rpx;height: 200rpx;background: #f4f5f6;"
+										class="flex justify-center align-center">
+										<view>
+											<view class="text-center">
+												<image src="https://moxuanyunshang.oss-cn-beijing.aliyuncs.com/duanxin/addimg.png" style="width: 65rpx;height: 55rpx;">
+												</image>
+											</view>
+											<view class="text-center text-black">添加图片</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="sure" @click="querenduanxin">确认拍照</view>
+					</view>
+				</u-popup>
+				<!-- 确认收货短信弹出框 -->
+				<u-popup v-model="alertduanxin" mode="center" border-radius="18" :closeable="closeable" close-icon="close-circle"
+					close-icon-size="45" width="680rpx" height="700rpx" @close="onclose2">
+					<view class="receipt_code">
+						<view class="receipt_code">
+							<view class="code_title">是否确认送达</view>
+							<view class="code_title2">已选订单：1单</view>
+							<view class="code_title2">通知形式：短信</view>
+							<view class="code_title2">通知内容：{{duanxin[0].templateContent.substring(0, 21)}}{{qiPhone}}</view>
+							<view class="code_title3">注：发送短信需要收费，每条{{duanPrice}}元</view>
+							<view class="sure" @click="querenSh">确认送达</view>
+						</view>
+					</view>
+				</u-popup>
+				<!-- 发送短信出错弹框 -->
+				<u-popup v-model="ifNotduan" mode="center" border-radius="18" :closeable="closeable" close-icon="close-circle"
+					close-icon-size="45" width="680rpx" height="700rpx">
+					<view class="receipt_code">
+						<view class="receipt_code">
+							<view class="code_title">是否确认送达</view>
+							<view class="text-center">
+								<image src="https://moxuanyunshang.oss-cn-beijing.aliyuncs.com/duanxin/%E7%94%BB%E6%9D%BF%202.png" style="width: 33px;height: 33px;">
+								</image>
+							</view>
+							<view class="code_title2">发送失败</view>
+							<view class="code_title2">原因：{{failYuanyin}}，短信发送失败，请点击拨号联系学生</view>
+							<view class="sure2" @click="phoneToxue(xuePhone)">
+								<image src="https://moxuanyunshang.oss-cn-beijing.aliyuncs.com/duanxin/%E7%94%BB%E6%9D%BF%201.png" style="width: 33rpx;height: 33rpx;">
+								</image>
+								{{xuePhone}}
+							</view>
+						</view>
+					</view>
+				</u-popup>
 				<!-- 筛选弹框 -->
 				<view class="box" v-if="show">
 					<view class="popbox" @click.stop="shop = false">
@@ -166,6 +254,7 @@
 
 <script>
 	import empty from '@/components/empty.vue'
+	import configdata from '@/common/config.js';
 	export default {
 		components: {
 			empty
@@ -223,7 +312,19 @@
 					}
 				],
 				arr:[],
+				closeable: true,
 				show1: true,
+				alertPhone:false,
+				alertduanxin:false,
+				goodsPicture: [],//拍照图片
+				count: 3,
+				orderId:'',
+				duanxin:[],//发送的短信
+				duanPrice:'',//短信费用
+				qiPhone:'',//骑手电话
+				ifNotduan:false,//发送短信出错
+				failYuanyin:'',//短信发送失败原因
+				xuePhone:'',//当前用户
 			};
 		},
 		onLoad(option) {
@@ -257,6 +358,7 @@
 			}
 		},
 		onShow() {
+			this.qiPhone=uni.getStorageSync('mobile')
 			this.shopId = uni.getStorageSync('shopId');
 			this.getOrderList();
 			this.clearOrderMsg();
@@ -398,6 +500,201 @@
 					}
 				});
 			},
+			//发短信送达
+			duanxinOrder(e){
+				this.orderId=e.orderId
+				this.xuePhone=e.phone
+				this.querenduanxinList()
+				this.getDuanPrice()
+			},
+			//拍照
+			paiOrder(e){
+				this.orderId=e.orderId
+				this.alertPhone=true
+			},
+			// 图片上传
+			addImages(e) {
+				if (e == 1) {
+					var num = this.goodsPicture.length
+					this.count = 2 - num
+				}
+			
+				let that = this
+				uni.chooseImage({
+					count: this.count,
+					sourceType: [ 'camera','album'],
+					success: res => {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							that.$queue.showLoading("上传中...");
+							uni.uploadFile({ // 上传接口
+								// url: that.config("APIHOST1") + '/alioss/upload', //真实的接口地址
+								url: that.config("APIHOST1") + '/alioss/upload',
+								// url: 'https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload',
+								filePath: res.tempFilePaths[i],
+								name: 'file',
+								success: (uploadFileRes) => {
+									if (e == 1) {
+										if (that.goodsPicture.length < 2) {
+											that.goodsPicture.push(JSON.parse(uploadFileRes.data)
+												.data)
+										}
+									}
+									uni.hideLoading();
+									// this.querenduanxin()
+								}
+							});
+						}
+					}
+				})
+			},
+			// 图片删除
+			removeImg(index, texts) {
+				if (texts == 'lb') {
+					this.goodsPicture.splice(index, 1)
+				}
+			},
+			config: function(name) {
+				var info = null;
+				if (name) {
+					var name2 = name.split("."); //字符分割
+					if (name2.length > 1) {
+						info = configdata[name2[0]][name2[1]] || null;
+					} else {
+						info = configdata[name] || null;
+					}
+					if (info == null) {
+						let web_config = cache.get("web_config");
+						if (web_config) {
+							if (name2.length > 1) {
+								info = web_config[name2[0]][name2[1]] || null;
+							} else {
+								info = web_config[name] || null;
+							}
+						}
+					}
+				}
+				return info;
+			},
+			// 监听拍照框关闭
+			onclose(){
+				this.alertPhone=false
+				this.goodsPicture=[]
+			},
+			//确认上传图片
+			querenduanxin(){
+				var tupian=this.goodsPicture.toString()
+				var orderId=this.orderId
+				this.$Request.postJson(`/admin/order/add-receive-img/${orderId}?img=`+tupian, {
+
+				}).then(res => {
+					console.log(res,'img')
+					if (res.code == 0) {
+						this.alertPhone = false
+						uni.showToast({
+							title: '图片上传完成',
+							icon: "none"
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none"
+						});
+					}
+				});
+			},
+			// 获取确认送达短信模板
+			querenduanxinList() {
+				this.$Request.getT('/app/tb-indent-sms/template', {
+				}).then(res => {
+					this.duanxin=res.data.list
+					if (res.code == 0) {
+						this.page = 1;
+						this.alertduanxin=true
+			
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none"
+						});
+					}
+				});
+			},
+			//获取短信价格
+			getDuanPrice(){
+				this.$Request.getT('/admin/tb-indent-sms/price-of-sms', {
+				}).then(res => {
+					if (res.code == 0) {
+						this.duanPrice=	res.data
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none"
+						});
+					}
+				});
+			},
+			//发短信并送达
+			querenSh() {
+				// #ifdef MP-WEIXIN
+				if (uni.getStorageSync('sendindexMsg')) {
+					uni.requestSubscribeMessage({
+						tmplIds: this.arr,
+						success(re) {
+							// console.log(re,'**********')
+							var datas = JSON.stringify(re);
+							if (datas.indexOf("accept") != -1) {
+								console.log(re)
+							}
+						},
+						fail: (res) => {
+							console.log(res)
+						}
+					})
+				}
+				// #endif
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认发送短信并完成送达吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								orderId: that.orderId,
+								sendSmsFlag:1,
+								smsTemplateId:that.duanxin[0].id
+							}
+							that.$Request.postT("/admin/order/accomplishOrder", data).then(res => {
+								if (res.code == 0) {
+									that.alertduanxin=false
+									that.xuePhone=''
+									that.getOrderList()
+									uni.showToast({
+										title: '配送成功',
+										icon: "success"
+									});
+								}else{
+									that.failYuanyin=res.msg
+									that.alertduanxin=false
+									that.xuePhone=''
+									that.ifNotduan=true
+									uni.showToast({
+										title: res.msg,
+										icon: "none"
+									});
+								}
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			//联系学生
+			phoneToxue(e){
+				uni.makePhoneCall({
+					phoneNumber: e ,
+				}) // 传参带入号码即可
+			},
 			// 完成送达
 			succOrder(e){
 				// #ifdef MP-WEIXIN
@@ -426,6 +723,7 @@
 							console.log('用户点击确定');
 							let data = {
 								orderId: e.orderId,
+								sendSmsFlag:0
 								// orderNumber: e.orderNumber,
 								// shopId: that.shopId,
 								// addressId: e.addressId,
@@ -537,7 +835,6 @@
 					uni.requestSubscribeMessage({
 						tmplIds: this.arr,
 						success(re) {
-							// console.log(re,'**********')
 							var datas = JSON.stringify(re);
 							if (datas.indexOf("accept") != -1) {
 								console.log(re)
@@ -920,6 +1217,20 @@
 		border-radius: 8rpx; */
 	}
 
+	/* 拍照 */
+    .btn_pai{
+		width: 150rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		background: rgba(255, 201, 189, 1);
+		font-size: 28rpx;
+		border: 2rpx solid rgba(255, 201, 189, 1);
+		color: #333333;
+		border-radius: 50rpx;
+		font-weight: 700;
+		margin-left: 15rpx;
+	}
 	.btn_ {
 		width: 150rpx;
 		height: 60rpx;
@@ -1268,4 +1579,98 @@
 	.u-border-top:after {
 		border: none !important;
 	}
+	
+	/* 收货码弹框 */
+	.receipt_code {
+		width: 90%;
+		margin: 0 auto;
+	}
+	
+	.code_title {
+		width: 100%;
+		line-height: 100rpx;
+		font-size: 31rpx;
+		font-weight: bold;
+		text-align: center;
+		letter-spacing: 2rpx;
+		margin-top: 21rpx;
+		margin-bottom: 25rpx;
+	}
+	
+	.u-input--border {
+		border: 1px solid #F2F2F2 !important;
+		background: #F2F2F2 !important;
+		color: #999999 !important;
+		font-weight: 500 !important;
+		letter-spacing: 2rpx !important;
+	}
+	
+	.u-input__input {
+		font-size: 30rpx;
+		font-weight: bold;
+		flex: 1;
+		color: #999999 !important;
+		min-height: 85rpx !important;
+		margin-top: 7rpx;
+	}
+	
+	.sure {
+		width: 100%;
+		height: 80rpx;
+		background: rgba(245, 211, 71, 1);
+		color: white;
+		border-radius: 46rpx;
+		text-align: center;
+		line-height: 80rpx;
+		margin-top: 30rpx;
+		color: rgba(0, 0, 0, 1);
+		letter-spacing: 2rpx;
+	}
+	.sure2{
+		text-align: center;
+		color: rgba(0, 0, 0, 1);
+		line-height: 80rpx;
+		margin-top: 30rpx;
+		width: 100%;
+		height: 80rpx;
+		opacity: 1;
+		border-radius: 10rpx;
+		background: rgba(245, 211, 71, 1);
+	}
+	/* 确认送达拍照框 */
+	.phone_title{
+		margin-top: 10px;
+		width: 100%;
+		height: 40px;
+		/* background-color: #FF7F00; */
+		text-align: center;
+		line-height: 40px;
+		/* color:#FFFFFF; */
+	}
+	.phone_title2{
+		margin-top: 10px;
+		text-align: center;
+		color:#9d9d9d;
+	}
+	.code_title2 {
+	    width: 100%;
+	    line-height: 50rpx;
+	    text-align: center;
+	    letter-spacing: 2rpx;
+	    margin-top: 21rpx;
+	    margin-bottom: 25rpx;
+	}
+	.code_title3{
+		margin-left: -20px;
+		margin-top: 21rpx;
+		margin-bottom: 25rpx;
+		width: 638rpx;
+		height: 66rpx;
+		border-radius: 6rpx;
+		background: rgba(255, 245, 245, 1);
+		font-size: 24rpx;
+		line-height: 66rpx;
+		color: rgba(212, 48, 48, 1);
+		text-align: center;
+	}
 </style>

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

@@ -47,6 +47,9 @@
         "other/moneydetail",
         "other/cashDetail",
         "store/huodong",
+        "store/join_huodong",
+        "store/select_shang",
+        "store/yixuan_shang",
         "store/hdInfo",
         "yhq/yhq",
         "yhq/add",

unpackage/dist/dev/mp-weixin/my/store/huodong.wxss

@@ -63,5 +63,13 @@
   padding: 10rpx 30rpx 10rpx 30rpx;
   font-size: 26rpx;
   border-radius: 24rpx;
+}
+.list .list-box .list-box-c-t {
+  background: #fc7e7e;
+  padding: 10rpx 30rpx 10rpx 30rpx;
+  font-size: 26rpx;
+  border-radius: 24rpx;
+  margin-top: 5px;
+  text-align: center;
 }
 

unpackage/dist/dev/mp-weixin/my/store/join_huodong.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "加入活动",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "u-form": "/uview-ui/components/u-form/u-form",
+    "u-form-item": "/uview-ui/components/u-form-item/u-form-item",
+    "u-radio-group": "/uview-ui/components/u-radio-group/u-radio-group",
+    "u-radio": "/uview-ui/components/u-radio/u-radio",
+    "u-button": "/uview-ui/components/u-button/u-button"
+  }
+}

unpackage/dist/dev/mp-weixin/my/store/join_huodong.wxss

@@ -0,0 +1,27 @@
+
+page {
+	background-color: #F5F5F5;
+}
+.bg {
+	background-color: #FFFFFF;
+}
+.tabBox {
+	border: 1rpx solid #999999;
+	padding: 15rpx 20rpx;
+	border-radius: 15rpx;
+	font-size: 28rpx;
+}
+.btnnum {
+	color: #005DFF;
+	border: 1rpx solid #005DFF;
+}
+.list-box-c-r {
+	width: 120rpx;
+	height: 62rpx;
+	background: #FCD202;
+	line-height: 62rpx;
+	text-align: center;
+	font-size: 26rpx;
+	border-radius: 24rpx;
+}
+

unpackage/dist/dev/mp-weixin/my/store/select_shang.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "选择商品",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "u-search": "/uview-ui/components/u-search/u-search",
+    "u-button": "/uview-ui/components/u-button/u-button"
+  }
+}

unpackage/dist/dev/mp-weixin/my/store/select_shang.wxss

@@ -0,0 +1,77 @@
+
+page {
+	/* background-color: #F5F5F5; */
+}
+.padding{
+	padding-top: 0px;
+}
+.all_circle{
+	margin-top: 20rpx;
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 86rpx;
+	border: 1rpx solid rgba(166, 166, 166, 1);
+}
+.quanxuan{
+	margin: -60rpx 0 0 70rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	line-height: 74rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.all_select{
+	margin: -75rpx 0 0 400rpx;
+	width: 137rpx;
+	height: 74rpx;
+	border-radius: 22rpx;
+	background: rgba(245, 211, 71, 1);
+	font-size: 24rpx;
+	line-height: 74rpx;
+	color: rgba(0, 0, 0, 1);
+	text-align: center;
+}
+/* 商品列表 */
+.shang_list{
+	width: 711rpx;
+	height: 160rpx;
+	margin-top: 20rpx;
+	opacity: 1;
+	background: rgba(255, 255, 255, 1);
+}
+.shang_circle{
+	position: absolute;
+	margin: 50rpx 0 0 41rpx;
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 86rpx;
+	border: 1rpx solid rgba(166, 166, 166, 1);
+}
+.shang_circle_select{
+	position: absolute;
+	margin: 50rpx 0 0 41rpx;
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 86rpx;
+	background-color:rgba(245, 211, 71, 1);
+}
+.shang_image{
+	position: absolute;
+	margin: 31rpx 0 0 141rpx;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 6rpx;
+	/* background: url(https://img.js.design/assets/smartFill/img395164da755928.jpeg), rgba(204, 204, 204, 1); */
+}
+.shang_name{
+	position: absolute;
+	margin: 29rpx 0 0 259rpx;
+	font-size: 32rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.shang_time{
+	position: absolute;
+	margin: 90rpx 0 0 259rpx;
+	font-size: 24rpx;
+	color: rgba(153, 153, 153, 1);
+}
+

unpackage/dist/dev/mp-weixin/my/store/yixuan_shang.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "已选商品",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/my/store/yixuan_shang.wxml

@@ -0,0 +1 @@
+<view class="padding"><view class="text-white padding bg radius"><view style="margin-left:-16px;"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index"><view class="shang_list"><image class="shang_image" src="{{item.g0[0]}}"></image><view class="shang_name">{{item.$orig.goodsName}}</view><view class="shang_time">{{item.$orig.createTime}}</view></view></block></view></view></view>

unpackage/dist/dev/mp-weixin/my/store/yixuan_shang.wxss

@@ -0,0 +1,52 @@
+
+page {
+	/* background-color: #F5F5F5; */
+}
+.padding{
+	padding-top: 0px;
+}
+/* 商品列表 */
+.shang_list{
+	width: 711rpx;
+	height: 160rpx;
+	margin-top: 20rpx;
+	opacity: 1;
+	background: rgba(255, 255, 255, 1);
+}
+.shang_circle{
+	position: absolute;
+	margin: 50rpx 0 0 41rpx;
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 86rpx;
+	border: 1rpx solid rgba(166, 166, 166, 1);
+}
+.shang_circle_select{
+	position: absolute;
+	margin: 50rpx 0 0 41rpx;
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 86rpx;
+	background-color:rgba(245, 211, 71, 1);
+}
+.shang_image{
+	position: absolute;
+	margin: 31rpx 0 0 41rpx;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 6rpx;
+	/* background: url(https://img.js.design/assets/smartFill/img395164da755928.jpeg), rgba(204, 204, 204, 1); */
+}
+.shang_name{
+	position: absolute;
+	margin: 29rpx 0 0 159rpx;
+	font-size: 32rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.shang_time{
+	position: absolute;
+	margin: 90rpx 0 0 159rpx;
+	font-size: 24rpx;
+	color: rgba(153, 153, 153, 1);
+}
+

unpackage/dist/dev/mp-weixin/pages/order/index.json

@@ -3,6 +3,8 @@
   "usingComponents": {
     "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
     "u-line": "/uview-ui/components/u-line/u-line",
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
     "empty": "/components/empty"
   }
 }

unpackage/dist/dev/mp-weixin/pages/order/index.wxss

@@ -1,322 +1,337 @@
 
 .active.data-v-0ca91b30 {
-	width: 82rpx;
-	height: 6rpx;
-	background: #333333;
-	margin-left: 12rpx;
+		width: 82rpx;
+		height: 6rpx;
+		background: #333333;
+		margin-left: 12rpx;
 }
 .bg.data-v-0ca91b30 {
-	background-color: #FFFFFF;
+		background-color: #FFFFFF;
 }
 
-/* 切换选项 */
+	/* 切换选项 */
 .nav.data-v-0ca91b30 {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background-color: #FFFFFF;
-	color: #999999;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+		color: #999999;
 }
 .btn.data-v-0ca91b30 {
-	/* padding: 10rpx 20rpx;
-	text-align: center;
-	background: rgba(255, 19, 10, 0.2);
-	font-size: 28rpx;
-	border: 2rpx solid #FF130A;
-	color: #FF130A;
-	opacity: 0.6;
-	border-radius: 8rpx; */
-	width: 150rpx;
-	height: 60rpx;
-	line-height: 60rpx;
-	text-align: center;
-	background: #F5F5F5;
-	font-size: 28rpx;
-	border: 2rpx solid ##F5F5F5;
-	color: #666666;
-	border-radius: 50rpx;
-	font-weight: 700;
-	margin-left: 10rpx;
+		/* padding: 10rpx 20rpx;
+		text-align: center;
+		background: rgba(255, 19, 10, 0.2);
+		font-size: 28rpx;
+		border: 2rpx solid #FF130A;
+		color: #FF130A;
+		opacity: 0.6;
+		border-radius: 8rpx; */
+		width: 150rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		background: #F5F5F5;
+		font-size: 28rpx;
+		border: 2rpx solid ##F5F5F5;
+		color: #666666;
+		border-radius: 50rpx;
+		font-weight: 700;
+		margin-left: 10rpx;
 }
 .btnCm.data-v-0ca91b30 {
-	/* padding: 10rpx 20rpx;
-	text-align: center;
-	background: #0081FF;
-	font-size: 28rpx;
-	border: 2rpx solid #0081FF;
-	color: #FFFFFF;
-	opacity: 0.6;
-	border-radius: 8rpx; */
+		/* padding: 10rpx 20rpx;
+		text-align: center;
+		background: #0081FF;
+		font-size: 28rpx;
+		border: 2rpx solid #0081FF;
+		color: #FFFFFF;
+		opacity: 0.6;
+		border-radius: 8rpx; */
+}
+
+	/* 拍照 */
+.btn_pai.data-v-0ca91b30{
+		width: 150rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		background: rgba(255, 201, 189, 1);
+		font-size: 28rpx;
+		border: 2rpx solid rgba(255, 201, 189, 1);
+		color: #333333;
+		border-radius: 50rpx;
+		font-weight: 700;
+		margin-left: 15rpx;
 }
 .btn_.data-v-0ca91b30 {
-	width: 150rpx;
-	height: 60rpx;
-	line-height: 60rpx;
-	text-align: center;
-	background: #FCD202;
-	font-size: 28rpx;
-	border: 2rpx solid #FCD202;
-	color: #333333;
-	border-radius: 50rpx;
-	font-weight: 700;
-	margin-left: 15rpx;
+		width: 150rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		background: #FCD202;
+		font-size: 28rpx;
+		border: 2rpx solid #FCD202;
+		color: #333333;
+		border-radius: 50rpx;
+		font-weight: 700;
+		margin-left: 15rpx;
 }
 .tabBtn.data-v-0ca91b30 {
-	/* background-color: #f6f6fa; */
-	height: 60rpx;
-	line-height: 60rpx;
-	color: #000000;
-	font-size: 31rpx;
-	font-weight: bold;
+		/* background-color: #f6f6fa; */
+		height: 60rpx;
+		line-height: 60rpx;
+		color: #000000;
+		font-size: 31rpx;
+		font-weight: bold;
 }
 .shaix.data-v-0ca91b30 {
-	width: 30%;
-	text-align: center;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	letter-spacing: 4rpx;
-	font-size: 27rpx;
+		width: 30%;
+		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		letter-spacing: 4rpx;
+		font-size: 27rpx;
 }
 .select.data-v-0ca91b30 {
-	color: #000000;
-	font-size: 31rpx;
-	font-weight: bold;
-	background-color: #fff;
+		color: #000000;
+		font-size: 31rpx;
+		font-weight: bold;
+		background-color: #fff;
 }
 .nav view.data-v-0ca91b30 {
-	flex-grow: 1;
-	margin: 3% 6.5% 2%;
-	text-align: center;
+		flex-grow: 1;
+		margin: 3% 6.5% 2%;
+		text-align: center;
 }
 .nav_btna.data-v-0ca91b30 {
-	font-size: 42rpx;
-	line-height: 34rpx;
-	color: #000000;
-	font-weight: bold;
-	border-bottom: 14rpx solid #FCD202;
+		font-size: 42rpx;
+		line-height: 34rpx;
+		color: #000000;
+		font-weight: bold;
+		border-bottom: 14rpx solid #FCD202;
 }
 
-/* 内容 */
+	/* 内容 */
 
-/* 全部订单 */
+	/* 全部订单 */
 .cont_one.data-v-0ca91b30 {
-	/* margin-top: 160rpx; */
+		/* margin-top: 160rpx; */
 }
 .cont_one image.data-v-0ca91b30 {
-	width: 80%;
-	height: 353rpx;
+		width: 80%;
+		height: 353rpx;
 }
 
-/* 到店取餐 */
+	/* 到店取餐 */
 .cont_two.data-v-0ca91b30 {
-	display: none;
-	width: 94%;
-	margin: 3% auto;
-	background-color: #FFFFFF;
-	border-radius: 18rpx;
+		display: none;
+		width: 94%;
+		margin: 3% auto;
+		background-color: #FFFFFF;
+		border-radius: 18rpx;
 }
 .cont.data-v-0ca91b30 {
-	/* display: none; */
-	width: 94%;
-	margin: 3% auto;
-	background-color: #FFFFFF;
-	border-radius: 18rpx;
+		/* display: none; */
+		width: 94%;
+		margin: 3% auto;
+		background-color: #FFFFFF;
+		border-radius: 18rpx;
 }
 .cont_two_top.data-v-0ca91b30 {
-	width: 94%;
-	padding: 4% 3% 0;
-	margin: 0 auto;
-	display: flex;
-	justify-content: space-between;
+		width: 94%;
+		padding: 4% 3% 0;
+		margin: 0 auto;
+		display: flex;
+		justify-content: space-between;
 }
 .cont_two_top_le.data-v-0ca91b30 {
-	width: 85%;
-	font-size: 30rpx;
-	font-weight: 500;
-	color: #333333;
-	/* line-height: 2; */
-	margin: 5rpx 0;
+		width: 85%;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #333333;
+		/* line-height: 2; */
+		margin: 5rpx 0;
 }
 .cont_two_top_ri.data-v-0ca91b30 {
-	/* width: 15%; */
-	padding: 6rpx 10rpx;
-	text-align: center;
-	background: rgba(255, 19, 10, 0.2);
-	font-size: 24rpx;
-	border: 2rpx solid #FF130A;
-	color: #FF130A;
-	opacity: 0.6;
-	border-radius: 8rpx;
+		/* width: 15%; */
+		padding: 6rpx 10rpx;
+		text-align: center;
+		background: rgba(255, 19, 10, 0.2);
+		font-size: 24rpx;
+		border: 2rpx solid #FF130A;
+		color: #FF130A;
+		opacity: 0.6;
+		border-radius: 8rpx;
 }
 .cont_two_top_ri1.data-v-0ca91b30 {
-	/* width: 15%; */
-	text-align: center;
-	/* line-height: 2; */
-	padding: 6rpx 10rpx;
-	background: #62ba8b;
-	font-size: 24rpx;
-	border: 2rpx solid #62ba8b;
-	color: #fff;
-	/* opacity: 0.6; */
-	border-radius: 8rpx;
+		/* width: 15%; */
+		text-align: center;
+		/* line-height: 2; */
+		padding: 6rpx 10rpx;
+		background: #62ba8b;
+		font-size: 24rpx;
+		border: 2rpx solid #62ba8b;
+		color: #fff;
+		/* opacity: 0.6; */
+		border-radius: 8rpx;
 }
 .cont_two_top_ri2.data-v-0ca91b30 {
-	/* width: 15%; */
-	text-align: center;
-	/* line-height: 2; */
-	padding: 6rpx 10rpx;
-	background: #FCD202;
-	font-size: 24rpx;
-	border: 2rpx solid #FCD202;
-	color: #fff;
-	/* opacity: 0.6; */
-	border-radius: 8rpx;
+		/* width: 15%; */
+		text-align: center;
+		/* line-height: 2; */
+		padding: 6rpx 10rpx;
+		background: #FCD202;
+		font-size: 24rpx;
+		border: 2rpx solid #FCD202;
+		color: #fff;
+		/* opacity: 0.6; */
+		border-radius: 8rpx;
 }
 .cont_two_text.data-v-0ca91b30 {
-	font-size: 58rpx;
-	text-align: center;
-	font-weight: bold;
-	color: red;
-	margin: 3% 0;
-	line-height: 32rpx;
+		font-size: 58rpx;
+		text-align: center;
+		font-weight: bold;
+		color: red;
+		margin: 3% 0;
+		line-height: 32rpx;
 }
 .cont_two_text2.data-v-0ca91b30 {
-	font-size: 30rpx;
-	width: 100%;
-	font-weight: 500;
-	color: #333333;
-	text-align: center;
-	padding-bottom: 3%;
-	/* line-height: 32rpx; */
+		font-size: 30rpx;
+		width: 100%;
+		font-weight: 500;
+		color: #333333;
+		text-align: center;
+		padding-bottom: 3%;
+		/* line-height: 32rpx; */
 }
 .cont_two_text2 text.data-v-0ca91b30 {
-	color: #FF130A;
+		color: #FF130A;
 }
 .cont_two_bottom.data-v-0ca91b30 {
-	width: 94%;
-	padding: 3%;
-	margin: 0 auto;
-	display: flex;
-	border-top: 1rpx solid #E6E6E6;
+		width: 94%;
+		padding: 3%;
+		margin: 0 auto;
+		display: flex;
+		border-top: 1rpx solid #E6E6E6;
 }
 .cont_two_bottom_le.data-v-0ca91b30 {
-	flex: 1;
-	font-size: 24rpx;
-	font-weight: 500;
-	color: #999999;
-	line-height: 32rpx;
+		flex: 1;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #999999;
+		line-height: 32rpx;
 }
 .cont_two_bottom_ri.data-v-0ca91b30 {
-	flex: 1;
-	text-align: right;
+		flex: 1;
+		text-align: right;
 }
 .cont_two_bottom_ri image.data-v-0ca91b30 {
-	width: 14rpx;
-	height: 24rpx;
+		width: 14rpx;
+		height: 24rpx;
 }
 
-/* 外卖订单 */
+	/* 外卖订单 */
 .cont_three.data-v-0ca91b30 {
-	display: none;
-	width: 94%;
-	margin: 3% auto;
-	background-color: #FFFFFF;
-	border-radius: 18rpx;
+		display: none;
+		width: 94%;
+		margin: 3% auto;
+		background-color: #FFFFFF;
+		border-radius: 18rpx;
 }
 .cont_three_top.data-v-0ca91b30 {
-	width: 94%;
-	padding: 4% 3% 0;
-	margin: 0 auto;
-	display: flex;
+		width: 94%;
+		padding: 4% 3% 0;
+		margin: 0 auto;
+		display: flex;
 }
 .cont_three_top_le.data-v-0ca91b30 {
-	flex: 2;
-	font-size: 30rpx;
-	font-weight: 500;
-	color: #D80204;
-	line-height: 32rpx;
+		flex: 2;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #D80204;
+		line-height: 32rpx;
 }
 .cont_three_top_ri.data-v-0ca91b30 {
-	flex: 1;
-	text-align: right;
-	font-size: 24rpx;
-	font-weight: 500;
-	color: #999999;
-	line-height: 32rpx;
+		flex: 1;
+		text-align: right;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #999999;
+		line-height: 32rpx;
 }
 .cont_three_text.data-v-0ca91b30 {
-	padding: 2% 0 2% 3%;
-	font-size: 24rpx;
-	font-weight: 500;
-	color: #999999;
-	line-height: 32rpx;
+		padding: 2% 0 2% 3%;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #999999;
+		line-height: 32rpx;
 }
 .cont_three_cen.data-v-0ca91b30 {
-	width: 94%;
-	padding: 0.5% 3%;
-	margin: 0 auto;
-	display: flex;
+		width: 94%;
+		padding: 0.5% 3%;
+		margin: 0 auto;
+		display: flex;
 }
 .cont_three_cen_le.data-v-0ca91b30 {
-	flex: 2;
-	font-size: 30rpx;
-	font-weight: 500;
-	color: #333333;
-	line-height: 32rpx;
+		flex: 2;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #333333;
+		line-height: 32rpx;
 }
 .cont_three_cen_ri.data-v-0ca91b30 {
-	flex: 1;
-	text-align: right;
-	font-size: 24rpx;
-	font-weight: 500;
-	color: #999999;
-	line-height: 32rpx;
+		flex: 1;
+		text-align: right;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #999999;
+		line-height: 32rpx;
 }
 .cont_three_text2.data-v-0ca91b30 {
-	font-size: 24rpx;
-	font-weight: 500;
-	color: #D80204;
-	padding: 0 3%;
-	line-height: 32rpx;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #D80204;
+		padding: 0 3%;
+		line-height: 32rpx;
 }
 .cont_three_bottom.data-v-0ca91b30 {
-	width: 94%;
-	padding: 3%;
-	margin: 3% auto 0;
-	display: flex;
-	border-top: 1rpx solid #E6E6E6;
+		width: 94%;
+		padding: 3%;
+		margin: 3% auto 0;
+		display: flex;
+		border-top: 1rpx solid #E6E6E6;
 }
 .cont_three_bottom_le.data-v-0ca91b30 {
-	flex: 1;
-	font-size: 24rpx;
-	font-weight: 500;
-	color: #999999;
-	line-height: 32rpx;
+		flex: 1;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #999999;
+		line-height: 32rpx;
 }
 .cont_three_bottom_ri.data-v-0ca91b30 {
-	flex: 1;
-	text-align: right;
+		flex: 1;
+		text-align: right;
 }
 .cont_dis.data-v-0ca91b30 {
-	display: block;
+		display: block;
 }
 .box.data-v-0ca91b30 {
-	width: 100%;
-	height: 100vh;
-	background-color: rgba(0, 0, 0, 0.2);
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0, 0, 0, 0.2);
 
-	/* opacity: 0.2; */
-	position: absolute;
-	top: 40px;
-	z-index: 999
+		/* opacity: 0.2; */
+		position: absolute;
+		top: 40px;
+		z-index: 999
 }
 .popbox.data-v-0ca91b30 {
-	width: 749rpx;
-	/* height: 764upx; */
-	background: #FFFFFF;
-	padding-bottom: 72rpx;
-	z-inde: 999;
+		width: 749rpx;
+		/* height: 764upx; */
+		background: #FFFFFF;
+		padding-bottom: 72rpx;
+		z-inde: 999;
 
 
 
@@ -325,36 +340,127 @@
 
 
 
-	position: fixed;
-	top: 66rpx;
-	left: 0;
-	right: 0;
+		position: fixed;
+		top: 66rpx;
+		left: 0;
+		right: 0;
 }
 .impute.data-v-0ca91b30 {
-	background: #F2F2F2;
-	height: 80rpx;
-	margin: 20rpx 0;
+		background: #F2F2F2;
+		height: 80rpx;
+		margin: 20rpx 0;
 }
 .btns.data-v-0ca91b30 {
-	width: 690rpx;
-	height: 88rpx;
-	background: #FF8D1A;
-	box-shadow: 0rpx 10rpx 20rpx 0rpx #FFD9B3;
-	border-radius: 16rpx;
-	text-align: center;
-	line-height: 88rpx;
-	font-size: 32rpx;
-	font-weight: bold;
-	margin: 0 auto;
+		width: 690rpx;
+		height: 88rpx;
+		background: #FF8D1A;
+		box-shadow: 0rpx 10rpx 20rpx 0rpx #FFD9B3;
+		border-radius: 16rpx;
+		text-align: center;
+		line-height: 88rpx;
+		font-size: 32rpx;
+		font-weight: bold;
+		margin: 0 auto;
 }
 .tosend_header_food_le.data-v-0ca91b30 {
-	width: 15%;
+		width: 15%;
 }
 .tosend_header_food_le image.data-v-0ca91b30 {
-	width: 110rpx;
-	height: 110rpx;
+		width: 110rpx;
+		height: 110rpx;
 }
 .u-border-top.data-v-0ca91b30:after {
-	border: none !important;
+		border: none !important;
+}
+
+	/* 收货码弹框 */
+.receipt_code.data-v-0ca91b30 {
+		width: 90%;
+		margin: 0 auto;
+}
+.code_title.data-v-0ca91b30 {
+		width: 100%;
+		line-height: 100rpx;
+		font-size: 31rpx;
+		font-weight: bold;
+		text-align: center;
+		letter-spacing: 2rpx;
+		margin-top: 21rpx;
+		margin-bottom: 25rpx;
+}
+.u-input--border.data-v-0ca91b30 {
+		border: 1px solid #F2F2F2 !important;
+		background: #F2F2F2 !important;
+		color: #999999 !important;
+		font-weight: 500 !important;
+		letter-spacing: 2rpx !important;
+}
+.u-input__input.data-v-0ca91b30 {
+		font-size: 30rpx;
+		font-weight: bold;
+		flex: 1;
+		color: #999999 !important;
+		min-height: 85rpx !important;
+		margin-top: 7rpx;
+}
+.sure.data-v-0ca91b30 {
+		width: 100%;
+		height: 80rpx;
+		background: rgba(245, 211, 71, 1);
+		color: white;
+		border-radius: 46rpx;
+		text-align: center;
+		line-height: 80rpx;
+		margin-top: 30rpx;
+		color: rgba(0, 0, 0, 1);
+		letter-spacing: 2rpx;
+}
+.sure2.data-v-0ca91b30{
+		text-align: center;
+		color: rgba(0, 0, 0, 1);
+		line-height: 80rpx;
+		margin-top: 30rpx;
+		width: 100%;
+		height: 80rpx;
+		opacity: 1;
+		border-radius: 10rpx;
+		background: rgba(245, 211, 71, 1);
+}
+
+	/* 确认送达拍照框 */
+.phone_title.data-v-0ca91b30{
+		margin-top: 10px;
+		width: 100%;
+		height: 40px;
+		/* background-color: #FF7F00; */
+		text-align: center;
+		line-height: 40px;
+		/* color:#FFFFFF; */
+}
+.phone_title2.data-v-0ca91b30{
+		margin-top: 10px;
+		text-align: center;
+		color:#9d9d9d;
+}
+.code_title2.data-v-0ca91b30 {
+	    width: 100%;
+	    line-height: 50rpx;
+	    text-align: center;
+	    letter-spacing: 2rpx;
+	    margin-top: 21rpx;
+	    margin-bottom: 25rpx;
+}
+.code_title3.data-v-0ca91b30{
+		margin-left: -20px;
+		margin-top: 21rpx;
+		margin-bottom: 25rpx;
+		width: 638rpx;
+		height: 66rpx;
+		border-radius: 6rpx;
+		background: rgba(255, 245, 245, 1);
+		font-size: 24rpx;
+		line-height: 66rpx;
+		color: rgba(212, 48, 48, 1);
+		text-align: center;
 }