diff --git a/src/components/goodsList/index.vue b/src/components/goodsList/index.vue
index 3b32fbe..f87676a 100644
--- a/src/components/goodsList/index.vue
+++ b/src/components/goodsList/index.vue
@@ -4,7 +4,7 @@
       <el-form-item label="商品分类：">
         <el-select v-model="tableFrom.mer_cate_id" placeholder="请选择" class="dialogWidth" clearable @change="getList(1)">
           <el-option v-for="item in merCateList" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>    
+        </el-select>
       </el-form-item>
       <el-form-item label="商品搜索：">
         <el-input
@@ -17,13 +17,13 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" @click="getList(1)">查询</el-button>
-      </el-form-item>       
+      </el-form-item>
     </el-form>
     <el-table
-      ref="table"  
+      ref="table"
       :data="tableData.data"
-      :row-key="getRowKeys" 
-      @selection-change="changeCheckbox" 
+      :row-key="getRowKeys"
+      @selection-change="changeCheckbox"
       size="small"
       v-loading="loading"
     >
@@ -49,7 +49,7 @@
         label="商品名称"
         min-width="200"
       />
-      <el-table-column label="售价" prop="price" min-width="80"/>
+      <el-table-column label="零售价" prop="price" min-width="80"/>
       <el-table-column label="会员价" prop="svip_price" min-width="80">
         <template slot-scope="scope">
           <span v-if="scope.row.svip_price_type == 0">未设置</span>
@@ -57,7 +57,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <div class="acea-row row-between mt20 mb15"> 
+    <div class="acea-row row-between mt20 mb15">
       <el-pagination
         :page-size="tableFrom.limit"
         :current-page="tableFrom.page"
@@ -162,7 +162,7 @@ export default {
         data: []
       },
       currentid: 0,
-      productRow: {}, 
+      productRow: {},
       images: [],
       diyVal: [],
       many: "",
