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

season
2 parents 4e4b2371 46add9c5
Showing 12 changed files with 411 additions and 140 deletions
components/com_top_nav/com_top_nav.js
components/com_top_nav/com_top_nav.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageD/pages/user/member/bring/bring.wxss
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
packageE/pages/cart/cart2/filter.wxs
packageE/pages/user/monthgiftbag/monthgiftbag.js
pages/payment/pay_success/pay_success.js
pages/payment/pay_success/pay_success.wxml
pages/payment/pay_success/pay_success.wxss
utils/more_cx.js
@@ -9,6 +9,9 @@ Component({
       },
       color:{
           type: String,value: '#313131'
+      },
+      need_cover:{
+          type: Number,value: 0
       }
   },
   data: {
-<cover-view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
-   <cover-view class="tab" style="height:{{h1}}px;">
-       <cover-view wx:if="{{user_no}}" class="tb_con" >ID:{{user_no}}<cover-view style="width:20rpx"></cover-view></cover-view>
-       <cover-view wx:else class="tb_con" ></cover-view>
-   </cover-view>
-   <cover-view bindtap="go_back" class="contant" style="height:{{h2}}px">
-       <cover-view  class="gback">
-            <cover-view class="rote_view" style="border: 3rpx solid {{color}};"></cover-view>
-       </cover-view>
-       <cover-view class="ellip">{{title}}</cover-view>
-   </cover-view>
+<!-- 需要cover-view是大转盘才会 -->
+<block wx:if="{{need_cover}}">
+    <cover-view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
+        <cover-view class="tab" style="height:{{h1}}px;">
+            <cover-view wx:if="{{user_no}}" class="tb_con" >ID:{{user_no}}<cover-view style="width:20rpx"></cover-view></cover-view>
+            <cover-view wx:else class="tb_con" ></cover-view>
+        </cover-view>
+        <cover-view bindtap="go_back" class="contant" style="height:{{h2}}px">
+            <cover-view  class="gback">
+                <cover-view class="rote_view" style="border: 3rpx solid {{color}};"></cover-view>
+            </cover-view>
+            <cover-view class="ellip">{{title}}</cover-view>
+        </cover-view>
+
+    </cover-view>
+</block>
+<block wx:else>
+    <view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
+        <view class="tab" style="height:{{h1}}px;">
+            <view wx:if="{{user_no}}" class="tb_con" >ID:{{user_no}}<view style="width:20rpx"></view></view>
+            <view wx:else class="tb_con" ></view>
+        </view>
+        <view bindtap="go_back" class="contant" style="height:{{h2}}px">
+            <view  class="gback">
+                <view class="rote_view" style="border: 3rpx solid {{color}};"></view>
+            </view>
+            <view class="ellip">{{title}}</view>
+        </view>
+    </view>
+</block>
+
-</cover-view>
 <!-- 用于顶开层的高 -->
-<cover-view style="height:{{height}}px"></cover-view>
 \ No newline at end of file
+<view style="height:{{height}}px"></view>
 \ No newline at end of file
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <wxs module="tool" src="./tool.wxs"></wxs>
-<com_top_nav title="{{l_title}}"></com_top_nav>
+<com_top_nav title="{{l_title}}" need_cover="1"></com_top_nav>
 <view class="luck-container {{!template&&custom ? 'on':''}}" style="{{luckStyle}}">
 <!-- <view class="luck-container {{!template&&custom ? 'on':''}}" style="background: {{template&&template.colorCode ? template.colorCode:(custom ? '#f0f0f0':'#da104b')}} url({{bannerUrl ? bannerUrl:''}}) no-repeat;"> -->
@@ -239,7 +239,15 @@ margin-top:28rpx;
   margin-left: 60rpx; 
   border-bottom: 1px solid #EEEEEE;
  }
