Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents f84b9253 0e038a8b
Showing 6 changed files with 231 additions and 87 deletions
components/goods_list/goods_list.wxml
pages/goods/goodsList/goodsList.wxml
pages/goods/search/search.wxml
pages/user/plus/plus.js
pages/user/plus/plus.wxml
pages/user/plus/plus.wxss
@@ -12,7 +12,7 @@
           <!-- 商品名称 -->
           <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
           <!-- 判断是否有活动价 -->
-          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7}}">
 						<view class="pdt10">
 							<view class="money flex xc-wc" >
 							<text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
@@ -62,7 +62,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 }}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 }}">
 				<view class="flex on">
 					<!-- 活动价 -->
 					<view class="price">
@@ -35,7 +35,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价，小程序没有有团购和拼单 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=7}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
@@ -38,6 +38,9 @@ Page({
     def_recommon: null, //分享人的手机号
     def_serviceman: null, //分享人的营业员
     fir_leader: 0, //分享人的ID	
+    staffNo_arr: [], //多个营业员
+    focus:false, 
+    is_select: false, //是否选择营业员过
   },
   swiperChange: function (e) {
     var currentId = e.detail.current;
@@ -280,6 +283,21 @@ Page({
       })
     }
   },
+
+  //选择营业员
+  select_serviceman(e) {
+    let StaffNo = e.currentTarget.dataset.staffno;
+    let {req_data,req} = this.data;
+    if (StaffNo || StaffNo !== "") {
+      req_data.staffNo = StaffNo;
+      req.serviceman = StaffNo;
+    };
+    this.setData({
+      is_select: 1,
+      staffNo_arr:[],
+    })
+    this.check_serviceman(req_data,req)
+  },
   //--绑定邀请码的输入--
   b_input: function (e) {
     var value = e.detail.value.trim();
@@ -299,6 +317,7 @@ Page({
   },
   //--立即购买卡--
   buy_card: async function () {
+    console.log(11111);
     var th = this;
     var is_card = 0;
     //--商家是不是有等级卡功能，开通的人数是不是够用，开通是时间是不是到期--
@@ -341,6 +360,9 @@ Page({
       if (th.data.is_salesman) {
         if (!th.data.inp_serviceman) {
           getApp().my_warnning("请输入营业员", 0, th);
+          th.setData({
+            focus:true
+          })
           return false;
         }
         req.serviceman = th.data.inp_serviceman
@@ -350,37 +372,93 @@ Page({
     req.userId = getApp().globalData.user_id;
     //--如果有邀请码，和营业员的情况下--
     if (req.recommon || req.serviceman) {
+
       var req_data = {
         storeId: os.stoid,
         userId: req.userId
       };
       if (req.recommon) req_data.inviteCode = req.recommon;
       if (req.serviceman) req_data.staffNo = req.serviceman;
-      getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
-        data: req_data,
-        success: function (res) {
-          if (res.data.code == 0) {
-            t_pay.pay(req, th.success, function () {
-              getApp().my_warnning("支付失败", 0, th);
-            });
-          } else {
-            getApp().my_warnning(res.data.msg, 0, th);
-          }
-        }
+      th.setData({
+        req_data,
+        req,
       })
+      th.check_serviceman(req_data,req)
+      // getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
+      //   data: req_data,
+      //   success: function (res) {
+      //     if (res.data.code == 0) {
+      //       if(res.data.data.length > 1 && !th.data.is_select){
+      //         th.setData({
+      //           staffNo_arr:res.data.data
+      //         })
+      //       }else{
+      //         t_pay.pay(req, th.success, function () {
+      //           getApp().my_warnning("支付失败", 0, th);
+      //           th.setData({
+      //             is_select:0,
+      //           })
+      //         });
+      //       }
+      //     } else {
+      //       getApp().my_warnning(res.data.msg, 0, th);
+      //       th.setData({
+      //         is_select:0,
+      //       })
+      //     }
+      //   }
+      // })
     } else {
       t_pay.pay(req, th.success, function () {
         getApp().my_warnning("支付失败", 0, th);
+        th.setData({
+          is_select:0,
+          focus:true,
+        })
       });
-    }
+    } 
   },
   //返回会员页面
   OpeningClose: function () {
     this.setData({
-      open_yq: 0
+      open_yq: 0,
+      inp_serviceman:""
     });
   },
-
+  dialog_close() {
+    this.setData({
+      staffNo_arr: [],
+    });
+  },
+  check_serviceman(data,req) {
+    let th = this;
+    getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
+      data,
+      success: function (res) {
+        if (res.data.code == 0) {
+          if (res.data.data.length > 1 && !th.data.is_select) {
+            th.setData({
+              staffNo_arr: res.data.data
+            })
+          }else{
+            t_pay.pay(req, th.success, function () {
+              getApp().my_warnning("支付失败", 0, th);
+              th.setData({
+                is_select:0,
+                focus:true,
+              })
+            });
+          }
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+          th.setData({
+            is_select:0,
+            focus:true,
+          })
+        }
+      }
+    })
+  },
   //返回会员中心
   back_user: function () {
     setTimeout(function () {
@@ -409,7 +487,6 @@ Page({
         url: u_url
       })
     }
-
   },
  
  
 <block wx:if="{{is_show && (fir_leader?is_fengxiang:1)}}">
-<!-- 我的会员背景图片 -->
-<import src="../../../utils/wxParse/wxParse.wxml"></import>
-<view>
-  <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
-</view>
-<view class="plus">
-  <!-- 开通会员模块 -->
+  <!-- 我的会员背景图片 -->
+  <import src="../../../utils/wxParse/wxParse.wxml"></import>
+  <view>
+    <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
+  </view>
+  <view class="plus">
+    <!-- 开通会员模块 -->
  
-  <block wx:if="{{is_plusCard}}">
-    <view class="Opening_plus">
-      <view class="Opening_bk">
-        <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
-      </view>
-      <view class="swiper">
+    <block wx:if="{{is_plusCard}}">
+      <view class="Opening_plus">
+        <view class="Opening_bk">
+          <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
+        </view>
+        <view class="swiper">
           <!-- 未开通会员swiper-item -->
           <swiper current="{{currentId}}" current-item-id="{{currentId}}" next-margin="60rpx" previous-margin="60rpx" bindchange="swiperChange">
             <swiper-item class="flex" item-id="{{index}}" data-item-id="{{index}}" wx:for="{{is_plusCard}}">
  
-              <view  class="Membership {{currentId==index?'enlarge':''}}" style=" background-image: url({{item.CardImg}});color:{{item.CardColor}}">
+              <view class="Membership {{currentId==index?'enlarge':''}}" style=" background-image: url({{item.CardImg}});color:{{item.CardColor}}">
                 <view class="flex-space-between Membership_go">
                   <view>
                     <view class="fs36">{{item.CardName}}</view>
@@ -32,7 +32,7 @@
  
                   <view class="flex-vertical fs24" style="overflow:hidden">
  
-                    <view class="Member"style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png');filter: drop-shadow( 40rpx 0rpx 0rpx {{item.CardColor}});"></view>
+                    <view class="Member" style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png');filter: drop-shadow( 40rpx 0rpx 0rpx {{item.CardColor}});"></view>
                     <view style="margin-left:5rpx;white-space: nowrap;">按去年用户消费计算，开卡后一年预计省￥{{item.free}}元
                     </view>
                   </view>
@@ -41,76 +41,80 @@
  
             </swiper-item>
           </swiper>
+        </view>
       </view>
-    </view>
-  </block>
+    </block>
  
-  <!-- 会员礼遇 -->
-  <view class="Courtesy">
+    <!-- 会员礼遇 -->
+    <view class="Courtesy">
+
+      <!-- 标题 -->
+      <view class="flex-center" style="width:100%;height:200rpx;">
+        <view>
+          <view class="Courtesy_title flex-center fs36">开通PLUS会员尊享礼遇
+          </view>
  
-    <!-- 标题 -->
-    <view class="flex-center" style="width:100%;height:200rpx;">
-      <view>
-        <view  class="Courtesy_title flex-center fs36">开通PLUS会员尊享礼遇
-        </view>
-       
  
  
-        <view class="flex-center">
-          <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
+          <view class="flex-center">
+            <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
  
-        
-          <view class="Courtesy_can fs24">PLUS会员可享受以下特权
+
+            <view class="Courtesy_can fs24">PLUS会员可享受以下特权
+            </view>
+
+            <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
           </view>
+        </view>
+      </view>
+
  
-          <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
+
+      <!-- 会员权益内容 -->
+      <view class="Courtesy_comment " style="padding:0 20rpx" wx:if="{{is_card_rule!=null&&is_card_rule!=''}}">
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
       </view>
     </view>
  
-    <!-- 会员权益内容 -->
-    <view class="Courtesy_comment "  style="padding:0 20rpx"  wx:if="{{is_card_rule!=null&&is_card_rule!=''}}">
-     <view class="wxParse">
-        <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
-     </view>
-    </view>
-  </view>
+    <!-- 好物推荐 -->
+    <!-- 好物推荐 -->
+    <view class="title">
+      <!-- 标题 -->
+      <view>
+        <!-- 中文名标题 -->
+        <view class="China flex-level">
+          <view class="line flex-vertical">
+            <view class="one"></view>
+            <view class="two"></view>
+            <view class="three"></view>
+          </view>
  
-  <!-- 好物推荐 -->
-  <!-- 好物推荐 -->
-  <view class="title">
-    <!-- 标题 -->
-    <view>
-      <!-- 中文名标题 -->
-      <view class="China flex-level">
-        <view class="line flex-vertical">
-          <view class="one"></view><view class="two"></view><view class="three"></view>
-        </view>
+          <view class="Recommend flex-level" bindtap="requestList">好物推荐</view>
  
-        <view class="Recommend flex-level" bindtap="requestList">好物推荐</view>
+          <view class="line flex-vertical">
+            <view class="three"></view>
+            <view class="two"></view>
+            <view class="one"></view>
+          </view>
+        </view>
  
-        <view class="line flex-vertical">
-          <view class="three"></view>
-          <view class="two"></view>
-          <view class="one"></view>
+        <!-- 英文标题 -->
+        <view class="english flex-center">
+          <view class="silk"></view>
+          <view class="esh five-level-word">GOOD HOT THING</view>
+          <view class="silk"></view>
         </view>
-      </view>
  
-      <!-- 英文标题 -->
-      <view class="english flex-center">
-        <view class="silk"></view>
-        <view class="esh five-level-word">GOOD HOT THING</view>
-        <view class="silk"></view>
       </view>
+      <!-- 商品列表组件 -->
+      <goods_recommend id="goods_list"></goods_recommend>
+      <!-- 商品列表 -->
  
     </view>
-    <!-- 商品列表组件 -->
-    <goods_recommend id="goods_list"></goods_recommend>
-    <!-- 商品列表 -->
  
   </view>
-
-</view>
 </block>
  
 <!-- 开通会员弹窗 -->
@@ -127,32 +131,54 @@
       <view class="fs36 flex-level perfect">请完善下面信息</view>
       <view class="fillin">
         <!-- 输入推荐人手机号 -->
-        <view class="flex ai_and Enter_phone" wx:if="{{isyaoqingma}}" >
+        <view class="flex ai_and Enter_phone" wx:if="{{isyaoqingma}}">
           <image class="phone_image" src="{{url}}/miniapp/images/plus/Invitation_code.png"></image>
           <view class="phone">
-            <input bindinput="b_input" data-name="inp_recommon" class="fs30" placeholder="请输入邀请码(推荐人手机号)" type="number" maxlength="20" />
+            <input bindinput="b_input" bindconfirm="buy_card" data-name="inp_recommon" class="fs30" placeholder="请输入邀请码(推荐人手机号)" type="number" maxlength="20" />
           </view>
         </view>
         <!-- 输入营业员 -->
         <view class="flex ai_and enter_SalesClerk" wx:if="{{is_salesman}}">
           <image class="SalesClerk_image" src="{{url}}/miniapp/images/plus/Sales_Clerk.png"></image>
           <view class="SalesClerk">
-            <input bindinput="b_input" class="fs30" data-name="inp_serviceman" placeholder="请输入营业员" maxlength="30" />
+            <input bindinput="b_input" bindconfirm="buy_card" class="fs30" focus="{{focus}}" data-name="inp_serviceman" value="{{inp_serviceman}}" placeholder="请输入营业员" maxlength="30" />
           </view>
         </view>
         <!-- 确认购买 -->
         <view class="flex-center" bindtap="buy_card">
-          <view class="flex-center purchase"
-                style="background-image:url({{url}}/miniapp/images/plus/purchase_Bk.png);">
+          <view class="flex-center purchase" style="background-image:url({{url}}/miniapp/images/plus/purchase_Bk.png);">
             确认购买
           </view>
         </view>
       </view>
     </view>
+
     <view class="flex-level">
       <image class="purchaseClose" bindtap="OpeningClose" src="{{url}}/miniapp/images/plus/Close.png"></image>
     </view>
   </view>
  
 </view>
+
+<view class="Disgraceful" wx:if="{{staffNo_arr.length>0}}">
+  <view bindtap="OpeningClose"></view>
+  <view class="dialog_body">
+    <view style="background-color: #fff;">
+      <view class="dialog_choose">
+        <text>请选择营业员</text>
+        <text class="dialog_close" bindtap="dialog_close">X</text>
+      </view>
+      <view class="dialog_name">
+        <text class="w50">编号</text>
+        <text class="w50">姓名</text>
+      </view>
+    </view>
+    <view class="dialog_name" bindtap="select_serviceman" data-StaffNo="{{item.StaffNo}}" wx:for="{{staffNo_arr}}" wx:key="id" hover-class="weui-active" hover-start-time="200" style="background-color: #fff;">
+      <view class="w50">{{item.StaffNo}}</view>
+      <view class="w50">{{item.StaffName}}</view>
+    </view>
+  </view>
+</view>
+
+
 <warn id="warn"></warn>
 \ No newline at end of file
@@ -16,7 +16,48 @@ page {
   width: 100%;
   height: 100%;
 }
-
+.dialogful{
+  position: fixed;
+  left: 0;
+  top: 15%;
+  right: 0;
+  bottom: 0;
+  z-index: 11;
+  background: rgba(0, 0, 0, 0.6);
+  width: 100%;
+  height: 100%;
+}
+.dialog_body {
+  margin:30% auto;
+  width: 660rpx;
+}
+.dialog_close{
+  float: right;
+  width: 50rpx;
+  height: 50rpx;
+  text-align: right;
+}
+.dialog_choose{
+  position: relative;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #eee;
+}
+.dialog_name,
+.dialog_content {
+  padding: 10rpx;
+  display: flex;
+  border-bottom: 1rpx solid #f7f7f7;
+  justify-content: space-around;
+  
+}
+.weui-active{
+  opacity: 0.9;
+  background: #f7f7f7;
+}
+.w50 {
+  width: 50%;
+  text-align: center;
+}
 .Opening_bk image {
   position: absolute;
   z-index: 2;