up

vue/src/views/shop/order_index.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="天猫" name="taoOrder">
         <order-tao></order-tao>
       </el-tab-pane>
-      <el-tab-pane label="京东" name="jdOrder" lazy>
+      <el-tab-pane label="京东POP" name="jdOrder" lazy>
         <order-jd></order-jd>
       </el-tab-pane>
 

vue/src/views/tao/order/index.vue

@@ -55,16 +55,16 @@
           @click="handlePull"
         >API拉取订单</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          :loading="pullLoading"
+<!--          :loading="pullLoading"-->
-          type="primary"
+<!--          type="primary"-->
-          plain
+<!--          plain-->
-          icon="el-icon-download"
+<!--          icon="el-icon-download"-->
-          size="mini"
+<!--          size="mini"-->
-          @click="handlePullDetailByTid"
+<!--          @click="handlePullDetailByTid"-->
-        >API拉取单个订单</el-button>
+<!--        >API拉取单个订单</el-button>-->
-      </el-col>
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -73,7 +73,7 @@
           size="mini"
           :disabled="multiple"
           @click="handlePushOms"
-        >手动将选中订单推送到OMS</el-button>
+        >批量确认订单</el-button>
       </el-col>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -128,12 +128,26 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-row>
+            <el-button
+              :loading="pullLoading"
+              type="text"
+              @click="handlePullUpdate(scope.row)"
+            >详情</el-button>
+            <el-button
+              :loading="pullLoading"
+              type="text"
+              icon="el-icon-refresh"
+              @click="handlePullUpdate(scope.row)"
+            >更新</el-button>
+          </el-row>
           <el-button
             :loading="pullLoading"
             size="mini"
-            icon="el-icon-refresh"
+            type="success"
+            icon="el-icon-success"
             @click="handlePullUpdate(scope.row)"
-          >更新订单</el-button>
+          >确认订单</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -311,7 +325,7 @@ export default {
     },
     handlePushOms(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否手动推送到系统？').then(function() {
+      this.$modal.confirm('是否批量确认订单？').then(function() {
         return pushOms({ids:ids});
       }).then(() => {
         // this.getList();