还是文字修改

shop/src/views/goods/goods-add.vue

@@ -20,8 +20,7 @@
 							:key="index"
 							size="small"
 							@change="selChangeDialogFn($event, item)"
-							>{{ item.categoryName }}</el-checkbox
-						>
+						>{{ item.categoryName }}</el-checkbox>
 					</el-checkbox-group>
 				</el-form-item>
 				<el-form-item label="款式" prop="goodsStyle">
@@ -32,50 +31,25 @@
 					</el-checkbox-group>
 					<!-- 选择款式 -->
 					<div class="style-modal-content" v-if="ruleForm.goodsStyle == 1">
-						<el-form
-							:inline="true"
-							:model="styleForm"
-							class="demo-form-inline"
-							v-if="actionOption"
-						>
-							<div
-								class="flex-center-between"
-								v-for="(item, index) in styleStoreData"
-								:key="index"
-							>
+						<el-form :inline="true" :model="styleForm" class="demo-form-inline" v-if="actionOption">
+							<div class="flex-center-between" v-for="(item, index) in styleStoreData" :key="index">
 								<template v-if="item.action != 'delete'">
 									<el-form-item label="款式名称">
-										<el-input
-											v-model="item.styleName"
-											placeholder="款式名称"
-										></el-input>
+										<el-input v-model="item.styleName" placeholder="款式名称"></el-input>
 									</el-form-item>
 									<el-form-item label="价格">
-										<el-input
-											v-model="item.price"
-											placeholder="价格"
-										></el-input>
+										<el-input v-model="item.price" placeholder="价格"></el-input>
 									</el-form-item>
 									<el-form-item label="图片" class="flex-center">
-										<cl-upload
-											v-model="item.picture"
-											:props="{ multiple: true }"
-										></cl-upload>
+										<cl-upload v-model="item.picture" :props="{ multiple: true }"></cl-upload>
 									</el-form-item>
 									<el-form-item>
-										<el-button
-											type="primary"
-											size="small"
-											@click="styleDelFn(index)"
-											>删除</el-button
-										>
+										<el-button type="primary" size="small" @click="styleDelFn(index)">删除</el-button>
 									</el-form-item>
 								</template>
 							</div>
 						</el-form>
-						<el-button type="primary" size="small" @click="styleFormAddFn"
-							>新增</el-button
-						>
+						<el-button type="primary" size="small" @click="styleFormAddFn">新增</el-button>
 					</div>
 				</el-form-item>
 				<el-form-item label="价格" prop="price" v-if="ruleForm.goodsStyle == 0">
@@ -93,20 +67,16 @@
 							@success="fromToData"
 							@handleRemove="fromToData"
 						></elxUpload>
-						<p style="color: red" v-show="ruleForm.categoryIdList.length == 0">
-							请先选择分类
-						</p>
+						<p style="color: red" v-show="ruleForm.categoryIdList.length == 0">请先选择分类</p>
 					</div>
 					<div>
-						<el-button type="primary" size="small" @click="openStore"
-							>从图库选择</el-button
-						>
+						<el-button type="primary" size="small" @click="openStore">从图库选择</el-button>
 					</div>
 					<el-dialog :visible.sync="dialogVisible">
 						<img width="100%" :src="dialogImageUrl" alt />
 					</el-dialog>
 				</el-form-item>
-				<el-form-item label="商品简介" prop="content">
+				<el-form-item label="简介" prop="content">
 					<cl-editor-quill v-model="ruleForm.content" @load="editor"></cl-editor-quill>
 					<!-- <el-input type="textarea" v-model="ruleForm.desc"></el-input> -->
 				</el-form-item>
@@ -115,26 +85,12 @@
 						<el-checkbox label="1" name="autoRise" true-label="1" false-label="0">
 							<span>需要</span>
 						</el-checkbox>
-						<el-popover
-							placement="top"
-							width="100"
-							trigger="hover"
-							v-model="autoPricePopover"
-						>
-							<p>节日当天和前一天，商品会自动根据设置统一涨价</p>
+						<el-popover placement="top" width="100" trigger="hover" v-model="autoPricePopover">
+							<p>重要节日的当天和前一天，商品会自动根据设置进行涨价</p>
 							<div style="text-align: right; margin-top: 10px">
