修复售后bug

pages/DetailsOfRefund/DetailsOfRefund.js

@@ -29,6 +29,7 @@ Page({
       3:'审核通过',
       4:'驳回',
       5:'退款成功',
+      7:'商家待收货'
     },
     refundDelivery: [], //收货地址对象
     refundId: '', //记录ID
@@ -87,7 +88,7 @@ Page({
         desc:''
       },
       65:{
-        title:'待确认收货',
+        title:'待商家收货',
         desc:'待商家收到商品，并确认不影响二次销售后，将为您退款'
       },
       70:{
@@ -198,7 +199,7 @@ Page({
         if(res.refundDelivery.imgs){
           refundPhotoFiles = res.refundDelivery.imgs.split(',')
         }
-        if(res.returnMoneySts == 65&&res.applyType == 2&&dvyType==1){//快递寄回
+        if(res.returnMoneySts == 65&&res.applyType == 2&&res.dvyType==1){//快递寄回
           ths.getShopAddress(res.refundDelivery.shopId)
         }else if(res.returnMoneySts == 65&&res.applyType == 2&&res.dvyType==3&&res.isReturnLogistics){
           ths.getRefundWriteInfo()

pages/DetailsOfRefund/DetailsOfRefund.wxml

@@ -58,7 +58,7 @@
   </view>
 
   <!-- <view class="write-info box" wx:if="{{isReturnLogistics}}"> -->
-  <view class="write-info box" wx:if="{{returnMoneySts == 65&&applyType == 2&&dvyType==3&&isReturnLogistics}}">
+  <view class="write-info box" wx:if="{{(returnMoneySts == 65||returnMoneySts == 70)&&applyType == 2&&dvyType==3&&isReturnLogistics}}">
     <view class="sub-title">配送信息</view>
     <view class="form-box">
       <view class="form-item">
@@ -118,7 +118,7 @@
   </view>
   <!-- 已填写 -->
   <!-- <view class="write-info-box box" wx:if="{{isReturnLogistics}}"> -->
-  <view class="write-info-box box" wx:if="{{returnMoneySts == 65&&applyType == 2&&dvyType==1&&isReturnLogistics}}">
+  <view class="write-info-box box" wx:if="{{(returnMoneySts == 65||returnMoneySts == 70)&&applyType == 2&&dvyType==1&&isReturnLogistics}}">
     <view class="title-box">
       <view class="sub-title">退货方式</view>
       <view class="edit" bind:tap="writeInfo" data-refundsn="{{refundSn}}" data-type="edit">修改</view>

pages/index/index.js

@@ -294,30 +294,33 @@ Page({
    */
   getRecommended: function () {
     var params = {
-      url: "/keyword/list",
+      url: "/searchTerm/hotSearchWord",
       method: "GET",
       data: {
-        type: 2
+        current:1,
+        size:9999
       },
       callBack: (res) => {
-        let reslut = res.filter(item => item.status !== 2) //过滤下线词
+        let reslut = res.records.filter(item => item.status !== 2) //过滤下线词
         let timeReslut = reslut.filter(e => util.dateToTimestamp(e.effectiveTime) < new Date().getTime()) //过滤未生效词
         this.setData({
           hotList: timeReslut
         })
+        console.log(2222,this.data.hotList);
       }
     };
     http.request(params);
   },
   getRecommendeds: function () {
     var params = {
-      url: "/keyword/list",
+      url: "/searchTerm/recommendSearchWord",
       method: "GET",
       data: {
-        type: 3
+        current:1,
+        size:9999
       },
       callBack: (res) => {
-        let reslut = res.filter(item => item.status !== 2) //过滤已线下推荐词
+        let reslut = res.records.filter(item => item.status !== 2) //过滤已线下推荐词
         let timeReslut = reslut.filter(e => util.dateToTimestamp(e.effectiveTime) < new Date().getTime()) //过滤未到生效时间推荐词
         this.setData({
           recommendedList: timeReslut

pages/index/index.wxml

@@ -27,7 +27,7 @@
   <view class="search-box" id="my-element">
     <view class="search-input">
       <swiper vertical="true" circular="true" autoplay="true" interval="3000" class="search-swiper" bindtap="toSearchPage" bindchange="swiperChange">
-        <swiper-item wx:for="{{hotList}}" wx:key="index">{{item.name}}</swiper-item>
+        <swiper-item wx:for="{{hotList}}" wx:key="index">{{item.searchName}}</swiper-item>
       </swiper>
       <!-- <view class="search-line">|</view> -->
       <view class="search-text" bindtap="inputSearch">搜索</view>
@@ -38,13 +38,13 @@
       <button class="share-btn" open-type="share"></button>
     </view> -->
   </view>
-  <!-- <view class="recommended-box">
+  <view class="recommended-box">
     <scroll-view class="recommended-swiper" enhanced="true" show-scrollbar="false" scroll-x="true">
-      <view class="recommended-text" wx:for="{{recommendedList}}" bindtap="recommendedSearch" data-name="{{item.name}}">
-        {{item.name}}
+      <view class="recommended-text" wx:for="{{recommendedList}}" bindtap="recommendedSearch" data-name="{{item.searchName}}">
+        {{item.searchName}}
       </view>
     </scroll-view>
-  </view> -->
+  </view>
   <!-- 搜索框end -->
   <view class="bg-box">
     <image class="bg" src="{{imgUrl+swiperList[swiperCurrent].advertBack}}" mode=""/>

utils/config.js

@@ -4,7 +4,7 @@
 
 var domain = "https://shop.api.zswlgz.com"; //统一接口域名，测试环境 
 var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
-// var domain = "http://89561bkaq794.vicp.fun"; //统一接口域名，正式环境 
+var domain = "https://63332824.r36.cpolar.top"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop.haimamart.com/api"; //统一接口域名，正式环境 
 
 // var domain = "http://192.168.1.206:8112"; //统一接口域名，测试环境