新增营销系统、分销系统、会员功能、门店、提现功能

components/order/order.vue

@@ -1,135 +1,216 @@
 <template>
+  <view
+      :class="['order']"
+      v-if="data"
+  >
     <view
-        :class="['order']"
-        v-if="data"
+        class="order-header"
+        @tap="toOrderInfo"
+    >
+      <view class="order-logo">
+        <view class="color-y">Y</view>
+        <view>SHOP商城</view>
+      </view>
+      <view
+          class="order-status status-2"
+          v-if="data._status"
+      >
+        {{ data._status._type === '8' && data.shippingType === 2 ? "待核销" : data._status._title }}
+      </view>
+    </view>
+    <view
+        class="order-goods"
+        @tap="toOrderInfo"
     >
       <view
-          class="order-header"
-          @tap="toOrderInfo"
+          v-for="(item, index) in data.cartInfo"
+          class="order-evaluate"
+          :class="{evaluateBtn: data._status._type == 3}"
       >
-        <view class="order-logo">
-          <view class="color-y">Y</view>
-          <view>SHOP商城</view>
-        </view>
         <view
-            class="order-status status-2"
-            v-if="data._status"
+            v-if="data._status._type == 3 && item.isReply === 0"
+            class="order-actions-primary order-evaluate-btn"
+            @tap.stop="toEvaluate(item.unique,data.orderId)"
         >
-          {{ data._status._title }}
+          去评价
         </view>
-      </view>
-      <view
-          class="order-goods"
-          @tap="toOrderInfo"
-      >
-        <view
-            v-for="(item, index) in data.cartInfo"
-            class="order-evaluate"
-            :class="{evaluateBtn: data._status._type == 3}"
+        <Goods
+            row
+            :jump="false"
+            imgWidth="200rpx"
+            info-padding="10rpx 40rpx"
+            :goods="item.productInfo"
         >
-          <view
-              v-if="data._status._type == 3 && item.isReply === 0"
-              class="order-actions-primary order-evaluate-btn"
-              @tap.stop="toEvaluate(item)"
-          >
-            去评价
-          </view>
-          <goods
-              list
-              interval
-              desc="3"
-              showAction
-              model
-              :purchase="item.cartNum"
-              :data="item.productInfo"
-          >
-            <template #price>
-              ￥{{ item.truePrice }}
-            </template>
-          </goods>
-        </view>
-      </view>
-      <view
-          class="order-info"
-          @tap="toOrderInfo"
-      >
-        <view class="text">总价：¥{{ data.cost }}</view>
-        <view class="text">优惠：¥{{ couponPrice }}</view>
-        <view class="text">运费：¥{{ totalPostage }}</view>
-        <view class="text flex flex-ai__center">总计：
-          <view class="total-price">¥{{ totalPrice }}</view>
-        </view>
-      </view>
-      <view v-if="data._status">
-        <view
-            class="order-actions"
+          <template #options>
+            <view
+                class="goods-options">
+              <!-- sku select -->
+              <view class="sku-row flex">
+                <view
+                    class="sku-info flex flex-jc__sb flex-ai__center"
+                >
+                  <view class="info">
+                    {{
+                      item.productInfo && item.productInfo.attrInfo && item.productInfo.attrInfo.sku
+                    }}
+                  </view>
+                  <view>
+                  </view>
+                </view>
+              </view>
+              <!-- 售后 -->
 
-        >
-          <!-- 未支付 -->
-          <view class="order-actions-left">
+              <!-- bottom -->
+              <view class="price-row flex flex-ai__center flex-jc__sb">
+                <!-- price -->
+                <view class="price-box flex flex-ai__center">
+                  ￥{{ item.truePrice }}
+                </view>
+                <!--  -->
+                <view class="flex flex-ai__center">
+                  <view
+                      class="after-sale-box"
+                      v-if="item.orderDetailState!==1"
+                  >
+                    <span v-if="item.orderDetailState===2"> 售后中 </span>
+                    <span v-if="item.orderDetailState===3"> 售后完成 </span>
+                  </view>
+                  <view class="price-box cart-num flex flex-ai__end">
+                    x{{ item.cartNum }}
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </Goods>
+
+      </view>
+    </view>
+    <view
+        class="order-info"
+        @tap="toOrderInfo"
+    >
+      <view class="text">总价：¥{{ data.cost }}</view>
+      <view class="text">总优惠：¥{{ couponPrice }}</view>
+      <view class="text">运费：¥{{ totalPostage }}</view>
+      <view class="text flex flex-ai__center">总计：
+        <view class="total-price">¥{{ totalPrice }}</view>
+      </view>
+    </view>
+    <view v-if="data._status">
+      <view
+          class="order-actions"
+
+      >
+        <!-- 未支付 -->
+        <view class="order-actions-left">
+        </view>
+        <view class="order-actions-btns">
+          <view
+              v-if="data._status._type === '0'"
+              class="order-actions-default"
+              @tap="showModal(1)"
+          >
+            取消订单
           </view>
