Merge branch 'feature/shop-order-v2.2' into 'master'

一件代发退货文案修改

一件代发退货文案修改

See merge request !119

@@ -20,14 +20,6 @@
             </Row>
             </Row>
             <filter-item>
             <filter-item>
               <Button
               <Button
-                type="success"
-                :loading="showExpressLoading"
-                :disabled="orderInfo.orderStatus >= 600 ? true : false"
-                @click="confirmExpress"
-              >
-                确认快递单
-              </Button>
-              <Button
                 type="primary"
                 type="primary"
                 :loading="showDeliverLoading"
                 :loading="showDeliverLoading"
                 :disabled="orderInfo.orderStatus >= 600 ? true : false"
                 :disabled="orderInfo.orderStatus >= 600 ? true : false"

@@ -44,13 +44,13 @@
     <div class="ivu-card">
     <div class="ivu-card">
       <div class="ivu-card-body">
       <div class="ivu-card-body">
         <template v-if="returnedInfo.status === 0">
         <template v-if="returnedInfo.status === 0">
+          <p class="red">请您在24小时以内尽快处理退货申请</p>
           <p class="red">若您同意退货，待买家寄回后，将退款给买家，若有异议请与平台联系</p>
           <p class="red">若您同意退货，待买家寄回后，将退款给买家，若有异议请与平台联系</p>
-          <p class="red">若您未响应申请，视作同意退货</p>
           <p class="red">若您不同意退货可点击驳回，若买家向平台投诉，如核实是您的责任，将会影响店铺评分</p>
           <p class="red">若您不同意退货可点击驳回，若买家向平台投诉，如核实是您的责任，将会影响店铺评分</p>
         </template>
         </template>
         <template v-if="returnedInfo.status === 10">
         <template v-if="returnedInfo.status === 10">
-          <p class="red">-若您同意退款，将直接退款给买家</p>
-          <p class="red">-若您逾期未响应，视作同意退款，系统将自动打款给买家</p>
+          <p class="red">请您在物流签收后24小时内尽快处理</p>
+          <p class="red">若您同意退款，将直接退款给买家</p>
         </template>
         </template>
         <br />
         <br />
         <template v-if="returnedInfo.status === 0">
         <template v-if="returnedInfo.status === 0">

 {
 {
   "name": "yoho-shop-manage",
   "name": "yoho-shop-manage",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "",
   "description": "",
   "main": "app.js",
   "main": "app.js",
   "scripts": {
   "scripts": {