1

pages/MallMange/components/orderItem.vue

@@ -33,26 +33,46 @@
           >规格：{{ getSpecificationsStr(item.SpecificationList) }}</view
         >
         <view class="flex-between">
-          <text>x{{ item.Number }}</text>
+          <text style="color: #808080">x{{ item.Number }}</text>
           <text>￥{{ item.SmallShopsCostPrice }}</text>
         </view>
       </view>
     </view>
     <view class="priceBox">
-      <text>合计：</text>
-      <text style="color: #111">￥{{ data.Income }}</text>
-      <text v-if="data.FreightMoney > 0"
-        >（含运费￥{{ data.FreightMoney }}）</text
+      <text>合计</text>
+      <text style="color: #111; margin: 0 4rpx; fond-size: 26rpx"
+        >￥{{ data.Income.toFixed(2) }}</text
       >
+      <text>(含运费￥{{ data.FreightMoney.toFixed(2) }})</text>
     </view>
     <view class="btnBox">
-      <button class="btn" @click="modal = true" v-if="orderType === 1">备注</button>
+      <button class="btn" @click="modal = true" v-if="orderType === 1">
+        备注
+      </button>
       <button class="btn" v-if="orderType === 2">拒绝</button>
       <button class="btn" v-if="orderType === 2">同意</button>
+      <button class="btn" v-if="orderType === 1 && data.OrderStatus === 2">
+        发货
+      </button>
+      <button class="btn" v-if="orderType === 1 && data.OrderStatus === 3">
+        确认收货
+      </button>
+      <button class="btn" v-if="orderType === 1 && data.OrderStatus === 3">
+        查看物流
+      </button>
+      <button class="btn" v-if="orderType === 1 && data.OrderStatus === 3">
+        修改物流
+      </button>
+      <button class="btn" v-if="orderType === 1 && (data.OrderStatus === 2||data.OrderStatus ===1)">
+        强制取消
+      </button>
+      <button class="btn" v-if="orderType === 1 && data.OrderStatus === 2">
+        修改地址
+      </button>
     </view>
     <u-modal
       v-model="modal"
-      :show-cancel-button="false"
+      :show-cancel-button="true"
       @confirm="confirm"
       contentSlot
       title="备注"
@@ -71,7 +91,7 @@
 export default {
   props: {
     data: Object,
-    orderType:Number,
+    orderType: Number,
   },
   data() {
     return {
@@ -100,18 +120,18 @@ export default {
     setOrderInfo() {
       this.requestAdmin("/api/order/SetOrderOperation", this.exitMsg, (res) => {
         if (res.resultCode === 1) {
-          this.$emit('update')
-        } 
+          this.$emit("update");
+        }
       });
     },
-    confirm(){
-      this.modal=false;
+    confirm() {
+      this.modal = false;
       this.setOrderInfo();
-    }
+    },
   },
-  created() { 
-    this.exitMsg.Remark=this.data?.Remark;
-    this.exitMsg.OrderId=this.data?.OrderId;
+  created() {
+    this.exitMsg.Remark = this.data?.Remark;
+    this.exitMsg.OrderId = this.data?.OrderId;
   },
 };
 </script>
@@ -130,13 +150,13 @@ export default {
   border-radius: 10rpx;
   margin: 20rpx auto;
   .orderNum {
-    font-size: 26rpx;
-    color: #333;
+    font-size: 24rpx;
+    color: #111;
     margin-bottom: 20rpx;
   }
   .remarks {
-    font-size: 26rpx;
-    color: #333;
+    font-size: 24rpx;
+    color: #111;
     margin-bottom: 20rpx;
   }
   .consigneeInfo {
@@ -182,6 +202,7 @@ export default {
     }
     .weight {
       height: 35%;
+      color: #808080;
     }
   }
   .priceBox {
@@ -196,10 +217,11 @@ export default {
     align-items: center;
     .btn {
       //   width: 90rpx;
-      //   height: 50rpx;
-      border-radius: 30rpx;
+      height: 50rpx;
+      border-radius: 25rpx;
       border: 2rpx solid #f7f7f7;
-      margin: 0 0 0 30rpx;
+      margin: 0 0 0 10rpx;
+      padding: 0 20rpx;
       display: flex;
       justify-content: center;
       align-items: center;