-
+ .one-lists1{
+  display: flex;
+   font-size: 25rpx;
+  width: 680rpx;
+  height: 90rpx;
+  color: #000000;
+  line-height: 90rpx;
+ margin-left: 60rpx; 
+}
  /* 输入框样式 */
  .srk-two{
     width: 200px;
@@ -891,6 +891,8 @@ Page({
   //-- is_change是有没有切换活动的意思 --
   async get_cart_next(carr,is_change,old_prom){
+    this.setData({yh_is_xz_yh:{}});
+
     //--- 切换的时候一定要把赠品去掉 ---
     if(is_change){
@@ -934,11 +936,11 @@ Page({
             }
         }
       }
-
     }
+
     //按门店分类的数组
     var arr = new Array();
-
+    
     var th=this;
     th.data.in_zhact_gdmap = {};
     //---是不是购买等级卡成功的返回---等级卡显示的判断---
@@ -6811,7 +6813,19 @@ Page({
           if (fid > -1) return false;
         }
-        ob.price += item.goods_price * item.goods_num;
+        //优惠促销取价的优化
+        let f_price=item.goods_price;
+        if(ob.discount_field!=undefined){
+          switch (ob.discount_field){
+            case 0: f_price=item.goods_price;break;
+            case 1: f_price=item.shop_price;break;
+            case 2: f_price=item.goods_market_price;break;
+          }
+        }
+
+        item.goods_price=f_price;
+
+        ob.price += f_price * item.goods_num;
         ob.goods_num += item.goods_num;
         ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
@@ -6851,13 +6865,27 @@ Page({
         var ob = {};
         ob.prom_id = item.prom_id;
         ob.name = prom.name;
-        ob.price = item.goods_price * item.goods_num;
+
+        //优惠促销取价的优化
+        let f_price=item.goods_price;
+        if(prom.discount_field!=undefined){
+            switch (prom.discount_field){
+              case 0: f_price=item.goods_price;break;
+              case 1: f_price=item.shop_price;break;
+              case 2: f_price=item.goods_market_price;break;
+            }
+        }
+
+        item.goods_price=f_price;
+
+        ob.price = f_price * item.goods_num;
         ob.goods_num = item.goods_num;
         ob.is_bz = prom.is_bz;
         ob.is_xz_yh = prom.is_xz_yh;
         ob.is_xz_yh = prom.is_xz_yh;
         ob.is_order_yh = prom.is_order_yh;
         ob.is_post_temp = prom.is_post_temp;
+        ob.discount_field = prom.discount_field;
         ob.goods = new Array();
         ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
         map[pickid][item.prom_id] = ob;
@@ -6897,14 +6925,29 @@ Page({
         }
       })
+
+      //优惠促销取价的优化
+      let f_price=item.goods_price;
+
+      if(prom.discount_field!=undefined){
+        switch (prom.discount_field){
+          case 0: f_price=item.goods_price;break;
+          case 1: f_price=item.shop_price;break;
+          case 2: f_price=item.goods_market_price;break;
+        }
+      }
+
+      item.goods_price=f_price;
+
       ob.prom_id = item.prom_id;
       ob.name = prom.name;
-      ob.price = item.goods_price * item.goods_num;
+      ob.price = f_price * item.goods_num;
       ob.goods_num = item.goods_num;
       ob.is_bz = prom.is_bz;
       ob.is_xz_yh = prom.is_xz_yh;
       ob.is_order_yh = prom.is_order_yh;
       ob.is_post_temp = prom.is_post_temp;
+      ob.discount_field = prom.discount_field;
       ob.goods = new Array();
       ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
       var obj = {};
@@ -8298,6 +8341,82 @@ Page({
       }
     }
     func({'code': 0, 'msg': '成功'})
+  },
+
+  //--- 不参与优惠促销的开关 ---
+  no_cj_prom: function (e) {
+
+    this.setData({
+      send_lb:{},
+      month_lb:{},
+      send_gf:{}
+    })
+
+
+    //清空优惠促销的内容
+    this.data.prom_goods_map = {};
+
+    let th=this;
+    let can_cx_idx = e.currentTarget.dataset.can_cx_idx;  //多促销的索引
+    let pidx = e.currentTarget.dataset.pidx;  //订单索引
+    let item = this.data.cartlist[pidx].show_can_cx[can_cx_idx];  //促销内容
+    let pk=this.data.cartlist[pidx].pickup_id;  //门店ID
+
+    //给no_cj_prom进行赋值
+    item.no_cj_prom = !item.no_cj_prom ? 1 : 0;
+    var txt = 'cartlist[' + pidx + '].show_can_cx';
+    this.setData({
+      [txt]: this.data.cartlist[pidx].show_can_cx,
+    })
+
+    let ck_prom_type=item.cur_act;
+    //处理一下商品
+    let goods0 = JSON.parse(JSON.stringify(th.data.cartlist_y));
+    let goods = [];
+    for (var ik = 0; ik < goods0.length; ik++) {
+      var item_c = goods0[ik];
+      if (item_c.pick_id == pk && item_c.is_collocation) continue;
+      goods.push(item_c);
+    }
+
+    //-- 此时要把购物车中的商品确定活动 --
+    for (var b = 0; b < ck_prom_type.goods.length; b++) {
+      //-- 开始查找 --
+      var fg = goods.findIndex(function (g_item) {
+        return g_item.goods_id == ck_prom_type.goods[b].goods_id
+            && [0, 3, 5, 7, 10].indexOf(g_item.prom_type) > -1
+            && g_item.pick_id == pk && g_item.is_gift == 0;
+      })
+      if (fg > -1) {
+        goods[fg].prom_type = ck_prom_type.prom_type;
+        goods[fg].prom_id = ck_prom_type.prom_id;
+
+        //如果是不参与的话，商品的活动状态要清理
+        if(item.no_cj_prom){
+            goods[fg].prom_type=0;
+            goods[fg].prom_id=0;
+        }
+
+        for (var ik = 0; ik < th.data.cartlist[pidx].goods.length; ik++) {
+          if (th.data.cartlist[pidx].goods[ik].id == goods[fg].id) {
+            th.data.cartlist[pidx].goods[ik].prom_type = goods[fg].prom_type;
+            th.data.cartlist[pidx].goods[ik].prom_id = goods[fg].prom_id;
+          }
+        }
+      }
+    }
+
+    //原始数据要有深拷贝不能有地址的牵连
+    th.data.cartlist_y = JSON.parse(JSON.stringify(goods))
+
+
+    //重新调用cart_next,进行下一步计算
+    wx.showLoading({
+      title: "处理中.",
+    })
+    this.get_cart_next(null, 1, {prom_type: 0, prom_id: 0});
+
+
   }
@@ -118,57 +118,65 @@
              <!-- 验证活动是不是多个，要不要显示切换 -->
              <!-- 新增促销多活动的排版,单商品的时候 -->
-             <block  wx:if="{{(util.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id] && item.show_can_cx[items.goods_id].act_arr.length>1)}}">
-
-
-               <!-- 组合购和阶梯促销要特殊出来 -->
-               <block wx:if="{{item.show_can_cx[items.goods_id].sele_prom_type==7 || item.show_can_cx[items.goods_id].sele_prom_type==10 }}">
-
-                 <!-- 是不是活动的最后一个商品 -->
-                 <view class="bdb16" wx:if="{{items.is_act_last}}"  >
-                   <view bindtap="switch_cx_group"
-                         data-index="{{pidx}}"
-                         data-gd_key="{{items.goods_id}}"
-                         class="cx-frame flex" style="position: relative">
-                     <view class="cx-sizs fs30">促销</view>
-                     <view class="flex ai_c f1 pdh20">
-                       <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
-                         <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
-                         <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                         <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                         <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+             <block  wx:if="{{(util.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id])}}">
+
+
+               <!-- 多个活动的时候 -->
+               <block wx:if="{{item.show_can_cx[items.goods_id].act_arr.length>1}}">
+                   <!-- 组合购和阶梯促销要特殊出来 -->
+                   <block wx:if="{{item.show_can_cx[items.goods_id].sele_prom_type==7 || item.show_can_cx[items.goods_id].sele_prom_type==10 }}">
+
+                     <!-- 是不是活动的最后一个商品 -->
+                     <view class="bdb16" wx:if="{{items.is_act_last}}"  >
+                       <view bindtap="switch_cx_group"
+                             data-index="{{pidx}}"
+                             data-gd_key="{{items.goods_id}}"
+                             class="cx-frame flex" style="position: relative">
+                         <view class="cx-sizs fs30">促销</view>
+                         <view class="flex ai_c f1 pdh20">
+                           <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
+                             <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                             <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                             <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                             <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                           </view>
+                         </view>
+                         <view class="cx-obtain-coupon wsize">
+                           <text class="bg_jj"></text>
+                         </view>
                        </view>
                      </view>
-                     <view class="cx-obtain-coupon wsize">
-                       <text class="bg_jj"></text>
-                     </view>
-                   </view>
-                 </view>
-               </block>
-               <block wx:else>
-                   <view class="bdb16">
-                   <view bindtap="switch_cx_group"
-                         data-index="{{pidx}}"
-                         data-gd_key="{{items.goods_id}}"
-                         class="cx-frame flex" style="position: relative">
-                     <view class="cx-sizs fs30">促销</view>
-                     <view class="flex ai_c f1 pdh20">
-                       <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
-                         <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
-                         <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                         <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                         <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                   </block>
+                   <block wx:else>
+                     <view class="bdb16">
+                       <view bindtap="switch_cx_group"
+                             data-index="{{pidx}}"
+                             data-gd_key="{{items.goods_id}}"
+                             class="cx-frame flex" style="position: relative">
+                         <view class="cx-sizs fs30">促销</view>
+                         <view class="flex ai_c f1 pdh20">
+                           <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
+                             <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                             <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                             <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                             <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                           </view>
+                         </view>
+                         <view class="cx-obtain-coupon wsize">
+                           <text class="bg_jj"></text>
+                         </view>
                        </view>
                      </view>
-                     <view class="cx-obtain-coupon wsize">
-                       <text class="bg_jj"></text>
-                     </view>
-                   </view>
-                 </view>
+                   </block>
                </block>
-
+               <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom) }}">
+                 <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}"  bindtap='no_cj_prom'>
+                   <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
+                   <view class="yu_er">参与优惠活动</view>
+                 </view>
+               </view>
              </block>
