Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshopb2c-uniapp

api/aftersales.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 // 提交售后
 /**
- * 
+ *
  订单号 orderCode;
  服务类型 0仅退款1退货退款 serviceType;
  申请原因 reasonForApplication;
@@ -46,12 +46,12 @@ export function rebackAfterSeals (key, id) {
 // 获取物流信息
 export function getExpressData () {
   return request.get('/yxExpress')
-  
+
 }
 
 // 添加快递单号
 export function addExpressData (params) {
-  return request.post('/addLogisticsInformation?' + `code=${params.code}&name=${params.name}&postalCode=${params.postalCode}&orderCode=${params.orderCode}&`, '', {
+  return request.post('/addLogisticsInformation?' + `code=${params.code}&name=${params.name}&id=${params.id}&postalCode=${params.postalCode}&orderCode=${params.orderCode}&`, '', {
 	  login: true
   })
 }

config/index.js

@@ -1,7 +1,7 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
-export const VUE_APP_API_URL = '/h5api'
+// export const VUE_APP_API_URL = '/h5api'
-// export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api'
+export const VUE_APP_API_URL = 'http://127.0.0.1:8008/api'
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'
 //  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yshopmall_uni",
-  "version": "1.0.0",
+  "version": "3.3.0",
   "description": "",
   "main": "main.js",
   "scripts": {

pages/order/Logistics/index.vue

@@ -57,19 +57,19 @@
                     <view class="active" v-if="logisticsListindex === 0">
                       <view></view>
                       <i class="node-icon"></i>
-                      <text class="txt">{{ item.acceptStation }}</text>
+                      <text class="txt">{{ item.AcceptStation }}</text>
-                      <text class="time">{{ item.acceptTime }}</text>
+                      <text class="time">{{ item.AcceptTime }}</text>
                     </view>
                     <view v-if="logisticsListindex > 0 && logisticsListindex !== logisticsList.length - 1">
                       <i class="node-icon"></i>
-                      <text class="txt">{{ item.acceptStation }}</text>
+                      <text class="txt">{{ item.AcceptStation }}</text>
-                      <text class="time">{{ item.acceptTime }}</text>
+                      <text class="time">{{ item.AcceptTime }}</text>
                     </view>
                     <view v-if="logisticsListindex === logisticsList.length - 1" class="finall">
                       <i class="div-spilander"></i>
                       <i class="node-icon"></i>
-                      <text class="txt">{{ item.acceptStation }}</text>
+                      <text class="txt">{{ item.AcceptStation }}</text>
-                      <text class="time">{{ item.acceptTime }}</text>
+                      <text class="time">{{ item.AcceptTime }}</text>
                     </view>
                   </view>
                 </view>

pages/order/OrderReturnDetail/index.vue

@@ -33,20 +33,27 @@
         <text>退款总金额</text>
         <text class="colorRed">￥{{ orderDetail.refundAmount || 0 }}</text>
       </view>
-      <view class="express" v-if="orderDetail.serviceType === 1">
+      <view class="express" v-if="orderDetail.state === 1 && orderDetail.serviceType === 1 && orderDetail.deliverySn===null">
         <view class="title">商家已同意退货申请，请尽快发货。</view>
         <view class="info people"> 收货人： {{ orderDetail.consignee || '' }} </view>
         <view class="info address"> 收货地址： {{ orderDetail.address || '' }} </view>
         <view class="info phone"> 收货电话： {{ orderDetail.phoneNumber || '' }} </view>
       </view>
       <!-- 退款信息 -->
-      <view class="tips" v-if="orderDetail.state === 0">
+      <view class="tips" v-if="orderDetail.state === 0 && orderDetail.salesState !== 1 && orderDetail.salesState !== 2 ">
         <text class="title">您已成功发起退款申请，请耐心等待商家处理</text>
         <view class="content">
           <view>· 卖家同意或超时未处理，系统将退款给您</view>
           <view>· 如果卖家拒绝，您可以修改退款申请后再次发起，卖家会重新处理</view>
         </view>
       </view>
+        <!-- 物流信息 -->
+        <view class="express" v-if="orderDetail.deliverySn && orderDetail.state !== 3">
+            <text class="title">您已发送快递，请耐心等待商家处理</text>
+            <view class="info people"> 快递公司： {{ orderDetail.deliveryName || '' }}</view>
+            <view class="info address"> 快递单号： {{ orderDetail.deliverySn || '' }}</view>
+            <view class="info phone"> 发货时间： {{ orderDetail.deliveryTime || '' }}</view>
+        </view>
       <!-- 撤销 -->
       <!-- <view class="tips" v-if="orderDetail.serviceType === 1 && orderDetail.state  >= 2">
 				<text class="title">您已撤销售后申请</text>
@@ -65,7 +72,8 @@
 			</view> -->
       <view class="bottom">
         <view class="btns redBtn" v-if="orderDetail.salesState === 0 && orderDetail.serviceType === 1 && orderDetail.state === 1" @click="toExpress">填写物流</view>
-        <view class="btns def" v-if="orderDetail.salesState === 0" @click="cancelReq">撤销申请</view>
+          <view class="btns def" v-if="orderDetail.deliverySn" @click="goLogistics(orderDetail)">查看物流</view>
+          <view class="btns def" v-if="orderDetail.salesState === 0 && orderDetail.state !== 2 && orderDetail.state !== 3" @click="cancelReq">撤销申请</view>
         <!-- <view class="btns redBtn" @click="editReq">修改申请</view>-->
       </view>
     </view>
@@ -138,6 +146,12 @@ export default {
     this.getReturnDetail()
   },
   methods: {
+      goLogistics(order) {
+          this.$yrouter.push({
+              path: '/pages/order/Logistics/index',
+              query: {id: order.orderCode},
+          })
+      },
     /** state售后状态 0已提交等待平台审核 1平台已审核 等待用户发货/退款 2 用户已发货 3已完成 */
     async getReturnDetail() {
       getAfterSealsDetail(this.orderId, this.id)
@@ -157,6 +171,7 @@ export default {
         path: '/pages/order/submitExpress/index',
         query: {
           orderCode: this.orderId,
+          id: this.id,
         },
       })
     },