-          <view class="order-actions-btns">
-            <view
-                v-if="data._status._type === '0'"
-                class="order-actions-default"
-                @tap="showModal(0)"
-            >
-              取消订单
-            </view>
-            <view
-                v-if="data._status._type === '0'"
-                class="order-actions-primary"
-                @tap="handlePay"
-            >
-              立即付款
-            </view>
-            <view
-                v-if="!['0','5','-1','-2'].includes(data._status._type)"
-                class="order-actions-default"
-                @tap="toSelectRefundGood"
-            >
-              申请退款
-            </view>
-            <view
-                class="order-actions-default"
-                v-if="data._status._type === '2'"
-                @tap="toOrderInfo"
-            >
-              查看物流
-            </view>
-            <view
-                v-if="data._status._type === '2'"
-                class="order-actions-primary"
-                @tap="showModal(2)"
-            >
-              确认收货
-            </view>
-            <view
-                v-if="['4'].includes(data._status._type)"
-                class="order-actions-default"
-                @tap="showModal(1)"
-            >
-              删除订单
-            </view>
+          <view
+              v-if="data._status._type === '0'"
+              class="order-actions-primary"
+              @tap="handlePay"
+          >
+            立即付款
+          </view>
+          <view
+              v-if="(data.shippingType ===1&&['1','2','3','4','8','6'].includes(data._status._type))||data.shippingType ===2&&['6'].includes(data._status._type)"
+              class="order-actions-default"
+              @tap="toSelectRefundGood(data.id)"
+          >
+            申请退款
+          </view>
+          <view
+              v-if="(data.shippingType ===2 && ['8'].includes(data._status._type))"
+              class="order-actions-default"
+              @tap="showModal(3)"
+          >
+            取消订单
+          </view>
+          <!-- _type: 2待收货 3已收货 4已完成 8代发货 6待成团 7已成团 -->
+          <view
+              v-if="data._status._type==='8' && data.shippingType === 2"
+              class="order-actions-primary"
+              @tap="emit('checkOffCode',data.writeOffCode)"
+          >
+            核销码
+          </view>
+          <view
+              class="order-actions-default"
+              v-if="data._status._type === '2'"
+              @tap="toOrderInfo"
+          >
+            查看物流
+          </view>
+          <view
+              v-if="data._status._type === '2'"
+              class="order-actions-primary"
+              @tap="showModal(2)"
+          >
+            确认收货
+          </view>
+          <view
+              v-if="['4','5','-2'].includes(data._status._type)"
+              class="order-actions-default"
+              @tap="showModal(0)"
+          >
+            删除订单
+          </view>
+          <view
+              v-if="data._status._type === '6'"
+              class="order-actions-primary"
+              @tap="goGroupByDetail({teamworkId:data.teamworkId})"
+          >
+            邀请好友拼团
           </view>
         </view>
       </view>
-      <Modal ref="modalRef" :content="modalTitle" @confirm="handleModalConfirm" />
     </view>
+    <Modal
+        ref="modalRef"
+        :content="modalTitle"
+        @confirm="confirmModal" />
+  </view>
 </template>
 
 <script setup>
-import { computed, ref, unref } from 'vue';
-import { orderCancel, orderDelete, orderTake } from '@/api/order'
+import { ref } from 'vue';
+import { cancelAfterVerification, orderTake } from '@/api/order'
 import Modal from "@/components/Modal/index.vue"
 
 import { useRouter } from "@/hooks/useRouter";
 import { useInterface } from "@/hooks/useInterface";
+import { useOrder } from "@/hooks/useOrder";
+import { useJump } from "@/hooks/useJump";
+import Goods from "@/components/goodsComponents/Goods.vue";
+
+
+const {
+  modalRef,
+  modalType,
+  modalTitle,
+  showModal,
+  cancelOrder,
+  deleteOrder,
+  toEvaluate,
+  toSelectRefundGood,
+  showWsReceipt,
+} = useOrder()
+
 
 const {push} = useRouter()
+const {goGroupByDetail} = useJump()
+
 const {toast} = useInterface()
 
-const emit = defineEmits(['refresh', 'pay'])
+const emit = defineEmits(['refresh', 'pay', 'checkOffCode'])
 
 const props = defineProps(['class', 'data'])
 
@@ -140,81 +221,66 @@ const totalPostage = ref(props.data.totalPostage)
 // 实际支付金额
 const payPrice = ref(props.data.payPrice)
 // 优惠券金额
-const couponPrice = ref(props.data.couponPrice)
+const couponPrice = ref(props.data.totalCouponPrice)
 // 订单总价
 const totalPrice = ref(props.data.totalPrice)
 