@@ -177,54 +185,61 @@
              <block wx:if="{{item.show_can_cx}}">
                     <block  wx:for="{{item.show_can_cx}}" wx:for-item="pitem">
-                      <!-- 组合购和阶梯促销要特殊出来 -->
-                      <block wx:if="{{ pitem.sele_prom_type==7 || pitem.sele_prom_type==10 }}">
-                        <!-- 是不是活动的最后一个商品 -->
-                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && items.is_act_last}}" >
-
-                          <view bindtap="switch_cx_group"
-                                data-index="{{pidx}}"
-                                data-gd_key="{{index}}"
-                                class="cx-frame flex" style="position: relative">
-                            <view class="cx-sizs fs30">促销</view>
-                            <view class="flex ai_c f1 pdh20">
-                              <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
-                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
-                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                        <!-- 组合购和阶梯促销要特殊出来 -->
+                        <block wx:if="{{ pitem.sele_prom_type==7 || pitem.sele_prom_type==10 }}">
+                          <!-- 是不是活动的最后一个商品 -->
+                          <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && items.is_act_last}}" >
+
+                            <view bindtap="switch_cx_group"
+                                  data-index="{{pidx}}"
+                                  data-gd_key="{{index}}"
+                                  class="cx-frame flex" style="position: relative">
+                              <view class="cx-sizs fs30">促销</view>
+                              <view class="flex ai_c f1 pdh20">
+                                <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
+                                  <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                                  <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                  <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                  <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                                </view>
+                              </view>
+                              <view class="cx-obtain-coupon wsize">
+                                <text class="bg_jj"></text>
                               </view>