@@ -173,7 +173,7 @@ export default {
     };
   },
   computed: {
-    
+
   },
   created() {
     let many = "";
@@ -183,15 +183,15 @@ export default {
       many = this.$route.query.type;
     }
     this.many = many;
-    
+
   },
   mounted() {
     this.getCategorySelect();
     this.getList('');
     setTimeout(()=>{
-      this.setSelectRow(); 
+      this.setSelectRow();
     },500)
-  
+
   },
   methods: {
     getRowKeys(row) {
@@ -255,7 +255,7 @@ export default {
         delete(that.tableFrom.is_good)
       }
         goodLstApi(that.tableFrom)
-          .then(async (res) => { 
+          .then(async (res) => {
             that.tableData.data = res.data.list;
             that.tableData.total = res.data.count;
             this.$nextTick(function () {
diff --git a/src/views/marketing/discounts/create.vue b/src/views/marketing/discounts/create.vue
index bfa9fdb..2692206 100644
--- a/src/views/marketing/discounts/create.vue
+++ b/src/views/marketing/discounts/create.vue
@@ -140,7 +140,7 @@
                   <el-table-column label="操作" min-width="100">
                       <template slot-scope="scope">
                         <el-button type="text" size="small" @click="editGoods(scope.row, scope.$index, 'Other')">设置规格</el-button>
-                        
+
                         <el-button type="text" size="small" @click="deleteGoods(scope.$index, 'Other')">删除</el-button>
                       </template>
                     </el-table-column>
@@ -153,7 +153,7 @@
                     @click="addGoods('Other')"
                     >添加商品</el-button>
                 </el-form-item>
-              </el-col>      
+              </el-col>
               <el-col>
                 <el-form-item
                   label="套餐数量："
@@ -202,7 +202,7 @@
                     :inactive-value="0"
                     active-text="是"
                     inactive-text="否"
-                  />                  
+                  />
                   <div class="ml100 grey">
                     不包邮时，将按照商品的运费模板进行计算
                   </div>
@@ -217,7 +217,7 @@
                     :width="55"
                     active-text="上架"
                     inactive-text="下架"
-                  /> 
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -230,7 +230,7 @@
                 <div v-if="!submitOpen">提交</div>
                 <div v-else>提交中</div>
               </el-button>
-            </el-form-item>          
+            </el-form-item>
           </el-form>
         </el-col>
       </el-row>
@@ -266,12 +266,12 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table 
+      <el-table
         ref="multipleSelection"
         :data="manyFormValidate"
-        :row-key="(row) => { return row.unique }" 
+        :row-key="(row) => { return row.unique }"
         @selection-change="selectOne"
-        height="420"  
+        height="420"
         size="small"
       >
         <el-table-column type="selection" :reserve-selection="true" width="80" />
@@ -280,18 +280,18 @@
               <div class="demo-image__preview">
               <el-image :src="scope.row.image" :preview-src-list="[scope.row.image]" />
             </div>
-            </template>           
+            </template>
         </el-table-column>
         <el-table-column label="规格" prop="sku" width="200">
            <template slot-scope="scope">
               <span>{{scope.row.sku || '默认'}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="售价" prop="price" width="100"/>
+        <el-table-column label="零售价" prop="price" width="100"/>
         <el-table-column label="会员价" prop="is_svip_price" width="100"/>
         <el-table-column align="center" label="优惠价" min-width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row['active_price']" type="number" style="width:100px" :min="0" :max="scope.row['price']" @blur="limitPrice(scope.row)" /> 
+            <el-input v-model="scope.row['active_price']" type="number" style="width:100px" :min="0" :max="scope.row['price']" @blur="limitPrice(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -329,12 +329,12 @@ export default {
       ggModel: false,
       modals: false,
       loading: false,
-      timeVal: '',      
+      timeVal: '',
       manyFormValidate: [],
-      multipleSelection: [], 
+      multipleSelection: [],
       submitOpen: false,
       spinShow: false,
-      addGoodsModel: false,   
+      addGoodsModel: false,
       isChoice: "单选",
       current: 0,
       modalPic: false,
@@ -365,9 +365,9 @@ export default {
       id: "",
       rate_price: 0,
     };
-  }, 
+  },
   computed: {
-    
+
   },
   mounted() {
     if (this.$route.params.id) {
@@ -410,7 +410,7 @@ export default {
             return this.$message.warning("请填写优惠价格");
          }else{
            items.push({active_price: this.multipleSelection[i]['active_price'],unique: this.multipleSelection[i]['unique']})
-         } 
+         }
         }
       this.$set(type[this.tabIndex],"items", items);
       this.ggModel = false;
@@ -444,7 +444,7 @@ export default {
               : this.specsData[this.tabIndex].attr || [];
           let selectArr = []
           if (data.length) {  //已经选择的商品的规格
-            for (let i = 0; i < info.length; i++) {     
+            for (let i = 0; i < info.length; i++) {
               for (let j = 0; j < data.length; j++) {
                 const element = data[j];
                 if (element.sku === info[i].sku) {
@@ -454,14 +454,14 @@ export default {
                   // this.multipleSelection.push(info[j]);
                 }
               }
-            }           
+            }
           }
           this.$nextTick(() => {
             selectArr.forEach((row) => {
               this.$refs.multipleSelection.toggleRowSelection(row, true)
             })
             this.multipleSelection = selectArr
-          })  
+          })
           this.manyFormValidate = info;
         })
         .catch((res) => {
@@ -507,7 +507,7 @@ export default {
     onchangeTime(e) {
       this.timeVal = e
       this.formValidate.time[0] = e ? this.moment(e[0]).format('YYYY-MM-DD HH:mm:ss') : ''
-      this.formValidate.time[1] = e ? this.moment(e[1]).format('YYYY-MM-DD HH:mm:ss') : ''   
+      this.formValidate.time[1] = e ? this.moment(e[1]).format('YYYY-MM-DD HH:mm:ss') : ''
     },
     // 详情
     getInfo() {
@@ -515,7 +515,7 @@ export default {
         this.formValidate = res.data;
         this.timeVal =  [
           new Date(this.formValidate.time[0]),
-          new Date(this.formValidate.time[1])];     
+          new Date(this.formValidate.time[1])];
         for (let i = 0; i < res.data.discountsProduct.length; i++) {
           const element = res.data.discountsProduct[i];
           element.attr= [];  element.items = [];
@@ -526,7 +526,7 @@ export default {
                 attr['active_price'] = attr['productSku']['active_price']
                 element.attr.push(attr)
                 element.items.push({active_price: attr['productSku']['active_price'],unique: attr['unique']})
-              } 
+              }
             }
           if (element.type == 1) {
             this.specsMainData.push(element);
@@ -631,9 +631,9 @@ export default {
     // 点击商品图
     modalPicTap(tit, num, i) {
      const _this = this;
-     this.$modalUpload(function(img) {   
+     this.$modalUpload(function(img) {
         if(tit == "1" && !num) {
-          _this.formValidate.image = img[0];  
+          _this.formValidate.image = img[0];
         }
       }, tit);
     },
@@ -696,7 +696,7 @@ export default {
 	.iconxiayi{
 		font-size: 12px
 	}
-}		
+}
 .custom-label {
   display: inline-flex;
   line-height: 1.5;
diff --git a/src/views/order/orderDetails.vue b/src/views/order/orderDetails.vue
index d31f85f..bc593ff 100644
--- a/src/views/order/orderDetails.vue
+++ b/src/views/order/orderDetails.vue
@@ -26,7 +26,7 @@
                 >订单核销</el-button
               >
               <el-button
-                 v-if="(orderDetailList.order_type == 0 || orderDetailList.order_type == 2) && orderDetailList.status === 0 && orderDetailList.paid === 1" 
+                 v-if="(orderDetailList.order_type == 0 || orderDetailList.order_type == 2) && orderDetailList.status === 0 && orderDetailList.paid === 1"
                 type="primary"
                 size="small"
                 @click="send"
@@ -43,8 +43,8 @@
                 <el-button icon="el-icon-more" size="small"></el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="mark">订单备注</el-dropdown-item>
-                  <el-dropdown-item v-if="orderDetailList.order_type == 0 && orderDetailList.status === 1 && orderDetailList.paid === 1" command="modify">修改发货信息</el-dropdown-item> 
-                  <el-dropdown-item v-if="orderDetailList.status!=-1&&orderDetailList.paid==1&&orderDetailList.status<9" command="refund">退款</el-dropdown-item> 
+                  <el-dropdown-item v-if="orderDetailList.order_type == 0 && orderDetailList.status === 1 && orderDetailList.paid === 1" command="modify">修改发货信息</el-dropdown-item>
+                  <el-dropdown-item v-if="orderDetailList.status!=-1&&orderDetailList.paid==1&&orderDetailList.status<9" command="refund">退款</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -100,7 +100,7 @@
                   <div>绑定电话：</div>
                   <div class="value">{{ orderDetailList.user.phone ? orderDetailList.user.phone : '-' }}</div>
                 </li>
-               
+
               </ul>
             </div>
             <div class="section">
@@ -120,7 +120,7 @@
                 </li>
               </ul>
             </div>
-            
+
             <div class="section">
               <div class="title">订单信息</div>
               <ul class="list">
@@ -244,7 +244,7 @@
                 </li>
               </ul>
             </div>
-            
+
           </el-tab-pane>
           <el-tab-pane label="商品信息" name="goods">
             <el-table :data="orderDetailList.orderProduct">
@@ -268,8 +268,8 @@
                   </div>
                 </template>
               </el-table-column>
-             
-              <el-table-column label="售价" min-width="90">
+
+              <el-table-column label="零售价" min-width="90">
                 <template slot-scope="scope">
                   <div class="tab">
                     <div class="line1">
@@ -405,7 +405,7 @@
                     </span>
                   </div>
                 </template>
-              </el-table-column> 
+              </el-table-column>
               <el-table-column label="实际支付" min-width="80" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.pay_price }}</span>
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index bbaf10e..cdba62f 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -1602,7 +1602,7 @@ const defaultObj = {
 }
 const objTitle = {
   price: {
-    title: '售价'
+    title: '零售价'
   },
   wholesale_price: {
     title: '批发价'
@@ -2683,7 +2683,7 @@ export default {
       }
     },
     memberPrice(formHead, row) {
-      if (formHead.title == '售价') {
+      if (formHead.title == '零售价') {
         row.svip_price = this.accMul(row.price, this.svip_rate)
       }
     },
diff --git a/src/views/product/addProduct/taoBao.vue b/src/views/product/addProduct/taoBao.vue
index a0e9618..d74c355 100644
--- a/src/views/product/addProduct/taoBao.vue
+++ b/src/views/product/addProduct/taoBao.vue
@@ -105,7 +105,7 @@ const defaultObj = {
 }
 const objTitle = {
   price: {
-    title: '售价'
+    title: '零售价'
   },
   cost: {
     title: '成本价'
@@ -147,7 +147,7 @@ export default {
           minWidth: 80
         },
         {
-          title: '售价',
+          title: '零售价',
           slot: 'price',
           align: 'center',
           minWidth: 95
diff --git a/src/views/product/productList/editAttr.vue b/src/views/product/productList/editAttr.vue
index 5f50dcf..c5b1f38 100644
--- a/src/views/product/productList/editAttr.vue
+++ b/src/views/product/productList/editAttr.vue
@@ -6,7 +6,7 @@
       width="80%"
       title="免审核商品信息编辑"
       custom-class="dialog-scustom"
-    > 
+    >
       <el-form
         ref="formValidate"
         class="formValidate mt20"
@@ -43,7 +43,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="售价" min-width="100" align="center">
+                <el-table-column label="零售价" min-width="100" align="center">
                   <template slot-scope="scope">
                     <el-input-number v-model="oneFormBatch[0].price" :min="0" class="priceBox" controls-position="right"/>
                   </template>
@@ -157,7 +157,7 @@
                   </el-table-column>
                 </template>
               </el-table>
-            </el-form-item> 
+            </el-form-item>
             <el-form-item>
               <el-button :loading="loading1" type="primary" class="submission" @click="handleSubmit('formValidate')">提交</el-button>
             </el-form-item>
@@ -224,7 +224,7 @@ const defaultObj = {
 }
 const objTitle = {
   price: {
-    title: '售价'
+    title: '零售价'
   },
   cost: {
     title: '成本价'
diff --git a/src/views/product/productList/proDetails.vue b/src/views/product/productList/proDetails.vue
index 0ba86d2..f2e6366 100644
--- a/src/views/product/productList/proDetails.vue
+++ b/src/views/product/productList/proDetails.vue
@@ -52,7 +52,7 @@
                 <li class="item item100">
                   <div class="item-title">轮播图：</div>
                   <img v-for="(pic,idx) in productData.slider_image" :key="idx" :src="pic" style="width:40px;height:40px;margin-right:12px;"/>
-                </li>  
+                </li>
               </ul>
               <li class="item item100">
                 <div class="item-title">商品简介：</div>
@@ -74,7 +74,7 @@
                   <div class="item-title">商品标签：</div>
                   <div v-if="(productData.mer_labels&&productData.mer_labels_data.length) || (productData.sys_labels_data&&productData.sys_labels_data.length)" class="value">
                     <template v-if="productData.mer_labels_data&&productData.mer_labels_data.length">
-                      <span v-for="(item,index) in productData.mer_labels_data" :key="index" class="value-item"> {{item}} </span> 
+                      <span v-for="(item,index) in productData.mer_labels_data" :key="index" class="value-item"> {{item}} </span>
                     </template>
                     <template v-if="productData.sys_labels_data&&productData.sys_labels_data.length">
                       <span v-for="(item,index) in productData.sys_labels_data" :key="index" class="value-item"> {{item}} </span>
@@ -172,7 +172,7 @@
                         </el-table-column>
                       </template>
                     <el-table-column align="center" label="图片" min-width="80">
-                      <template slot-scope="scope"> 
+                      <template slot-scope="scope">
                         <div class="pictrue tabPic"><img :src="scope.row.image" style="width: 36px; height: 36px; border-radius: 4px;"></div>
                       </template>
                     </el-table-column>
@@ -446,7 +446,7 @@
               <div class="block">
                 <el-pagination :page-size="recordForm.limit" :current-page="recordForm.page" layout="prev, pager, next, jumper" :total="recordData.total" @size-change="handleSizeChange" @current-change="pageChange" />
               </div>
-            </div> 
+            </div>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -498,11 +498,11 @@ const defaultObj = {
   extension_type: 0,
   content: '',
   spec_type: 0,
- 
+
 }
 const objTitle = {
   price: {
-    title: '售价'
+    title: '零售价'
   },
   svip_price: {
     title: '付费会员价'
@@ -668,7 +668,7 @@ export default {
       this.getRecordData()
     },
     tabClick(tab) {
-   
+
     },
   },
 };
@@ -721,7 +721,7 @@ export default {
       width: 20%;
       font-size: 14px;
       line-height: 14px;
-      color: rgba(0, 0, 0, 0.85);      
+      color: rgba(0, 0, 0, 0.85);
       .title {
         margin-bottom: 12px;
         font-size: 13px;
diff --git a/src/views/product/productList/taoBao.vue b/src/views/product/productList/taoBao.vue
index 071a0aa..21c1c71 100644
--- a/src/views/product/productList/taoBao.vue
+++ b/src/views/product/productList/taoBao.vue
@@ -191,7 +191,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="售价" min-width="150" align="center">
+                <el-table-column label="零售价" min-width="150" align="center">
                   <template slot-scope="scope">
                     <el-input v-model="oneFormBatch[0].price" type="number" min="0" class="priceBox" />
                   </template>
@@ -387,7 +387,7 @@ const defaultObj = {
 }
 const objTitle = {
   price: {
-    title: '售价'
+    title: '零售价'
   },
   cost: {
     title: '成本价'
@@ -440,7 +440,7 @@ export default {
           minWidth: 80
         },
         {
-          title: '售价',
+          title: '零售价',
           slot: 'price',
           align: 'center',
           minWidth: 95