Merge remote-tracking branch 'origin/master'

src/pages/goods/detail.vue

@@ -250,7 +250,10 @@
           type,
           operate: status ? 'NO' : 'YES'
         }).then(res => {
-          this.getDetail();
+          this.detail.up = res.data.up;
+          this.detail.collectNum = res.data.collectNum;
+          this.detail.isLike = res.data.isLike;
+          this.detail.isCollect = res.data.isCollect;
         })
       },
 

src/pages/mine/index.vue

@@ -137,13 +137,13 @@ export default {
       ],
       issueStats: [
         { name: '我的发布', tab: 0, icon: 'icon-xiangji', num: 0 },
-        { name: '已卖出', tab: 1, icon: 'icon-xiangji', num: 0 },
-        { name: '已下架', tab: 2, icon: 'icon-xiangji', num: 0 },
+        { name: '已卖出', tab: 1, icon: 'icon-yimaichu', num: 0 },
+        { name: '已下架', tab: 2, icon: 'icon-yixiajia', num: 0 },
       ],
       buyStats: [
-        { name: '待付款', tab: 1, icon: 'icon-xiangji', num: 0 },
-        { name: '待发货', tab: 2, icon: 'icon-xiangji', num: 0 },
-        { name: '待收货', tab: 3, icon: 'icon-xiangji', num: 0 },
+        { name: '待付款', tab: 1, icon: 'icon-daifukuan', num: 0 },
+        { name: '待发货', tab: 2, icon: 'icon-daifahuo', num: 0 },
+        { name: '待收货', tab: 3, icon: 'icon-daishouhuo', num: 0 },
       ],
 
       pageList: [

src/pages/mine/myBuy/list.vue

@@ -68,6 +68,10 @@
             <block v-if="item.status == 'COMPLETE'">
               <u-button text="申请售后" shape="circle" @tap="toReturn(item.orderId)"></u-button>
             </block>
+            
+            <block v-if="~['AFTER_WAIT', 'REFUND', 'NO_REFUND'].indexOf(item.status)">
+              <u-button text="售后详情" shape="circle" @tap="toReturn(item.orderId)"></u-button>
+            </block>
 
           </view>
         </view>

src/pages/mine/myIssue/list.vue

@@ -47,7 +47,7 @@
           <view class="bottom">
             <view class="left-location"><text class="iconfont icon-dingwei"></text>{{item.city}} {{item.area}}</view>
             <view class="right-btn" @tap.stop>
-              <block v-if="item.status === 4">
+              <block v-if="item.status === 4 && item.sendStatus === 'NO'">
                 <u-button text="确认发货" shape="circle" @click="openDeliver(item.id)"></u-button>
               </block>
             </view>

src/styles/iconfont.css

@@ -1,9 +1,9 @@
 /* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
   font-family: 'iconfont';  /* Project id 4308323 */
-  src: url('https://at.alicdn.com/t/c/font_4308323_zf22lmymn5.woff2?t=1698736545710') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_4308323_zf22lmymn5.woff?t=1698736545710') format('woff'),
-       url('https://at.alicdn.com/t/c/font_4308323_zf22lmymn5.ttf?t=1698736545710') format('truetype');
+  src: url('https://at.alicdn.com/t/c/font_4308323_2ahynczrz8w.woff2?t=1699010638735') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_4308323_2ahynczrz8w.woff?t=1699010638735') format('woff'),
+       url('https://at.alicdn.com/t/c/font_4308323_2ahynczrz8w.ttf?t=1699010638735') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-daifukuan:before {
+  content: "\e604";
+}
+
+.icon-yixiajia:before {
+  content: "\e6e4";
+}
+
+.icon-daishouhuo:before {
+  content: "\e620";
+}
+
+.icon-daifahuo:before {
+  content: "\e6b4";
+}
+
+.icon-yimaichu:before {
+  content: "\e877";
+}
+
 .icon-dingwei1:before {
   content: "\e603";
 }