Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue

@@ -7,7 +7,8 @@
       <div class="jz">
         <el-breadcrumb class="breadcrumb" separator="/">
           <el-breadcrumb-item :to="{ path: '/shopping/person' }">个人中心</el-breadcrumb-item>
-          <el-breadcrumb-item :to="{ path: '/shopping/person' }">上级页面</el-breadcrumb-item>
+          <el-breadcrumb-item :to="{ path: '/shopping/person' }">全部订单</el-breadcrumb-item>
+          <el-breadcrumb-item>订单详情</el-breadcrumb-item>
         </el-breadcrumb>
         <div class="d-flex">
           <div class="l">
@@ -116,7 +117,7 @@
             </div>
           </div>
         </div>
-        <div class="btn"><a class="c_fff f_16">返回</a></div>
+        <div class="btn"><router-link to="/shopping/person" class="c_fff f_16">返回</router-link></div>
       </div>
     </div>
     <Footer></Footer>