huangmp 2 лет назад
Родитель
Сommit
77a6702afc

+ 1 - 1
src/views/modules/print/print-scan-delivery.vue

@@ -171,7 +171,7 @@ export default {
       this.$http({
         url: this.$http.adornUrl('/platform/logistics/printOrder'),
         method: 'POST',
-        data: this.$http.adornData({orderNo: this.scanOrderNo, logistics: this.printOrder.orderLogistics.logistics, deviceNo: this.deviceNo}),
+        data: this.$http.adornData({orderNumber: this.scanOrderNo, logistics: this.printOrder.orderLogistics.logistics, deviceNo: this.deviceNo}),
       }).then(({data}) => {
         if(data){
           this.getLogisticsInfo(this.scanOrderNo);

+ 6 - 0
src/views/modules/promotion/promotionUp.vue

@@ -67,6 +67,12 @@
               <span>{{ scope.row.upName}}</span>
             </template>
           </el-table-column>
+          <el-table-column label="是否拉黑" prop="isBlack" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.isBlack === 1" type="info">拉黑</el-tag>
+              <el-tag v-if="scope.row.isBlack === 0" type="success">正常</el-tag>
+            </template>
+          </el-table-column>
           <!-- 博主粉丝 -->
           <el-table-column label="博主粉丝" prop="fansNum" align="center">
             <template slot-scope="scope">

+ 9 - 2
src/views/modules/promotion/promotionVideo.vue

@@ -236,17 +236,24 @@
               <span>{{ scope.row.publishTime}}</span>
             </template>
           </el-table-column>
+          <el-table-column label="创建时间" prop="publishTime" align="center" width="120px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.publishTime}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="同步状态" prop="settleStatus" align="center" width="90px">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.syncStatus === '失败'" type="danger">失败</el-tag>
               <el-tag v-if="scope.row.syncStatus === '成功'" type="success">成功</el-tag>
+              <br/>
+              <span>{{ scope.row.syncTime}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="同步时间" prop="publishTime" align="center" width="120px">
+          <!--<el-table-column label="同步时间" prop="publishTime" align="center" width="120px">
             <template slot-scope="scope">
               <span>{{ scope.row.syncTime}}</span>
             </template>
-          </el-table-column>
+          </el-table-column>-->
           <el-table-column align="center" fixed="right" :label="$t('publics.operating')" width="auto">
             <template slot-scope="scope">
               <div class="text-btn-con">