Merge branch 'master' of http://git.zonelife.cn:3000/zhangtao/city-gather

src/api/api.type.d.ts

@@ -1414,6 +1414,18 @@ namespace Api {
      */
     shipTime?: string
     updateTime?: string
+    /**
+     * 退款时过期的积分
+     */
+    refundExpiredScore?: number
+    /**
+     * 退款总积分
+     */
+    refundScore?: number
+    /**
+     * 退款金额
+     */
+    refundMoney?: number
     [property: string]: any
   }
   interface OrderRefundSkuVo {

src/config/index.ts

@@ -2,13 +2,13 @@ const mapEnvVersion = {
   /**
    * 开发版
    */
-  // develop: 'http://192.168.1.166:8080', // 张
+  develop: 'http://192.168.1.166:8080', // 张
   // develop: 'http://192.168.1.101:8080',
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.1.253:8080',
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://47.109.84.152:8081',
-  develop: 'https://smqjh.api.zswlgz.com',
+  // develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */

src/pages/index/index.vue

@@ -55,7 +55,7 @@ onReachBottom(() => {
 const navList = computed(() => {
   const list = [
     { icon: `${StaticUrl}/xsb.png`, title: '星闪豹', name: 'xsb-homeTabbar', show: true },
-    { icon: `${StaticUrl}/smqjh-index-cd.png`, title: '充电', name: 'charge-index', show: true }, // !isOnlineAudit.value
+    { icon: `${StaticUrl}/smqjh-index-cd.png`, title: '充电', name: '', show: !isOnlineAudit.value }, // !isOnlineAudit.value
     { icon: `${StaticUrl}/smqjh-sp.png`, title: '电影演出', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-vip.png`, title: '视频权益', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-diancan.png`, title: '大牌点餐', name: '', show: !isOnlineAudit.value },

src/subPack-common/afterSalesDetail/index.vue

@@ -125,6 +125,10 @@ async function handleCancel() {
       <view class="mt20rpx text-24rpx text-#AAAAAA">
         申请通过后，将退回至原账户
       </view>
+      <view v-if="refundOrderInfo.returnMoneySts == refundStatus.ReturnCompleted" class="mt20rpx flex items-center text-24rpx text-#AAAAAA">
+        <view>退还金额：{{ refundOrderInfo.refundMoney }}</view>
+        <view>退还积分：{{ refundOrderInfo.refundScore }}（已过期{{ refundOrderInfo.refundExpiredScore }}） </view>
+      </view>
     </view>
     <view class="mt20rpx rounded-16rpx bg-white p24rpx">
       <view class="grid grid-cols-5 py24rpx text-28rpx text-#222">

src/subPack-smqjh/order/index.vue

@@ -216,7 +216,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
               </wd-button>
             </view>
           </template>
-          <template v-if="item.refundStatus != 2 && [subPackOrder?.OrderStatus.OrderCompleted, subPackOrder?.OrderStatus.OrderWaitDelivery, subPackOrder?.OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
+          <template v-if="item.refundStatus != 2 || [subPackOrder?.OrderStatus.OrderCompleted, subPackOrder?.OrderStatus.OrderWaitDelivery, subPackOrder?.OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
             <view class="mr20rpx">
               <wd-button size="small" plain type="info" @click.stop="handleAfterSale(item)">
                 申请售后

src/subPack-xsb/order/index.vue

@@ -199,7 +199,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
               </wd-button>
             </view>
           </template>
-          <template v-if="item.refundStatus != 2 && [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
+          <template v-if="item.refundStatus != 2 || [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
             <view class="mr20rpx">
               <wd-button size="small" plain type="info" @click.stop="handleAfterSale(item)">
                 申请售后

src/subPack-xsb/orderDetaile/index.vue

@@ -15,14 +15,6 @@ definePage({
     navigationBarTitleText: '订单详情',
     navigationStyle: 'custom',
   },
-
-  plugins: {
-    logisticsPlugin: {
-      version: '2.1.12',
-      provider: 'wx9ad912bf20548d92',
-    },
-  },
-
 })
 const collapse = ref(true)
 const orderInfo = ref<Api.xsbOrderList>()
@@ -398,7 +390,7 @@ async function handleReceive() {
             </Zcontact>
           </view>
           <view
-            v-if="[OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(orderInfo.hbOrderStatus)"
+            v-if="orderInfo.refundStatus == 2 || [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(orderInfo.hbOrderStatus)"
             class="flex flex-col items-center" @click="handleAfterSale"
           >
             <image :src="`${StaticUrl}/orderDetaile-shou.png`" class="h40rpx w40rpx" />

src/uni-pages.d.ts

@@ -28,8 +28,7 @@ type _LocationUrl =
   "/subPack-common/revalue/index" |
   "/subPack-common/revalueSuccess/index" |
   "/subPack-common/user-center/index" |
-  "/subPack-smqjh/order/index" |
-  "/subPack-charge/index/index";
+  "/subPack-smqjh/order/index";
 
 interface NavigateToOptions {
   url: _LocationUrl;