@@ -175,7 +190,7 @@ export default {
         })
         .catch(err => {
           uni.showToast({
-            title: '撤销失败',
+            title: err.msg || '撤销失败',
             icon: 'none',
             duration: 2000,
           })

pages/order/submitExpress/index.vue

@@ -42,8 +42,9 @@ export default {
       expressQuery: {
         code: '', // 快递公司编码
         name: '', // 快递公司名称
-        postalCode: 'SF1213132132', // 快递编号
+        postalCode: '', // 快递编号
         orderCode: '', // 订单编号
+        id: '', // 售后订单id
       },
       expressList: [],
       expressPicker: [],
@@ -52,6 +53,7 @@ export default {
   },
   mounted() {
     this.expressQuery.orderCode = this.$yroute.query.orderCode
+    this.expressQuery.id = this.$yroute.query.id
     this.getExpress()
   },
   methods: {
@@ -77,17 +79,21 @@ export default {
     async addExpress() {
       let errMsg = '请选择'
       if (!this.expressQuery.code || !this.expressQuery.code) {
-        errMsg += ' 快递公司 '
+        errMsg += '快递公司 '
+          uni.showToast({
+              title: errMsg,
+              icon: 'none',
+              duration: 2000,
+          })
+          return
       }
       if (!this.expressQuery.postalCode) {
-        errMsg += ' 快递单号 '
+          uni.showToast({
-      }
+              title: '请填写快递单号',
-      if (errMsg.length > 3) {
+              icon: 'none',
-        uni.showToast({
+              duration: 2000,
-          title: errMsg,
+          })
-          icon: 'none',
+          return
-          duration: 2000,
-        })
       }
       addExpressData(this.expressQuery)
         .then(res => {

pages/user/promotion/CommissionDetails/index.vue

@@ -71,7 +71,7 @@ export default {
           that.loaded = res.data.length < that.where.limit
           that.loadTitle = that.loaded ? '人家是有底线的' : '上拉加载更多'
           that.where.page = that.where.page + 1
-          that.info.push.apply(that.info, res.data[0])
+          that.info.push.apply(that.info, res.data)
         },
         err => {
           uni.showToast({