1. 美导顾问

2. 超时退款后的订单的显示退款的问题

1. 美导顾问
2. 超时退款后的订单的显示退款的问题
yvan.ni
1 parent 3ed5153b
Showing 9 changed files with 255 additions and 10 deletions
app.json
pages/user/choice_guide/choice_guide.js
pages/user/choice_guide/choice_guide.json
pages/user/choice_guide/choice_guide.wxml
pages/user/choice_guide/choice_guide.wxss
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.wxml
pages/user/userinfo/userinfo.js
pages/user/userinfo/userinfo.wxml
 {
   "pages": [
-    "pages/index/index/index",    
+
+    "pages/index/index/index",
     "pages/justTest/justTest",
     "pages/goods/categoryList/categoryList",
     "pages/cart/cart/cart",
@@ -85,7 +86,8 @@
     "pages/user/assistance/assistance",
     "pages/video/index",
     "pages/template/index",
-    "pages/store/index"
+    "pages/store/index",
+    "pages/user/choice_guide/choice_guide"
   ],
   "plugins": {
     "live-player-plugin": {
+var a = getApp(),
+  os = a.globalData.setting,
+  util = require("../../../utils/util.js"),
+  ut = util;
+Page({
+  data: {
+    url: os.url,
+    iurl: os.imghost,
+    total: 0, //数据的总量
+    ismore: 0,//数据是否加载完毕
+    page:1,
+    pageSize:10,
+    isload:0,
+    show_pop:0,
+    sele_item:null,
+
+  },
+  //------初始化加载----------
+  onLoad: function(t) {},
+
+  onShow: function() {
+    this.get_list();
+  },
+
+  //--点击分享事件---
+  onShareAppMessage: function(t) {
+	  return o.share;
+  },
+
+  get_list: function() {
+    var th = this, e = th;
+    var r_data={
+      storeId: os.stoid,
+      page: th.data.page,
+      pageSize: th.data.pageSize
+    };
+
+    if(th.data.datet!="" && th.data.datet){
+      r_data.Sdate=th.data.datet;
+    }
+    if(th.data.dates!="" && th.data.dates){
+      r_data.Edate=th.data.dates;
+    }
+    if(th.data.input_val!="" && th.data.input_val){
+      r_data.MobileTel=th.data.input_val;
+    }
+    if(getApp().globalData.userInfo.pickup_id){
+      r_data.pickupId=getApp().globalData.userInfo.pickup_id;
+    }
+    getApp().request.promiseGet("/api/weshop/users/staff/page", {
+      data:r_data
+    }).then(res => {
+      th.setData({isload:1});
+      if(res.data.code==0 && res.data.data.pageData &&  res.data.data.pageData.length>0) {
+        th.data.page++;//当前页数+1
+        var arr1 = th.data.list;//获取明细数组
+        var arr2 = res.data.data.pageData;//获取当前查询数据
+        if(!arr1)	arr1=[];
+
+        var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面
+        var ismore = 0;
+        if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断
+        th.setData({
+          list: arr3,
+          total: res.data.data.total,
+          ismore: ismore,
+        })
+      }
+    })
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function() {
+    if (this.data.total <= this.data.pageSize) return;
+    if (this.data.ismore) {
+      t.my_warnning("加载完啦!", 0, this);return
+    };
+    this.get_list();
+  },
+
+  //返回
+  back:function () {
+    wx.navigateBack({ delta: 1})
+  },
+
+  pop_sele:function (e) {
+    var index=e.currentTarget.dataset.index;
+    var item=this.data.list[index];
+    this.setData({show_pop:1,sele_item:item});
+  },
+  close_pop:function () {
+    this.setData({show_pop:0});
+  },
+  //选择了导购，就跳转到会员中心页面
+  go_user_info:function () {
+     var item=this.data.sele_item;
+     getApp().globalData.choice_guide=item;
+     getApp().goto("/pages/user/userinfo/userinfo");
+  },
+
+
+  
+
+
+});
 \ No newline at end of file
+{
+    "navigationBarTitleText": "选择美导",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
+}
 \ No newline at end of file
+<!-- 搜索导购顾问 -->
+<view>
+   <view class="flex sear_all">
+        <view class="inp_div flex" style="position: relative">
+            <image class="find_img" src="{{iurl}}/miniapp/images/search.png"></image>
+            <input class="fs32" placeholder="请输入关键字"  />
+        </view>
+        <view  class="sear_btn" onclick="sear()">查询</view>
+   </view>
+</view>
+
+
+<view wx:if="{{list.length>0}}">
+  <!-- 导购列表 -->
+  <view class="big_box">
+      <view class="item flex jc_sb ai-center"  wx:for="{{list}}">
+          <!-- 左边 -->
+          <view class="flex">
+             <view><image class="head_pic" src="{{item.PhotoUrl}}"    data-err_img="list[{{index}}].head_pic" ></image></view>
+             <view style="margin-left: 30rpx; margin-top: 20rpx">
+                 <view class="fs35">{{item.StaffName}}</view>
+                 <view class="fs28">{{item.Remark1}}</view>
+             </view>
+          </view>
+          <!-- 右边 -->
+          <view bindtap="pop_sele" data-index="{{index}}">
+               <view class="choice_btn flex jc-center ai-center fs26">选择</view>
+          </view>
+      </view>
+  </view>
+</view>
+
+<!-- 没有明细 -->
+<view class="empty_order" wx:if="{{isload && list.length<=0}}">
+  <view class="flex-level">
+    <image src="{{url}}miniapp/images/order/empty_order.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">暂无顾问明细</view>
+  <view class="flex-level">
+    <navigator bindtap="back">
+      <view class="flex-center fs30 white">返回</view>
+    </navigator>
+  </view>
+</view>
+
+<!-- 弹起来选择 -->
+<view class="pop_sele" hidden="{{!show_pop}}" >
+    <view class="cover-layer" bindtap="close_pop"></view>
+    <view class="box">
+        <view style="padding: 0 30rpx">
+            <view class="flex ai-center" style="background: #f2f2f2;margin-top: 30rpx; padding: 10rpx">
+                <image style="margin: 10rpx" class="head_pic pic2" src="{{iurl}}/miniapp/images/no-head.jpg"></image>
+                <text class="fs35" style="margin-left: 10rpx">{{sele_item.StaffName}}</text>
+            </view>
+            <view class="flex ai-center" style="min-height: 160rpx; background:#f2f2f2; margin-top: 10rpx">
+                <view class="fs28" style="margin-left: 10rpx">工作介绍:{{sele_item.Remark1}}</view>
+            </view>
+            <view  bindtap="go_user_info"  class="flex jc-center ai-center" style="margin-top: 20rpx; margin-bottom: 30rpx">
+                  <view class="t_choice_btn flex jc-center ai-center">选择</view>
+            </view>
+        </view>
+    </view>
+</view>
+<!-- 引入提示组件 -->
+<warn id="warn"></warn>
 \ No newline at end of file
+.big_box{padding: 0 20rpx }
+.head_pic{ width: 160rpx; height: 160rpx; border-radius: 50%}
+.pic2{ width: 100rpx; height: 100rpx; }
+
+.item{border-bottom: 0.01rem solid #eeeeee; padding: 20rpx 0;}
+.choice_btn{ width: 130rpx; height: 50rpx; border-radius: 50rpx;
+    border:1rpx solid #cb3549; color: #cb3549;
+}
+.box{ position: fixed; z-index: 6666; bottom: 0; left: 0;background-color: #fff;width: 100%;}
+.t_choice_btn{ width: 160rpx; height: 50rpx; background-color:#169bd5; border-radius: 10rpx; color: #fff  }
+
+.sear_all{ width: 93%; margin: 0 auto; height: 80rpx; margin-top: 20rpx }
+.sear_all .inp_div,.sear_all .sear_btn{ height: 80rpx; line-height: 80rpx  }
+.inp_div{ width: 80%; overflow: hidden;background-color: #f2f2f2}
+.sear_all .inp_div input{ margin-left: 54rpx; width: 100%; height: 100%; border: 0; border-radius: 0; }
+.sear_btn{ width: 20%;background-color: #ff6768; text-align: center;color: #fff; font-size: 32rpx}
+.find_img{width: 44rpx; height: 44rpx; position: absolute; left: 8rpx; top: 18rpx; z-index: 10}
 \ No newline at end of file
@@ -18,7 +18,8 @@
         <view class="order-state"><view class="shop_name">门店：{{order.pickname}}</view>
              <view>{{order.order_status_detail}}</view>
         </view>
-        <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}"  wx:if="{{item.return_btn!=4}}"  >
+        <!--wx:if="{{item.return_btn!=4}}" -->
+        <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}" >
             <view class="goods-img">
                 <image class="wh100" src="{{resourceUrl+item.original_img}}"  binderror="bind_bnerr" lazy-load="true"
                         data-errorimg="order.order_goods[{{index}}].original_img"></image>
@@ -35,7 +36,7 @@
                 <view class="goods-num">×{{item.goods_num}}</view>
                 <!-- 不是整单退的时候 -->
-                <block wx:if="{{order.is_all_return!=1 && order.discount==0  && order.coupon_price<=0 &&  order.order_prom_amount<=0 && order.discount_amount<0 && item.prom_type!=5 && !order.is_prom}}">
+                <block wx:if="{{order.is_all_return!=1 && order.discount<=0  && order.coupon_price<=0 &&  order.order_prom_amount<=0 && order.discount_amount<=0 && item.prom_type!=5 && !order.is_prom}}">
                     <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
                           data-recid="{{item.goods_id}}"  wx:if="{{item.return_btn==1 && !order.is_bedistri}}">申请退款</view>
                     <view bindtap="gotoreturn" class="return-btn" data-oid="{{item.order_id}}"
@@ -44,8 +44,9 @@
   <!-- 商品详情集合 -->
   <view class="detail_commoditys">
     <!-- 单个商品 -->
+    <!-- wx:if="{{goods.return_btn!=4}}" -->
     <view>
-      <navigator class="detail_commodity flex-vertical padding border_bottom" wx:for="{{item.order_goods}}" wx:for-item="goods" wx:if="{{goods.return_btn!=4}}" wx:for-index="pinx" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
+      <navigator class="detail_commodity flex-vertical padding border_bottom" wx:for="{{item.order_goods}}" wx:for-item="goods"  wx:for-index="pinx" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
         <!-- 商品图片 -->
         <navigator class="rel">
           <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
@@ -67,7 +68,7 @@
               </view>
               <view class="flex-level-right fs26 refund">
                 <!-- 不是整单退的时候 -->
-                <block wx:if="{{item.is_all_return!=1 && item.discount==0 && item.coupon_price<=0 &&  item.order_prom_amount<=0 && item.discount_amount<0 && goods.prom_type!=5 && !item.is_prom}}">
+                <block wx:if="{{item.is_all_return!=1 && item.discount<=0 && item.coupon_price<=0 &&  item.order_prom_amount<=0 && item.discount_amount<=0 && goods.prom_type!=5 && !item.is_prom}}">
                   <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1 && !item.is_bedistri }}">申请退款</view>
                   <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
                   <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
@@ -67,6 +67,8 @@ Page({
     is_zy: 0, //是否执行onshow
     is_lable_set: "", //是否启用我的兴趣标签
     check_label: [], //我选择的兴趣标签
+    fir_guide_id:null,  //存储会员详情接口出来的美导ID
+
   },
   //通过路径跳转到其他页面
   goto: function(e) {
@@ -80,7 +82,9 @@ Page({
       var sms_conf = ee.switch_list;
       sms_conf = JSON.parse(sms_conf);
       th.setData({
-        is_lable_set: sms_conf.user_label_set
+        is_lable_set: sms_conf.user_label_set,  //是不是会员标签设置
+        guide_title:sms_conf.guide_consultant,  //系统参数  导购标题
+        guide_change_time:sms_conf.guide_change_time     //每月能修改几次
       })
       if (sms_conf.user_label_set) {
         th.query_checklabels();
@@ -627,6 +631,14 @@ Page({
     var e = this;
     if (this.data.is_zy) return false;
     this.wait_for_store_config();
+
+    //如果有传值进行跳转的话
+    var choice_guide=null;
+    if(getApp().globalData.choice_guide){
+       choice_guide=JSON.parse(JSON.stringify(getApp().globalData.choice_guide));
+       getApp().globalData.choice_guide=null;
+    }
+
     var req = t;
     req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, {
       success: function(src) {
@@ -644,6 +656,13 @@ Page({
           a.address="";
         }
+        e.data.fir_guide_id=a.staffId;
+        if(choice_guide){
+          a.staffName=choice_guide.StaffName;
+          a.staffId=choice_guide.Id;
+        }
+
+
         e.setData({
           phone: a.mobile,
           user: a,
@@ -656,6 +675,7 @@ Page({
           isstcsp: a.vipnopwd,
 		  iscalendar:a.islunar
         });
+
       }
     })
     a.getUserInfo(function(a) {
@@ -832,6 +852,11 @@ Page({
 	  islunar:th.data.iscalendar,
 	  birthday:th.data.datet  
     }
+    //往上提交美导的ID
+    if(th.data.fir_guide_id!=th.data.user.staffId){
+      datas.staffId=th.data.user.staffId;
+    }
+
     getApp().request.put("/api/weshop/users/updateUserInfo", {
       data: datas,
       success: function(res) {
@@ -862,5 +887,10 @@ Page({
 	  return o.share;   
   },
+  //-- 跳转到获取导购的列表 --
+  go_get_guide:function () {
+      getApp().goto("/pages/user/choice_guide/choice_guide");
+  }
+
 });
 \ No newline at end of file
@@ -184,15 +184,26 @@
         <!-- </block> -->
       </view>
+      <!-- 选择门店 -->
       <view bindtap="onclickstore" class="user-name flex-vertical-between" data-type="email">
         <view class="user-name-txt">所属门店</view>
         <view class="flex-center user-txt-right">
-          <view class="one-line">{{stoname}}
-          </view>
+          <view class="one-line">{{stoname}}</view>
+          <view class="angle">∟</view>
+        </view>
+      </view>
+      <!-- 美容顾问 -->
+      <view bindtap="go_get_guide" class="user-name flex-vertical-between" data-type="email">
+        <view class="user-name-txt">{{guide_title}}</view>
+        <view class="flex-center user-txt-right">
+          <view class="one-line">{{user.staffName?user.staffName:"*选择顾问"}}</view>
           <view class="angle">∟</view>
         </view>
       </view>
+
+
+
     </view>
     <!-- 我的兴趣 -->
     <view wx:if="{{ isBool==1 && is_lable_set==1}}" class="padding Bbottom">
@@ -218,6 +229,8 @@
         </view>
       </view>
     </view>
+    </view>
+
     <navigator bindtap="goto-address" class="user-name mt flex-vertical-between" url="/pages/user/address_list/address_list">
       <view class="user-name-txt">收货地址</view>
       <view class="flex-center user-txt-right">
@@ -225,11 +238,12 @@
         <view class="angle">∟</view>
       </view>
     </navigator>
+
     <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="email">
       <view class="user-name-txt">绑定时间</view>
       <view class="user-txt-right one-line">{{user.reg_time?filters.replace_time2(user.reg_time):""}}</view>
     </view>
-  </view>
+
 </view>
 <!-- 确认修改按钮 -->
 <view class="flex-center confirm">