-                            </view>
-                            <view class="cx-obtain-coupon wsize">
-                              <text class="bg_jj"></text>
                             </view>
                           </view>
-                        </view>
-                      </block>
-                      <block wx:else>
-                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id) }}" >
-                          <view bindtap="switch_cx_group"
-                                data-index="{{pidx}}"
-                                data-gd_key="{{index}}"
-                                class="cx-frame flex" style="position: relative">
-                            <view class="cx-sizs fs30">促销</view>
-                            <view class="flex ai_c f1 pdh20">
-                              <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
-                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
-                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
-                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
-                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                        </block>
+                        <block wx:else>
+                          <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id) }}" >
+                            <view bindtap="switch_cx_group"
+                                  data-index="{{pidx}}"
+                                  data-gd_key="{{index}}"
+                                  class="cx-frame flex" style="position: relative">
+                              <view class="cx-sizs fs30">促销</view>
+                              <view class="flex ai_c f1 pdh20">
+                                <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
+                                  <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                                  <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                  <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                  <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                                </view>
+                              </view>
+                              <view class="cx-obtain-coupon wsize">
+                                <text class="bg_jj"></text>
                               </view>
-                            </view>
-                            <view class="cx-obtain-coupon wsize">
-                              <text class="bg_jj"></text>
                             </view>
                           </view>
