update

src/components/UserMan/distributionOrder.vue

@@ -171,7 +171,7 @@
                                     <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 地址：{{item.ShoppingAddress}}</div>
                                 </div>
                             </div>
-                            <div v-if="item.Remark && item.Remark!=''" class="seller-remark">商家备注：{{item.Remark}}</div>
+                            <div v-if="item.ReRemark && item.ReRemark!=''" class="seller-remark">商家备注：{{item.ReRemark}}</div>
                         </div>
                     </el-card>
                     <el-card v-if="tableData.length==0" class="app-order-item" shadow="never">

src/components/orderMan/afterSalesOrder.vue

@@ -85,7 +85,7 @@
                         <div class="app-order-body">
                             <div class="goods-item" style="width: 50%;">
                                 <div class="goods">
-                                    <img :src="domainManager().ImageUrl+item.OrderDetailModel.CoverImagePath" class="goods-image">
+                                    <img :src="getIconLink(item.OrderDetailModel.CoverImagePath)" class="goods-image">
                                     <div flex="dir:left">
                                         <div class="goods-info">
                                             <div class="goods-name">
@@ -141,10 +141,10 @@
                             </div>
                             <div flex="main:center cross:center" class="app-order-info" style="width: 18%;">
                                 <el-tooltip class="item" effect="dark" content="同意" placement="top">
-                                    <img @click="setOrder(item,1)" v-if="msg.SelectStatus==1" style="margin-right:5px" src="../../assets/img/userman/pass.png" alt="">
+                                    <img @click="setOrder(item,1)" v-if="item.ReOrderStatus==1" style="margin-right:5px" src="../../assets/img/userman/pass.png" alt="">
                                 </el-tooltip>
                                 <el-tooltip class="item" effect="dark" content="拒绝" placement="top">
-                                    <img @click="setOrder(item,2)" v-if="msg.SelectStatus==1" style="margin-right:5px" src="../../assets/img/userman/nopass.png" alt="">
+                                    <img @click="setOrder(item,2)" v-if="item.ReOrderStatus==1" style="margin-right:5px" src="../../assets/img/userman/nopass.png" alt="">
                                 </el-tooltip>
                                 <el-tooltip class="item" effect="dark" content="发货" placement="top">
                                     <img v-if="item.Type==2 && item.ReOrderStatus==3" @click="fhOpenDig(item)" style="margin-right:5px" src="../../assets/img/userman/confirm.png" alt="">
@@ -174,7 +174,7 @@
                                     <button @click="ExitshAdress(item.OrderModel)" type="button" class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
                                 </div>
                             </div>
-                            <div v-if="item.Remark!=''" class="seller-remark">商家备注：{{item.Remark}}</div>
+                            <div v-if="item.ReRemark && item.ReRemark!=''" class="seller-remark">商家备注：{{item.ReRemark}}</div>
                         </div>
                     </el-card>
                     <el-card v-if="tableData.length==0" class="app-order-item" shadow="never">