-								<el-button
-									size="mini"
-									type="primary"
-									@click="autoPricePopover = false"
-									>涨价设置</el-button
-								>
+								<el-button size="mini" type="primary" @click="autoPricePopover = false">涨价设置</el-button>
 							</div>
-							<el-button
-								type="text"
-								icon="el-icon-question"
-								slot="reference"
-							></el-button>
+							<el-button type="text" icon="el-icon-question" slot="reference"></el-button>
 							<!-- <el-button slot="reference">删除</el-button> -->
 						</el-popover>
 					</el-checkbox-group>
@@ -151,28 +107,16 @@
 						<el-radio label="0">
 							<span>按距离收费</span>
 						</el-radio>
-						<el-popover
-							placement="top"
-							width="100"
-							trigger="hover"
-							v-model="chargePopover"
-						>
+						<el-popover placement="top" width="100" trigger="hover" v-model="chargePopover">
 							<p>
 								{{ shopInfo.extend.freeDistance }}公里内免运费，超过每增加{{
-									shopInfo.extend.freight
+								shopInfo.extend.freight
 								}}公里运费增加2元
 							</p>
 							<div style="text-align: right; margin-top: 10px">
-								<el-button size="mini" type="primary" @click="chargePopover = false"
-									>修改</el-button
-								>
+								<el-button size="mini" type="primary" @click="chargePopover = false">修改</el-button>
 							</div>
-							<el-button
-								type="text"
-								icon="el-icon-question"
-								slot="reference"
-								class="question-btn"
-							></el-button>
+							<el-button type="text" icon="el-icon-question" slot="reference" class="question-btn"></el-button>
 							<!-- <el-button slot="reference">删除</el-button> -->
 						</el-popover>
 						<el-radio label="1">
@@ -181,9 +125,7 @@
 					</el-radio-group>
 				</el-form-item>
 				<el-form-item>
-					<el-button type="primary" @click="submitForm('ruleForm', 1)"
-						>上架出售</el-button
-					>
+					<el-button type="primary" @click="submitForm('ruleForm', 1)">上架出售</el-button>
 					<el-button @click="submitForm('ruleForm', 0)">加入仓库</el-button>
 				</el-form-item>
 			</el-form>
@@ -206,8 +148,7 @@
 							:key="index"
 							:label="item.categoryName"
 							:value="item.id"
-							>{{ item.categoryName }}</el-option
-						>
+						>{{ item.categoryName }}</el-option>
 					</el-select>
 					<!-- <div style="width: 80px">选择分类</div>
                     <el-select
@@ -226,16 +167,8 @@
 					</el-select>-->
 				</div>
 				<div class="img-store-wrap">
-					<el-checkbox-group
-						v-model="imgStoreArr"
-						class="list-store"
-						@change="setCheckImg"
-					>
-						<div
-							class="list-checkbox"
-							v-for="(item, index) in imgStoreData"
-							:key="index"
-						>
+					<el-checkbox-group v-model="imgStoreArr" class="list-store" @change="setCheckImg">
+						<div class="list-checkbox" v-for="(item, index) in imgStoreData" :key="index">
 							<el-checkbox :label="item.imgUrl + ''">
 								<div class="list-img">
 									<img :src="item.imgUrl" alt="图库图片" />

shop/src/views/order/components/sel-order.vue

@@ -44,40 +44,23 @@
 						<!-- title -->
 						<div class="title-wrap">
 							<div class="title">{{ item.actionName }}</div>
-							<div class="time" v-if="item.finishTime != 0">
-								{{ item.finishTime | formatTime }}
-							</div>
+							<div class="time" v-if="item.finishTime != 0">{{ item.finishTime | formatTime }}</div>
 						</div>
 						<!-- content -->
 						<div class="content-wrap">
 							<!-- 制单 -->
 							<template v-if="item.actionName == '制单'">
 								<div v-if="$util.isEmpty(item.receive) && index == 0">
-									<el-button type="primary" @click="hasDeliver"
-										>有配送单</el-button
-									>
-									<el-button type="primary" @click="fillFormFn">填单</el-button>
+									<el-button type="primary" @click="hasDeliver">跳过</el-button>
+									<el-button type="primary" @click="fillFormFn">填写</el-button>
 								</div>
 								<div v-else>
 									<!-- <span>配送用户信息</span> -->