+                        </block>
+
+                        <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) }}">
+                          <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}"  bindtap='no_cj_prom'>
+                            <icon color="{{!pitem.no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
+                            <view class="yu_er">参与优惠活动</view>
+                          </view>
                         </view>
-                      </block>
                     </block>
-                  </block>
+            </block>
         </block>
@@ -27,6 +27,10 @@ function check_show(items,sele_prom_type){
 //is_act_last 是不是最后一个
 function check_is_last(index,goods_id){
+
+    if(!index) index='';
+    index+='';
+
     var gd_arr=index.split(',');
     var idx=-1;
     //-- 判断有没有包含商品 --
@@ -92,9 +92,10 @@ Page({
         getApp().goto('/packageE/pages/togoin/togoin');
         return false;
       }
-      this.setData({
-        wareCard:[]
-      })
+      this.data.curpage=0;
+      this.data.searching=0;
+      this.setData({ismore:0,is_get:0,wareCard:[]});
+
       this.init()
     })
@@ -251,7 +252,7 @@ Page({
   search_lb(){
     this.data.curpage=0;
-    this.searching=0;
+    this.data.searching=0;
     this.setData({ismore:0,is_get:0,wareCard:[]});
     this.getList();
   },
@@ -30,6 +30,29 @@ Page({
 			});
       var type=options.type,order_sn=options.order_sn;
       var th=this,order=null;
+
+	  getApp().request.promiseGet("/api/weshop/ad/page?pid=1211&store_id=" + getApp().globalData.setting.stoid, {
+        data: {
+          enabled: 1
+        }
+      }).then(res => {
+        if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+          var a = res.data.data.pageData;
+          var arr = new Array();
+          for (var i = 0; i < a.length; i++) {
+            var tt = {
+              'ad_code': getApp().globalData.setting.imghost + a[i].ad_code,
+              'media_link': '',
+              'ad_weapplink': a[i].ad_weapplink
+            };
+            arr.push(tt);
+          }
+          if (arr.length > 0) th.setData({
+            banner: arr,
+          });
+        }
+      })
+
 			// 卡项订单
@@ -117,4 +140,10 @@ Page({
      var  url= '/pages/index/index/index';
      getApp().goto(url)
   },
+
+  gotoshequn:function(e){
+	getApp().goto(e.currentTarget.dataset.url);
+  },
+
+
 })
 \ No newline at end of file
@@ -12,6 +12,39 @@
       </view>
     </view>
+    
+    <!-- 链接 -->
+    <view class="fs28 pd20" style="padding-top: 0;">
+			<view class="flex-center">
+			
+				<block wx:if="{{options.card == 1}}">
+					<!-- <view class="flex-center"> -->
+					  <navigator class="btn border c-6" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{order.order_id}}">
+					    <view>订单详情</view>
+					  </navigator>
+					<!-- </view> -->
+					<!-- <view class="flex-center"> -->
+					  <navigator class="btn bg-red white mgl20" url="/pages/user/my_service/i_service">
+					    <view>立即预约</view>
+					  </navigator>
+					<!-- </view> -->
+				</block>
+				
+				<block wx:else>
+          
+          <navigator class="btn border c-6" bindtap="goto">
+            <view>回到首页</view>
+          </navigator>
+					<navigator class="btn bg-yellow white mgl20" url="/pages/user/order_list/order_list">
+					  <view>查看订单</view>
+					</navigator>
+				</block>
+				
+			</view>
+      
+    </view>
+    
+
     <!-- 支付信息 -->
     <view class="payitem_max fs28">
       <!-- 订单编号 -->
