运费跳转

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

@@ -88,7 +88,7 @@
 						<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="$util.pageTo({url: '/goods/auto-price'})">涨价设置</el-button>
 							</div>
 							<el-button type="text" icon="el-icon-question" slot="reference"></el-button>
 							<!-- <el-button slot="reference">删除</el-button> -->
@@ -109,12 +109,10 @@
 						</el-radio>
 						<el-popover placement="top" width="100" trigger="hover" v-model="chargePopover">
 							<p>
-								{{ shopInfo.extend.freeDistance }}公里内免运费，超过每增加{{
-								shopInfo.extend.freight
-								}}公里运费增加2元
+								{{ shopInfo.extend.freeDistance }}公里内免运费，超过每增加1公里运费增加{{shopInfo.extend.freight}}元
 							</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="$util.pageTo({url: '/goods/freight'})">修改</el-button>
 							</div>
 							<el-button type="text" icon="el-icon-question" slot="reference" class="question-btn"></el-button>
 							<!-- <el-button slot="reference">删除</el-button> -->

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

@@ -98,8 +98,7 @@
 									</template>
 									<template v-else>
 										<div class="label-list">
-											<span class="label">配送：</span>
-											<span class="value">门店</span>
+											<span class="label">门店配送</span>
 										</div>
 									</template>
 								</div>