no message

pages-order/takeout-info.vue

@@ -160,7 +160,7 @@
 				</view>
 				<view class="display-flex flex-justify-space mb-26">
 					<view class="fs-28 fc-9">
-						配送时间
+						期望时间
 					</view>
 					<view class="fs-28 fc-3 w-480 text-align-right">
 						{{infoData.time}}

pages-school/circle-info.vue

@@ -67,7 +67,7 @@
 											class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
 
 									</view>
-									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item,i,i)">
+									<view class="fs-30 fw-400 mb-8 item_content" @click.stop="openInput(1,item,i,i)">
 										{{item.content}}
 									</view>
 									<view class="align-items-center mb-8">
@@ -580,6 +580,11 @@
 </script>
 
 <style scoped lang="scss">
+	.item_content{
+		// max-width: 100%;
+		word-break: break-all;
+		word-wrap: break-word;
+	}
 	.item-content {
 		word-wrap: break-word;
 	}

pages-takeout/confirm-mod/dryClean-coupon.vue

@@ -137,7 +137,7 @@
 				let school_id = uni.getStorageSync('school_id');
 				getExpressCoupon({
 					operate_id: operate_id,
-					school_id:school_id
+					school_id: school_id
 				}).then((res) => {
 					if (res.code === 1) {
 						this.expressCouponData = res.data;
@@ -157,8 +157,14 @@
 				this.$refs.popupCoupon.close();
 			},
 			setFun(item) {
-				this.$emit('giveCouPon', item);
-				this.closeCoupon();
+				if (this.coupon_id == item.id) {
+					this.coupon_id = ''
+					this.$emit('giveCouPon', '');
+					this.closeCoupon();
+				} else {
+					this.$emit('giveCouPon', item);
+					this.closeCoupon();
+				}
 			},
 
 			getFun(item) {

pages-takeout/confirm-order.vue

@@ -20,7 +20,7 @@
 				<view class="p-b-20">
 					<view class=" flex-justify-space box-border-box p-b-20">
 						<view class="fs-28 fw-600">取件码</view>
-<!-- 						<view class="align-items-center" @click="selectFun(4)">
+						<!-- 						<view class="align-items-center" @click="selectFun(4)">
 							<view class="fs-24 fw-400 fc-9">修改</view>
 							<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
 						</view> -->
@@ -49,7 +49,8 @@
 					<view class="fs-28 fw-400">优惠券</view>
 					<view class="align-items-center">
 						<view :class="fromData.coupon_id?'fc-FB3D03 fw-600 fs-32':'fw-400 fs-28'">
-							{{fromData.coupon_id?'-￥'+ quanMoney:'请选择优惠券'}}</view>
+							{{fromData.coupon_id?'-￥'+ quanMoney:'请选择优惠券'}}
+						</view>
 						<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
 					</view>
 				</view>
@@ -63,7 +64,8 @@
 			<view class="box-card box-border-box bgc-f mb-20">
 				<view class="flex-justify-space b-b-F9F9F9  mb-24">
 					<view class="fs-28 fw-600 w158 mr-12">备注</view>
-					<input v-model="fromData.note" class="flex-1 text-align-right fs-28" type="text" placeholder="请填写你的备注">
+					<input v-model="fromData.note" class="flex-1 text-align-right fs-28" type="text"
+						placeholder="请填写你的备注">
 				</view>
 				<view class="p-b-20"></view>
 			</view>
@@ -151,7 +153,7 @@
 		onShow() {
 			let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
 			if (isConfirmAddressFlag.flag) {
-				this.selectFun(2,isConfirmAddressFlag);
+				this.selectFun(2, isConfirmAddressFlag);
 			}
 		},
 		onUnload() {
@@ -183,7 +185,7 @@
 				})
 			},
 
-			selectFun(type,addressData) {
+			selectFun(type, addressData) {
 				if (type === 1) {
 					// 选择优惠券
 					this.$refs.coupon.getList(this.type, this.fromData.coupon_id);
@@ -207,8 +209,13 @@
 				}
 			},
 			giveCouPon(e) {
-				this.quanMoney = Number(e.money);
-				this.fromData.coupon_id = e.id;
+				if (e.id) {
+					this.quanMoney = Number(e.money);
+					this.fromData.coupon_id = e.id;
+				} else {
+					this.quanMoney = ''
+					this.fromData.coupon_id = 0
+				}
 			},
 			giveAddress(e) {
 				this.addressData = e;
@@ -217,7 +224,7 @@
 			giveTime(e) {
 				console.log(e);
 			},
-			toSave() {				
+			toSave() {
 				if (!this.fromData.address_id) {
 					return tools.error('请先选择地址')
 				}
@@ -227,9 +234,11 @@
 					return tools.error('请先输入取件码')
 				}
 				let codeRule = /^[A-Za-z0-9-]+$/
-				let flagRule = this.fromData.pickup_code.every((item) => {return codeRule.test(item)});
-				if(!flagRule){
-					return tools.error('请输入正确的取件码')	
+				let flagRule = this.fromData.pickup_code.every((item) => {
+					return codeRule.test(item)
+				});
+				if (!flagRule) {
+					return tools.error('请输入正确的取件码')
 				}
 				if (this.isAJAX) {
 					return

pages-takeout/shop-mod/menu.vue

@@ -16,17 +16,24 @@
 					<view class="mb-32 fs-30">{{item.name}}</view>
 					<view class="menu-list flex-justify-space" v-for="(info,k) in item.list" :key="k">
 						<image class="flex-shrink0 goods_img" :src="info.goods_image" mode="scaleToFill"></image>
-						<view class="menu-list-right">
-							<view class="mb-4 goods-name text-overflow-ellipsis fs-34 fw-600">{{info.goods_name}}</view>
-							<view class="mb-20 fw-400 fc-9 fs-24">月销{{info.sales}}</view>
+						<view class="menu-list-right flex-direction flex-justify-space">
+							<view class="mb-8">
+								<view class="mb-4 goods-name text-overflow-ellipsis fs-32 fw-600">{{info.goods_name}}
+								</view>
+								<view class="text-overflow-ellipsis-one fw-400 fc-9 fs-24 mb-2 goods-name" v-if="info.spec_type == 1">
+									{{info.goods_desc}}
+								</view>
+								<view class="fw-400 fc-9 fs-24">月销{{info.sales}}</view>
+							</view>
+
 							<view class="flex-justify-space align-items-flex-end">
 								<view class="">
 									<span class="fs-24 fw-400 fc-FB3D03">￥</span>
 									<span
 										class="fs-40 fw-b fc-FB3D03">{{info.seckill_money>0?info.seckill_money:info.price}}</span>
-									<view class="">
+									<!-- 									<view class="">
 										<span class="fs-24 fc-9 fw-400 text-line-through">￥{{info.line_price}}</span>
-									</view>
+									</view> -->
 								</view>
 								<view class="display-flex align-items-center" v-if="info.spec_type == 1">
 									<image v-show="info.num > 0" class="wh-44" @click="addred(1,i,k,info)"
@@ -65,6 +72,9 @@
 						<view style="width: 446rpx;" class="fw-600 fs-34 text-overflow-ellipsis-one">
 							{{popData.goodsItem.goods_name}}
 						</view>
+						<view class="fw-400 fc-9 fs-24 mb-2 text-overflow-ellipsis-t">
+							{{popData.goodsItem.goods_desc}}
+						</view>
 						<view class="fw-400 fc-9 fs-24">月销{{popData.goodsItem.sales}}</view>
 					</view>
 				</view>
@@ -167,7 +177,7 @@
 					is_quota: 0,
 					is_infinite: 0,
 					quota_num: 0,
-          payNum: 0,
+					payNum: 0,
 					stock: 0,
 					spec_key: '',
 					goods_spec_id: '',
@@ -204,14 +214,14 @@
 						this.isAjax = false
 					}
 				} else {
-          if (this.popData.is_infinite === 0 && this.popData.payNum > this.popData.stock) {
-            tools.error('最多购买' + this.popData.quota_num + '件')
-          } else if (this.popData.is_quota > 0 && this.popData.payNum > this.popData.quota_num) {
-            tools.error('限购' + this.popData.quota_num + '件')
-          }else {
-            // 加
-            ++this.popData.num;
-          }
+					if (this.popData.is_infinite === 0 && this.popData.payNum > this.popData.stock) {
+						tools.error('商品库存' + this.popData.stock + '件')
+					} else if (this.popData.is_quota > 0 && this.popData.payNum > this.popData.quota_num) {
+						tools.error('限购' + this.popData.quota_num + '件')
+					} else {
+						// 加
+						++this.popData.num;
+					}
 
 
 				}
@@ -239,7 +249,6 @@
 								}
 							})
 						}