@@ -78,6 +111,8 @@
     <view class="line"></view>
   </view>
+
+
   <!-- 跳转链接 -->
   <view>
     <!-- 个人收货信息 -->
@@ -107,35 +142,10 @@
       </view>
     </view>
-    <!-- 链接 -->
-    <view class="fs28 pd20 mgt40">
-			<view class="flex">
-				
-				<block wx:if="{{options.card == 1}}">
-					<!-- <view class="flex-center"> -->
-					  <navigator class="btn f1 bg-yellow white" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{order.order_id}}">
-					    <view>订单详情</view>
-					  </navigator>
-					<!-- </view> -->
-					<!-- <view class="flex-center"> -->
-					  <navigator class="btn f1 bg-red white mgl20" url="/pages/user/my_service/i_service">
-					    <view>立即预约</view>
-					  </navigator>
-					<!-- </view> -->
-				</block>
-				
-				<block wx:else>
-					<navigator class="btn f1 bg-yellow white" url="/pages/user/order_list/order_list">
-					  <view>查看订单</view>
-					</navigator>
-				</block>
-				
-			</view>
-      <view class="mgt30">
-        <navigator class="btn border c-6" bindtap="goto">
-          <view>回到首页</view>
-        </navigator>
-      </view>
-    </view>
   </view>
+</view>
+
+
+<view class="shequn" style="margin-top:20rpx；"  bindtap="gotoshequn" wx:if="{{banner}}" data-url="{{banner[0].ad_weapplink}}">
+   <image src="{{banner[0].ad_code}}" mode="widthFix" style="width: 100%;border-radius: 15rpx;" />
 </view>
 \ No newline at end of file
@@ -64,11 +64,12 @@ page {
 .btn {
 	box-sizing: border-box;
-	height: 80rpx;
-	line-height: 80rpx;
+	height: 75rpx;
+	line-height: 75rpx;
 	/* padding: 10rpx; */
 	text-align: center;
-  border-radius: 40rpx;
+  border-radius: 20rpx;
+  padding: 0 40rpx;
 }
 .pay_home {
@@ -94,3 +95,52 @@ page {
 .border {
 	border: 2rpx solid #ccc;
 }
+
+
+.shequn{
+  width: 94%;
+  margin:10rpx 23rpx 23rpx 23rpx;
+  min-height: 260rpx;
+  background: white;
+  border-radius: 15rpx;
+  display: flex;
+}
+
+.shequnleft{
+  display: block;
+  width: 60%;
+  margin: 30rpx;
+}
+.shequnleft .one1{
+  display: flex;
+  width: 100%;
+  height: 110rpx;
+  line-height: 110rpx;
+  margin-top: -15rpx;
+  font-size: 30rpx;
+  color: #313131;
+  font-weight: bold;
+}
+.shequnleft .one2{
+  display: flex;
+  width: 100%;
+  color: #f39700;
+  font-size: 24rpx;
+}
+.shequnleft .one3{
+  display: flex;
+  width: 100%;
+  color: #313131;
+  font-size: 24rpx;
+}
+.shequnright{
+  display: flex;
+  width: 40%;
+  justify-content: center;
+  align-items: center;
+}
+
+.shequnright image{
+  width: 150rpx;
+  height: 150rpx;
+}
@@ -524,6 +524,19 @@ module.exports = {
                     var all_pri=0;
                     for(var f=0;f<t_goods.length;f++){
                         all_num+=t_goods[f].goods_num;
+
+                        //-- 优惠促销取价的优化 --
+                        let f_price=t_goods[f].goods_price;
+                        if(fd.discount_field!=undefined){
+                            switch (fd.discount_field){
+                                case 0: f_price=t_goods[f].goods_price;break;
+                                case 1: f_price=t_goods[f].shop_price;break;
+                                case 2: f_price=t_goods[f].goods_market_price;break;
+                            }
+                        }
+                        t_goods[f].goods_price=f_price;
+
+
                         all_pri+=t_goods[f].goods_num*t_goods[f].goods_price;
                     }
                     var yh_ok=1;