Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

buyer/src/pages/home/orderCenter/AfterSale.vue

@@ -95,8 +95,8 @@
               <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </FormItem>
-          <FormItem label="快递单号" prop="logisticsNo">
+          <FormItem label="物流单号" prop="logisticsNo">
-            <Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
+            <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
           </FormItem>
           <FormItem label="发货时间" prop="mDeliverTime">
             <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime"

buyer/src/pages/home/orderCenter/AfterSaleDetail.vue

@@ -85,8 +85,8 @@
               <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </FormItem>
-          <FormItem label="快递单号" prop="logisticsNo">
+          <FormItem label="物流单号" prop="logisticsNo">
-            <Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
+            <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
           </FormItem>
           <FormItem label="发货时间" prop="mDeliverTime">
             <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker>

manager/src/views/order/after-order/afterSaleOrderDetail.vue

@@ -340,7 +340,7 @@
           </dd>
         </dl>
         <dl>
-          <dt>快递单号：</dt>
+          <dt>物流单号：</dt>
           <dd>
             <div class="text-box">{{ afterSaleInfo.mlogisticsNo }}</div>
           </dd>

seller/src/views/home/home.vue

@@ -162,7 +162,7 @@
           </div>
           <div>
             <div class="counts">{{ homeData.goodsNum || 0 }}</div>
-            <div>整体商品数量</div>
+            <div>上架商品数量</div>
           </div>
 
         </div>

seller/src/views/order/after-order/reurnGoodsOrderDetail.vue

@@ -326,7 +326,7 @@
           </dd>
         </dl>
         <dl>
-          <dt>快递单号：</dt>
+          <dt>物流单号：</dt>
           <dd>
             <div nctype="ordersSn" class="text-box">{{ logisticsInfo.logisticCode }}</div>
           </dd>

seller/src/views/order/order/orderDetail.vue

@@ -357,7 +357,7 @@
           </dd>
         </dl>
         <dl>
-          <dt>快递单号：</dt>
+          <dt>物流单号：</dt>
           <dd>
             <div nctype="ordersSn" class="text-box">
               {{ logisticsInfo.logisticCode || orderInfo.order.logisticsNo }}

seller/src/views/promotion/pintuan/pintuan-edit.vue

@@ -35,7 +35,7 @@
             </Radio>
           </RadioGroup>
           <br />
-          <span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高</span>
+          <span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高成团率</span>
         </FormItem>
         <FormItem label="拼团规则" prop="pintuanRule">
           <Input v-model="form.pintuanRule" type="textarea" :rows="4" clearable maxlength="255" style="width: 260px" />