-									<card-name
-										v-if="!$util.isEmpty(item.receive)"
-										:info="item.receive"
-									/>
-									<span v-else>手写配送单</span>
-									<div
-										style="margin-top: 10px"
-										v-if="!$util.isEmpty(item.receive)"
-									>
-										<el-button
-											size="mini"
-											v-if="orderData.printStatus == 0"
-											@click="printOrderFn"
-											>打印</el-button
-										>
-										<el-button size="mini" v-else @click="rePrintOrderFn"
-											>重打</el-button
-										>
+									<card-name v-if="!$util.isEmpty(item.receive)" :info="item.receive" />
+									<span v-else>已手写</span>
+									<div style="margin-top: 10px" v-if="!$util.isEmpty(item.receive)">
+										<el-button size="mini" v-if="orderData.printStatus == 0" @click="printOrderFn">打印</el-button>
+										<el-button size="mini" v-else @click="rePrintOrderFn">重打</el-button>
 									</div>
 								</div>
 							</template>
@@ -85,76 +68,32 @@
 							<template v-if="item.actionName == '发货'">
 								<div v-if="item.finishTime == 0">
 									<template v-if="orderData.hasDeliver == 1">
-										<el-popover
-											placement="top"
-											width="160"
-											v-model="sendMySelfConfirm"
-										>
+										<el-popover placement="top" width="160" v-model="sendMySelfConfirm">
 											<p>确认发送？</p>
 											<div style="text-align: right; margin: 0">
-												<el-button
-													size="mini"
-													type="text"
-													@click="sendMySelfConfirm = false"
-													>取消</el-button
-												>
-												<el-button
-													type="primary"
-													size="mini"
-													@click="sendMySelfFn"
-													>确定</el-button
-												>
+												<el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
+												<el-button type="primary" size="mini" @click="sendMySelfFn">确定</el-button>
 											</div>
-											<el-button type="primary" size="small" slot="reference"
-												>确认发送</el-button
-											>
+											<el-button type="primary" size="small" slot="reference">确认</el-button>
 										</el-popover>
 									</template>
 									<template v-else>
-										<el-popover
-											placement="top"
-											width="160"
-											v-model="sendMySelfConfirm"
-										>
+										<el-popover placement="top" width="160" v-model="sendMySelfConfirm">
 											<p>确认自己配送？</p>
 											<div style="text-align: right; margin: 0">
-												<el-button
-													size="mini"
-													type="text"
-													@click="sendMySelfConfirm = false"
-													>取消</el-button
-												>
-												<el-button
-													type="primary"
-													size="mini"
-													@click="sendMySelfFn"
-													>确定</el-button
-												>
+												<el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
+												<el-button type="primary" size="mini" @click="sendMySelfFn">确定</el-button>
 											</div>
-											<el-button type="primary" size="small" slot="reference"
-												>自己送</el-button
-											>
+											<el-button type="primary" size="small" slot="reference">自己送</el-button>
 										</el-popover>
-										<el-button
-											type="primary"
-											size="small"
-											@click="sendShipFn"
-											style="margin-left:15px;"
-											>代送</el-button
-										>
+										<el-button type="primary" size="small" @click="sendShipFn" style="margin-left:15px;">代送</el-button>
 									</template>
 								</div>
 								<div v-else>
 									<template v-if="!$util.isEmpty(item.sendInfo)">
-										<div class="label-list">
-											配送：{{ item.sendInfo.sideName }}
-										</div>
-										<div class="label-list">
-											距离：{{ item.sendInfo.distance }}km
-										</div>
-										<div class="label-list">
-											运费：¥{{ item.sendInfo.cost }}
-										</div>
+										<div class="label-list">配送：{{ item.sendInfo.sideName }}</div>
+										<div class="label-list">距离：{{ item.sendInfo.distance }}km</div>
+										<div class="label-list">运费：¥{{ item.sendInfo.cost }}</div>
 										<div class="label-list">小费：¥{{ item.sendInfo.tip }}</div>
 									</template>
 									<template v-else>
