1 participants
-
Status changed to merged
-
mentioned in commit 308856a8e48abe08d6e51bbf73fdafe52c08ab2b
Showing
29 changed files
app.json
| ... | ... | @@ -121,7 +121,6 @@ |
| 121 | 121 | "pages/hongBaoDetails/hongBaoDetails", |
| 122 | 122 | "pages/service_record/service_record", |
| 123 | 123 | "pages/checkin/checkin", |
| 124 | - "pages/distribution/main/main", | |
| 125 | 124 | "pages/distribution/myteam/myteam", |
| 126 | 125 | "pages/distribution/order/order", |
| 127 | 126 | "pages/distribution/commision/commision", |
| ... | ... | @@ -132,7 +131,15 @@ |
| 132 | 131 | "pages/distribution/rookie/rookie", |
| 133 | 132 | "pages/service_share/service_share", |
| 134 | 133 | "pages/cardList/cardList", |
| 135 | - "pages/cardDetails/cardDetails" | |
| 134 | + "pages/goodsInfo/goodsInfo", | |
| 135 | + "pages/my_service/appment_main", | |
| 136 | + "pages/my_service/i_service", | |
| 137 | + "pages/my_service/cosmetology_list", | |
| 138 | + "pages/my_service/hist_service", | |
| 139 | + "pages/my_service/tment_details", | |
| 140 | + "pages/my_service/tment_eval", | |
| 141 | + "pages/my_service/tment_order_list", | |
| 142 | + "pages/my_service/beauty_deta" | |
| 136 | 143 | ] |
| 137 | 144 | |
| 138 | 145 | }], | ... | ... |
components/diy_nav/diy_nav.js
packageA/pages/cardList/cardList.js
packageA/pages/cardList/cardList.wxml
| 1 | 1 | <view class="page"> |
| 2 | 2 | <swiper class="swiper" autoplay indicator-dots circular easing-function="easeOutCubic"> |
| 3 | - <swiper-item wx:for="{{banner}}"><image src="{{item.ad_code}}" class="swiper-img"/></swiper-item> | |
| 3 | + <swiper-item wx:for="{{banner}}"><image src="{{item.ad_code ? item.ad_code : (imghost + default_img)}}" class="swiper-img"/></swiper-item> | |
| 4 | 4 | <!-- <swiper-item>234</swiper-item> |
| 5 | 5 | <swiper-item>345</swiper-item> --> |
| 6 | 6 | </swiper> |
| ... | ... | @@ -26,6 +26,6 @@ |
| 26 | 26 | <nodata class="t-c" wx:if="{{list.pageData.length == 0 || list == null}}"></nodata> |
| 27 | 27 | </view> |
| 28 | 28 | <!-- <nodata class="t-c" wx:if="{{list.pageData.length == 0 && list.pageData}}"></nodata> --> |
| 29 | - <view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view> | |
| 29 | + <view class="noMore">- 已经到底了 -</view> | |
| 30 | 30 | </scroll-view> |
| 31 | 31 | </view> | ... | ... |
packageA/pages/cardList/cardList.wxss
packageA/pages/goodsInfo/buy_integral.wxml deleted
| 1 | -<view bindtap="closeSpecModal_inte" class="cover-layer"></view> | |
| 2 | - <view class="spec-model"> | |
| 3 | - <view class="pding"> | |
| 4 | - <icon bindtap="closeSpecModal_inte" class="modal-close" color="black" size="22" type="cancel"></icon> | |
| 5 | - <view class="spec-goods"> | |
| 6 | - <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> | |
| 7 | - <view class="spec-goods-info"> | |
| 8 | - <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view> | |
| 9 | - <view class="flex ai_end xc-val-money"> | |
| 10 | - <view class="spec-goods-price"> | |
| 11 | - <text wx:if="{{prom_integral}}">{{prom_integral}}积分</text> | |
| 12 | - <text wx:if="{{prom_integral && prom_price}}">+</text> | |
| 13 | - <text wx:if="{{prom_price}}">{{prom_price}}元</text> | |
| 14 | - <text wx:if="{{!prom_integral && !prom_price}}">0积分</text> | |
| 15 | - </view> | |
| 16 | - </view> | |
| 17 | - | |
| 18 | - | |
| 19 | - <view class="flex"> | |
| 20 | - <view class="spec-goods-stock">已售：{{prom_act.buy_num}}</view> | |
| 21 | - <view class="spec-goods-stock">可售：{{prom_act.limitqty-prom_act.buy_num}}</view> | |
| 22 | - </view> | |
| 23 | - | |
| 24 | - </view> | |
| 25 | - | |
| 26 | - <!-- 选择门店模块 --> | |
| 27 | - <view class="flex-space-between address ai_end xc-width "> | |
| 28 | - | |
| 29 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | |
| 30 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | |
| 31 | - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> | |
| 32 | - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | |
| 33 | - | |
| 34 | - </view> | |
| 35 | - </view> | |
| 36 | - | |
| 37 | - <!-- 没有门店的时候 --> | |
| 38 | - <view class="flex" bindtap="choice_store" wx:else> | |
| 39 | - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | |
| 40 | - <view class="fs30" style="color:black;">选择门店</view> | |
| 41 | - </view> | |
| 42 | - | |
| 43 | - <view class="red-co fs28" bindtap="choice_store" > | |
| 44 | - 更多门店 | |
| 45 | - <text class="right-arrow"></text> | |
| 46 | - </view> | |
| 47 | - </view> | |
| 48 | - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | |
| 49 | - <block wx:else> | |
| 50 | - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | |
| 51 | - <block wx:else> | |
| 52 | - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | |
| 53 | - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view> | |
| 54 | - </block> | |
| 55 | - </block> | |
| 56 | - | |
| 57 | - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view> | |
| 58 | - | |
| 59 | - | |
| 60 | - <!--商品的属性项目--> | |
| 61 | - <view class="xc-goods-attribute"> | |
| 62 | - <view hidden="{{ismend==1}}" class="spec-name">商品属性</view> | |
| 63 | - <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;"> | |
| 64 | - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g"> | |
| 65 | - {{item.gg}} | |
| 66 | - </view> | |
| 67 | - </view> | |
| 68 | - </view> | |
| 69 | - | |
| 70 | - <view class="b_num"> | |
| 71 | - <view>购买数量</view> | |
| 72 | - <view class="count"> | |
| 73 | - <view bindtap="subCartNum_inte" class="sub">-</view> | |
| 74 | - <input bindblur="inputCartNum_inte" type="number" value="{{goodsInputNum}}"></input> | |
| 75 | - <view bindtap="addCartNum_inte" class="add">+</view> | |
| 76 | - </view> | |
| 77 | - </view> | |
| 78 | - </view> | |
| 79 | - | |
| 80 | - <!-- 按钮部分 --> | |
| 81 | - <view class="spec-cart-btns"> | |
| 82 | - <!-- 根本就找不到门店 --> | |
| 83 | - <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> | |
| 84 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | |
| 85 | - </block> | |
| 86 | - | |
| 87 | - <block wx:else> | |
| 88 | - | |
| 89 | - <!-- 根本就找不到门店 --> | |
| 90 | - <block wx:if="{{!only_pk && !def_pickpu_list}}"> | |
| 91 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | |
| 92 | - </block> | |
| 93 | - <block wx:else> | |
| 94 | - | |
| 95 | - | |
| 96 | - <block wx:if="{{only_pk.length && !only_pk.length}}"> | |
| 97 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | |
| 98 | - </block> | |
| 99 | - <block wx:else> | |
| 100 | - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> | |
| 101 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | |
| 102 | - </block> | |
| 103 | - <block wx:else> | |
| 104 | - <block wx:if="{{!def_pick_store}}"> | |
| 105 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> | |
| 106 | - </block> | |
| 107 | - <block wx:else> | |
| 108 | - <block wx:if="{{data.store_count<=0}}"> | |
| 109 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | |
| 110 | - </block> | |
| 111 | - <block wx:else> | |
| 112 | - <view bindtap="addCart_inte" class="spec-cart-btn spec-buy" data-action="buy">立即兑换</view> | |
| 113 | - </block> | |
| 114 | - | |
| 115 | - </block> | |
| 116 | - </block> | |
| 117 | - </block> | |
| 118 | - </block> | |
| 119 | - </block> | |
| 120 | - </view> | |
| 121 | - | |
| 122 | - | |
| 123 | - </view> | |
| 124 | - </view> | |
| 125 | - <view class="clear"></view> | |
| 126 | 0 | \ No newline at end of file |
packageA/pages/goodsInfo/buy_integral_normal.wxml deleted
| 1 | -<view bindtap="closeSpecModal_inte_normal" class="cover-layer"></view> | |
| 2 | - <view class="spec-model"> | |
| 3 | - <view class="pding"> | |
| 4 | - <icon bindtap="closeSpecModal_inte_normal" class="modal-close" color="black" size="22" type="cancel"></icon> | |
| 5 | - <view class="spec-goods"> | |
| 6 | - <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> | |
| 7 | - <view class="spec-goods-info"> | |
| 8 | - <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view> | |
| 9 | - <view class="flex ai_end xc-val-money"> | |
| 10 | - <text class="fs20">￥</text> | |
| 11 | - <!-- 如果是等级会员，且有等级价 --> | |
| 12 | - <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> | |
| 13 | - <block wx:else>{{sele_g.shop_price}}</block> | |
| 14 | - </view> | |
| 15 | - | |
| 16 | - <view class="flex"> | |
| 17 | - <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view> | |
| 18 | - <block wx:if="{{sales_rules==2}}"> | |
| 19 | - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view> | |
| 20 | - <view class="spec-goods-stock" wx:else>可售:0</view> | |
| 21 | - </block> | |
| 22 | - <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> | |
| 23 | - </view> | |
| 24 | - | |
| 25 | - | |
| 26 | - </view> | |
| 27 | - | |
| 28 | - <!-- 选择门店模块 --> | |
| 29 | - <view class="flex-space-between address ai_end xc-width "> | |
| 30 | - | |
| 31 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | |
| 32 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | |
| 33 | - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> | |
| 34 | - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | |
| 35 | - | |
| 36 | - </view> | |
| 37 | - </view> | |
| 38 | - | |
| 39 | - <!-- 没有门店的时候 --> | |
| 40 | - <view class="flex" bindtap="choice_store" wx:else> | |
| 41 | - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | |
| 42 | - <view class="fs30" style="color:black;">选择门店</view> | |
| 43 | - </view> | |
| 44 | - | |
| 45 | - <view class="red-co fs28" bindtap="choice_store" > | |
| 46 | - 更多门店 | |
| 47 | - <text class="right-arrow"></text> | |
| 48 | - </view> | |
| 49 | - </view> | |
| 50 | - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> | |
| 51 | - <block wx:else> | |
| 52 | - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view> | |
| 53 | - <block wx:else> | |
| 54 | - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | |
| 55 | - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view> | |
| 56 | - </block> | |
| 57 | - </block> | |
| 58 | - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view> | |
| 59 | - | |
| 60 | - | |
| 61 | - <!--商品的属性项目--> | |
| 62 | - <view class="xc-goods-attribute"> | |
| 63 | - <view hidden="{{ismend==1}}" class="spec-name">商品属性</view> | |
| 64 | - <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;"> | |
| 65 | - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g"> | |
| 66 | - {{item.gg}} | |
| 67 | - </view> | |
| 68 | - </view> | |
| 69 | - </view> | |
| 70 | - | |
| 71 | - <view class="b_num"> | |
| 72 | - <view>购买数量</view> | |
| 73 | - <view class="count"> | |
| 74 | - <view bindtap="subCartNum" class="sub">-</view> | |
| 75 | - <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> | |
| 76 | - <view bindtap="addCartNum" class="add">+</view> | |
| 77 | - </view> | |
| 78 | - </view> | |
| 79 | - </view> | |
| 80 | - | |
| 81 | - <!-- 按钮部分 --> | |
| 82 | - <view class="spec-cart-btns"> | |
| 83 | - | |
| 84 | - | |
| 85 | - <!-- 根本就找不到门店 --> | |
| 86 | - <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> | |
| 87 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | |
| 88 | - </block> | |
| 89 | - <block wx:else> | |
| 90 | - <!-- 根本就找不到门店 --> | |
| 91 | - <block wx:if="{{!only_pk && !def_pickpu_list}}"> | |
| 92 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | |
| 93 | - </block> | |
| 94 | - <block wx:else> | |
| 95 | - | |
| 96 | - | |
| 97 | - <block wx:if="{{only_pk.length && !only_pk.length}}"> | |
| 98 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | |
| 99 | - </block> | |
| 100 | - <block wx:else> | |
| 101 | - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> | |
| 102 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | |
| 103 | - </block> | |
| 104 | - <block wx:else> | |
| 105 | - <block wx:if="{{!def_pick_store}}"> | |
| 106 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> | |
| 107 | - </block> | |
| 108 | - <block wx:else> | |
| 109 | - <block wx:if="{{data.store_count<=0}}"> | |
| 110 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | |
| 111 | - </block> | |
| 112 | - <block wx:else> | |
| 113 | - <view class="flex jc_sb"> | |
| 114 | - <view class="spec-cart-btn spec-buy w40" bindtap="addCart" | |
| 115 | - data-action="add" style="background-color: #ffb03f;">加入购物车</view> | |
| 116 | - <view class="spec-cart-btn spec-buy w40" bindtap="addCart" | |
| 117 | - data-action="buy">立即购买</view> | |
| 118 | - </view> | |
| 119 | - </block> | |
| 120 | - | |
| 121 | - </block> | |
| 122 | - </block> | |
| 123 | - </block> | |
| 124 | - </block> | |
| 125 | - </block> | |
| 126 | - </view> | |
| 127 | - | |
| 128 | - | |
| 129 | - </view> | |
| 130 | - </view> | |
| 131 | - <view class="clear"></view> | |
| 132 | 0 | \ No newline at end of file |
packageA/pages/goodsInfo/buy_pt.wxml deleted
| 1 | -<view bindtap="closeSpecModal" class="cover-layer"></view> | |
| 2 | - <view class="spec-model"> | |
| 3 | - <view class="pding"> | |
| 4 | - <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> | |
| 5 | - | |
| 6 | - <!-- 商品名称 --> | |
| 7 | - <view class="spec-goods"> | |
| 8 | - <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> | |
| 9 | - <view class="spec-goods-info"> | |
| 10 | - <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view> | |
| 11 | - <view class="flex ai_end xc-val-money {{sele_g[card_field]}}" > | |
| 12 | - <view class="spec-goods-price" wx:if="{{is_normal==1}}" > | |
| 13 | - <!-- 如果是等级会员，且有等级价 --> | |
| 14 | - <block wx:if="{{card_field && sele_g[card_field]>0}}"> | |
| 15 | - ￥ {{sele_g[card_field]}} | |
| 16 | - </block> | |
| 17 | - <block wx:else> | |
| 18 | - ￥ {{sele_g.shop_price}} | |
| 19 | - </block> | |
| 20 | - </view> | |
| 21 | - <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view> | |
| 22 | - </view> | |
| 23 | - | |
| 24 | - <block wx:if="{{is_normal==1}}"> | |
| 25 | - <view class="flex"> | |
| 26 | - <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view> | |
| 27 | - <block wx:if="{{sales_rules==2}}"> | |
| 28 | - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view> | |
| 29 | - <view class="spec-goods-stock" wx:else>可售:0</view> | |
| 30 | - </block> | |
| 31 | - <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> | |
| 32 | - </view> | |
| 33 | - </block> | |
| 34 | - <block wx:if="{{is_normal==0}}"> | |
| 35 | - <view class="flex"> | |
| 36 | - <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num}}</view> | |
| 37 | - <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view> | |
| 38 | - <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view> | |
| 39 | - </view> | |
| 40 | - </block> | |
| 41 | - </view> | |
| 42 | - | |
| 43 | - </view> | |
| 44 | - | |
| 45 | - | |
| 46 | - <view style="clear: both"></view> | |
| 47 | - <view style="margin-top: 20rpx"> | |
| 48 | - <view class="flex-space-between address ai_end xc-width "> | |
| 49 | - | |
| 50 | - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | |
| 51 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | |
| 52 | - | |
| 53 | - | |
| 54 | - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> | |
| 55 | - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | |
| 56 | - | |
| 57 | - </view> | |
| 58 | - </view> | |
| 59 | - | |
| 60 | - <!-- 没有门店的时候 --> | |
| 61 | - <view class="flex" bindtap="choice_store" wx:else> | |
| 62 | - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | |
| 63 | - <view class="fs28 xc-ash-9f">选择门店</view> | |
| 64 | - </view> | |
| 65 | - | |
| 66 | - <view class="red-co fs28" bindtap="choice_store" > | |
| 67 | - 更多门店 | |
| 68 | - <text class="right-arrow"></text> | |
| 69 | - </view> | |
| 70 | - </view> | |
| 71 | - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view> | |
| 72 | - <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view> | |
| 73 | - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view> | |
| 74 | - </view> | |
| 75 | - <!----商品的属性项目----> | |
| 76 | - <view> | |
| 77 | - <view hidden="{{ismend==1}}" class="spec-name">商品属性</view> | |
| 78 | - <block wx:if="{{is_normal==0}}"> | |
| 79 | - <view hidden="{{ismend==1}}" class="flex"> | |
| 80 | - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}} | |
| 81 | - </view> | |
| 82 | - </view> | |
| 83 | - </block> | |
| 84 | - | |
| 85 | - <block wx:else> | |
| 86 | - <view hidden="{{ismend==1}}" class="flex"> | |
| 87 | - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}} | |
| 88 | - </view> | |
| 89 | - </view> | |
| 90 | - </block> | |
| 91 | - <view class="clear"></view> | |
| 92 | - </view> | |
| 93 | - | |
| 94 | - | |
| 95 | - <view> | |
| 96 | - <!--<view bindtap="getmendian" class="quhuo logistics-item" hidden="{{ismend==1}}">--> | |
| 97 | - <!--<view wx:if="{{sto_sele_name==''}}">取货门店--> | |
| 98 | - <!--<text class='small'>（选择门店）</text>--> | |
| 99 | - <!--</view>--> | |
| 100 | - <!--<view wx:else>{{sto_sele_name}}</view>--> | |
| 101 | - <!--<view class="item-img">--> | |
| 102 | - <!--<image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>--> | |
| 103 | - <!--</view>--> | |
| 104 | - <!--</view>--> | |
| 105 | - | |
| 106 | - | |
| 107 | - <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx"> | |
| 108 | - <view>购买数量</view> | |
| 109 | - <view class="count"> | |
| 110 | - <view bindtap="subCartNum" class="sub">-</view> | |
| 111 | - <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input> | |
| 112 | - <view bindtap="addCartNum" class="add">+</view> | |
| 113 | - </view> | |
| 114 | - </view> | |
| 115 | - | |
| 116 | - <view class="clear"></view> | |
| 117 | - <!---当选取门店的时候会显示门店的选项----> | |
| 118 | - <view hidden="{{ismend==0}}" class="sto_v"> | |
| 119 | - <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend"> | |
| 120 | - <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>选择门店 | |
| 121 | - </view> | |
| 122 | - <!-----第一级显示------> | |
| 123 | - <view class="itemlists" hidden="{{is_sec_mend==1}}"> | |
| 124 | - <block wx:if="{{is_show_sto_cat>0}}"> | |
| 125 | - <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view> | |
| 126 | - </block> | |
| 127 | - <block wx:else> | |
| 128 | - <view wx:for="{{only_pk}}" wx:key="only_pk" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}} | |
| 129 | - </view> | |
| 130 | - </block> | |
| 131 | - </view> | |
| 132 | - <!-----第二级显示------> | |
| 133 | - <view class="stitle" hidden="{{is_sec_mend==0}}" bindtap="hide_sec_mend"> | |
| 134 | - <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>{{sec_sto.name}}</view> | |
| 135 | - <view class="itemlists" hidden="{{is_sec_mend==0}}"> | |
| 136 | - <view wx:for="{{sec_sto.s_arr}}" wx:key="{{index}}" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}} | |
| 137 | - </view> | |
| 138 | - </view> | |
| 139 | - </view> | |
| 140 | - </view> | |
| 141 | - </view> | |
| 142 | - <view class="pt_qd"> | |
| 143 | - <block wx:if="{{is_normal==1}}"> | |
| 144 | - <!-- 按钮部分 --> | |
| 145 | - <view class="spec-cart-btns"> | |
| 146 | - <!-- 根本就找不到门店 --> | |
| 147 | - <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> | |
| 148 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | |
| 149 | - </block> | |
| 150 | - <block wx:else> | |
| 151 | - | |
| 152 | - <!-- 根本就找不到门店 --> | |
| 153 | - <block wx:if="{{!only_pk && !def_pickpu_list}}"> | |
| 154 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | |
| 155 | - </block> | |
| 156 | - <block wx:else> | |
| 157 | - | |
| 158 | - | |
| 159 | - <block wx:if="{{only_pk.length && !only_pk.length}}"> | |
| 160 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view> | |
| 161 | - </block> | |
| 162 | - <block wx:else> | |
| 163 | - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}"> | |
| 164 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | |
| 165 | - </block> | |
| 166 | - <block wx:else> | |
| 167 | - <block wx:if="{{!def_pick_store}}"> | |
| 168 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view> | |
| 169 | - </block> | |
| 170 | - <block wx:else> | |
| 171 | - <block wx:if="{{data.store_count<=0}}"> | |
| 172 | - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | |
| 173 | - </block> | |
| 174 | - <block wx:else> | |
| 175 | - <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> | |
| 176 | - </block> | |
| 177 | - | |
| 178 | - </block> | |
| 179 | - </block> | |
| 180 | - </block> | |
| 181 | - </block> | |
| 182 | - </block> | |
| 183 | - </view> | |
| 184 | - | |
| 185 | - </block> | |
| 186 | - <block wx:else> | |
| 187 | - <!-- 根本就找不到门店 --> | |
| 188 | - <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}"> | |
| 189 | - <view class="spec-cart-btn spec-buy w100" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | |
| 190 | - </block> | |
| 191 | - <block wx:else> | |
| 192 | - <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view> | |
| 193 | - </block> | |
| 194 | - </block> | |
| 195 | - | |
| 196 | - | |
| 197 | - </view> | |
| 198 | - </view> | |
| 199 | - | |
| 200 | 0 | \ No newline at end of file |
packageA/pages/my_service/appment_main.js
| ... | ... | @@ -34,7 +34,7 @@ Page({ |
| 34 | 34 | is_success: 0, //是否提交成功 |
| 35 | 35 | remarks: "", //备注 |
| 36 | 36 | storageId: "", //线下门店id |
| 37 | - url: "/pages/user/my_service/appment_main", //本页面地址路径用于选择时间页面跳转回来 | |
| 37 | + url: "/packageA/pages/my_service/appment_main", //本页面地址路径用于选择时间页面跳转回来 | |
| 38 | 38 | buyType: "", //项目类型 |
| 39 | 39 | time: "", //选择预约时间 |
| 40 | 40 | tment_count: "", //可预约人数 |
| ... | ... | @@ -96,7 +96,7 @@ Page({ |
| 96 | 96 | var buyType = th.data.buyType; //服务项目类型 |
| 97 | 97 | var storeId = a.stoid; //商家id |
| 98 | 98 | var storageId = th.data.storageId; //门店id |
| 99 | - var userId = d.user_id; //用户id | |
| 99 | + var userId = th.data.options.userid; //用户id | |
| 100 | 100 | var remarks = th.data.remarks; //用户备注 |
| 101 | 101 | var project_id = th.data.project_id; //项目id |
| 102 | 102 | var validay = th.data.validay; |
| ... | ... | @@ -150,10 +150,10 @@ Page({ |
| 150 | 150 | "keyword": res.data.data.Address |
| 151 | 151 | } |
| 152 | 152 | ], |
| 153 | - "page": "/pages/user/my_service/tment_details?number=" + number, | |
| 153 | + "page": "/packageA/pages/my_service/tment_details?number=" + number, | |
| 154 | 154 | "storeId": a.stoid, |
| 155 | 155 | "typeId": "1011", |
| 156 | - "userId": d.user_id | |
| 156 | + "userId": th.data.options.userid | |
| 157 | 157 | }; |
| 158 | 158 | var data = JSON.stringify(json); |
| 159 | 159 | //调用发送预约成功模版接口 |
| ... | ... | @@ -168,7 +168,7 @@ Page({ |
| 168 | 168 | }) |
| 169 | 169 | setTimeout(function() { |
| 170 | 170 | wx.redirectTo({ |
| 171 | - url: "/pages/user/my_service/tment_details?number=" + number | |
| 171 | + url: "/packageA/pages/my_service/tment_details?number=" + number | |
| 172 | 172 | }); |
| 173 | 173 | }, 1000); |
| 174 | 174 | } else { |
| ... | ... | @@ -373,7 +373,7 @@ Page({ |
| 373 | 373 | key_word = key_word.replace(/\s+/g, ""); |
| 374 | 374 | getApp().request.promiseGet(url, { |
| 375 | 375 | data: { |
| 376 | - userId:getApp().globalData.user_id, | |
| 376 | + userId: th.data.options.userid, | |
| 377 | 377 | storeId: a.stoid, |
| 378 | 378 | serviceId: itemId, |
| 379 | 379 | latitude: th.data.lat, |
| ... | ... | @@ -413,7 +413,8 @@ Page({ |
| 413 | 413 | var th = this; |
| 414 | 414 | th.setData({ |
| 415 | 415 | is_textea: 0 |
| 416 | - }) | |
| 416 | + }); | |
| 417 | + | |
| 417 | 418 | if (th.data.store_name == "") { |
| 418 | 419 | getApp().my_warnning("请选择服务门店", 0, th); |
| 419 | 420 | th.settime(); |
| ... | ... | @@ -428,7 +429,7 @@ Page({ |
| 428 | 429 | getApp().request.promiseGet(url, { |
| 429 | 430 | data: { |
| 430 | 431 | storeId: a.stoid, |
| 431 | - userId: d.user_id, | |
| 432 | + userId: th.data.options.userid, | |
| 432 | 433 | serviceId: itemid, |
| 433 | 434 | storageId: storageId |
| 434 | 435 | } |
| ... | ... | @@ -459,6 +460,7 @@ Page({ |
| 459 | 460 | }) |
| 460 | 461 | } |
| 461 | 462 | }, |
| 463 | + | |
| 462 | 464 | choice_beautician: function(e) { |
| 463 | 465 | var th = this; |
| 464 | 466 | var bea_index = e.currentTarget.dataset.baaindex; |
| ... | ... | @@ -515,8 +517,10 @@ Page({ |
| 515 | 517 | th.setData({ |
| 516 | 518 | is_textea: 1 |
| 517 | 519 | }) |
| 520 | + console.log('optionsxxx===>', this.data.options); | |
| 521 | + // console.log('1-->', "/pages/user/my_service/cosmetology_list?userid=" + th.data.options.userid + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id); | |
| 518 | 522 | wx.navigateTo({ |
| 519 | - url: "/pages/user/my_service/cosmetology_list?" + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id | |
| 523 | + url: "/packageA/pages/my_service/cosmetology_list?userid=" + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id | |
| 520 | 524 | }); |
| 521 | 525 | |
| 522 | 526 | } |
| ... | ... | @@ -527,6 +531,7 @@ Page({ |
| 527 | 531 | onLoad: function(options) { |
| 528 | 532 | var th = this; |
| 529 | 533 | th.setData({ |
| 534 | + options, | |
| 530 | 535 | itemId: options.service_id, |
| 531 | 536 | buyType: options.BuyType, |
| 532 | 537 | project_id: options.ProjectID, |
| ... | ... | @@ -562,19 +567,34 @@ Page({ |
| 562 | 567 | }); |
| 563 | 568 | |
| 564 | 569 | // 获取当前默认导购信息及归属门店信息 |
| 565 | - getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', { | |
| 566 | - data: { | |
| 567 | - store_id: 1, | |
| 568 | - guide_id: 73, | |
| 569 | - UserCode: '01', | |
| 570 | - } | |
| 571 | - }).then(res => { | |
| 572 | - console.log('res==>', res.data.data); | |
| 573 | - th.setData({ | |
| 574 | - store_name: res.data.data.StorageName, | |
| 575 | - beautician_name: res.data.data.StaffName, | |
| 570 | + if(options.firstleader) { | |
| 571 | + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+a.stoid+"/"+options.firstleader,{}).then(res=>{ | |
| 572 | + if(res.data.code==0){ | |
| 573 | + getApp().globalData.guide_id=res.data.data.id; | |
| 574 | + | |
| 575 | + getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', { | |
| 576 | + data: { | |
| 577 | + store_id: a.stoid, | |
| 578 | + guide_id: e.globalData.guide_id, | |
| 579 | + UserCode: th.data.options.usercode, | |
| 580 | + } | |
| 581 | + }).then(res => { | |
| 582 | + console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode); | |
| 583 | + if(res.data.data.Tech) { | |
| 584 | + th.setData({ | |
| 585 | + store_name: res.data.data.StorageName, | |
| 586 | + beautician_name: res.data.data.StaffName, | |
| 587 | + beauticianID: res.data.data.StaffId, | |
| 588 | + StorageId: res.data.data.StorageId, | |
| 589 | + }); | |
| 590 | + } | |
| 591 | + }); | |
| 592 | + | |
| 593 | + | |
| 594 | + }; | |
| 576 | 595 | }); |
| 577 | - }); | |
| 596 | + }; | |
| 597 | + | |
| 578 | 598 | |
| 579 | 599 | }, |
| 580 | 600 | //查询剩下可预约人数 |
| ... | ... | @@ -630,7 +650,7 @@ Page({ |
| 630 | 650 | getApp().request.promiseGet(url, { |
| 631 | 651 | data: { |
| 632 | 652 | storeId: a.stoid, |
| 633 | - userId: d.user_id, | |
| 653 | + userId: th.data.options.userid, | |
| 634 | 654 | projectId: project_id |
| 635 | 655 | } |
| 636 | 656 | }).then(res => { |
| ... | ... | @@ -645,9 +665,9 @@ Page({ |
| 645 | 665 | }) |
| 646 | 666 | }, |
| 647 | 667 | //关闭导航 |
| 648 | - close: function() { | |
| 649 | - var th = this; | |
| 650 | - var nav_b = th.selectComponent("#nav_b"); //组件的id | |
| 651 | - nav_b.close_box(); | |
| 652 | - } | |
| 668 | + // close: function() { | |
| 669 | + // var th = this; | |
| 670 | + // var nav_b = th.selectComponent("#nav_b"); //组件的id | |
| 671 | + // nav_b.close_box(); | |
| 672 | + // } | |
| 653 | 673 | }) |
| 654 | 674 | \ No newline at end of file | ... | ... |
packageA/pages/my_service/appment_main.json
| 1 | 1 | { |
| 2 | 2 | "navigationBarTitleText": "预约服务", |
| 3 | - "usingComponents": { | |
| 4 | - "warn": "/components/long_warn/long_warn", | |
| 5 | - "nav_b": "/components/nav_b/nav_b" | |
| 6 | - } | |
| 3 | + "enablePullDownRefresh": false, | |
| 4 | + "usingComponents": { | |
| 5 | + "warn": "/components/long_warn/long_warn", | |
| 6 | + "nav_b": "/components/nav_b/nav_b" | |
| 7 | + } | |
| 7 | 8 | } |
| 8 | 9 | \ No newline at end of file | ... | ... |
packageA/pages/my_service/appment_main.wxml
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | </view> |
| 56 | 56 | |
| 57 | 57 | <!-- 选择时间 --> |
| 58 | - <view class="flex-vertical-between fs26 select" data-url="/pages/user/my_service/beauty_deta?url={{url}}&StorageId={{StorageId}}&BeauticianID={{beauticianID}}&itemId={{itemId}}&modify=0&projectId={{project_id}}" bindtap="goto"> | |
| 58 | + <view class="flex-vertical-between fs26 select" data-url="/packageA/pages/my_service/beauty_deta?url={{url}}&StorageId={{StorageId}}&BeauticianID={{beauticianID}}&itemId={{itemId}}&modify=0&projectId={{project_id}}" bindtap="goto"> | |
| 59 | 59 | <view class="{{time==''?'color':''}}">{{time==""?'选择时间':time}}</view> |
| 60 | 60 | <view class="angle angler">∟</view> |
| 61 | 61 | </view> |
| ... | ... | @@ -83,14 +83,12 @@ |
| 83 | 83 | <view>注：剩余可预约人数{{tment_count}}人</view> |
| 84 | 84 | </view> |
| 85 | 85 | |
| 86 | - <view class="submitMax flex-space-between fs32"> | |
| 87 | - <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list"> | |
| 86 | + <view class="submitMax flex-space-center fs32"> | |
| 87 | + <!-- <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list"> | |
| 88 | 88 | <view>我的预约</view> |
| 89 | - </navigator> | |
| 89 | + </navigator> --> | |
| 90 | 90 | <form report-submit='true' bindtap="sub_success"> |
| 91 | - <button form-type="submit" class="sub_appment flex-center"> | |
| 92 | - <view>提交预约</view> | |
| 93 | - </button> | |
| 91 | + <button form-type="submit" class="sub_appment flex-center">帮你预约</button> | |
| 94 | 92 | </form> |
| 95 | 93 | </view> |
| 96 | 94 | </view> |
| ... | ... | @@ -149,4 +147,4 @@ |
| 149 | 147 | <view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view> |
| 150 | 148 | <warn id="warn"></warn> |
| 151 | 149 | <!-- 制作一个圆球导航 --> |
| 152 | -<nav_b id="nav_b"></nav_b> | |
| 153 | 150 | \ No newline at end of file |
| 151 | +<!-- <nav_b id="nav_b"></nav_b> --> | |
| 154 | 152 | \ No newline at end of file | ... | ... |
packageA/pages/my_service/beauty_deta.js
| ... | ... | @@ -46,13 +46,16 @@ Page({ |
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | th.setData({ |
| 49 | + options, | |
| 50 | + storeid: options.storeid, | |
| 49 | 51 | beautician_id: beautician_id, |
| 50 | 52 | itemId: options.itemId, |
| 51 | 53 | modify: options.modify, |
| 52 | 54 | hours: hours, |
| 53 | 55 | projectId: options.projectId, |
| 54 | - storageId:storageId | |
| 55 | - }) | |
| 56 | + storageId: storageId, | |
| 57 | + }); | |
| 58 | + | |
| 56 | 59 | if (options.url != undefined) { |
| 57 | 60 | th.setData({ |
| 58 | 61 | url: options.url |
| ... | ... | @@ -162,7 +165,7 @@ Page({ |
| 162 | 165 | "number": th.data.number, |
| 163 | 166 | "remark": "更改时间", |
| 164 | 167 | "states": 0, |
| 165 | - "storeId": a.stoid | |
| 168 | + "storeId": a.stoid, | |
| 166 | 169 | }; |
| 167 | 170 | var data = JSON.stringify(json); |
| 168 | 171 | var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址 |
| ... | ... | @@ -198,7 +201,8 @@ Page({ |
| 198 | 201 | //直接给上一个页面赋值 |
| 199 | 202 | time: time, |
| 200 | 203 | beautician_name: th.data.StaffName, |
| 201 | - beauticianID: th.data.beautician_id | |
| 204 | + beauticianID: th.data.beautician_id, | |
| 205 | + storageId: th.data.storageId, | |
| 202 | 206 | }); |
| 203 | 207 | wx.navigateBack({ |
| 204 | 208 | //返回 |
| ... | ... | @@ -208,7 +212,8 @@ Page({ |
| 208 | 212 | var prevPage = pages[pages.length - 2]; //上一页面 |
| 209 | 213 | prevPage.setData({ |
| 210 | 214 | //直接给上一个页面赋值 |
| 211 | - time: time | |
| 215 | + time: time, | |
| 216 | + storageId: th.data.storageId, | |
| 212 | 217 | }); |
| 213 | 218 | wx.navigateBack({ |
| 214 | 219 | //返回 |
| ... | ... | @@ -245,7 +250,7 @@ Page({ |
| 245 | 250 | beauticianId: beautician_id, |
| 246 | 251 | serviceId: itemId, |
| 247 | 252 | storeId: a.stoid, |
| 248 | - storageId:storageId | |
| 253 | + storageId:storageId | |
| 249 | 254 | } |
| 250 | 255 | }).then(res => { |
| 251 | 256 | if (res.data.code == 0) { |
| ... | ... | @@ -363,7 +368,7 @@ Page({ |
| 363 | 368 | "number": number, |
| 364 | 369 | "remark": "更改预约时间", |
| 365 | 370 | "states": 0, |
| 366 | - "storeId": a.stoid | |
| 371 | + "storeId": a.stoid, | |
| 367 | 372 | }; |
| 368 | 373 | var data = JSON.stringify(json); |
| 369 | 374 | var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址 | ... | ... |
packageA/pages/my_service/cosmetology_list.js
| ... | ... | @@ -3,6 +3,8 @@ var e = getApp(), |
| 3 | 3 | os = a, |
| 4 | 4 | t = e.request, |
| 5 | 5 | d = e.globalData; |
| 6 | + | |
| 7 | + | |
| 6 | 8 | Page({ |
| 7 | 9 | |
| 8 | 10 | /** |
| ... | ... | @@ -21,6 +23,7 @@ Page({ |
| 21 | 23 | storageId: 0, //线下门店id |
| 22 | 24 | projectId:"",//项目id |
| 23 | 25 | }, |
| 26 | + | |
| 24 | 27 | onReachBottom: function() { |
| 25 | 28 | var th = this; |
| 26 | 29 | if (this.data.total <= th.data.pageSize) return; |
| ... | ... | @@ -30,6 +33,8 @@ Page({ |
| 30 | 33 | }) |
| 31 | 34 | th.query_cology(); |
| 32 | 35 | }, |
| 36 | + | |
| 37 | + | |
| 33 | 38 | query_cology: function() { |
| 34 | 39 | var th = this; |
| 35 | 40 | var url = "/api/weshop/marketing/reservation/staff/pagenew"; |
| ... | ... | @@ -38,7 +43,7 @@ Page({ |
| 38 | 43 | getApp().request.promiseGet(url, { |
| 39 | 44 | data: { |
| 40 | 45 | storeId: a.stoid, |
| 41 | - userId: d.user_id, | |
| 46 | + userId: th.data.options.userid, | |
| 42 | 47 | serviceId: itemId, |
| 43 | 48 | storageId: storageId, |
| 44 | 49 | page: th.data.curpage, |
| ... | ... | @@ -67,6 +72,8 @@ Page({ |
| 67 | 72 | } |
| 68 | 73 | }) |
| 69 | 74 | }, |
| 75 | + | |
| 76 | + | |
| 70 | 77 | //图片失败，默认图片 |
| 71 | 78 | bind_bnerr1: function(e) { |
| 72 | 79 | var _errImg = e.target.dataset.errorimg; |
| ... | ... | @@ -78,12 +85,17 @@ Page({ |
| 78 | 85 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
| 79 | 86 | } |
| 80 | 87 | }, |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 81 | 91 | /** |
| 82 | 92 | * 生命周期函数--监听页面加载 |
| 83 | 93 | */ |
| 84 | 94 | onLoad: function(options) { |
| 95 | + console.log('options--->', options); | |
| 85 | 96 | var th = this; |
| 86 | - th.setData({ | |
| 97 | + this.setData({ | |
| 98 | + options, | |
| 87 | 99 | projectId: options.projectId, |
| 88 | 100 | itemId: options.itemId, |
| 89 | 101 | storageId: options.storageId |
| ... | ... | @@ -105,4 +117,5 @@ Page({ |
| 105 | 117 | th.query_cology(); |
| 106 | 118 | }, |
| 107 | 119 | |
| 120 | + | |
| 108 | 121 | }) |
| 109 | 122 | \ No newline at end of file | ... | ... |
packageA/pages/my_service/cosmetology_list.wxml
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | </view> |
| 28 | 28 | |
| 29 | 29 | <!-- 预约状态 --> |
| 30 | - <navigator class="flex-center gofu go" url="/pages/user/my_service/beauty_deta?StorageId={{item.StorageId}}&BeauticianID={{item.staffid}}&itemId={{itemId}}&iscos=1&modify=0&projectId={{projectId}}&StaffName={{item.StaffName}}"> | |
| 30 | + <navigator class="flex-center gofu go" url="/packageA/pages/my_service/beauty_deta?StorageId={{item.StorageId}}&BeauticianID={{item.staffid}}&itemId={{itemId}}&iscos=1&modify=0&projectId={{projectId}}&StaffName={{item.StaffName}}"> | |
| 31 | 31 | <view class="fs24">预约</view> |
| 32 | 32 | </navigator> |
| 33 | 33 | </view> | ... | ... |
packageA/pages/my_service/hist_service.js
| ... | ... | @@ -69,6 +69,10 @@ Page({ |
| 69 | 69 | */ |
| 70 | 70 | onLoad: function(options) { |
| 71 | 71 | var th = this; |
| 72 | + console.log('xxoptions==>', options); | |
| 73 | + this.setData({ | |
| 74 | + options, | |
| 75 | + }); | |
| 72 | 76 | th.query_hist(); |
| 73 | 77 | }, |
| 74 | 78 | /** |
| ... | ... | @@ -116,7 +120,7 @@ Page({ |
| 116 | 120 | getApp().request.promiseGet(url, { |
| 117 | 121 | data: { |
| 118 | 122 | storeId: a.stoid, |
| 119 | - userId: d.user_id, | |
| 123 | + userId: th.data.options.userid, | |
| 120 | 124 | beginDate: startTime, |
| 121 | 125 | endDate: endTime, |
| 122 | 126 | page: th.data.curpage, | ... | ... |
packageA/pages/my_service/i_service.js
| ... | ... | @@ -29,16 +29,21 @@ Page({ |
| 29 | 29 | * 生命周期函数--监听页面加载 |
| 30 | 30 | */ |
| 31 | 31 | onLoad: function(options) { |
| 32 | + console.log('options==>', options); | |
| 32 | 33 | var userinfo = getApp().globalData.userInfo; |
| 33 | 34 | if (userinfo == null) { |
| 34 | 35 | //界面必须使用warn 做ID,并调用 |
| 35 | - return false; | |
| 36 | - } | |
| 36 | + // return false; | |
| 37 | + }; | |
| 37 | 38 | this.setData({ |
| 38 | - userinfo: userinfo | |
| 39 | + userinfo: userinfo, | |
| 40 | + options, | |
| 39 | 41 | }); |
| 40 | 42 | var th = this; |
| 41 | - th.query_service(); | |
| 43 | + // if(options.UserId) { | |
| 44 | + th.query_service(); | |
| 45 | + // }; | |
| 46 | + | |
| 42 | 47 | }, |
| 43 | 48 | /** |
| 44 | 49 | * 生命周期函数--监听页面显示 |
| ... | ... | @@ -48,6 +53,7 @@ Page({ |
| 48 | 53 | var my_confirm = th.selectComponent("#my_confirm"); //组件的id |
| 49 | 54 | my_confirm.open_cancel(0); |
| 50 | 55 | }, |
| 56 | + | |
| 51 | 57 | onReachBottom: function() { |
| 52 | 58 | var th = this; |
| 53 | 59 | if (this.data.total <= th.data.pageSize) return; |
| ... | ... | @@ -65,7 +71,7 @@ Page({ |
| 65 | 71 | getApp().request.promiseGet(url, { |
| 66 | 72 | data: { |
| 67 | 73 | storeId: a.stoid, |
| 68 | - userId: d.user_id, | |
| 74 | + userId: th.data.options.UserId, | |
| 69 | 75 | page: th.data.curpage, |
| 70 | 76 | pageSize: th.data.pageSize |
| 71 | 77 | } |
| ... | ... | @@ -113,7 +119,7 @@ Page({ |
| 113 | 119 | data: { |
| 114 | 120 | serviceId: service_id, |
| 115 | 121 | storeId: a.stoid, |
| 116 | - userId: d.user_id | |
| 122 | + userId: th.data.options.UserId, | |
| 117 | 123 | } |
| 118 | 124 | }).then(res => { |
| 119 | 125 | wx.hideLoading(); |
| ... | ... | @@ -129,7 +135,7 @@ Page({ |
| 129 | 135 | "继续使用", |
| 130 | 136 | function() { |
| 131 | 137 | my_confirm.open_cancel(0); |
| 132 | - var deta_url = "/pages/user/my_service/tment_details?number=" + res.data.data.Number; | |
| 138 | + var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number; | |
| 133 | 139 | wx.navigateTo({ |
| 134 | 140 | url: deta_url |
| 135 | 141 | }) |
| ... | ... | @@ -190,7 +196,7 @@ Page({ |
| 190 | 196 | data: { |
| 191 | 197 | serviceId: service_id, |
| 192 | 198 | storeId: a.stoid, |
| 193 | - userId: d.user_id | |
| 199 | + userId: th.data.options.UserId, | |
| 194 | 200 | } |
| 195 | 201 | }).then(res => { |
| 196 | 202 | wx.hideLoading(); |
| ... | ... | @@ -209,7 +215,7 @@ Page({ |
| 209 | 215 | "继续预约", |
| 210 | 216 | function() { |
| 211 | 217 | my_confirm.open_cancel(0); |
| 212 | - var deta_url = "/pages/user/my_service/tment_details?number=" + number; | |
| 218 | + var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId; | |
| 213 | 219 | wx.navigateTo({ |
| 214 | 220 | url: deta_url |
| 215 | 221 | }) |
| ... | ... | @@ -221,7 +227,7 @@ Page({ |
| 221 | 227 | projectId: project_id, |
| 222 | 228 | serviceId: service_id, |
| 223 | 229 | storeId: a.stoid, |
| 224 | - userId: d.user_id | |
| 230 | + userId: th.data.options.UserId, | |
| 225 | 231 | } |
| 226 | 232 | }).then(res => { |
| 227 | 233 | if (res.data.code == 0) { | ... | ... |
packageA/pages/my_service/i_service.json
packageA/pages/my_service/i_service.wxml
| 1 | 1 | <!-- 背景图片 --> |
| 2 | 2 | <view catchtap="close"> |
| 3 | 3 | <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image> |
| 4 | - <navigator class="History fs26" url="/packageA/pages/service_record/service_record" style="left:10px;right:auto;">服务记录</navigator> | |
| 5 | - <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator> | |
| 4 | + <navigator class="History fs26" url="/packageA/pages/service_record/service_record?userid={{options.UserId}}" style="left:10px;right:auto;">服务记录</navigator> | |
| 5 | + <navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}">历史预约</navigator> | |
| 6 | 6 | </view> |
| 7 | 7 | |
| 8 | 8 | <!-- 预约内容 --> |
| ... | ... | @@ -50,7 +50,7 @@ |
| 50 | 50 | <!-- <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}"> |
| 51 | 51 | <view>帮你预约</view> |
| 52 | 52 | </view> --> |
| 53 | - <view class="flex-level btn" data-url="/packageA/pages/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}"> | |
| 53 | + <view class="flex-level btn" data-url="/packageA/pages/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}&userid={{options.UserId}}&usercode={{options.UserCode}}&firstleader={{options.first_leader}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}"> | |
| 54 | 54 | <view>帮你预约</view> |
| 55 | 55 | </view> |
| 56 | 56 | </view> | ... | ... |
packageA/pages/my_service/tment_details.js
| ... | ... | @@ -71,6 +71,7 @@ Page({ |
| 71 | 71 | onLoad: function(options) { |
| 72 | 72 | var th = this; |
| 73 | 73 | th.setData({ |
| 74 | + options, | |
| 74 | 75 | number: options.number |
| 75 | 76 | }) |
| 76 | 77 | }, |
| ... | ... | @@ -82,7 +83,7 @@ Page({ |
| 82 | 83 | getApp().request.promiseGet(url, { |
| 83 | 84 | data: { |
| 84 | 85 | storeId: a.stoid, |
| 85 | - userId: d.user_id, | |
| 86 | + userId: th.data.options.userid, | |
| 86 | 87 | number: number |
| 87 | 88 | } |
| 88 | 89 | }).then(res => { | ... | ... |
packageA/pages/my_service/tment_details.wxml
| ... | ... | @@ -97,20 +97,20 @@ |
| 97 | 97 | <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}" bindtap="cancel_tment"> |
| 98 | 98 | <view class="yellow-b" data-index="{{index}}">取消预约</view> |
| 99 | 99 | </view> |
| 100 | - <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/pages/user/my_service/tment_order_list"> | |
| 100 | + <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/packageA/pages/my_service/tment_order_list?userid={{options.userid}}"> | |
| 101 | 101 | <view class="yellow-b">我的服务</view> |
| 102 | 102 | </navigator> |
| 103 | 103 | <!-- 右边栏 --> |
| 104 | - <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}"> | |
| 104 | + <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/packageA/pages/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}"> | |
| 105 | 105 | <view>更改时间</view> |
| 106 | 106 | </navigator> |
| 107 | - <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}"> | |
| 107 | + <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}&userid={{options.userid}}"> | |
| 108 | 108 | <view>发表评价</view> |
| 109 | 109 | </navigator> |
| 110 | - <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}"> | |
| 110 | + <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}&userid={{options.userid}}"> | |
| 111 | 111 | <view>查看评价</view> |
| 112 | 112 | </navigator> |
| 113 | - <navigator wx:if="{{item.State==2 || item.State==3}}" class="sub rb flex-center" url="/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}"> | |
| 113 | + <navigator wx:if="{{item.State==2 || item.State==3}}" class="sub rb flex-center" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}"> | |
| 114 | 114 | <view>重新预约</view> |
| 115 | 115 | </navigator> |
| 116 | 116 | ... | ... |
packageA/pages/my_service/tment_eval.js
| ... | ... | @@ -40,7 +40,7 @@ Page({ |
| 40 | 40 | getApp().request.promiseGet(url, { |
| 41 | 41 | data: { |
| 42 | 42 | Star: index + 1, |
| 43 | - storeId: a.stoid | |
| 43 | + storeId: a.stoid, | |
| 44 | 44 | } |
| 45 | 45 | }).then(res => { |
| 46 | 46 | if (res.data.code == 0) { |
| ... | ... | @@ -103,7 +103,7 @@ Page({ |
| 103 | 103 | getApp().request.promiseGet(url, { |
| 104 | 104 | data: { |
| 105 | 105 | storeId: a.stoid, |
| 106 | - userId: d.user_id, | |
| 106 | + userId: th.data.options.userid, | |
| 107 | 107 | number: number |
| 108 | 108 | } |
| 109 | 109 | }).then(res => { |
| ... | ... | @@ -126,7 +126,7 @@ Page({ |
| 126 | 126 | getApp().request.promiseGet(url, { |
| 127 | 127 | data: { |
| 128 | 128 | number: th.data.number, |
| 129 | - storeId: a.stoid | |
| 129 | + storeId: a.stoid, | |
| 130 | 130 | } |
| 131 | 131 | }).then(res => { |
| 132 | 132 | if (res.data.code == 0) { |
| ... | ... | @@ -175,7 +175,7 @@ Page({ |
| 175 | 175 | "number": posNo, |
| 176 | 176 | "remark": proposal, |
| 177 | 177 | "star": stars + 1, |
| 178 | - "storeId": a.stoid | |
| 178 | + "storeId": a.stoid, | |
| 179 | 179 | }; |
| 180 | 180 | var data = JSON.stringify(json); //转换成json格式 |
| 181 | 181 | wx.request({ |
| ... | ... | @@ -220,6 +220,7 @@ Page({ |
| 220 | 220 | onLoad: function(options) { |
| 221 | 221 | var th = this; |
| 222 | 222 | th.setData({ |
| 223 | + options, | |
| 223 | 224 | number: options.Number, |
| 224 | 225 | is_evaluate: options.evaluate |
| 225 | 226 | }) |
| ... | ... | @@ -265,7 +266,7 @@ Page({ |
| 265 | 266 | orderNumber: th.data.number, |
| 266 | 267 | orderType: 2, |
| 267 | 268 | storeId: a.stoid, |
| 268 | - userId: d.user_id | |
| 269 | + userId: th.data.options.userid, | |
| 269 | 270 | } |
| 270 | 271 | }).then(res => { |
| 271 | 272 | if (res.data.code == 0) { | ... | ... |
packageA/pages/my_service/tment_order_list.js
| ... | ... | @@ -39,6 +39,9 @@ Page({ |
| 39 | 39 | * 生命周期函数--监听页面加载 |
| 40 | 40 | */ |
| 41 | 41 | onLoad: function(options) { |
| 42 | + this.setData({ | |
| 43 | + options, | |
| 44 | + }); | |
| 42 | 45 | var state=options.state; |
| 43 | 46 | if (state != null && state != undefined && state!=""){ |
| 44 | 47 | this.setData({ activeCategoryId: state }); |
| ... | ... | @@ -93,7 +96,7 @@ Page({ |
| 93 | 96 | getApp().request.promiseGet(url, { |
| 94 | 97 | data: { |
| 95 | 98 | storeId: a.stoid, |
| 96 | - userId: d.user_id, | |
| 99 | + userId: th.data.options.userid, | |
| 97 | 100 | state: state_index, |
| 98 | 101 | page: th.data.curpage, |
| 99 | 102 | pageSize: th.data.pageSize | ... | ... |
packageA/pages/my_service/tment_order_list.wxml
| ... | ... | @@ -68,12 +68,12 @@ |
| 68 | 68 | <view class="Unimportance flex-level" data-index="{{index}}" bindtap="cancel_tment">取消预约</view> |
| 69 | 69 | </block> |
| 70 | 70 | <block wx:else> |
| 71 | - <navigator url="/pages/user/my_service/tment_details?number={{item.Number}}" class="Unimportance flex-level">查看详情</navigator> | |
| 71 | + <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}" class="Unimportance flex-level">查看详情</navigator> | |
| 72 | 72 | </block> |
| 73 | - <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">更改时间</navigator> | |
| 74 | - <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}" class="important Unimportance flex-level">发表评价</navigator> | |
| 75 | - <navigator wx:if="{{item.State==2 || item.State==3}}" url="/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}" class="important Unimportance flex-level">重新预约</navigator> | |
| 76 | - <navigator wx:if="{{item.State==4}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" class="important Unimportance flex-level">评价详情</navigator> | |
| 73 | + <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/packageA/pages/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}&userid={{options.userid}}">更改时间</navigator> | |
| 74 | + <navigator wx:if="{{item.State==1}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}&userid={{options.userid}}" class="important Unimportance flex-level">发表评价</navigator> | |
| 75 | + <navigator wx:if="{{item.State==2 || item.State==3}}" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}" class="important Unimportance flex-level">重新预约</navigator> | |
| 76 | + <navigator wx:if="{{item.State==4}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}&userid={{options.userid}}" class="important Unimportance flex-level">评价详情</navigator> | |
| 77 | 77 | </view> |
| 78 | 78 | </view> |
| 79 | 79 | <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}"> | ... | ... |
packageA/pages/service_record/service_record.js
| ... | ... | @@ -14,10 +14,11 @@ Page({ |
| 14 | 14 | endDate: '结束日期', |
| 15 | 15 | }, |
| 16 | 16 | |
| 17 | - onLoad: function(t) { | |
| 17 | + onLoad: function(options) { | |
| 18 | 18 | _this = this; |
| 19 | 19 | |
| 20 | 20 | this.setData({ |
| 21 | + options, | |
| 21 | 22 | currentDate: this.currentDate(), |
| 22 | 23 | }); |
| 23 | 24 | |
| ... | ... | @@ -27,15 +28,22 @@ Page({ |
| 27 | 28 | }, |
| 28 | 29 | |
| 29 | 30 | onShow: function() { |
| 30 | - this.isLogin() | |
| 31 | - .then(function(data) { | |
| 32 | - reqData.url = '/api/weshop/marketing/servicewrite/page'; | |
| 33 | - reqData.data = { | |
| 34 | - storeId: app.globalData.setting.stoid, | |
| 35 | - userId: app.globalData.user_id, | |
| 36 | - }; | |
| 37 | - _this.getData(true, reqData.url, reqData.data); | |
| 38 | - }); | |
| 31 | + reqData.url = '/api/weshop/marketing/servicewrite/page'; | |
| 32 | + reqData.data = { | |
| 33 | + storeId: app.globalData.setting.stoid, | |
| 34 | + }; | |
| 35 | + | |
| 36 | + if(this.data.options.userid) { | |
| 37 | + reqData.data.userId = this.data.options.userid; | |
| 38 | + _this.getData(true, reqData.url, reqData.data); | |
| 39 | + } else { | |
| 40 | + reqData.data.userId = app.globalData.user_id; | |
| 41 | + this.isLogin() | |
| 42 | + .then(function(data) { | |
| 43 | + _this.getData(true, reqData.url, reqData.data); | |
| 44 | + }); | |
| 45 | + }; | |
| 46 | + | |
| 39 | 47 | }, |
| 40 | 48 | |
| 41 | 49 | ... | ... |
packageA/pages/shop_details/shop_details.js
0 → 100644
| 1 | +Page({ | |
| 2 | + data: { | |
| 3 | + shop: null, | |
| 4 | + }, | |
| 5 | + | |
| 6 | + onLoad(options) { | |
| 7 | + let shop = JSON.parse(decodeURIComponent(options.shop)) | |
| 8 | + this.setData({ | |
| 9 | + shop: shop, | |
| 10 | + }); | |
| 11 | + }, | |
| 12 | + | |
| 13 | + // 监听拨打电话 | |
| 14 | + onPhone() { | |
| 15 | + wx.makePhoneCall({ | |
| 16 | + phoneNumber: this.data.shop.pickup_phone, | |
| 17 | + }) | |
| 18 | + }, | |
| 19 | + | |
| 20 | +}) | |
| 0 | 21 | \ No newline at end of file | ... | ... |
pages/distribution/distribution.js
| ... | ... | @@ -268,7 +268,17 @@ Page({ |
| 268 | 268 | mobile: mobile, |
| 269 | 269 | }, |
| 270 | 270 | success: function (res) { |
| 271 | - var showtxt=res.data.msg; | |
| 271 | + var showtxt=res.data.msg; | |
| 272 | + | |
| 273 | + if(!res.data.data){ | |
| 274 | + wx.showToast({ | |
| 275 | + title: showtxt, | |
| 276 | + icon: 'none', | |
| 277 | + duration: 1500 | |
| 278 | + }); | |
| 279 | + return false; | |
| 280 | + } | |
| 281 | + | |
| 272 | 282 | if(res.data.data.indexOf('已成为分销商')!=-1){ |
| 273 | 283 | showtxt="成功成为分销商"; |
| 274 | 284 | var txt="fenxiao["+index+"].pass"; | ... | ... |
pages/user/my_service/i_service.wxml
| ... | ... | @@ -65,6 +65,7 @@ |
| 65 | 65 | <view class="end fs26 xc-black">到底了</view> |
| 66 | 66 | <view class="Line"></view> |
| 67 | 67 | </view> |
| 68 | + <!-- <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}">选择更多服务卡项，</view> --> | |
| 68 | 69 | </view> |
| 69 | 70 | <!-- 无服务项目 --> |
| 70 | 71 | <view wx:if="{{service_List.length<1 && is_service_read}}"> |
| ... | ... | @@ -75,7 +76,8 @@ |
| 75 | 76 | <view class="flex-level"> |
| 76 | 77 | <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image> |
| 77 | 78 | </view> |
| 78 | - <view class="flex-level fs30 xc-ash">暂无服务项目</view> | |
| 79 | + <!-- <view class="flex-level fs30 xc-ash">暂无服务项目</view> --> | |
| 80 | + <view class="flex-level fs30 xc-ash">暂无服务卡项，<text class="ctb" data-url="/packageA/pages/cardList/cardList" bindtap="goto">立即购买！</text></view> | |
| 79 | 81 | <view class="flex-level"> |
| 80 | 82 | <navigator data-url="/pages/user/index/index" bindtap="goto"> |
| 81 | 83 | <view class="flex-center fs28 white">回到首页</view> | ... | ... |