修改易购页面顶部标签样式

packages/homeServer/index/index.css

@@ -386,7 +386,7 @@
     height: 100rpx;
     position: fixed;
     right: 33rpx;
-    bottom: 320rpx;
+    bottom: 100rpx;
     z-index: 10;
 }
 

packages/myOrders/groupOrders/index.vue

@@ -67,7 +67,7 @@
                 </view>
                 <view class="btn-group" v-if="item.order_status === 5">
                   <!-- <text class="afterSaleNum">{{ item.commodity_order_item_list.length }}笔售后</text> -->
-                  <button class="cancel-btn" @click="afterSale(item)">退换/售后</button>
+                  <button class="cancel-btn" @click="afterSale(item)" v-if="item.after_sales_status === 2">退换/售后</button>
                   <button class="pay-btn" @click="orderEvaluate(item)" :disabled="item.evauate_status === 1">评价</button>
                 </view>
                 <view class="btn-group" v-if="item.order_status === 6">

packages/myOrders/index/index.vue

@@ -68,7 +68,7 @@
                 </view>
                 <view class="btn-group" v-if="item.order_status === 5">
                   <!-- <text class="afterSaleNum">{{ item.commodity_order_item_list.length }}笔售后</text> -->
-                  <button class="cancel-btn" @click="afterSale(item)">退换/售后</button>
+                  <button class="cancel-btn" @click="afterSale(item)" v-if="item.after_sales_status === 2">退换/售后</button>
                   <button class="pay-btn" @click="orderEvaluate(item)" :disabled="item.evauate_status === 1">评价</button>
                 </view>
                 <view class="btn-group" v-if="item.order_status === 6">
@@ -213,17 +213,17 @@ export default {
       console.log(item.id);
 
       // 根据条件判断是否可以售后
-      request(afterSaleApi.isAllow, "POST", {
+      // request(afterSaleApi.isAllow, "POST", {
-        order_id: item.id,
+      //   order_id: item.id,
-      }).then((res) => {
+      // }).then((res) => {
-        if (res.data.is_allow_after_sales) {
+      //   if (res.data.is_allow_after_sales) {
-          this.afterSaleGoods = res.data.allow_items;
+      //     this.afterSaleGoods = res.data.allow_items;
-          // this.selectedAsGood = item.commodity_order_item_list[0].id;
+      //     // this.selectedAsGood = item.commodity_order_item_list[0].id;
-          this.$refs.afterSalePopupRef.openAfterSalePopup();
+      //     this.$refs.afterSalePopupRef.openAfterSalePopup();
-        } else {
+      //   } else {
-          this.noSalePopup = true
+      //     this.noSalePopup = true
-        }
+      //   }
-      });
+      // });
     },
 
     // 处理退款提交事件

packages/myOrders/index/popup/afterSale/index.vue

@@ -29,7 +29,7 @@
                                     {{ item.goods_name }}
                                 </view>
                                 <view class="asGoodDesc">{{ item.goods_spec }}</view>
-                                <view class="asGoodPrice">¥{{ item.cost_price }}/个</view>
+                                <view class="asGoodPrice">¥{{ item.sales_price }}/个</view>
                             </view>
                             <view class="asGoodNum">x{{ item.count }}</view>
                         </view>
@@ -186,8 +186,8 @@
                             <text> {{ orderItem.receiving_address }} </text>
                             <view class="copy-icon" @click="copyRefundNo"></view>
                         </view>
-                        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/af_update_address.png"
+                        <!-- <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/af_update_address.png"
-                            class="icon_2"></image>
+                            class="icon_2"></image> -->
                     </view>
                     <view class="hr"></view>
                     <view class="refund-item2">
@@ -310,6 +310,7 @@ export default {
         // 打开售后弹窗
         openAfterSalePopup() {
             this.$nextTick(() => {
+                console.log("🚀 ~ this.afterSaleGoods:", this.afterSaleGoods)
                 if (this.afterSaleGoods && this.afterSaleGoods.length > 0) {
                     this.selectedAsGood = this.afterSaleGoods[0].goods_id;
                     this.afterSalesType = 2

packages/myOrders/orderDetails/index.vue

@@ -12,7 +12,8 @@
       <view class="tips">商家正在加急打包中了，请耐心等候</view>
     </view>
     <view class="status-bar" v-if="status === '4'">
-      <view class="status">待配送</view>
+      <view class="status" v-if="orderInfo.order_cate === 1">待配送</view>
+      <view class="status" v-if="orderInfo.order_cate === 2">待自提</view>
       <view class="countdown">预计到货时间: {{ orderInfo.estimated_delivery_time }}</view>
       <view class="tips">
         配送司机：15901518415
@@ -45,7 +46,7 @@
           </view>
         </view>
         <view class="goods-item" v-for="(item, index) in orderInfo.commodity_order_item_list" :key="index">
-          <view class="goods-content">
+          <view class="goods-content" @click="toDetail(orderInfo)">
             <image :src="item.commodity_pic" class="goods-img"></image>
             <view class="goods-info">
               <view>
@@ -177,6 +178,10 @@ export default {
     this.status = JSON.stringify(item.order_status);
   },
   methods: {
+    toDetail(item) {
+      console.log("🚀 ~ item:", item)
+      // NavgateTo(`/packages/myOrders/commodityDetails/index?item=${JSON.stringify(item)}`);
+    },
     startCountdown() {
       // 检查订单信息中是否有时效时间戳
       if (!this.orderInfo.timeout_time_stamp) {

packages/myOrders/rated/rated.vue

@@ -15,7 +15,7 @@
             <!-- 评价图片区域 -->
             <view class="image-list" v-if="item.evaluate_info.review_image && item.evaluate_info.review_image.length > 0">
               <view class="image-item" v-for="(img, index) in parseReviewImages(item.evaluate_info.review_image)" :key="index">
-                <image :src="img"></image>
+                <image :src="img" @tap="previewImage(parseReviewImages(item.evaluate_info.review_image), index)"></image>
               </view>
             </view>
             <text class="order-date">{{ item.evaluate_info.create_time }}</text>
@@ -53,6 +53,14 @@ export default {
     };
   },
   methods: {
+    // 预览图片
+    previewImage(imageList, currentIndex) {
+      uni.previewImage({
+        urls: imageList,
+        current: currentIndex,
+        showmenu: true
+      });
+    },
     // 解析评价图片格式
     parseReviewImages(reviewImage) {
       try {

packages/shop/index/index.css

@@ -336,7 +336,8 @@ page {
 }
 
 .CateList_Item {
-    min-width: 110rpx;
+    /* min-width: 110rpx; */
+    width: auto;
     height: 40rpx;
     background: #F6F7FB;
     border-radius: 10rpx 10rpx 10rpx 10rpx;