@@ -169,76 +108,38 @@
 							<template v-if="item.actionName == '送达'">
 								<div v-if="item.finishTime == 0">
 									<template v-if="orderData.sendType == 3">
-										<el-popover
-											placement="top"
-											width="210"
-											v-model="confirmSendVisit"
-										>
-											<p>
-												此订单由快递配送，送到会自动确认，确定要手动确认？
-											</p>
+										<el-popover placement="top" width="210" v-model="confirmSendVisit">
+											<p>此订单已由快递配送，送到会自动确认，确定要手动操作？</p>
 											<div style="text-align: right; margin: 0">
-												<el-button
-													size="mini"
-													type="text"
-													@click="confirmSendVisit = false"
-													>取消</el-button
-												>
-												<el-button
-													type="primary"
-													size="mini"
-													@click="orderReachFn"
-													>确定</el-button
-												>
+												<el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
+												<el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
 											</div>
-											<el-button slot="reference" size="small" type="primary"
-												>确认送达</el-button
-											>
+											<el-button slot="reference" size="small" type="primary">确认</el-button>
 										</el-popover>
 									</template>
 
 									<template v-else>
-										<el-popover
-											placement="top"
-											width="160"
-											v-model="confirmSendVisit"
-										>
+										<el-popover placement="top" width="160" v-model="confirmSendVisit">
 											<p>确认已送达？</p>
 											<div style="text-align: right; margin: 0">
-												<el-button
-													size="mini"
-													type="text"
-													@click="confirmSendVisit = false"
-													>取消</el-button
-												>
-												<el-button
-													type="primary"
-													size="mini"
-													@click="orderReachFn"
-													>确定</el-button
-												>
+												<el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
+												<el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
 											</div>
-											<el-button slot="reference" size="small" type="primary"
-												>确认送达</el-button
-											>
+											<el-button slot="reference" size="small" type="primary">确认</el-button>
 										</el-popover>
+										<div class="prompt-text">确认后会通知客户</div>
 									</template>
 
-									<div class="prompt-text">确认后会自动通知客户</div>
 								</div>
 							</template>
 							<!-- 订单分类 -->
 							<template v-if="item.actionName == '完成'">
 								<div v-if="!$util.isEmpty(item.classify)">
-									<div class="label-list">
-										订单分类：{{ item.classify.category }}
-									</div>
+									<div class="label-list">订单分类：{{ item.classify.category }}</div>
 									<div class="label-list">用途：{{ item.classify.usage }}</div>
 								</div>
 								<div v-else>
-									<el-button type="primary" @click="orderClassFn"
-										>订单分类</el-button
-									>
+									<el-button type="primary" @click="orderClassFn">订单分类</el-button>
 								</div>
 							</template>
 						</div>
@@ -247,12 +148,7 @@
 			</div>
 		</el-drawer>
 		<!-- 填单 -->
-		<el-dialog
-			title="填单"
-			:visible.sync="orderDialog"
-			:close-on-click-modal="false"
-			width="1000px"
-		>
+		<el-dialog title="填单" :visible.sync="orderDialog" :close-on-click-modal="false" width="30%">
 			<div class="order-modal-content">
 				<el-form
 					:model="orderForm"
@@ -264,89 +160,52 @@
 					<div class="form-wrap">
 						<!-- 左侧 -->
 						<div class="form-left-wrap">
-							<el-form-item label="收花人姓名" prop="receiveUserName">
-								<el-input
-									v-model="orderForm.receiveUserName"
-									placeholder="请输入姓名"
-									size="small"
-								></el-input>
+							<el-form-item label="收花人姓名" prop="receiveUserName" style="margin-bottom: 8px;">
+								<el-input v-model="orderForm.receiveUserName" placeholder="请输入姓名" size="mini"></el-input>
 							</el-form-item>
-							<el-form-item label="收花人电话" prop="receiveMobile">
-								<el-input
-									v-model="orderForm.receiveMobile"
-									placeholder="请输入电话"
-									size="small"
-								></el-input>
+							<el-form-item label="收花人电话" prop="receiveMobile" style="margin-bottom: 8px;">
+								<el-input v-model="orderForm.receiveMobile" placeholder="请输入电话" size="mini"></el-input>
 							</el-form-item>