-const modalRef = ref()
-const modalType = ref(0) // 0取消订单 1删除订单 2确认收获
-const modalTitle = computed(()=>{
-  const tipArr = ['确认取消订单吗？','确认删除订单吗？','确认要确认收货吗？']
-  return tipArr[modalType.value]
-})
-
-/**
- * 弹窗确认
- */
-function handleModalConfirm(){
-  const funcArr = [doCancelRequest,doDeleteRequest,doTakeRequest]
-  funcArr[modalType.value]()
-
-}
-
-/**
- * 打开弹窗
- * @param {number} type  0取消订单 1删除订单 2确认收获
- */
-function showModal(type = 0){
-  modalType.value = type
-  unref(modalRef).show()
-}
 
 /**
  * 确认取消订单
  * @returns {Promise<void>}
  */
-async function doCancelRequest(){
-  await orderCancel({
-    id: data.value.orderId
+async function doCancelOrder() {
+  cancelOrder(data.value).then(() => {
+    emit('refresh')
   })
-  emit('refresh')
-  toast({title: '已取消'});
 }
 
 /**
  * 确认删除订单
  * @returns {Promise<void>}
  */
-async function doDeleteRequest(){
-  await orderDelete({
-    uni: data.value.orderId
+async function doDeleteOrder() {
+  deleteOrder(data.value).then(() => {
+    emit('refresh')
   })
-  emit('refresh')
-  toast({title: '删除成功'});
 }
 
 /**
  * 确认收货
  * @returns {Promise<void>}
  */
-async function doTakeRequest(){
+async function doTakeGoods() {
   let option = {
     uni: data.value.orderId,
   }
-  await orderTake(option)
-  emit('refresh')
-  toast({title: '已收货'});
-}
-
-function toSelectRefundGood(){
-  push({url: '/pages/selectRefundGood/selectRefundGood'}, {
-    data: {
-      id: data.value.id
+  let payInfo = JSON.parse(data.value.payInfo)
+  showWsReceipt(payInfo.transaction_id).then(async (res) => {
+    if (res === 'success') {
+      await orderTake(option)
+      emit('refresh')
+      toast({title: '已收货'});
     }
   })
 }
 
-function handlePay(){
+
+const doCancelAnOrder = async () => {
+  await cancelAfterVerification({id: data.value.orderId})
+  toast({title: '取消成功'})
+  emit('refresh')
+}
+
+
+/**
+ * 确认弹窗
+ */
+function confirmModal() {
+  const funcArr = [doDeleteOrder, doCancelOrder, doTakeGoods, doCancelAnOrder]
+  funcArr[modalType.value]()
+}
+
+function handlePay() {
   emit('pay', data.value.orderId)
 }
 
@@ -229,33 +295,118 @@ function toOrderInfo() {
 }
 
 
-function toEvaluate(item){
-  push({url: '/pages/evaluate/evaluate'}, {
-    data: {
-      unique: item.unique,
-      orderId: data.value.orderId,
-    }
-  })
-}
-
-
 </script>
 
-<style lang="scss" scoped>
-.order-header{
+<style
+    lang="scss"
+    scoped>
+.order-header {
   width: 100%;
   box-sizing: border-box;
-  .order-logo,.order-status{
+
+  .order-logo, .order-status {
     flex-shrink: 0;
   }
-  .order-logo{
+
+  .order-logo {
     white-space: nowrap;
   }
-  .order-status{
+
+  .order-status {
     max-width: 80%;
     text-align: right;
     white-space: pre-wrap;
     font-size: 22rpx;
   }
 }
+
+// 商品SKU 数量等操作条
+.goods-options {
+  width: 100%;
+
+
+  .sku-row {
+    margin-bottom: 30rpx;
+
+    .sku-info {
+      @include usePadding(10, 4);
+      border: 1rpx solid #ccc;
+      border-radius: 5rpx;
+      font-size: 24rpx;
+      transition: all .3s;
+      max-width: 100%;
+
+
+      .info {
+        width: 100%;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+
+      &:active {
+        scale: 1.1;
+      }
+
+      .icon {
+        margin-left: 15rpx;
+      }
+    }
+  }
+
+  .price-row {
+    width: 100%;
+
+    .price-box {
+      font-size: 30rpx;
+      color: $primary-color;
+
+      .old-price {
+        font-size: 20rpx;
+        color: $tips-color;
+        text-decoration: line-through;
+        margin-left: 10rpx;
+      }
+    }
+
+    .after-sale-box {
+      font-size: 22rpx;
+      margin-right: 5rpx;
+      color: $tips-color;
+    }
+
+
+    .cart-num {
+      font-size: 24rpx;
+
+      .input {
+        width: 120rpx;
+
+
+        input {
+          width: 100%;
+          text-align: center;
+          color: #333;
+        }
+      }
+
+      .button {
+        font-size: 32rpx;
+        width: 34rpx;
+        aspect-ratio: 1/1;
+        border-radius: 5rpx;
+        border: 2rpx solid #cccccc;
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: all .3s;
+
+        &:active {
+          scale: 1.2;
+        }
+      }
+    }
+  }
+}
 </style>