Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

# Conflicts:
#	src/pages/mine/myIssue/list.vue

src/filters/index.js

@@ -11,6 +11,16 @@ export function priceFilter(num) {
 }
 
 /**
+ * 手机号加密
+ * @param {string} val
+ * @return {string}
+ */
+export function phoneFilter(val) {
+  if (!val) return '';
+  return val.slice(0, 3) + '****' + val.slice(7);
+}
+
+/**
  * 日期转 年月日格式 YY-mm-dd
  * @param {string} date
  * @return {string}

src/pages/goods/detail.vue

@@ -16,7 +16,7 @@
           <image :src="detail.userPic ? (imageUrl + detail.userPic) : require('@/static/common/logo.png')"></image>
           <view class="info">
             <view class="name">{{detail.userName}}</view>
-            <view class="phone">联系电话：{{detail.phone}}</view>
+            <view class="phone">{{detail.phone | phoneFilter}}</view>
           </view>
         </view>
         <view class="btns">
@@ -401,7 +401,7 @@
       border-radius: 50%;
     }
     .info {
-      margin-left: 12rpx;
+      margin-left: 20rpx;
       .name {
         font-size: 28rpx;
       }

src/pages/mine/myBuy/detail.vue

@@ -26,9 +26,9 @@
         <view class="goods">
           <image :src="imageUrl + detail.goodsPicUrl" mode="aspectFill"></image>
           <view class="main">
-            <view class="name">{{detail.goodsTitle}}</view>
+            <view class="name">{{detail.goodsTitle}}<text>×{{detail.num}}</text></view>
             <view class="des">{{detail.content}}</view>
-            <view class="price"><text>{{detail.goodsAmount | priceFilter2}}</text>数量：{{detail.num}}</view>
+            <view class="price">{{detail.goodsAmount | priceFilter2}}</view>
           </view>
         </view>
         <view class="total">订单总金额<text>{{detail.price | priceFilter2}}</text></view>
@@ -36,13 +36,36 @@
 
       <view class="order-container">
         <view class="title">订单信息</view>
-        <view class="row">订单编号：{{detail.orderId}}</view>
-        <view class="row">创建时间：{{detail.createTime}}</view>
-        <view class="row">付款时间：{{detail.payTime}}</view>
-        <view class="row">支付方式：{{detail.payType | payTypeFilter}}</view>
-        <view class="row">支付单号：{{detail.transactionId}}</view>
-        <view class="row">发货时间：{{detail.logisticsTime}}</view>
-        <view class="row">收货时间：{{detail.completeTime}}</view>
+        <view class="info">
+          <view class="row">
+            <view class="label">订单编号</view>
+            <view class="value">{{detail.orderId}}</view>
+          </view>
+          <view class="row">
+            <view class="label">创建时间</view>
+            <view class="value">{{detail.createTime}}</view>
+          </view>
+          <view class="row">
+            <view class="label">付款时间</view>
+            <view class="value">{{detail.payTime}}</view>
+          </view>
+          <view class="row">
+            <view class="label">支付方式</view>
+            <view class="value">{{detail.payType | payTypeFilter}}</view>
+          </view>
+          <view class="row">
+            <view class="label">支付单号</view>
+            <view class="value">{{detail.transactionId}}</view>
+          </view>
+          <view class="row">
+            <view class="label">发货时间</view>
+            <view class="value">{{detail.logisticsTime}}</view>
+          </view>
+          <view class="row">
+            <view class="label">收货时间</view>
+            <view class="value">{{detail.completeTime}}</view>
+          </view>
+        </view>
       </view>
 
       <template slot="footer">
@@ -140,7 +163,7 @@
           })
         }).catch(() => {})
       },
-      
+
       // 确认收货
       confirmReceipt(orderId) {
         this.$modal({
@@ -262,6 +285,11 @@
       margin-left: 20rpx;
       .name {
         font-size: 32rpx;
+        text {
+          font-size: 28rpx;
+          color: $sec-font;
+          margin-left: 12rpx;
+        }
       }
       .des {
         margin-top: 12rpx;
@@ -270,12 +298,9 @@
       }
       .price {
         margin-top: 12rpx;
-      	text {
-      		color: $assist-color;
-      		font-weight: 500;
-      		font-size: 32rpx;
-          margin-right: 12rpx;
-      	}
+        color: $assist-color;
+        font-weight: 500;
+        font-size: 32rpx;
       }
     }
   }
@@ -302,10 +327,20 @@
     margin-bottom: 20rpx;
   }
   .row {
-    margin-top: 12rpx;
-    font-size: 28rpx;
-    text {
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    .label {
+      font-size: 28rpx;
+      color: $sec-font;
+      margin-right: 20rpx;
+    }
+    .value {
+      font-size: 28rpx;
+    }
+    .price {
       color: $assist-color;
+      font-weight: 500;
     }
   }
 }

src/pages/mine/myBuy/list.vue

@@ -43,20 +43,27 @@
             <view class="price">{{item.goodsAmount | priceFilter2}}</view>
           </view>
         </view>
-        <view class="total">订单总金额<text>{{item.price | priceFilter2}}</text></view>
+        <view class="info">
+          <view class="row">
+            <view class="label">订单编号</view>
+            <view class="value">{{item.orderId}}</view>
+          </view>
+          <view class="row">
+            <view class="label">订单金额</view>
+            <view class="value price">{{item.price | priceFilter2}}</view>
+          </view>
+        </view>
         <view class="bottom">
           <view class="left-location"><text class="iconfont icon-dingwei"></text>{{item.city}} {{item.area}}</view>
           <view class="right-btn" @tap.stop>
 
+            <u-button text="联系卖家" shape="circle" @tap="toContact(item.goodsId)"></u-button>
+
             <block v-if="item.status == 'WAIT'">
               <u-button text="取消订单" shape="circle" @click="cancelOrder(item.orderId)"></u-button>
               <u-button text="去支付" shape="circle" type="primary" plain @tap="toPay(item.goodsId, item.orderId)"></u-button>
             </block>
 
-            <block v-if="item.status == 'WAIT_SEND'">
-              <u-button text="联系卖家" shape="circle" @tap="toContact(item.goodsId)"></u-button>
-            </block>
-
             <block v-if="~['SEND', 'COMPLETE'].indexOf(item.status)">
               <u-button text="查看物流" shape="circle" @tap="toLogistics(item.logisticsNum)"></u-button>
             </block>
@@ -68,7 +75,7 @@
             <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>
@@ -207,7 +214,7 @@
           })
         }).catch(() => {})
       },
-      
+
       // 确认收货
       confirmReceipt(orderId) {
         this.$modal({

src/pages/mine/myEarnings/detail.vue

@@ -18,9 +18,9 @@
         <view class="goods">
           <image :src="imageUrl + detail.goodsPicUrl"></image>
           <view class="main">
-            <view class="name">{{detail.goodsTitle}}</view>
+            <view class="name">{{detail.goodsTitle}}<text>×{{detail.num}}</text></view>
             <view class="des">{{detail.content}}</view>
-            <view class="price"><text>{{detail.goodsAmount | priceFilter2}}</text>数量：{{detail.num}}</view>
+            <view class="price">{{detail.goodsAmount | priceFilter2}}</view>
           </view>
         </view>
         <view class="total">订单总金额<text>{{detail.price | priceFilter2}}</text></view>
@@ -28,14 +28,40 @@
 
       <view class="order-container">
         <view class="title">订单信息</view>
-        <view class="row">订单编号：{{detail.orderId}}</view>
-        <view class="row">创建时间：{{detail.createTime}}</view>
-        <view class="row">付款时间：{{detail.payTime}}</view>
-        <view class="row">支付方式：{{detail.payType | payTypeFilter}}</view>
-        <view class="row">支付单号：{{detail.transactionId}}</view>
-        <view class="row">发货时间：{{detail.logisticsTime}}</view>
-        <view class="row">收货时间：{{detail.completeTime}}</view>
-        <view class="row">结算金额：<text>¥{{detail.sharePrice | priceFilter}}</text></view>
+        <view class="info">
+          <view class="row">
+            <view class="label">订单编号</view>
+            <view class="value">{{detail.orderId}}</view>
+          </view>
+          <view class="row">
+            <view class="label">创建时间</view>
+            <view class="value">{{detail.createTime}}</view>
+          </view>
+          <view class="row">
+            <view class="label">付款时间</view>
+            <view class="value">{{detail.payTime}}</view>
+          </view>
+          <view class="row">
+            <view class="label">支付方式</view>
+            <view class="value">{{detail.payType | payTypeFilter}}</view>
+          </view>
+          <view class="row">
+            <view class="label">支付单号</view>
+            <view class="value">{{detail.transactionId}}</view>
+          </view>
+          <view class="row">
+            <view class="label">发货时间</view>
+            <view class="value">{{detail.logisticsTime}}</view>
+          </view>
+          <view class="row">
+            <view class="label">收货时间</view>
+            <view class="value">{{detail.completeTime}}</view>
+          </view>
+          <view class="row">
+            <view class="label">结算金额</view>
+            <view class="value price">¥{{detail.sharePrice | priceFilter}}</view>
+          </view>
+        </view>
       </view>
 
     </zj-page-layout>
@@ -131,6 +157,11 @@
       margin-left: 20rpx;
       .name {
         font-size: 32rpx;
+        text {
+          font-size: 28rpx;
+          color: $sec-font;
+          margin-left: 12rpx;
+        }
       }
       .des {
         margin-top: 12rpx;
@@ -139,12 +170,9 @@
       }
       .price {
         margin-top: 12rpx;
-      	text {
-      		color: $assist-color;
-      		font-weight: 500;
-      		font-size: 32rpx;
-          margin-right: 12rpx;
-      	}
+        color: $assist-color;
+        font-weight: 500;
+        font-size: 32rpx;
       }
     }
   }
@@ -171,10 +199,20 @@
     margin-bottom: 20rpx;
   }
   .row {
-    margin-top: 12rpx;
-    font-size: 28rpx;
-    text {
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    .label {
+      font-size: 28rpx;
+      color: $sec-font;
+      margin-right: 20rpx;
+    }
+    .value {
+      font-size: 28rpx;
+    }
+    .price {
       color: $assist-color;
+      font-weight: 500;
     }
   }
 }

src/pages/mine/myIssue/list.vue

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <template>
   <!-- #ifdef H5 -->
   <view>
@@ -72,6 +73,88 @@
 </template>
 
 <script>
+=======
+<template>
+  <!-- #ifdef H5 -->
+  <view>
+    <zj-page-layout
+      :hasFooter="false"
+      :isScroll="true"
+      :refresherTriggered="refresherTriggered"
+      @refresherrefresh="refresherrefresh"
+      @scrolltolower="scrolltolower">
+      <template slot="header">
+        <view class="header-container">
+          <u-tabs
+            :scrollable="false"
+            :list="tabList"
+            :current="tabCurrent"
+            @click="clickTab"
+            lineColor="#01C30B"
+            :activeStyle="{
+              color: '#01C30B'
+            }"
+            :inactiveStyle="{
+              color: '#666666'
+            }"
+            itemStyle="padding-left: 0; padding-right: 0; height: 88rpx;">
+          </u-tabs>
+        </view>
+      </template>
+
+      <view class="common-order-list">
+        <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item.id)">
+          <view class="top">
+            <image :src="item.userPic ? (imageUrl + item.userPic) : require('@/static/common/logo.png')"></image>
+            <view class="user">
+              <view class="name">{{item.userName}}</view>
+              <view class="time">{{item.createTime | timeFilter}}发布</view>
+            </view>
+            <view class="status">{{item.status | statusFilter}}</view>
+          </view>
+          <view class="goods">
+            <image :src="imageUrl + item.goodsPicUrl" mode="aspectFill"></image>
+            <view class="main">
+              <view class="name">{{item.title}}<text>×{{item.num}}</text></view>
+              <view class="des">{{item.content}}</view>
+              <view class="price">{{item.amount | priceFilter2}}</view>
+            </view>
+          </view>
+          <view class="bottom">
+            <view class="left-buyer" v-if="item.status === 4 && item.orderInfo">
+              <image :src="item.orderInfo.buyerUserPic ? (imageUrl + item.orderInfo.buyerUserPic) : require('@/static/common/logo.png')"></image>
+              <view class="name">{{item.orderInfo.buyerUserName}}</view>
+              <view class="text">买到了</view>
+            </view>
+            <view class="left-location" v-else><text class="iconfont icon-dingwei"></text>{{item.city}} {{item.area}}</view>
+            
+            <view class="right-btn" @tap.stop>
+              <block v-if="item.status === 4 && item.sendStatus === 'NO'">
+                <u-button text="确认发货" shape="circle" @click="openDeliver(item.id)"></u-button>
+              </block>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <Loading :loadStatus="loadStatus" :dataList="dataList" />
+
+    </zj-page-layout>
+
+    <zj-dialog-deliver
+      ref="deliverDialog"
+      :isShow="isShowDeliverDialog"
+      @close="isShowDeliverDialog = false">
+    </zj-dialog-deliver>
+  </view>
+  <!-- #endif -->
+  <!-- #ifndef H5 -->
+  <web-view :src="webViewHref(`/pages/mine/myIssue/list`, pam)"></web-view>
+  <!-- #endif -->
+</template>
+
+<script>
+>>>>>>> 910ae31612a93586d8e4a73a7c09a61cc7dcbfe0
   // #ifdef H5
 	import zjDialogDeliver from '@/components/zj-dialog/zj-dialog-deliver.vue';
 

src/styles/common.scss

@@ -164,7 +164,7 @@
         }
       }
       .status {
-        color: $assist-color;
+        color: $theme-color;
       }
     }
     .goods {
@@ -198,19 +198,28 @@
         }
       }
     }
-    .total {
+    .info {
       border-top: 1px solid #eaeaea;
-      height: 80rpx;
-      display: flex;
-      align-items: center;
-      justify-content: end;
-      font-size: 28rpx;
-      text {
-        margin-left: 12rpx;
-        color: $assist-color;
-        font-weight: 500;
+      padding: 10rpx 0;
+      .row {
+        display: flex;
+        align-items: center;
+        margin: 10rpx 0;
+        .label {
+          font-size: 28rpx;
+          color: $sec-font;
+          margin-right: 20rpx;
+        }
+        .value {
+          font-size: 28rpx;
+        }
+        .price {
+          color: $assist-color;
+          font-weight: 500;
+        }
       }
     }
+
     .bottom {
       border-top: 1px solid #eaeaea;
       padding-top: 20rpx;
@@ -226,6 +235,24 @@
           margin-right: 4rpx;
         }
       }
+      .left-buyer {
+        display: flex;
+        align-items: center;
+        image {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+        }
+        .name {
+          font-size: 28rpx;
+          margin-left: 12rpx;
+        }
+        .text {
+          color: $sec-font;
+          font-size: 28rpx;
+          margin-left: 16rpx;
+        }
+      }
       .right-btn {
         display: flex;
         .u-button {