-							<el-form-item label="收花人城市" prop="receiveProvince">
+							<el-form-item label="收花人城市" prop="receiveProvince" style="margin-bottom: 8px;">
 								<el-cascader
 									v-model="addressArr"
 									:options="addressOptions"
 									:props="addressProps"
-									size="small"
+									size="mini"
 									@change="handleChange"
 									style="width: 100%"
 								></el-cascader>
 							</el-form-item>
-							<el-form-item label="详细地址" prop="receiveAddress">
+							<el-form-item label="详细地址" prop="receiveAddress" style="margin-bottom: 8px;">
 								<el-autocomplete
 									v-model="orderForm.receiveAddress"
 									:fetch-suggestions="querySearchAsync"
-									placeholder="请输入内容"
+									placeholder="请输入地址搜索"
 									@select="addressFn"
-									size="small"
+									size="mini"
 									style="width: 100%"
 								>
 									<template slot-scope="{ item }">
 										<p style="line-height: 30px">{{ item.title }}</p>
-										<p style="line-height: 20px;font-size: 12px;color: #999">
-											{{ item.address }}
-										</p>
+										<p style="line-height: 20px;font-size: 12px;color: #999">{{ item.address }}</p>
 									</template>
 								</el-autocomplete>
-								<!-- <el-input
-									type="textarea"
-									v-model="orderForm.receiveFullAddress"
-									placeholder="小区、大厦或街道名称"
-									size="small"
-								></el-input> -->
-							</el-form-item>
-							<el-form-item label="门牌号" prop="receiveFloor">
-								<el-input
-									v-model="orderForm.receiveFloor"
-									placeholder="楼号门牌号（选填）"
-									size="small"
-								></el-input>
 							</el-form-item>
-							<!-- <el-form-item label="商品名称" prop="adminName">
-								<el-input
-									v-model="orderForm.adminName"
-									placeholder="填了名称看打印单就知道商品"
-									size="small"
-								></el-input>
+							<el-form-item label="门牌号" prop="receiveFloor" style="margin-bottom: 8px;">
+								<el-input v-model="orderForm.receiveFloor" placeholder="楼号门牌号（选填）" size="mini"></el-input>
 							</el-form-item>
-							<el-form-item label="商品图片" prop="adminName">
-								<cl-upload v-model="orderForm.adImg"></cl-upload>
-								<i class="prompt-text">有商品图看打印单就知道商品的花材和包装纸</i>
-							</el-form-item> -->
-						</div>
-						<!-- 右侧 -->
-						<div class="form-left-wrap">
-							<el-form-item label="订花人电话" prop="bookMobile">
-								<el-input
-									v-model="orderForm.bookMobile"
-									placeholder="请输入电话（选填）"
-									size="small"
-								></el-input>
+
+							<el-form-item label="订花人电话" prop="bookMobile" style="margin-bottom: 8px;">
+								<el-input v-model="orderForm.bookMobile" placeholder="请输入电话（选填）" size="mini"></el-input>
 							</el-form-item>
-							<el-form-item label="送达时间" prop="reachTime">
+							<el-form-item label="送达时间" prop="reachTime" style="margin-bottom: 8px;">
 								<el-date-picker
 									type="date"
-									placeholder="选择开始日期"
+									placeholder="请选择日期"
 									v-model="orderForm.reachTime"
 									value-format="yyyy-MM-dd"
 									style="width: 100%;"
-									size="small"
+									size="mini"
 								></el-date-picker>
 								<el-radio-group v-model="orderForm.reachPeriod">
 									<el-radio label="0">上午</el-radio>
@@ -354,33 +213,17 @@
 									<el-radio label="2">晚上</el-radio>
 								</el-radio-group>
 							</el-form-item>
-							<el-form-item label="带贺卡"
-								><el-switch
-									v-model="orderForm.needCard"
-									active-value="1"
-									inactive-value="0"
-								></el-switch>
+							<el-form-item label="要贺卡" style="margin-bottom: 8px;">
+								<el-switch v-model="orderForm.needCard" active-value="1" inactive-value="0"></el-switch>
 								<template v-if="orderForm.needCard == '1'">