-
 					}
 					this.popData.spec_list = res.data.spec_list
 					this.popData.spec_attr = res.data.spec_attr
@@ -395,8 +404,8 @@
 					}
 				} else if (type === 2) {
 					// 加
-					if (item.is_infinite === 0  && item.num >= item.stock) {
-						tools.error('最多购买' + item.quota_num + '件')
+					if (item.is_infinite === 0 && item.num >= item.stock) {
+						tools.error('商品库存' + item.stock + '件')
 						this.isAjax = false
 					} else if (item.is_quota > 0 && item.num >= item.quota_num) {
 						tools.error('限购' + item.quota_num + '件')
@@ -407,7 +416,7 @@
 
 				} else if (type === 3) {
 					// 选规格
-          console.log(item)
+					console.log(item)
 					this.popData.is_quota = item.is_quota
 					this.popData.quota_num = item.quota_num
 					this.popData.is_infinite = item.is_infinite
@@ -419,27 +428,27 @@
 					console.log('this.popData.goods_spec_id')
 					console.log(this.popData.goods_spec_id)
 					if (this.popData.goods_spec_id) {
-            if (this.popData.is_infinite === 0 && this.popData.payNum > this.popData.stock) {
-              tools.error('最多购买' + this.popData.quota_num + '件')
-              this.popData.num = this.popData.stock
-            } else if (this.popData.is_quota > 0 && this.popData.payNum > this.popData.quota_num) {
-              tools.error('限购' + this.popData.quota_num + '件')
-              this.popData.num = this.popData.quota_num
-            }else {
-              let cartKey = this.cartData.goods_list.findIndex(row => this.popData.goods_spec_id === row
-                  .goods_spec_id)
-              console.log(cartKey)
-              let addType = this.popData.num > 0 ? 2 : 1
-              console.log('addType:' + addType)
-              if (addType === 2 && cartKey < 0) {
-                this.setShopIngAdd(this.popData.goods_id, this.popData.goodsItem.category_id, this.popData
-                    .goods_spec_id, this.popData.num)
-              } else {
-                this.setShopIngNumber(this.popData.goods_id, this.popData.goodsItem.category_id, type, this
-                    .popData
-                    .goods_spec_id, this.popData.num)
-              }
-            }
+						if (this.popData.is_infinite === 0 && this.popData.payNum > this.popData.stock) {
+							tools.error('商品库存' + this.popData.stock + '件')
+							this.popData.num = this.popData.stock
+						} else if (this.popData.is_quota > 0 && this.popData.payNum > this.popData.quota_num) {
+							tools.error('限购' + this.popData.quota_num + '件')
+							this.popData.num = this.popData.quota_num
+						} else {
+							let cartKey = this.cartData.goods_list.findIndex(row => this.popData.goods_spec_id === row
+								.goods_spec_id)
+							console.log(cartKey)
+							let addType = this.popData.num > 0 ? 2 : 1
+							console.log('addType:' + addType)
+							if (addType === 2 && cartKey < 0) {
+								this.setShopIngAdd(this.popData.goods_id, this.popData.goodsItem.category_id, this.popData
+									.goods_spec_id, this.popData.num)
+							} else {
+								this.setShopIngNumber(this.popData.goods_id, this.popData.goodsItem.category_id, type, this
+									.popData
+									.goods_spec_id, this.popData.num)
+							}
+						}
 
 					} else {
 						console.log('无规格信息')