-									<el-input
-										v-model="orderForm.cardInfo"
-										placeholder="输入贺卡内容，留空将寄出空白贺卡"
-										size="small"
-									></el-input>
+									<el-input v-model="orderForm.cardInfo" placeholder="请输入贺卡内容，留空将寄出空白贺卡" size="mini"></el-input>
 								</template>
 							</el-form-item>
-							<el-form-item label="其它备注" prop="remark">
-								<el-input
-									v-model="orderForm.remark"
-									placeholder="选填"
-									size="small"
-								></el-input>
+							<el-form-item label="其它备注" prop="remark" style="margin-bottom: 8px;">
+								<el-input v-model="orderForm.remark" placeholder="选填" size="mini"></el-input>
 							</el-form-item>
-							<el-form-item label="匿名派送"
-								><el-switch
-									v-model="orderForm.anonymity"
-									active-value="1"
-									inactive-value="0"
-								></el-switch>
+							<el-form-item label="匿名派送">
+								<el-switch v-model="orderForm.anonymity" active-value="1" inactive-value="0"></el-switch>
 							</el-form-item>
 						</div>
 					</div>
@@ -392,12 +235,7 @@
 			</div>
 		</el-dialog>
 		<!-- 发货弹窗 -->
-		<el-dialog
-			title="确认发货？"
-			:visible.sync="shipDialog"
-			:close-on-click-modal="false"
-			width="400px"
-		>
+		<el-dialog title="请选择" :visible.sync="shipDialog" :close-on-click-modal="false" width="400px">
 			<div class="ship-modal-content">
 				<el-form
 					:model="shipForm"
@@ -407,7 +245,7 @@
 					class="demo-form"
 				>
 					<template>
-						<el-form-item label="送花时间" prop="sendTime">
+						<el-form-item label="配送时间" prop="sendTime">
 							<el-time-select
 								v-model="shipForm.sendTime"
 								:picker-options="{
@@ -415,26 +253,19 @@
 									step: '00:10',
 									end: '24:00'
 								}"
-								placeholder="选择时间"
+								placeholder="请选择时间"
 								size="small"
 								style="width: 100%"
-							>
-							</el-time-select>
+							></el-time-select>
 						</el-form-item>
-						<el-form-item label="配送" prop="sendSide">
-							<el-select
-								v-model="shipForm.sendSide"
-								placeholder="请选择"
-								size="small"
-								style="width: 100%"
-							>
+						<el-form-item label="配送方" prop="sendSide">
+							<el-select v-model="shipForm.sendSide" placeholder="请选择" size="small" style="width: 100%">
 								<el-option
 									v-for="item in sendSideOpt"
 									:key="item.value"
 									:label="item.label"
 									:value="item.value"
-								>
-								</el-option>
+								></el-option>
 							</el-select>
 						</el-form-item>
 					</template>
@@ -468,8 +299,7 @@
 								:label="item.id"
 								:key="index"
 								size="small"
-								>{{ item.categoryName }}</el-radio
-							>
+							>{{ item.categoryName }}</el-radio>
 						</el-radio-group>
 					</el-form-item>
 					<el-form-item label="选择用途" prop="usageId">
@@ -480,8 +310,7 @@
 								:label="item.id"
 								:key="index"
 								size="small"
-								>{{ item.usageName }}</el-radio
-							>
+							>{{ item.usageName }}</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-form>
@@ -503,13 +332,9 @@
 				</tr>
 				<tr>
 					<td style="padding-left: 10px;width: 100px;">收花人姓名：</td>
-					<td style="padding-left: 10px;width: 130px;">
-						{{ deliver.data.receiveUserName }}
-					</td>
+					<td style="padding-left: 10px;width: 130px;">{{ deliver.data.receiveUserName }}</td>
 					<td style="padding-left: 10px;width: 100px;">收花人电话：</td>
-					<td style="padding-left: 10px;width: 130px;">
-						{{ deliver.data.receiveMobile }}
-					</td>
+					<td style="padding-left: 10px;width: 130px;">{{ deliver.data.receiveMobile }}</td>
 					<td style="padding-left: 10px;" colspan="2" rowspan="4">
 						<div style="text-align: center;padding-top: 1px">
 							<p>情人节</p>
@@ -517,16 +342,14 @@
 								style="width: 100px;height: 100px;margin-bottom: 20px"
 								class="cover"
 								:src="deliver.data.img"
-								alt=""
+								alt
 							/>
 						</div>
 					</td>
 				</tr>
 				<tr>
 					<td style="padding-left: 10px;width: 100px;">收花人地址：</td>
-					<td style="padding-left: 10px" colspan="3">
-						{{ deliver.data.receiveFullAddress }}
-					</td>
+					<td style="padding-left: 10px" colspan="3">{{ deliver.data.receiveFullAddress }}</td>
 				</tr>
 				<tr>
 					<td style="padding-left: 10px;width: 100px;">祝福语：</td>
@@ -701,11 +524,11 @@ export default {
 				});
 		},
 		addressFn(item) {
-			console.log('江总', item)
+			console.log('江总', item);
 			this.orderForm.latitude = item.location.lat;
 			this.orderForm.longitude = item.location.lng;
 			this.orderForm.receiveAddress = item.title;
-			this.orderForm.receiveFullAddress = item.address
+			this.orderForm.receiveFullAddress = item.address;
 		},
 		submitOrderFn() {
 			this.$service.order
@@ -940,7 +763,7 @@ export default {
 		.form-wrap {
 			@include disFlex(flex-start, space-between);
 			& > div {
-				width: 49%;
+				width: 100%;
 			}
 		}
 		.prompt-text {

shop/src/views/order/list.vue

@@ -98,7 +98,6 @@
 					<el-button type="text" size="small" disabled>自取</el-button>
 					<el-button type="text" size="small" disabled>发货</el-button>
 				</template>
-
 				<template v-else-if="['4', '5', '6'].indexOf(scope.row.status) != -1"></template>
 				<template v-else>
 					<template v-if="scope.row.currentFlow == 1">

store/src/admin/order/components/sel-express-confirm.vue

@@ -13,8 +13,8 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">送达</div>
 						<div class="axis-det express-wrap">
-							<button class="admin-button-com big blue" @click="askConfirmReachFn">确认送达</button>
-							<div class="button-prompt">送达会通知客户哦</div>
+							<button class="admin-button-com big blue" @click="askConfirmReachFn">确认</button>
+							<div class="button-prompt">确认后会通知客户</div>
 						</div>
 					</div>
 				</template>

store/src/admin/order/components/sel-order.vue

@@ -19,7 +19,7 @@
 						query: {
 							id: orderData.id
 						}
-							})">填单</button>
+							})">填写</button>
 						</div>
 					</div>
 				</template>

store/src/admin/order/components/sel-ship-manage.vue

@@ -13,7 +13,7 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">发货</div>
                         <div v-if="orderData.hasDeliver == 1" class="axis-det btn-wrap">
-                            <button class="admin-button-com big blue confirm-btn" @click="sendSelfFn(1)">确认发货</button>
+                            <button class="admin-button-com big blue confirm-btn" @click="sendSelfFn(1)">确认</button>
                         </div>
 						<div v-else class="axis-det btn-wrap">
 							<button class="admin-button-com big blue confirm-btn" @click="sendSelfFn(0)" style="margin:auto;">自己送</button>

store/src/admin/order/detail.vue

@@ -121,7 +121,7 @@
         <div class="module-det flex-center-between">
           <div
             class="app-color-3"
-          >{{ data.discountType == 0 ? '使用优惠券' : data.discountType == 1 ? '会员打折' : '付款随机优惠' }}</div>
+          >{{ data.discountType == 0 ? '使用优惠券' : data.discountType == 1 ? '会员打折' : '随机优惠' }}</div>
           <div class="app-price">-￥{{ data.discountAmount }}</div>
         </div>
       </div>
@@ -158,7 +158,7 @@
             >配送详情</button>
           </block>
           <block v-else>
-            <button class="admin-button-com middle" @click.stop="freeShippingFn">自取</button>
+            <button v-if="data.currentFlow == 1" class="admin-button-com middle" @click.stop="freeShippingFn">自取</button>
             <button
               class="admin-button-com middle"
               @click.stop="pageTo({